fix(app): keep settings sidebar scrollable

This commit is contained in:
Mohamed Boudra
2026-06-10 17:02:58 +07:00
parent f7bef36606
commit 201f427f62
2 changed files with 99 additions and 21 deletions
+38 -21
View File
@@ -996,11 +996,12 @@ function SettingsSidebar({
const insets = useSafeAreaInsets();
const padding = useWindowControlsPadding("sidebar");
const isDesktop = layout === "desktop";
const containerStyle = useMemo(
() => [
isDesktop ? sidebarStyles.desktopContainer : sidebarStyles.mobileContainer,
isDesktop ? { paddingTop: insets.top } : null,
],
const outerContainerStyle = useMemo(
() => [isDesktop ? sidebarStyles.desktopContainer : sidebarStyles.mobileContainer],
[isDesktop],
);
const innerContainerStyle = useMemo(
() => [{ flex: 1 }, isDesktop ? { paddingTop: insets.top } : null],
[insets.top, isDesktop],
);
const selectedSectionId = view.kind === "section" ? view.section : null;
@@ -1008,22 +1009,8 @@ function SettingsSidebar({
const isProjectsSelected = view.kind === "projects" || view.kind === "project";
const paddingTopStyle = useMemo(() => ({ height: padding.top }), [padding.top]);
return (
<View style={containerStyle} testID="settings-sidebar">
{isDesktop ? (
<>
<TitlebarDragRegion />
{padding.top > 0 ? <View style={paddingTopStyle} /> : null}
</>
) : null}
{isDesktop ? (
<SidebarHeaderRow
icon={ArrowLeft}
label="Back"
onPress={onBackToWorkspace}
testID="settings-back-to-workspace"
/>
) : null}
const sidebarBody = (
<>
<View style={sidebarStyles.list}>
<Text style={sidebarStyles.groupLabel}>App</Text>
{items.map((item) => (
@@ -1079,6 +1066,30 @@ function SettingsSidebar({
</Pressable>
</View>
)}
</>
);
return (
<View style={outerContainerStyle} testID="settings-sidebar">
{isDesktop ? (
<View style={innerContainerStyle}>
<View style={sidebarStyles.sidebarDragArea}>
<TitlebarDragRegion />
{padding.top > 0 ? <View style={paddingTopStyle} /> : null}
<SidebarHeaderRow
icon={ArrowLeft}
label="Back"
onPress={onBackToWorkspace}
testID="settings-back-to-workspace"
/>
</View>
<ScrollView style={sidebarStyles.scrollBody} showsVerticalScrollIndicator={false}>
{sidebarBody}
</ScrollView>
</View>
) : (
sidebarBody
)}
</View>
);
}
@@ -1630,6 +1641,12 @@ const sidebarStyles = StyleSheet.create((theme) => ({
borderRightColor: theme.colors.border,
backgroundColor: theme.colors.surfaceSidebar,
},
scrollBody: {
flex: 1,
},
sidebarDragArea: {
position: "relative",
},
mobileContainer: {
paddingVertical: theme.spacing[2],
paddingHorizontal: theme.spacing[2],