@umami/shiso 0.18.0 → 0.19.0

package/dist/index.d.ts

@@ -26,9 +26,9 @@ declare module '@umami/shiso/Docs' {
 
 declare module '@umami/shiso/Shiso' {
     import { JSX } from 'react';
-    import type { ShisoConfig } from '@/lib/types';
+    import type { ShisoConfig, ShisoContent } from '@/lib/types';
     export interface ShisoProps {
-        content: any;
+        content: ShisoContent;
         type: string;
         config: ShisoConfig;
         components?: {

package/dist/index.js

@@ -210,8 +210,8 @@ function SideNav({ tabs, navigation }) {
   const pathname = (0, import_navigation.usePathname)();
   const tab = tabs?.find(({ url, id }) => id !== "docs" ? pathname.startsWith(url) : false);
   const menu = navigation[tab?.id || "docs"];
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react_zen3.Box, { className: SideNav_default.nav, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react_zen3.List, { items: navigation, "aria-label": "nav", children: menu.map(({ group, pages }) => {
-    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react_zen3.ListSection, { title: group, className: SideNav_default.items, children: pages.map(({ label: text, url }, index) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react_zen3.Box, { className: SideNav_default.nav, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react_zen3.List, { items: navigation, "aria-label": "nav", children: menu.map(({ section, pages }) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react_zen3.ListSection, { title: section, className: SideNav_default.items, children: pages.map(({ label: text, url }, index) => {
       return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
         import_react_zen3.ListItem,
         {
@@ -222,7 +222,7 @@ function SideNav({ tabs, navigation }) {
         },
         index
       );
-    }) }, group);
+    }) }, section);
   }) }) });
 }
 
@@ -249,9 +249,9 @@ var ContentArea_default = { "content": "ContentArea_content__OTBiZ" };
 // src/components/ContentArea.tsx
 var import_link3 = __toESM(require("next/link"));
 var import_jsx_runtime9 = require("react/jsx-runtime");
-function ContentArea({ group, title, description, code, next, prev }) {
+function ContentArea({ section, title, description, code, next, prev }) {
   return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_react_zen5.Box, { flexGrow: 1, children: [
-    group && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react_zen5.Text, { color: "primary", weight: "bold", children: group }),
+    section && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react_zen5.Text, { color: "primary", weight: "bold", children: section }),
     title && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react_zen5.Heading, { size: "8", as: "h1", children: title }),
     description && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react_zen5.Text, { color: "muted", children: description }),
     /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react_zen5.Box, { className: ContentArea_default.content, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Markdown, { code }) }),
@@ -280,31 +280,37 @@ var NavigationButton = ({
 var import_jsx_runtime10 = require("react/jsx-runtime");
 function parseContent(content, config = {}) {
   const { tabs, navigation } = config;
-  let next, prev, group, prevKey, found = false;
-  for (const key in navigation) {
-    if (!group) {
-      group = navigation[key]?.find((section, sectionIndex) => {
-        return section.pages.find((page, pageIndex) => {
-          const found2 = content.path.replace(/(\/index)?\.mdx$/, "").endsWith(page.url);
-          if (found2) {
-            prev = section.pages[pageIndex - 1] || section[prevKey]?.pages?.[sectionIndex - 1];
-            next = section.pages[pageIndex + 1];
+  const keys = Object.keys(navigation);
+  let next, prev, section, found;
+  keys.forEach((key) => {
+    if (!found) {
+      const groups = navigation[key];
+      found = groups?.find((group, groupIndex) => {
+        return group.pages.find((page, pageIndex) => {
+          const match = content.path.replace(/(\/index)?\.mdx$/, "").endsWith(page.url);
+          if (match) {
+            const prevGroup = groups[groupIndex - 1];
+            const nextGroup = groups[groupIndex + 1];
+            prev = group.pages[pageIndex - 1] || prevGroup?.pages?.at(-1);
+            next = group.pages[pageIndex + 1] || nextGroup?.pages?.[0];
+            section = group.section;
           }
-          return found2;
+          return match;
         });
-      })?.group;
-      prevKey = key;
+      });
     }
-  }
-  return { ...content, tabs, navigation, group, next, prev };
+  });
+  return { ...content, tabs, navigation, section, next, prev };
 }
 function Docs() {
   const { content, config } = useShiso();
   if (!content) {
     return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_react_zen6.Heading, { size: "6", children: "Page not found" });
   }
-  const { tabs, navigation, group, next, prev } = parseContent(content, config?.docs);
-  console.log({ content, next, prev, group });
+  const { tabs, navigation, code, meta, section, next, prev, anchors } = parseContent(
+    content,
+    config?.docs
+  );
   return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_react_zen6.Box, { flexGrow: "1", children: [
     tabs && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(TopNav, { tabs }),
     /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_react_zen6.Grid, { gap: "6", columns: "240px 1fr 240px", children: [
@@ -312,15 +318,15 @@ function Docs() {
       /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
         ContentArea,
         {
-          group,
-          title: content.meta?.title,
-          description: content.meta?.description,
-          code: content.code,
+          section,
+          title: meta?.title,
+          description: meta?.description,
+          code,
           next,
           prev
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(PageLinks, { items: content?.anchors, offset: 150 })
+      /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(PageLinks, { items: anchors, offset: 150 })
     ] })
   ] });
 }

package/dist/index.mjs

@@ -174,8 +174,8 @@ function SideNav({ tabs, navigation }) {
   const pathname = usePathname();
   const tab = tabs?.find(({ url, id }) => id !== "docs" ? pathname.startsWith(url) : false);
   const menu = navigation[tab?.id || "docs"];
-  return /* @__PURE__ */ jsx7(Box, { className: SideNav_default.nav, children: /* @__PURE__ */ jsx7(List, { items: navigation, "aria-label": "nav", children: menu.map(({ group, pages }) => {
-    return /* @__PURE__ */ jsx7(ListSection, { title: group, className: SideNav_default.items, children: pages.map(({ label: text, url }, index) => {
+  return /* @__PURE__ */ jsx7(Box, { className: SideNav_default.nav, children: /* @__PURE__ */ jsx7(List, { items: navigation, "aria-label": "nav", children: menu.map(({ section, pages }) => {
+    return /* @__PURE__ */ jsx7(ListSection, { title: section, className: SideNav_default.items, children: pages.map(({ label: text, url }, index) => {
       return /* @__PURE__ */ jsx7(
         ListItem,
         {
@@ -186,7 +186,7 @@ function SideNav({ tabs, navigation }) {
         },
         index
       );
-    }) }, group);
+    }) }, section);
   }) }) });
 }
 
@@ -213,9 +213,9 @@ var ContentArea_default = { "content": "ContentArea_content__OTBiZ" };
 // src/components/ContentArea.tsx
 import Link3 from "next/link";
 import { jsx as jsx9, jsxs as jsxs5 } from "react/jsx-runtime";
-function ContentArea({ group, title, description, code, next, prev }) {
+function ContentArea({ section, title, description, code, next, prev }) {
   return /* @__PURE__ */ jsxs5(Box2, { flexGrow: 1, children: [
-    group && /* @__PURE__ */ jsx9(Text2, { color: "primary", weight: "bold", children: group }),
+    section && /* @__PURE__ */ jsx9(Text2, { color: "primary", weight: "bold", children: section }),
     title && /* @__PURE__ */ jsx9(Heading, { size: "8", as: "h1", children: title }),
     description && /* @__PURE__ */ jsx9(Text2, { color: "muted", children: description }),
     /* @__PURE__ */ jsx9(Box2, { className: ContentArea_default.content, children: /* @__PURE__ */ jsx9(Markdown, { code }) }),
@@ -244,31 +244,37 @@ var NavigationButton = ({
 import { jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
 function parseContent(content, config = {}) {
   const { tabs, navigation } = config;
-  let next, prev, group, prevKey, found = false;
-  for (const key in navigation) {
-    if (!group) {
-      group = navigation[key]?.find((section, sectionIndex) => {
-        return section.pages.find((page, pageIndex) => {
-          const found2 = content.path.replace(/(\/index)?\.mdx$/, "").endsWith(page.url);
-          if (found2) {
-            prev = section.pages[pageIndex - 1] || section[prevKey]?.pages?.[sectionIndex - 1];
-            next = section.pages[pageIndex + 1];
+  const keys = Object.keys(navigation);
+  let next, prev, section, found;
+  keys.forEach((key) => {
+    if (!found) {
+      const groups = navigation[key];
+      found = groups?.find((group, groupIndex) => {
+        return group.pages.find((page, pageIndex) => {
+          const match = content.path.replace(/(\/index)?\.mdx$/, "").endsWith(page.url);
+          if (match) {
+            const prevGroup = groups[groupIndex - 1];
+            const nextGroup = groups[groupIndex + 1];
+            prev = group.pages[pageIndex - 1] || prevGroup?.pages?.at(-1);
+            next = group.pages[pageIndex + 1] || nextGroup?.pages?.[0];
+            section = group.section;
           }
-          return found2;
+          return match;
         });
-      })?.group;
-      prevKey = key;
+      });
     }
-  }
-  return { ...content, tabs, navigation, group, next, prev };
+  });
+  return { ...content, tabs, navigation, section, next, prev };
 }
 function Docs() {
   const { content, config } = useShiso();
   if (!content) {
     return /* @__PURE__ */ jsx10(Heading2, { size: "6", children: "Page not found" });
   }
-  const { tabs, navigation, group, next, prev } = parseContent(content, config?.docs);
-  console.log({ content, next, prev, group });
+  const { tabs, navigation, code, meta, section, next, prev, anchors } = parseContent(
+    content,
+    config?.docs
+  );
   return /* @__PURE__ */ jsxs6(Box3, { flexGrow: "1", children: [
     tabs && /* @__PURE__ */ jsx10(TopNav, { tabs }),
     /* @__PURE__ */ jsxs6(Grid, { gap: "6", columns: "240px 1fr 240px", children: [
@@ -276,15 +282,15 @@ function Docs() {
       /* @__PURE__ */ jsx10(
         ContentArea,
         {
-          group,
-          title: content.meta?.title,
-          description: content.meta?.description,
-          code: content.code,
+          section,
+          title: meta?.title,
+          description: meta?.description,
+          code,
           next,
           prev
         }
       ),
-      /* @__PURE__ */ jsx10(PageLinks, { items: content?.anchors, offset: 150 })
+      /* @__PURE__ */ jsx10(PageLinks, { items: anchors, offset: 150 })
     ] })
   ] });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umami/shiso",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "A content layer for Next.js",
   "homepage": "https://umami.is/shiso",
   "repository": {