Skip to content

Commit add3eba

Browse files
committed
chore: to squash
1 parent 572862e commit add3eba

4 files changed

Lines changed: 15 additions & 10 deletions

File tree

app/components/CollapsibleSection.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const isOpen = shallowRef(true)
2424
2525
onPrehydrate(() => {
2626
const sidebar = JSON.parse(localStorage.getItem('npmx-settings') || '{}')
27-
const collapsed: string[] = sidebar?.sidebarCollapsedSections || []
27+
const collapsed: string[] = sidebar?.sidebar?.collapsed || []
2828
for (const id of collapsed) {
2929
if (!document.documentElement.dataset.collapsed?.split(' ').includes(id)) {
3030
document.documentElement.dataset.collapsed = (
@@ -47,17 +47,16 @@ onMounted(() => {
4747
function toggle() {
4848
isOpen.value = !isOpen.value
4949
50-
const removed = userLocalSettings.value.sidebarCollapsedSections.filter(c => c !== props.id)
50+
const removed = userLocalSettings.value.sidebar.collapsed.filter(c => c !== props.id)
5151
5252
if (isOpen.value) {
53-
userLocalSettings.value.sidebarCollapsedSections = removed
53+
userLocalSettings.value.sidebar.collapsed = removed
5454
} else {
5555
removed.push(props.id)
56-
userLocalSettings.value.sidebarCollapsedSections = removed
56+
userLocalSettings.value.sidebar.collapsed = removed
5757
}
5858
59-
document.documentElement.dataset.collapsed =
60-
userLocalSettings.value.sidebarCollapsedSections.join(' ')
59+
document.documentElement.dataset.collapsed = userLocalSettings.value.sidebar.collapsed.join(' ')
6160
}
6261
6362
const ariaLabel = computed(() => {

app/composables/useUserLocalSettings.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
interface UserLocalSettings {
2-
sidebarCollapsedSections: string[]
2+
sidebar: {
3+
collapsed: string[]
4+
}
35
connector: {
46
autoOpenURL: boolean
57
}
68
}
79

810
const STORAGE_KEY = 'npmx-settings'
911
const DEFAULT_USER_LOCAL_SETTINGS: UserLocalSettings = {
10-
sidebarCollapsedSections: [],
12+
sidebar: {
13+
collapsed: [],
14+
},
1115
connector: {
1216
autoOpenURL: false,
1317
},

app/utils/prehydrate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ export function initPreferencesOnPrehydrate() {
5252

5353
// Read sidebar preferences from separate localStorage key
5454
const sidebar = JSON.parse(localStorage.getItem('npmx-settings') || '{}')
55-
document.documentElement.dataset.collapsed = sidebar.sidebarCollapsedSections?.join(' ') ?? ''
55+
document.documentElement.dataset.collapsed = sidebar.sidebar?.collapsed?.join(' ') ?? ''
5656
})
5757
}

test/nuxt/components/HeaderConnectorModal.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ function simulateConnect() {
113113
}
114114

115115
const mockUserLocalSettings = ref({
116-
sidebarCollapsedSections: [],
116+
sidebar: {
117+
collapsed: [],
118+
},
117119
connector: {
118120
autoOpenURL: false,
119121
},

0 commit comments

Comments
 (0)