@@ -28,7 +28,7 @@ import { deriveProjectGroupLabel } from "@t3tools/client-runtime/state/project-g
2828import { useSafeAreaInsets } from "react-native-safe-area-context" ;
2929
3030import { hasCloudPublicConfig } from "../cloud/publicConfig" ;
31- import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout " ;
31+ import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context " ;
3232import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry" ;
3333import { SettingsRow } from "./components/SettingsRow" ;
3434import { SettingsSection , SettingsSidebarContext } from "./components/SettingsSection" ;
@@ -43,10 +43,6 @@ import { filterSettingsSections } from "./settings-search";
4343import { NativePrimaryColumnContext } from "../../native/v5-workspace-context" ;
4444
4545export function SettingsRouteScreen ( ) {
46- const surface = useWorkspaceSurface ( ) ;
47- const deviceType = useDeviceType ( ) ;
48- const compactTabs = useCompactWorkspaceTabs ( ) ;
49- const workspace = useWorkspaceTabs ( ) ;
5046 const { layout } = useAdaptiveWorkspaceLayout ( ) ;
5147 const inSidebar = use ( NativePrimaryColumnContext ) !== null && layout . usesSplitView ;
5248 // The page open beside the list: the route right above the Settings tab's route. While
@@ -58,6 +54,19 @@ export function SettingsRouteScreen() {
5854 ? rememberedSettingsPage ( currentWorkspaceSelections ( ) )
5955 : ( state . routes [ list + 1 ] ?. name ?? null ) ;
6056 } ) ;
57+ return < SettingsListScreen sidebar = { inSidebar } selected = { selected } /> ;
58+ }
59+
60+ export function SettingsListScreen ( props : {
61+ readonly sidebar : boolean ;
62+ readonly selected : string | null ;
63+ } ) {
64+ const surface = useWorkspaceSurface ( ) ;
65+ const deviceType = useDeviceType ( ) ;
66+ const compactTabs = useCompactWorkspaceTabs ( ) ;
67+ const workspace = useWorkspaceTabs ( ) ;
68+ const inSidebar = props . sidebar ;
69+ const selected = props . selected ;
6170 const sidebar = useMemo ( ( ) => ( inSidebar ? { selected } : null ) , [ inSidebar , selected ] ) ;
6271 const content = hasCloudPublicConfig ( ) ? (
6372 < ConfiguredSettingsRouteScreen />
@@ -73,6 +82,7 @@ export function SettingsRouteScreen() {
7382 { Platform . OS === "android" ? (
7483 < SettingsScreen
7584 title = "Settings"
85+ workspaceRoot = { inSidebar }
7686 trailing = { < AndroidSettingsEnvironmentFilter /> }
7787 search = {
7888 workspace
0 commit comments