gitea-yuany3721/vuepress-theme-plume
1
0
Fork 1
mirror of https://github.com/pengzhanbo/vuepress-theme-plume.git synced 2026-04-23 10:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(theme): incorrect sidebar auto sorting, close #387 (#389)

Browse Source
This commit is contained in:
pengzhanbo 2024-12-22 00:26:56 +08:00 committed by GitHub
parent 361ef45a0f
commit d261dc312a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
theme/src/node/prepare/prepareSidebar.ts
View File

@ -88,6 +88,17 @@ function resolveTitle(dirname: string) {
.replace(NUMBER_RE, '')
}
const RE_FILE_SORTING = /(?:(\d+)\.)?(?=[^/]+$)/
function fileSorting(filepath?: string): number | false {
if (!filepath)
return false
const matched = filepath.match(RE_FILE_SORTING)
const sorted = matched ? Number(matched[1]) : 0
if (Number.isNaN(sorted))
return 0
return sorted
}
function getAutoDirSidebar(
app: App,
localePath: string,
@ -104,11 +115,13 @@ function getAutoDirSidebar(
while (nowIndex < maxIndex) {
pages = pages.sort((prev, next) => {
const pi = prev.splitPath?.[nowIndex]?.match(/(?:(\d+)\.)?(?=[^/]+$)/)?.[1]
const ni = next.splitPath?.[nowIndex]?.match(/(?:(\d+)\.)?(?=[^/]+$)/)?.[1]
if (!pi || !ni)
const pi = fileSorting(prev.splitPath?.[nowIndex])
const ni = fileSorting(next.splitPath?.[nowIndex])
if (pi === false || ni === false)
return 0
return Number.parseFloat(pi) < Number.parseFloat(ni) ? -1 : 1
if (pi === ni)
return 0
return pi < ni ? -1 : 1
})
nowIndex++
@ -164,7 +177,23 @@ function getAutoDirSidebar(
index++
}
}
return { link: rootLink, sidebar }
return { link: rootLink, sidebar: cleanSidebar(sidebar) }
}
function cleanSidebar(sidebar: (SidebarItem)[]) {
for (const item of sidebar) {
if (isPlainObject(item)) {
if (isArray(item.items)) {
if (item.items.length === 0) {
delete item.items
}
else {
cleanSidebar(item.items as SidebarItem[])
}
}
}
}
return sidebar
}
function findAutoDirList(sidebar: (string | SidebarItem)[], prefix = ''): string[] {