fix(ui): reattach floating sessions after workspace rebuild

commit: bfcbf1a503b9c4d3fddbd35e62018af46c943cd6
author: brice · 8mo ago · 2026-02-10 06:00 UTC
parent: ff584d1
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +28 -11

M internal/ui/app.go +28 -11


@@ -1031,6 +1031,8 @@ func (a *App) rebuildAndAttachWorkspace(ctx context.Context, tabID entity.TabID,
1031	1031		return
1032	1032		}
1033	1033		_ = wsView.Rebuild(ctx)
	1034	+	a.reattachFloatingSessions(tabID, wsView)
	1035	+	a.syncFloatingFocus()
1034	1036
1035	1037		if tab == nil \|\| tab.Workspace == nil \|\| a.contentCoord == nil {
1036	1038		return

@@ -1041,6 +1043,31 @@ func (a *App) rebuildAndAttachWorkspace(ctx context.Context, tabID entity.TabID,
1041	1043		}
1042	1044		}
1043	1045
	1046	+	func (a App) reattachFloatingSessions(tabID entity.TabID, wsView component.WorkspaceView) {
	1047	+	if wsView == nil {
	1048	+	return
	1049	+	}
	1050	+
	1051	+	for key, session := range a.floatingSessions {
	1052	+	if key.tabID != tabID \|\| session == nil \|\| session.pane == nil {
	1053	+	continue
	1054	+	}
	1055	+
	1056	+	session.pane.SetParentOverlay(wsView.WorkspaceOverlayWidget())
	1057	+	if session.widget != nil {
	1058	+	wsView.AddWorkspaceOverlayWidget(session.widget)
	1059	+	configureFloatingOverlayMeasurement(wsView.WorkspaceOverlayWidget(), session.widget)
	1060	+	setFloatingWidgetShown(session.widget, session.pane.IsVisible())
	1061	+	}
	1062	+	if session.paneView != nil {
	1063	+	wsView.RegisterPaneView(session.paneID, session.paneView)
	1064	+	if session.focusWidget == nil {
	1065	+	session.focusWidget = session.paneView.WebViewWidget()
	1066	+	}
	1067	+	}
	1068	+	}
	1069	+	}
	1070	+
1044	1071		func (a App) switchToTargetTabIfConfigured(ctx context.Context, out usecase.MovePaneToTabOutput) {
1045	1072		if out == nil \|\| out.TargetTab == nil {
1046	1073		return

@@ -1954,17 +1981,7 @@ func (a App) createWorkspaceViewWithoutAttach(ctx context.Context, tab entity.
1954	1981
1955	1982		// Store in map
1956	1983		a.workspaceViews[tab.ID] = wsView
1957		-	for key, session := range a.floatingSessions {
1958		-	if key.tabID != tab.ID \|\| session == nil \|\| session.pane == nil {
1959		-	continue
1960		-	}
1961		-	session.pane.SetParentOverlay(wsView.WorkspaceOverlayWidget())
1962		-	if session.widget != nil {
1963		-	wsView.AddWorkspaceOverlayWidget(session.widget)
1964		-	configureFloatingOverlayMeasurement(wsView.WorkspaceOverlayWidget(), session.widget)
1965		-	setFloatingWidgetShown(session.widget, session.pane.IsVisible())
1966		-	}
1967		-	}
	1984	+	a.reattachFloatingSessions(tab.ID, wsView)
1968	1985		a.syncFloatingFocus()
1969	1986
1970	1987		log.Debug().Str("tab_id", string(tab.ID)).Msg("workspace view created")

 		return
 	}
 	_ = wsView.Rebuild(ctx)
+	a.reattachFloatingSessions(tabID, wsView)
+	a.syncFloatingFocus()
 	if tab == nil || tab.Workspace == nil || a.contentCoord == nil {
 		return
 	}
 }
+func (a *App) reattachFloatingSessions(tabID entity.TabID, wsView *component.WorkspaceView) {
+	if wsView == nil {
+		return
+	}
+	for key, session := range a.floatingSessions {
+		if key.tabID != tabID || session == nil || session.pane == nil {
+			continue
+		}
+		session.pane.SetParentOverlay(wsView.WorkspaceOverlayWidget())
+		if session.widget != nil {
+			wsView.AddWorkspaceOverlayWidget(session.widget)
+			configureFloatingOverlayMeasurement(wsView.WorkspaceOverlayWidget(), session.widget)
+			setFloatingWidgetShown(session.widget, session.pane.IsVisible())
+		}
+		if session.paneView != nil {
+			wsView.RegisterPaneView(session.paneID, session.paneView)
+			if session.focusWidget == nil {
+				session.focusWidget = session.paneView.WebViewWidget()
+			}
+		}
+	}
+}
 func (a *App) switchToTargetTabIfConfigured(ctx context.Context, out *usecase.MovePaneToTabOutput) {
 	if out == nil || out.TargetTab == nil {
 		return
 	// Store in map
 	a.workspaceViews[tab.ID] = wsView
-	for key, session := range a.floatingSessions {
+	a.reattachFloatingSessions(tab.ID, wsView)
-		if key.tabID != tab.ID || session == nil || session.pane == nil {
-			continue
-		}
-		session.pane.SetParentOverlay(wsView.WorkspaceOverlayWidget())
-		if session.widget != nil {
-			wsView.AddWorkspaceOverlayWidget(session.widget)
-			configureFloatingOverlayMeasurement(wsView.WorkspaceOverlayWidget(), session.widget)
-			setFloatingWidgetShown(session.widget, session.pane.IsVisible())
-		}
-	}
 	a.syncFloatingFocus()
 	log.Debug().Str("tab_id", string(tab.ID)).Msg("workspace view created")