diff --git a/plugins/nav.ts b/plugins/nav.ts index dce97cc1..f900582f 100644 --- a/plugins/nav.ts +++ b/plugins/nav.ts @@ -161,7 +161,7 @@ function convert( ? Object.values(temp.children) .map((child) => convert(child, order, data)) .sort((a, b) => { - if (a.data && b.data && order) { + if (a.data && b.data) { return order(a.data, b.data); } return a.slug < b.slug ? -1 : 1; diff --git a/tests/__snapshots__/nav.test.ts.snap b/tests/__snapshots__/nav.test.ts.snap index 7a8e728f..e5bf9f57 100644 --- a/tests/__snapshots__/nav.test.ts.snap +++ b/tests/__snapshots__/nav.test.ts.snap @@ -146,110 +146,64 @@ snapshot[`nav plugin 3`] = `
@@ -297,119 +251,73 @@ snapshot[`nav plugin 3`] = `@@ -286,7 +240,7 @@ snapshot[`nav plugin 3`] = ` content: '
-
+
@@ -434,7 +342,7 @@ snapshot[`nav plugin 3`] = ` paginate: "paginate", search: [], tags: "Array(0)", - title: "About docs", + title: "About docs (1)", url: "/docs/about-docs/", }, src: { @@ -448,7 +356,7 @@ snapshot[`nav plugin 3`] = ` content: '
-
+
@@ -595,7 +457,7 @@ snapshot[`nav plugin 3`] = ` paginate: "paginate", search: [], tags: "Array(0)", - title: "About pages", + title: "About pages (0)", url: "/docs/pages/", }, src: { @@ -609,7 +471,7 @@ snapshot[`nav plugin 3`] = ` content: '
-
+
@@ -758,7 +574,7 @@ snapshot[`nav plugin 3`] = ` paginate: "paginate", search: [], tags: "Array(0)", - title: "Pages first", + title: "Pages first (1)", url: "/docs/pages/first/", }, src: { @@ -772,7 +588,7 @@ snapshot[`nav plugin 3`] = ` content: '
-
+
@@ -922,7 +692,7 @@ snapshot[`nav plugin 3`] = ` paginate: "paginate", search: [], tags: "Array(0)", - title: "Pages second", + title: "Pages second (0)", url: "/docs/pages/second/", }, src: { @@ -952,110 +722,64 @@ snapshot[`nav plugin 3`] = ` @@ -1237,128 +961,74 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` @@ -1395,7 +1065,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` content: '
-
+
@@ -1561,7 +1177,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` paginate: "paginate", search: [], tags: "Array(0)", - title: "About docs", + title: "About docs (1)", url: "/docs/about-docs.html", }, src: { @@ -1575,7 +1191,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` content: '
-
+
@@ -1740,7 +1302,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` paginate: "paginate", search: [], tags: "Array(0)", - title: "About pages", + title: "About pages (0)", url: "/docs/pages.html", }, src: { @@ -1754,7 +1316,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` content: '
-
+
@@ -1921,7 +1429,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` paginate: "paginate", search: [], tags: "Array(0)", - title: "Pages first", + title: "Pages first (1)", url: "/docs/pages/first.html", }, src: { @@ -1935,7 +1443,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` content: '
-
+
@@ -2103,7 +1557,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` paginate: "paginate", search: [], tags: "Array(0)", - title: "Pages second", + title: "Pages second (0)", url: "/docs/pages/second.html", }, src: { @@ -2131,128 +1585,74 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` diff --git a/tests/assets/nav/_includes/main.vto b/tests/assets/nav/_includes/main.vto index beed68bf..4a1ecd45 100644 --- a/tests/assets/nav/_includes/main.vto +++ b/tests/assets/nav/_includes/main.vto @@ -16,21 +16,21 @@ diff --git a/tests/assets/nav/_includes/step.vto b/tests/assets/nav/_includes/step.vto index a0013d6b..b703e919 100644 --- a/tests/assets/nav/_includes/step.vto +++ b/tests/assets/nav/_includes/step.vto @@ -1,15 +1,15 @@ -{{ if item.data }} +{{- if item.data }} {{ item.data.title }} -{{ else }} +{{- else }} {{ item.slug }} -{{ /if }} +{{- /if }} -{{ if item.children }} +{{- if item.children }}
-{{ /if }} +{{- /if }} diff --git a/tests/assets/nav/docs/about-docs.md b/tests/assets/nav/docs/about-docs.md index c69a8a18..26b2b387 100644 --- a/tests/assets/nav/docs/about-docs.md +++ b/tests/assets/nav/docs/about-docs.md @@ -1,5 +1,5 @@ --- -title: About docs +title: About docs (1) order: 1 menu: true --- diff --git a/tests/assets/nav/docs/pages.md b/tests/assets/nav/docs/pages.md index 6ed876d4..2837209a 100644 --- a/tests/assets/nav/docs/pages.md +++ b/tests/assets/nav/docs/pages.md @@ -1,4 +1,4 @@ --- -title: About pages +title: About pages (0) order: 0 --- diff --git a/tests/assets/nav/docs/pages/first.md b/tests/assets/nav/docs/pages/first.md index 65ee1455..20410d56 100644 --- a/tests/assets/nav/docs/pages/first.md +++ b/tests/assets/nav/docs/pages/first.md @@ -1,4 +1,4 @@ --- -title: Pages first +title: Pages first (1) order: 1 --- diff --git a/tests/assets/nav/docs/pages/second.md b/tests/assets/nav/docs/pages/second.md index 0663e002..4aac0fd3 100644 --- a/tests/assets/nav/docs/pages/second.md +++ b/tests/assets/nav/docs/pages/second.md @@ -1,5 +1,5 @@ --- -title: Pages second +title: Pages second (0) order: 0 menu: true ---