dumi 2.2.13 → 2.2.14

package/dist/client/theme-api/useNavData.js

@@ -16,7 +16,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { useFullSidebarData, useLocale, useSiteData } from 'dumi';
 import { useState } from 'react';
-import { getLocaleClearPath } from "./useSidebarData";
+import { getLocaleClearPath, getRouteParentPath } from "./useSidebarData";
 import { getLocaleNav, pickRouteSortMeta, useLocaleDocRoutes, useRouteDataComparer } from "./utils";
 function genNavItem(meta, groups, activePath, link) {
   return _objectSpread({
@@ -70,11 +70,14 @@ export var useNavData = function useNavData() {
         var _ref6 = _slicedToArray(_ref5, 2),
           link = _ref6[0],
           groups = _ref6[1];
-        var _ref7 = "/".concat(getLocaleClearPath(link.replace(/^\//, ''), locale)).match(/^(\/[^/]+)([^]+)?$/),
-          _ref8 = _slicedToArray(_ref7, 3),
-          parentPath = _ref8[1],
-          restPath = _ref8[2];
-        var isNestedNav = Boolean(restPath) && is2LevelNav;
+        var clearPath = getLocaleClearPath(link.replace(/^\//, ''), locale);
+        var parentPath = link.replace(clearPath, function (s) {
+          return getRouteParentPath(s, {
+            is2LevelNav: is2LevelNav,
+            locale: locale
+          });
+        });
+        var isNestedNav = link.length > parentPath.length && is2LevelNav;
         var _Object$values$reduce = Object.values(routes).reduce(function (ret, route) {
             // find routes which within the nav path
             if (route.path.startsWith(link.slice(1))) {
@@ -90,14 +93,14 @@ export var useNavData = function useNavData() {
         if (isNestedNav) {
           var _firstMeta$title, _ret$parentPath, _second$children;
           // fallback to use parent path as 1-level nav title
-          (_firstMeta$title = firstMeta.title) !== null && _firstMeta$title !== void 0 ? _firstMeta$title : firstMeta.title = parentPath.slice(1).replace(/^[a-z]/, function (s) {
+          (_firstMeta$title = firstMeta.title) !== null && _firstMeta$title !== void 0 ? _firstMeta$title : firstMeta.title = parentPath.split('/').pop().replace(/^[a-z]/, function (s) {
             return s.toUpperCase();
           });
 
           // handle nested nav item as parent children
           var second = (_ret$parentPath = ret[parentPath]) !== null && _ret$parentPath !== void 0 ? _ret$parentPath : ret[parentPath] = genNavItem(firstMeta, groups, parentPath);
           (_second$children = second.children) !== null && _second$children !== void 0 ? _second$children : second.children = [];
-          ret[parentPath].children.push(genNavItem(secondMeta, groups, link, groups[0].children[0].link));
+          second.children.push(genNavItem(secondMeta, groups, link, groups[0].children[0].link));
         } else {
           // handle root nav item
           ret[link] = genNavItem(firstMeta, groups, link, groups[0].children[0].link);

package/dist/client/theme-api/useSidebarData.d.ts

@@ -1,5 +1,13 @@
-import type { ILocalesConfig, ISidebarGroup } from './types';
+import type { ILocalesConfig, IRouteMeta, ISidebarGroup } from './types';
 export declare const getLocaleClearPath: (routePath: string, locale: ILocalesConfig[0]) => string;
+/**
+ * get parent path from route path
+ */
+export declare function getRouteParentPath(path: string, { meta, is2LevelNav, locale, }: {
+    meta?: IRouteMeta;
+    is2LevelNav: boolean;
+    locale: ILocalesConfig[0];
+}): string;
 /**
  * hook for get sidebar data for all nav
  */

package/dist/client/theme-api/useSidebarData.js

@@ -26,11 +26,12 @@ export var getLocaleClearPath = function getLocaleClearPath(routePath, locale) {
 /**
  * get parent path from route path
  */
-function getRouteParentPath(path, _ref) {
-  var _meta$frontmatter$fil;
+export function getRouteParentPath(path, _ref) {
   var meta = _ref.meta,
-    is2LevelNav = _ref.is2LevelNav;
-  var isIndexDocRoute = ((_meta$frontmatter$fil = meta.frontmatter.filename) === null || _meta$frontmatter$fil === void 0 ? void 0 : _meta$frontmatter$fil.endsWith('index.md')) && !meta._atom_route && is2LevelNav;
+    is2LevelNav = _ref.is2LevelNav,
+    locale = _ref.locale;
+  var indexDocRegex = new RegExp("/index(\\.".concat(locale.id, ")?.md$"));
+  var isIndexDocRoute = (meta === null || meta === void 0 ? void 0 : meta.frontmatter.filename) && indexDocRegex.test(meta.frontmatter.filename) && !meta._atom_route && is2LevelNav;
   var paths = path.split('/')
   // strip end slash
   .filter(Boolean);
@@ -74,7 +75,8 @@ export var useFullSidebarData = function useFullSidebarData() {
           var parentPath = "/".concat(route.path.replace(clearPath, function (s) {
             return getRouteParentPath(s, {
               is2LevelNav: is2LevelNav,
-              meta: route.meta
+              meta: route.meta,
+              locale: locale
             });
           }));
           var _pickRouteSortMeta = pickRouteSortMeta({
@@ -227,7 +229,8 @@ export var useSidebarData = function useSidebarData() {
   var parentPath = clearPath ? pathname.replace(clearPath, function (s) {
     return getRouteParentPath(s, {
       is2LevelNav: is2LevelNav,
-      meta: meta
+      meta: meta,
+      locale: locale
     });
   }) : pathname;
   return parentPath ? sidebar[parentPath] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.2.13",
+  "version": "2.2.14",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",