Improve review comment UI

2026-05-02 18:04:18 +07:00
parent 49e3011a28
commit 34b95e7f01
20 changed files with 801 additions and 286 deletions
@@ -1013,10 +1013,7 @@ const styles = StyleSheet.create((theme) => ({
    alignItems: "center",
    gap: theme.spacing[2],
  },
-  newTabTooltipShortcut: {
-    backgroundColor: theme.colors.surface3,
-    borderColor: theme.colors.borderAccent,
-  },
+  newTabTooltipShortcut: {},
  tooltipAgentRow: {
    flexDirection: "row",
    alignItems: "center",
@@ -118,6 +118,7 @@ import {
  type WorkspacePaneContentModel,
 } from "@/screens/workspace/workspace-pane-content";
 import { useMountedTabSet } from "@/screens/workspace/use-mounted-tab-set";
+import { WorkspaceFocusProvider } from "@/workspace/focus";
 import { shouldSeedEmptyWorkspaceDraft } from "@/screens/workspace/workspace-empty-draft-seed";
 import {
  buildBulkCloseConfirmationMessage,
@@ -2897,127 +2898,129 @@ function WorkspaceScreenContent({
  ]);

  return (
-    <View style={containerStyle}>
-      {documentTitleEffectTab ? (
-        <WorkspaceTabPresentationResolver
-          tab={documentTitleEffectTab}
-          serverId={normalizedServerId}
-          workspaceId={normalizedWorkspaceId}
-        >
-          {(presentation) => (
-            <WorkspaceDocumentTitleEffect
-              label={presentation.label}
-              titleState={presentation.titleState}
-            />
-          )}
-        </WorkspaceTabPresentationResolver>
-      ) : null}
-      <View style={styles.threePaneRow}>
-        <View style={styles.centerColumn}>
-          {showScreenHeader && (
-            <ScreenHeader
-              onRowLayout={onHeaderLayout}
-              left={
-                <>
-                  <SidebarMenuToggle />
-                  <WorkspaceHeaderTitleBar
-                    isLoading={isWorkspaceHeaderLoading}
-                    title={workspaceHeaderTitle}
-                    subtitle={workspaceHeaderSubtitle}
-                    showSubtitle={shouldShowWorkspaceHeaderSubtitle}
-                    currentBranchName={currentBranchName}
-                    isGitCheckout={isGitCheckout}
-                    normalizedServerId={normalizedServerId}
-                    normalizedWorkspaceId={normalizedWorkspaceId}
-                    showWorkspaceSetup={showWorkspaceSetup}
-                    isMobile={isMobile}
-                    createTerminalDisabled={createTerminalDisabled}
-                    menuNewAgentIcon={menuNewAgentIcon}
-                    menuNewTerminalIcon={menuNewTerminalIcon}
-                    menuCopyIcon={menuCopyIcon}
-                    menuSettingsIcon={menuSettingsIcon}
-                    onCreateDraftTab={handleCreateDraftTab}
-                    onCreateTerminal={handleCreateTerminal}
-                    onCopyWorkspacePath={handleCopyWorkspacePath}
-                    onCopyBranchName={handleCopyBranchName}
-                    onOpenSetupTab={handleOpenSetupTab}
-                  />
-                </>
-              }
-              right={headerRight}
-            />
-          )}
-
-          {isMobile ? (
-            <MobileWorkspaceTabSwitcher
-              tabs={tabs}
-              activeTabKey={activeTabKey}
-              activeTab={activeTabDescriptor}
-              tabSwitcherOptions={tabSwitcherOptions}
-              tabByKey={tabByKey}
-              normalizedServerId={normalizedServerId}
-              normalizedWorkspaceId={normalizedWorkspaceId}
-              onSelectSwitcherTab={handleSelectSwitcherTab}
-              onCopyResumeCommand={handleCopyResumeCommand}
-              onCopyAgentId={handleCopyAgentId}
-              onReloadAgent={handleReloadAgent}
-              onCloseTab={handleCloseTabById}
-              onCloseTabsAbove={handleCloseTabsToLeft}
-              onCloseTabsBelow={handleCloseTabsToRight}
-              onCloseOtherTabs={handleCloseOtherTabs}
-            />
-          ) : null}
-
-          {shouldRenderDesktopPaneFallback ? (
-            <WorkspaceDesktopTabsRow
-              paneId={focusedPaneIdOrUndefined}
-              isFocused={isRouteFocused}
-              tabs={desktopTabRowItems}
-              normalizedServerId={normalizedServerId}
-              normalizedWorkspaceId={normalizedWorkspaceId}
-              setHoveredTabKey={setHoveredTabKey}
-              setHoveredCloseTabKey={setHoveredCloseTabKey}
-              onNavigateTab={navigateToTabId}
-              onCloseTab={handleCloseTabById}
-              onCopyResumeCommand={handleCopyResumeCommand}
-              onCopyAgentId={handleCopyAgentId}
-              onReloadAgent={handleReloadAgent}
-              onCloseTabsToLeft={handleCloseTabsToLeft}
-              onCloseTabsToRight={handleCloseTabsToRight}
-              onCloseOtherTabs={handleCloseOtherTabs}
-              onCreateDraftTab={handleCreateDraftTab}
-              onCreateTerminalTab={handleCreateTerminal}
-              disableCreateTerminal={createTerminalMutation.isPending}
-              isWaitingOnTerminalReadiness={pendingTerminalCreateInput !== null}
-              onReorderTabs={handleReorderTabsInFocusedPane}
-              onSplitRight={noop}
-              onSplitDown={noop}
-              showPaneSplitActions={false}
-            />
-          ) : null}
-
-          <View style={styles.centerContent}>
-            {isMobile ? (
-              <GestureDetector gesture={explorerOpenGesture} touchAction="pan-y">
-                <View style={styles.content}>{content}</View>
-              </GestureDetector>
-            ) : (
-              <View style={styles.content}>{desktopContent}</View>
-            )}
-          </View>
-        </View>
-
-        {showExplorerSidebar && workspaceDirectory ? (
-          <ExplorerSidebar
+    <WorkspaceFocusProvider workspaceKey={persistenceKey}>
+      <View style={containerStyle}>
+        {documentTitleEffectTab ? (
+          <WorkspaceTabPresentationResolver
+            tab={documentTitleEffectTab}
            serverId={normalizedServerId}
            workspaceId={normalizedWorkspaceId}
-            workspaceRoot={workspaceDirectory}
-            isGit={isGitCheckout}
-            onOpenFile={handleOpenFileFromExplorer}
-          />
+          >
+            {(presentation) => (
+              <WorkspaceDocumentTitleEffect
+                label={presentation.label}
+                titleState={presentation.titleState}
+              />
+            )}
+          </WorkspaceTabPresentationResolver>
        ) : null}
+        <View style={styles.threePaneRow}>
+          <View style={styles.centerColumn}>
+            {showScreenHeader && (
+              <ScreenHeader
+                onRowLayout={onHeaderLayout}
+                left={
+                  <>
+                    <SidebarMenuToggle />
+                    <WorkspaceHeaderTitleBar
+                      isLoading={isWorkspaceHeaderLoading}
+                      title={workspaceHeaderTitle}
+                      subtitle={workspaceHeaderSubtitle}
+                      showSubtitle={shouldShowWorkspaceHeaderSubtitle}
+                      currentBranchName={currentBranchName}
+                      isGitCheckout={isGitCheckout}
+                      normalizedServerId={normalizedServerId}
+                      normalizedWorkspaceId={normalizedWorkspaceId}
+                      showWorkspaceSetup={showWorkspaceSetup}
+                      isMobile={isMobile}
+                      createTerminalDisabled={createTerminalDisabled}
+                      menuNewAgentIcon={menuNewAgentIcon}
+                      menuNewTerminalIcon={menuNewTerminalIcon}
+                      menuCopyIcon={menuCopyIcon}
+                      menuSettingsIcon={menuSettingsIcon}
+                      onCreateDraftTab={handleCreateDraftTab}
+                      onCreateTerminal={handleCreateTerminal}
+                      onCopyWorkspacePath={handleCopyWorkspacePath}
+                      onCopyBranchName={handleCopyBranchName}
+                      onOpenSetupTab={handleOpenSetupTab}
+                    />
+                  </>
+                }
+                right={headerRight}
+              />
+            )}
+
+            {isMobile ? (
+              <MobileWorkspaceTabSwitcher
+                tabs={tabs}
+                activeTabKey={activeTabKey}
+                activeTab={activeTabDescriptor}
+                tabSwitcherOptions={tabSwitcherOptions}
+                tabByKey={tabByKey}
+                normalizedServerId={normalizedServerId}
+                normalizedWorkspaceId={normalizedWorkspaceId}
+                onSelectSwitcherTab={handleSelectSwitcherTab}
+                onCopyResumeCommand={handleCopyResumeCommand}
+                onCopyAgentId={handleCopyAgentId}
+                onReloadAgent={handleReloadAgent}
+                onCloseTab={handleCloseTabById}
+                onCloseTabsAbove={handleCloseTabsToLeft}
+                onCloseTabsBelow={handleCloseTabsToRight}
+                onCloseOtherTabs={handleCloseOtherTabs}
+              />
+            ) : null}
+
+            {shouldRenderDesktopPaneFallback ? (
+              <WorkspaceDesktopTabsRow
+                paneId={focusedPaneIdOrUndefined}
+                isFocused={isRouteFocused}
+                tabs={desktopTabRowItems}
+                normalizedServerId={normalizedServerId}
+                normalizedWorkspaceId={normalizedWorkspaceId}
+                setHoveredTabKey={setHoveredTabKey}
+                setHoveredCloseTabKey={setHoveredCloseTabKey}
+                onNavigateTab={navigateToTabId}
+                onCloseTab={handleCloseTabById}
+                onCopyResumeCommand={handleCopyResumeCommand}
+                onCopyAgentId={handleCopyAgentId}
+                onReloadAgent={handleReloadAgent}
+                onCloseTabsToLeft={handleCloseTabsToLeft}
+                onCloseTabsToRight={handleCloseTabsToRight}
+                onCloseOtherTabs={handleCloseOtherTabs}
+                onCreateDraftTab={handleCreateDraftTab}
+                onCreateTerminalTab={handleCreateTerminal}
+                disableCreateTerminal={createTerminalMutation.isPending}
+                isWaitingOnTerminalReadiness={pendingTerminalCreateInput !== null}
+                onReorderTabs={handleReorderTabsInFocusedPane}
+                onSplitRight={noop}
+                onSplitDown={noop}
+                showPaneSplitActions={false}
+              />
+            ) : null}
+
+            <View style={styles.centerContent}>
+              {isMobile ? (
+                <GestureDetector gesture={explorerOpenGesture} touchAction="pan-y">
+                  <View style={styles.content}>{content}</View>
+                </GestureDetector>
+              ) : (
+                <View style={styles.content}>{desktopContent}</View>
+              )}
+            </View>
+          </View>
+
+          {showExplorerSidebar && workspaceDirectory ? (
+            <ExplorerSidebar
+              serverId={normalizedServerId}
+              workspaceId={normalizedWorkspaceId}
+              workspaceRoot={workspaceDirectory}
+              isGit={isGitCheckout}
+              onOpenFile={handleOpenFileFromExplorer}
+            />
+          ) : null}
+        </View>
      </View>
-    </View>
+    </WorkspaceFocusProvider>
  );
 }

@@ -3154,10 +3157,7 @@ const styles = StyleSheet.create((theme) => ({
    alignItems: "center",
    gap: theme.spacing[2],
  },
-  newTabTooltipShortcut: {
-    backgroundColor: theme.colors.surface3,
-    borderColor: theme.colors.borderAccent,
-  },
+  newTabTooltipShortcut: {},
  explorerTooltipRow: {
    flexDirection: "row",
    alignItems: "center",
@@ -3167,10 +3167,7 @@ const styles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.sm,
    color: theme.colors.popoverForeground,
  },
-  explorerTooltipShortcut: {
-    backgroundColor: theme.colors.surface3,
-    borderColor: theme.colors.borderAccent,
-  },
+  explorerTooltipShortcut: {},
  mobileTabsRow: {
    backgroundColor: theme.colors.surface0,
    borderBottomWidth: theme.borderWidth[1],