Skip to content
Merged
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
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion apps/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"react-native-pdf-jsi": "5.0.0",
"react-native-reanimated": "4.7.1",
"react-native-safe-area-context": "~5.10.1",
"react-native-screens": "file:deps/react-native-screens-5.0.0-t3.31.tgz",
"react-native-screens": "file:deps/react-native-screens-5.0.0-t3.32.tgz",
"react-native-shiki-engine": "^0.3.12",
"react-native-svg": "15.16.0",
"react-native-webview": "14.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,10 @@ function WorkspaceColumns(
collapsed.current = false;
}}
preferredDisplayMode={
panes.primarySidebarVisible || (!layout.usesSplitView && !activeDetailKey)
// UIKit applies the mode as a collapsed split expands, before the new width reaches JS, so a
// collapsed split already carries the sidebar the expanded one will show.
(layout.usesSplitView ? panes.primarySidebarVisible : panes.primarySidebarWhenExpanded) ||
(!layout.usesSplitView && !activeDetailKey)
? "oneBesideSecondary"
: "secondaryOnly"
}
Expand Down
4 changes: 4 additions & 0 deletions apps/mobile/src/lib/layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ export interface Layout {

export interface WorkspacePaneLayout {
readonly primarySidebarVisible: boolean;
/** Whether the sidebar shows once a collapsed split expands; independent of the current width. */
readonly primarySidebarWhenExpanded: boolean;
readonly primarySidebarSuppressedByAuxiliary: boolean;
readonly contentPaneWidth: number;
readonly supportsAuxiliaryPane: boolean;
Expand Down Expand Up @@ -215,6 +217,7 @@ export function deriveWorkspacePaneLayout(input: {

return {
primarySidebarVisible,
primarySidebarWhenExpanded: input.primarySidebarPreferredVisible,
primarySidebarSuppressedByAuxiliary,
contentPaneWidth: Math.max(0, viewportWidth - primarySidebarWidth),
supportsAuxiliaryPane: fileInspector.supported,
Expand All @@ -235,6 +238,7 @@ export function deriveWorkspacePaneLayout(input: {

return {
primarySidebarVisible: preferredPrimarySidebarVisible,
primarySidebarWhenExpanded: input.primarySidebarPreferredVisible,
primarySidebarSuppressedByAuxiliary: false,
contentPaneWidth,
supportsAuxiliaryPane,
Expand Down
2 changes: 1 addition & 1 deletion docs/operations/mobile-screens-fork.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Building the mobile Screens dependency

The mobile v5 stack uses a committed tarball from the
[T3 Screens fork](https://github.com/pingdotgg/react-native-screens/tree/t3-v5.0.0-t3.31).
[T3 Screens fork](https://github.com/pingdotgg/react-native-screens/tree/t3-v5.0.0-t3.32).
The fork owns the integration changes; the app does not patch this package.
Each archive includes compiled JavaScript, declarations, native source and
`t3-fork.json` recording its version, source commit and upstream base.
Expand Down
18 changes: 9 additions & 9 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading