Merge pull request #116 from aslafy-z/feat/frontmatter-order-recursive

Blocked: feat: retrieve ordering for top level folder indexes
jooy2 · Dec 10, 2023 · 21f359a · 21f359a
2 parents e36557e + a679b97
commit 21f359a
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/index.ts b/lib/index.ts
@@ -326,15 +326,17 @@ export default class VitePressSidebar {
             ) || [];
 
           let newDirectoryText = VitePressSidebar.getTitleFromMd(x, childItemPath, options, true);
+          let newDirectoryPagePath = childItemPath;
           let withDirectoryLink;
 
           if (options.convertSameNameSubFileToGroupIndexPage) {
             const findItem = directorySidebarItems.find((y: SidebarListItem) => y.text === x);
 
             if (findItem) {
+              newDirectoryPagePath = resolve(childItemPath, `${findItem.text}.md`);
               newDirectoryText = VitePressSidebar.getTitleFromMd(
                 x,
-                resolve(childItemPath, `${findItem.text}.md`),
+                newDirectoryPagePath,
                 options,
                 false
               );
@@ -353,13 +355,13 @@ export default class VitePressSidebar {
             // If an index.md file exists in a folder subfile,
             // replace the name or link of the folder with what is set in index.md.
             // The index.md file can still be displayed if the value of `includeFolderIndexFile` is `true`.
-            const childIndexFilePath = `${childItemPath}/index.md`;
+            newDirectoryPagePath = `${childItemPath}/index.md`;
 
-            if (existsSync(childIndexFilePath)) {
+            if (existsSync(newDirectoryPagePath)) {
               if (options.useFolderTitleFromIndexFile) {
                 newDirectoryText = VitePressSidebar.getTitleFromMd(
                   'index',
-                  childIndexFilePath,
+                  newDirectoryPagePath,
                   options
                 );
               }
@@ -376,7 +378,10 @@ export default class VitePressSidebar {
               items: directorySidebarItems,
               ...(options.collapsed === null || options.collapsed === undefined
                 ? {}
-                : { collapsed: depth >= options.collapseDepth! && options.collapsed })
+                : { collapsed: depth >= options.collapseDepth! && options.collapsed }),
+              ...(options.sortMenusByFrontmatterOrder
+                ? { order: VitePressSidebar.getOrderFromFrontmatter(newDirectoryPagePath) }
+                : {})
             };
           }