@antv/dumi-theme-antv 0.5.7-beta.3 → 0.6.1

package/dist/hooks/useMenu.js

@@ -15,11 +15,14 @@ import styles from "../slots/ManualContent/index.module.less";
 import { getBaseRoute } from "../slots/ManualContent/utils";
 import { flattenMenu } from "../utils/menu";
 export var useMenu = function useMenu() {
+  var _navOf;
   var fullData = useFullSidebarData();
   var _useLocation = useLocation(),
     pathname = _useLocation.pathname;
   var _useSiteData = useSiteData(),
-    docs = _useSiteData.themeConfig.docs;
+    _useSiteData$themeCon = _useSiteData.themeConfig,
+    docs = _useSiteData$themeCon.docs,
+    navs = _useSiteData$themeCon.navs;
   var baseRoute = getBaseRoute();
   var navigate = useNavigate();
   var locale = useLocale();
@@ -107,10 +110,20 @@ export var useMenu = function useMenu() {
     return flattenMenu(menuData);
   }, [menuData]);
   var selectedKey = pathname;
-  // 如果当前路径不在菜单中，选中第一个有 link 的菜单项
-  if (!flattedMenuData.find(function (item) {
-    return item.link === selectedKey;
-  })) {
+
+  // Nav 跳转但不在菜单中，则选中第一个菜单项
+  var navOf = function navOf(navs) {
+    return navs.some(function (nav) {
+      var _nav$slug;
+      return (nav === null || nav === void 0 || (_nav$slug = nav.slug) === null || _nav$slug === void 0 ? void 0 : _nav$slug.replace('docs/', '/')) === pathname;
+    });
+  };
+  var isNavLink = !!navOf(navs);
+  var isExactLink = (_navOf = navOf(navs)) === null || _navOf === void 0 ? void 0 : _navOf.exact;
+  var isLinkInMenu = flattedMenuData.some(function (item) {
+    return item.link === pathname;
+  });
+  if (isNavLink && !isExactLink && !isLinkInMenu) {
     var firstValidMenuItem = flattedMenuData.find(function (item) {
       return item.link;
     });

package/dist/plugin/index.js

@@ -48,7 +48,6 @@ var plugin_default = (api) => {
     memo.mfsu = false;
     memo.jsMinifier = "terser";
     memo.favicons = ["https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*7svFR6wkPMoAAAAAAAAAAAAADmJ7AQ/original"];
-    memo.extraRemarkPlugins = memo.themeConfig.feedback ? [import_remarkFeedback.default] : [];
     memo.extraRehypePlugins = [import_rehypeObservable.default];
     return memo;
   });
@@ -88,6 +87,10 @@ var plugin_default = (api) => {
       file: `${PAGES_DIR}/Example`
     }
   ];
+  api.modifyConfig((memo) => {
+    memo.extraRemarkPlugins = memo.themeConfig.feedback ? [import_remarkFeedback.default] : [];
+    return memo;
+  });
   api.onGenerateFiles(() => {
     api.writeTmpFile({
       noPluginDir: true,

package/dist/slots/CodeEditor/index.js

@@ -347,7 +347,7 @@ export var CodeEditor = function CodeEditor(_ref) {
         {
           var _code = function _code(spec) {
             if (!full) return "(".concat(spec, ")");
-            return "import { Chart } from '@antv/g2';\n          \n          const chart = new Chart({container:'container'});\n\n          chart.options(".concat(spec, ");\n\n          chart.render();\n          ");
+            return "import { Chart } from '@antv/g2';\n\n          const chart = new Chart({container:'container'});\n\n          chart.options(".concat(spec, ");\n\n          chart.render();\n          ");
           };
           return format(parseFunction(_code(JSON.stringify(spec, withFunction))), {
             plugins: [parserBabel]
@@ -412,7 +412,7 @@ export var CodeEditor = function CodeEditor(_ref) {
       language: languageOf(tab),
       value: valueOf(tab),
       defaultValue: defaultOf(tab),
-      path: tab,
+      path: "".concat(tab, "_").concat(relativePath || exampleId),
       loading: /*#__PURE__*/React.createElement(Loading, null),
       options: {
         readOnly: tab === EDITOR_TABS.DATA || tab === EDITOR_TABS.SPEC,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/dumi-theme-antv",
-  "version": "0.5.7-beta.3",
+  "version": "0.6.1",
   "description": "AntV website theme based on dumi2.",
   "keywords": [
     "dumi",
@@ -49,7 +49,7 @@
     "@docsearch/css": "^3.8.0",
     "@docsearch/react": "^3.8.0",
     "@monaco-editor/react": "^4.6.0",
-    "@petercatai/assistant": "^2.0.17",
+    "@petercatai/assistant": "^2.0.24",
     "@stackblitz/sdk": "^1.11.0",
     "antd": "^4.24.16",
     "classnames": "^2.5.1",