Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ function WorkspaceColumns(
const windowDimensions = useWindowDimensions();
const nativeMetrics = useNativeLayoutMetrics();
const viewportWidth = nativeMetrics?.width ?? windowDimensions.width;
const primaryColumnWidth = layout.listPaneWidth ?? 320;
const [inspectorWidthFraction, setInspectorWidthFraction] = useState(0.4);
const inspectorWidth = Math.max(
260,
Expand Down Expand Up @@ -354,9 +355,11 @@ function WorkspaceColumns(
if (inspector.visible) toggleAuxiliaryPane();
}}
columnMetrics={{
minimumPrimaryColumnWidth: 280,
maximumPrimaryColumnWidth: Math.max(380, layout.listPaneWidth ?? 0),
preferredPrimaryColumnWidthOrFraction: layout.listPaneWidth ?? 320,
minimumPrimaryColumnWidth: layout.primarySidebarOverlaysContent ? primaryColumnWidth : 280,
maximumPrimaryColumnWidth: layout.primarySidebarOverlaysContent
? primaryColumnWidth
: Math.max(380, primaryColumnWidth),
preferredPrimaryColumnWidthOrFraction: primaryColumnWidth,
minimumSecondaryColumnWidth: 320,
// UIKit can retain its automatic width despite a new preference; constrain both edges.
minimumInspectorColumnWidth: inspectorWidth,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useControlTheme } from "../../components/ui/useControlTheme";
import { useNavigationTabOrder, useHiddenNavigationTabs } from "./navigation-tabs";
import { useWorkspaceTabs } from "./WorkspaceTabsContext";
import { useSelectWorkspaceTab } from "./useSelectWorkspaceTab";
import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";

const NativeSidebarTabBar = requireNativeView<
ViewProps & {
Expand All @@ -25,6 +26,7 @@ export function WorkspaceSidebarTabs(props: {
readonly reserveComposeSpace?: boolean;
}) {
const workspace = useWorkspaceTabs()!;
const { layout } = useAdaptiveWorkspaceLayout();
const order = useNavigationTabOrder();
const hidden = useHiddenNavigationTabs();
const tabs = [...visibleNavigationTabs(order, hidden), "settings" as const];
Expand Down Expand Up @@ -57,6 +59,7 @@ export function WorkspaceSidebarTabs(props: {
position: "absolute",
bottom: 0,
left: props.compact ? 8 : 0,
maxWidth: layout.primarySidebarOverlaysContent ? 280 : undefined,
// Keep the tab icons in place when Compose disappears on other destinations.
right:
(props.compact ? 12 : 0) +
Expand Down
13 changes: 10 additions & 3 deletions apps/mobile/src/lib/layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,21 @@ export function deriveLayout(input: {
region.x - metrics.safeArea.left >= SPLIT_SIDEBAR_MIN_WIDTH &&
width - region.x - region.width - metrics.safeArea.right >= 320,
);
const primarySidebarOverlaysContent =
input.nativeWorkspace === true && metrics?.hasHinge === true && width < height;
return {
variant: "split",
usesSplitView: true,
primarySidebarOverlaysContent:
input.nativeWorkspace === true && metrics?.hasHinge === true && width < height,
primarySidebarOverlaysContent,
listPaneWidth:
division?.x ??
clamp(Math.round(width * 0.32), SPLIT_SIDEBAR_MIN_WIDTH, SPLIT_SIDEBAR_DEFAULT_MAX_WIDTH),
(primarySidebarOverlaysContent
? 350
: clamp(
Math.round(width * 0.32),
SPLIT_SIDEBAR_MIN_WIDTH,
SPLIT_SIDEBAR_DEFAULT_MAX_WIDTH,
)),
...(division ? { listPaneGap: division.width } : {}),
shellPadding: 0,
};
Expand Down
Loading