TypeScript
fix(mobile): the Duo inspector stops at its widest instead of vanishing (#31665)
Julius Marminge6a4031a4a0f1
diff --git a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsxindex 7196929b8a8..354d6413549 100644--- a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx+++ b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx@@ -244,10 +244,14 @@ function AdaptiveWorkspaceLayoutContent(const [primarySidebarPreferredVisible, setPrimarySidebarPreferredVisible] = useState(true);const [fileInspectorPreferredVisible, setFileInspectorPreferredVisible] = useState(true);const [nativeInspectorWidthFraction, setNativeInspectorWidthFraction] = useState(0.4);- const nativeInspectorWidth = nativeInspectorColumnWidth(- viewportWidth,- nativeInspectorWidthFraction,- );+ const inspectorWidthFor = (fraction: number) =>+ nativeInspectorColumnWidth({+ viewportWidth,+ horizontalSafeArea:+ (nativeMetrics?.safeArea.left ?? 0) + (nativeMetrics?.safeArea.right ?? 0),+ fraction,+ });+ const nativeInspectorWidth = inspectorWidthFor(nativeInspectorWidthFraction);const [fileInspectorPreferredWidth, setFileInspectorPreferredWidth] = useState<number | null>(null,);@@ -1000,9 +1004,7 @@ function AdaptiveWorkspaceLayoutContent(setAuxiliaryPaneWidth: setFileInspectorPreferredWidth,nativeInspectorWidth,setNativeInspectorWidth: (width: number) =>- setNativeInspectorWidthFraction(- nativeInspectorColumnWidth(viewportWidth, width / viewportWidth) / viewportWidth,- ),+ setNativeInspectorWidthFraction(inspectorWidthFor(width / viewportWidth) / viewportWidth),composerKeyboardActive,keyboardHoldsSidebar,setComposerEditing,diff --git a/apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx b/apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsxindex ab5d8baad87..ea1b37ffb06 100644--- a/apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx+++ b/apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx@@ -33,6 +33,7 @@ import { Split, type SplitHostCommands } from "react-native-screens";import { SafeAreaView } from "react-native-safe-area-context";import { GestureHandlerRootView } from "react-native-gesture-handler";import { EnvironmentId, ThreadId } from "@t3tools/contracts";+import { NATIVE_INSPECTOR_MIN_MAIN_WIDTH } from "../../lib/layout";import { scopedThreadKey } from "../../lib/scopedEntities";import { WorkspaceTabsProvider, useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";import {@@ -389,7 +390,7 @@ function WorkspaceColumns(minimumPrimaryColumnWidth: 280,maximumPrimaryColumnWidth: Math.max(380, layout.listPaneWidth ?? 0),preferredPrimaryColumnWidthOrFraction: layout.listPaneWidth ?? 320,- minimumSecondaryColumnWidth: 320,+ minimumSecondaryColumnWidth: NATIVE_INSPECTOR_MIN_MAIN_WIDTH,// UIKit can retain its automatic width despite a new preference; constrain both edges.minimumInspectorColumnWidth: inspectorWidth,maximumInspectorColumnWidth: inspectorWidth,diff --git a/apps/mobile/src/lib/layout.test.ts b/apps/mobile/src/lib/layout.test.tsindex 1095bd75dd2..1cfe78e2323 100644--- a/apps/mobile/src/lib/layout.test.ts+++ b/apps/mobile/src/lib/layout.test.ts@@ -169,7 +169,11 @@ describe("deriveWorkspacePaneLayout", () => {nativeWorkspace: true,primarySidebarPreferredVisible,auxiliaryPanePreferredVisible: true,- nativeInspectorWidth: nativeInspectorColumnWidth(width, 0.4),+ nativeInspectorWidth: nativeInspectorColumnWidth({+ viewportWidth: width,+ horizontalSafeArea: 0,+ fraction: 0.4,+ }),}),).toMatchObject({primarySidebarVisible: primarySidebarPreferredVisible && !suppressed,@@ -180,6 +184,17 @@ describe("deriveWorkspacePaneLayout", () => {},);+ it.each([+ { viewportWidth: 1_376, horizontalSafeArea: 0 },+ { viewportWidth: 951, horizontalSafeArea: 76 },+ ])(+ "never widens the native inspector past the page's minimum ($viewportWidth wide)",+ ({ viewportWidth, horizontalSafeArea }) => {+ const width = nativeInspectorColumnWidth({ viewportWidth, horizontalSafeArea, fraction: 1 });+ expect(viewportWidth - horizontalSafeArea - width).toBeGreaterThanOrEqual(320);+ },+ );+it("keeps an explicitly hidden thread sidebar hidden when the file inspector is visible", () => {const layout = deriveLayout({ width: 1_024, height: 1_366 });diff --git a/apps/mobile/src/lib/layout.ts b/apps/mobile/src/lib/layout.tsindex d555a1c0e0e..01464beb30c 100644--- a/apps/mobile/src/lib/layout.ts+++ b/apps/mobile/src/lib/layout.ts@@ -60,7 +60,7 @@ const FILE_INSPECTOR_MIN_VIEWPORT_WIDTH = 820;const FILE_INSPECTOR_MIN_MAIN_WIDTH = 560;// UIKit's inspector column keeps its own width, so the sidebar steps aside only when the page// would get narrower than this: landscape 11" and 13" iPads keep three columns, portrait ones don't.-const NATIVE_INSPECTOR_MIN_MAIN_WIDTH = 320;+export const NATIVE_INSPECTOR_MIN_MAIN_WIDTH = 320;/*** The window's width class. Compact: the sidebar is the root and pages push over it. Medium: the@@ -268,8 +268,21 @@ export function deriveWorkspacePaneLayout(input: {};}-export function nativeInspectorColumnWidth(viewportWidth: number, fraction: number) {- return Math.max(260, Math.min(viewportWidth * 0.6, viewportWidth * fraction));+/**+ * UIKit drops the inspector column, and refuses to show it again, once the page beside it would+ * fall under its minimum inside the safe area (the Duo's system bar takes width from the window).+ */+export function nativeInspectorColumnWidth(input: {+ readonly viewportWidth: number;+ readonly horizontalSafeArea: number;+ readonly fraction: number;+}) {+ const { viewportWidth } = input;+ const maxWidth = Math.min(+ viewportWidth * 0.6,+ viewportWidth - input.horizontalSafeArea - NATIVE_INSPECTOR_MIN_MAIN_WIDTH,+ );+ return Math.max(260, Math.min(maxWidth, viewportWidth * input.fraction));}export function deriveFileInspectorPaneLayout(input: {