vocs 1.2.1 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/_lib/app/components/Sidebar.js +5 -2
- package/_lib/app/components/Sidebar.js.map +1 -1
- package/_lib/app/hooks/useActiveNavIds.d.ts.map +1 -1
- package/_lib/app/hooks/useActiveNavIds.js +8 -4
- package/_lib/app/hooks/useActiveNavIds.js.map +1 -1
- package/_lib/cli/version.d.ts +1 -1
- package/_lib/cli/version.js +1 -1
- package/app/components/Sidebar.tsx +6 -1
- package/app/hooks/useActiveNavIds.ts +10 -4
- package/cli/version.ts +1 -1
- package/package.json +1 -1
- package/tsconfig.build.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# vocs
|
|
2
2
|
|
|
3
|
+
## 1.2.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`1914333`](https://github.com/wevm/vocs/commit/1914333e40d7353676812b6e45f3d0357e5da6dd) Thanks [@jxom](https://github.com/jxom)! - Enhanced sidebar active match mechanism to avoid duplicate topnav matches.
|
|
8
|
+
|
|
3
9
|
## 1.2.1
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -68,14 +68,17 @@ function SidebarItem(props) {
|
|
|
68
68
|
const match = useMatch(item.link || '');
|
|
69
69
|
const hasActiveChildItem = useMemo(() => (item.items ? Boolean(getActiveChildItem(item.items, pathname)) : false), [item.items, pathname]);
|
|
70
70
|
const [collapsed, setCollapsed] = useState(() => {
|
|
71
|
-
if (item.link && match)
|
|
72
|
-
return false;
|
|
73
71
|
if (!item.items)
|
|
74
72
|
return false;
|
|
75
73
|
if (hasActiveChildItem)
|
|
76
74
|
return false;
|
|
77
75
|
return Boolean(item.collapsed);
|
|
78
76
|
});
|
|
77
|
+
useEffect(() => {
|
|
78
|
+
if (hasActiveChildItem) {
|
|
79
|
+
setCollapsed(false);
|
|
80
|
+
}
|
|
81
|
+
}, [hasActiveChildItem]);
|
|
79
82
|
const isCollapsable = item.collapsed !== undefined && item.items !== undefined;
|
|
80
83
|
const onCollapseInteraction = useCallback((event) => {
|
|
81
84
|
if ('key' in event && event.key !== 'Enter')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sidebar.js","sourceRoot":"","sources":["../../../app/components/Sidebar.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Sidebar.js","sourceRoot":"","sources":["../../../app/components/Sidebar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useActiveNavIds.d.ts","sourceRoot":"","sources":["../../../app/hooks/useActiveNavIds.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"useActiveNavIds.d.ts","sourceRoot":"","sources":["../../../app/hooks/useActiveNavIds.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AA2BvD,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,gBAAgB,EAAE,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;CACjB,GAAG,MAAM,EAAE,CAEX"}
|
|
@@ -1,17 +1,21 @@
|
|
|
1
1
|
import { useMemo } from 'react';
|
|
2
2
|
function getActiveNavIds({ items, pathname, }) {
|
|
3
3
|
const path = pathname.replace(/\.html$/, '');
|
|
4
|
-
const
|
|
4
|
+
const matches = [];
|
|
5
5
|
for (const item of items) {
|
|
6
6
|
if (item.link && path.startsWith(item.match || item.link))
|
|
7
|
-
|
|
7
|
+
matches.push({ id: item.id, children: [] });
|
|
8
8
|
else if (item.items) {
|
|
9
9
|
const activeChildItems = getActiveNavIds({ items: item.items, pathname });
|
|
10
10
|
if (activeChildItems.length > 0)
|
|
11
|
-
|
|
11
|
+
matches.push({ id: item.id, children: activeChildItems });
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
|
|
14
|
+
// Return only the last match and its children (prefer most specific/last match)
|
|
15
|
+
if (matches.length === 0)
|
|
16
|
+
return [];
|
|
17
|
+
const lastMatch = matches[matches.length - 1];
|
|
18
|
+
return [lastMatch.id, ...lastMatch.children];
|
|
15
19
|
}
|
|
16
20
|
export function useActiveNavIds({ items, pathname, }) {
|
|
17
21
|
return useMemo(() => getActiveNavIds({ items, pathname }), [items, pathname]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useActiveNavIds.js","sourceRoot":"","sources":["../../../app/hooks/useActiveNavIds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,SAAS,eAAe,CAAC,EACvB,KAAK,EACL,QAAQ,GAIT;IACC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IAC5C,MAAM,
|
|
1
|
+
{"version":3,"file":"useActiveNavIds.js","sourceRoot":"","sources":["../../../app/hooks/useActiveNavIds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,SAAS,eAAe,CAAC,EACvB,KAAK,EACL,QAAQ,GAIT;IACC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IAC5C,MAAM,OAAO,GAAyC,EAAE,CAAA;IAExD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAA;aACxC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,gBAAgB,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;YACzE,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAC5F,CAAC;IACH,CAAC;IAED,gFAAgF;IAChF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAA;IACnC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC7C,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,EAC9B,KAAK,EACL,QAAQ,GAIT;IACC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;AAC/E,CAAC"}
|
package/_lib/cli/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "1.2.
|
|
1
|
+
export declare const version = "1.2.2";
|
|
2
2
|
//# sourceMappingURL=version.d.js.map
|
package/_lib/cli/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = '1.2.
|
|
1
|
+
export const version = '1.2.2';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -147,12 +147,17 @@ function SidebarItem(props: {
|
|
|
147
147
|
)
|
|
148
148
|
|
|
149
149
|
const [collapsed, setCollapsed] = useState(() => {
|
|
150
|
-
if (item.link && match) return false
|
|
151
150
|
if (!item.items) return false
|
|
152
151
|
if (hasActiveChildItem) return false
|
|
153
152
|
return Boolean(item.collapsed)
|
|
154
153
|
})
|
|
155
154
|
|
|
155
|
+
useEffect(() => {
|
|
156
|
+
if (hasActiveChildItem) {
|
|
157
|
+
setCollapsed(false)
|
|
158
|
+
}
|
|
159
|
+
}, [hasActiveChildItem])
|
|
160
|
+
|
|
156
161
|
const isCollapsable = item.collapsed !== undefined && item.items !== undefined
|
|
157
162
|
const onCollapseInteraction = useCallback((event: KeyboardEvent | MouseEvent) => {
|
|
158
163
|
if ('key' in event && event.key !== 'Enter') return
|
|
@@ -9,15 +9,21 @@ function getActiveNavIds({
|
|
|
9
9
|
pathname: string
|
|
10
10
|
}): number[] {
|
|
11
11
|
const path = pathname.replace(/\.html$/, '')
|
|
12
|
-
const
|
|
12
|
+
const matches: { id: number; children: number[] }[] = []
|
|
13
|
+
|
|
13
14
|
for (const item of items) {
|
|
14
|
-
if (item.link && path.startsWith(item.match || item.link))
|
|
15
|
+
if (item.link && path.startsWith(item.match || item.link))
|
|
16
|
+
matches.push({ id: item.id, children: [] })
|
|
15
17
|
else if (item.items) {
|
|
16
18
|
const activeChildItems = getActiveNavIds({ items: item.items, pathname })
|
|
17
|
-
if (activeChildItems.length > 0)
|
|
19
|
+
if (activeChildItems.length > 0) matches.push({ id: item.id, children: activeChildItems })
|
|
18
20
|
}
|
|
19
21
|
}
|
|
20
|
-
|
|
22
|
+
|
|
23
|
+
// Return only the last match and its children (prefer most specific/last match)
|
|
24
|
+
if (matches.length === 0) return []
|
|
25
|
+
const lastMatch = matches[matches.length - 1]
|
|
26
|
+
return [lastMatch.id, ...lastMatch.children]
|
|
21
27
|
}
|
|
22
28
|
|
|
23
29
|
export function useActiveNavIds({
|
package/cli/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '1.2.
|
|
1
|
+
export const version = '1.2.2'
|