@antv/dumi-theme-antv 0.3.0-beta.9 → 0.3.1

package/dist/slots/ManualContent/index.js

@@ -19,19 +19,19 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useEffect, useState } from 'react';
-import { Layout, Affix, BackTop, Menu, Tooltip } from 'antd';
+import { Layout, Affix, BackTop, Menu } from 'antd';
 import { useMedia } from 'react-use';
 import Drawer from 'rc-drawer';
 import { useLocale, useSiteData, useFullSidebarData, useRouteMeta } from 'dumi';
 import { useNavigate } from "react-router-dom";
-import { EditOutlined, MenuFoldOutlined, MenuUnfoldOutlined, VerticalAlignTopOutlined } from '@ant-design/icons';
+import { MenuFoldOutlined, MenuUnfoldOutlined, VerticalAlignTopOutlined } from '@ant-design/icons';
 import readingTime from 'reading-time';
-import { SEO } from "../SEO";
-import { getBaseRoute, getIndexRoute, getOpenKeys } from "./utils";
+import URI from 'uri-parse';
+import { SEO } from "dumi/theme/slots/SEO";
+import { getBaseRoute, getIndexRoute, getOpenKeys, getNavigateUrl } from "./utils";
 import { NavigatorBanner } from "./NavigatorBanner";
 import ReadingTime from "./ReadingTime";
-import { TOC } from "../TOC";
-import { Footer } from "../Footer";
+import { ContentTable } from "dumi/theme/slots/ContentTable";
 import { useScrollToTop } from "../hooks";
 import 'rc-drawer/assets/index.css';
 import styles from "./index.module.less";
@@ -92,7 +92,7 @@ export var ManualContent = function ManualContent(_ref) {
     function fullSidebarDataToMenuData(rootList, hrefId, list) {
       // 递归
       rootList.forEach(function (item) {
-        var href = !baseRoute.startsWith('/en') ? "/".concat(item.slug) : "/en/".concat(item.slug);
+        var href = (!baseRoute.startsWith('/en') ? "/".concat(item.slug) : "/en/".concat(item.slug)).toLocaleLowerCase();
         var id = href.split("/").slice(0, href.split("/").length - 1).join("/");
 
         if (href.includes(baseRoute)) {
@@ -115,13 +115,17 @@ export var ManualContent = function ManualContent(_ref) {
           var item = _step.value;
           item.children = [];
           fullSidebarDataToMenuData(rootList, item.key, item.children);
-          (_funllSidebarData$ite = funllSidebarData[item.key][0].children) === null || _funllSidebarData$ite === void 0 ? void 0 : _funllSidebarData$ite.forEach(function (itemChild) {
+          funllSidebarData[item.key] && ((_funllSidebarData$ite = funllSidebarData[item.key][0].children) === null || _funllSidebarData$ite === void 0 ? void 0 : _funllSidebarData$ite.forEach(function (itemChild) {
             var label = itemChild.title;
             var key = itemChild.link;
             item.children.push(_objectSpread(_objectSpread({}, itemChild), {}, {
               label: label,
               key: key
             }));
+          })); // children 的 order 排序
+
+          item.children.sort(function (a, b) {
+            return a.order - b.order;
           });
 
           if (item.children.length == 0) {
@@ -175,7 +179,7 @@ export var ManualContent = function ManualContent(_ref) {
     useScrollToTop();
   };
 
-  var _useState5 = useState(renderSidebar.length !== 0 ? [renderSidebar[0].key] : ['']),
+  var _useState5 = useState(),
       _useState6 = _slicedToArray(_useState5, 2),
       defaultSelectedKey = _useState6[0],
       setDefaultSelectedKey = _useState6[1]; //上一夜下一页
@@ -197,11 +201,14 @@ export var ManualContent = function ManualContent(_ref) {
   for (var _i3 = 0, _Object$keys = Object.keys(linkoTitle); _i3 < _Object$keys.length; _i3++) {
     var route = _Object$keys[_i3];
     sidebarRoutes.push(route);
-  } // 兜底 如果 nav 指定有误则自动重定向到 indexDocRoute
+  }
 
+  var uri = new URI(location.href);
+  uri.path = getNavigateUrl("/".concat(uri.path), indexRoute, sidebarRoutes);
 
-  if (window.location.pathname.startsWith('/docs/') || !sidebarRoutes.includes(window.location.pathname)) {
-    navigate(indexRoute);
+  if ("".concat(uri.path) !== window.location.pathname) {
+    uri.path = uri.path.slice(1);
+    navigate(uri.toURI().replace(location.origin, ''));
   } // 改变菜单栏选中和 openKeys 状态
 
 
@@ -301,18 +308,7 @@ export var ManualContent = function ManualContent(_ref) {
     className: styles.main
   }, /*#__PURE__*/React.createElement("h1", {
     className: styles.contentTitle
-  }, linkoTitle[window.location.pathname], /*#__PURE__*/React.createElement(Tooltip, {
-    title: '在 GitHub 上编辑'
-  }, /*#__PURE__*/React.createElement("a", {
-    href: getGithubSourceUrl({
-      githubUrl: githubUrl,
-      relativePath: relativePath,
-      prefix: 'docs'
-    }),
-    target: "_blank",
-    rel: "noopener noreferrer",
-    className: styles.editOnGtiHubButton
-  }, /*#__PURE__*/React.createElement(EditOutlined, null)))), /*#__PURE__*/React.createElement("div", {
+  }, linkoTitle[window.location.pathname]), /*#__PURE__*/React.createElement("div", {
     className: styles.readtimeContainer
   }, /*#__PURE__*/React.createElement(ReadingTime, {
     readingTime: time,
@@ -333,12 +329,10 @@ export var ManualContent = function ManualContent(_ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.backTop
-  }, /*#__PURE__*/React.createElement(VerticalAlignTopOutlined, null)))))), /*#__PURE__*/React.createElement(Footer, {
-    className: styles.footer
-  })), is991Wide ? /*#__PURE__*/React.createElement(Layout.Sider, {
+  }, /*#__PURE__*/React.createElement(VerticalAlignTopOutlined, null))))))), is991Wide ? /*#__PURE__*/React.createElement(Layout.Sider, {
     theme: "light",
     width: 260
   }, /*#__PURE__*/React.createElement(Affix, {
     className: styles.toc
-  }, /*#__PURE__*/React.createElement(TOC, null))) : /*#__PURE__*/React.createElement("div", null)));
+  }, /*#__PURE__*/React.createElement(ContentTable, null))) : /*#__PURE__*/React.createElement("div", null)));
 };

package/dist/slots/ManualContent/index.module.less

@@ -7,6 +7,7 @@
 .markdown {
   font-size: 14px;
   line-height: 2;
+  min-height: 600px; // 大概一屏幕占位，防止切换文档的时候，有黑影！
 
   h1 {
     margin-bottom: 20px;
@@ -83,6 +84,14 @@
     background-color: rgba(0, 0, 0, 0.03);
   }
 
+  code {
+    padding: 0.2em 0.4em;
+    margin: 0;
+    font-size: 85%;
+    background-color: rgba(175, 184, 193, 0.2);
+    border-radius: 6px;
+  }
+
   code[class*='language-'] {
     background: none;
   }
@@ -196,6 +205,10 @@
   > p > br {
     clear: both;
   }
+
+  img {
+    max-width: 100%;
+  }
 }
 
 .layout {
@@ -249,7 +262,7 @@
   ul>li {
     list-style: none !important;
     padding: 0 !important;
-    margin-left: 1em !important;
+    margin-left: -1px !important;
 
     // 超出部分省略号显示
     text-overflow: ellipsis;
@@ -261,7 +274,7 @@
     }
   }
 }
-.contentTitle{
+.contentTitle {
   margin-top: 8px;
   margin-bottom: 20px;
   font-weight: 500;
@@ -616,10 +629,6 @@
   justify-content: center;
 }
 
-.footer {
-  width: 100%;
-}
-
 .menuSwitch {
   position: absolute;
   top: 72px;
@@ -639,11 +648,10 @@
   border-radius: 0 4px 4px 0;
 }
 
-
-
-.readtimeContainer{
+.readtimeContainer {
   margin-bottom: 1.2em;
 }
+
 .readtime {
   color: #0d1a26;
   line-height: 1.5715;

package/dist/slots/ManualContent/utils.d.ts

@@ -1,3 +1,18 @@
 export declare function getOpenKeys(): any[];
 export declare function getBaseRoute(): string;
 export declare function getIndexRoute(MenuData: any): any;
+/**
+ * 返回需要跳转的 pathname
+ * /en/api/ ----> /en/api/[first-doc]
+ * /zh/api/ ----> /api/[first-doc]
+ * /en/docs/api/ ----> /en/api/[first-doc]
+ * /zh/docs/api/ ----> /api/[first-doc]
+ *
+ * /en/docs/api/xxx ----> /en/api/xxx
+ * /zh/docs/api/xxx ----> /api/xxx
+ *
+ * /docs/api/xxx -----> /api/xxx
+ *
+ * @param p
+ */
+export declare function getNavigateUrl(pathname: string, first: string, siderbarMenu: any[]): string;

package/dist/slots/ManualContent/utils.js

@@ -1,5 +1,5 @@
 export function getOpenKeys() {
-  var pathname = window.location.pathname;
+  var pathname = window.location.pathname.replace('/docs/', '/').replace('/zh/', '/');
   var pathArr = pathname.split('/');
   var openKeys = [];
 
@@ -32,4 +32,34 @@ export function getIndexRoute(MenuData) {
   }
 
   return defaultOpenKeys[defaultOpenKeys.length - 1];
+}
+/**
+ * 返回需要跳转的 pathname
+ * /en/api/ ----> /en/api/[first-doc]
+ * /zh/api/ ----> /api/[first-doc]
+ * /en/docs/api/ ----> /en/api/[first-doc]
+ * /zh/docs/api/ ----> /api/[first-doc]
+ *
+ * /en/docs/api/xxx ----> /en/api/xxx 
+ * /zh/docs/api/xxx ----> /api/xxx
+ * 
+ * /docs/api/xxx -----> /api/xxx
+ * 
+ * @param p 
+ */
+
+export function getNavigateUrl(pathname, first, siderbarMenu) {
+  // 兜底 如果 nav 指定有误则自动重定向到 indexDocRoute
+  if (pathname.includes('/docs/') || pathname.includes('/zh/')) {
+    return pathname.replace('/docs/', '/').replace('/zh/', '/');
+  }
+
+  if (siderbarMenu.every(function (item) {
+    var itemLowerCase = "".concat(item).toLowerCase();
+    return ![itemLowerCase, "".concat(itemLowerCase, "/")].includes(pathname.toLowerCase());
+  })) {
+    return first;
+  }
+
+  return pathname;
 }

package/dist/slots/_.less

@@ -10,7 +10,7 @@
 
   @media only screen and (max-width: 931.99px) {
     & {
-      max-width: calc(100% - 60px);
+      max-width: calc(100% - 80px);
     }
   }
 

package/dist/slots/hooks.d.ts

@@ -1,7 +1,6 @@
 import { NavigatorBannerProps } from './ManualContent/NavigatorBanner';
 export declare const useChinaMirrorHost: () => [boolean];
 export declare const useScrollToTop: () => void;
-export declare const useT: (transformedMessage: string) => string;
 export declare const useLogoLink: ({ link, siteUrl, lang, }: {
     link?: string;
     siteUrl?: string;
@@ -14,3 +13,4 @@ export declare const usePrevAndNext: () => NavigatorBannerProps['post'][];
  * @param v
  */
 export declare function ic(v: string | object): any;
+export declare function icWithLocale(v: string | object, locale: any): any;

package/dist/slots/hooks.js

@@ -14,7 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useEffect, useState } from 'react';
 import { get } from 'lodash-es';
-import { useIntl, useLocale } from 'dumi';
+import { useLocale } from 'dumi';
 export var useChinaMirrorHost = function useChinaMirrorHost() {
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -31,12 +31,6 @@ export var useChinaMirrorHost = function useChinaMirrorHost() {
 export var useScrollToTop = function useScrollToTop() {
   document.body.scrollTop = document.documentElement.scrollTop = 0;
 };
-export var useT = function useT(transformedMessage) {
-  var intl = useIntl();
-  return intl.formatMessage({
-    id: transformedMessage
-  });
-};
 export var useLogoLink = function useLogoLink(_ref) {
   var _ref$link = _ref.link,
       link = _ref$link === void 0 ? '' : _ref$link,
@@ -100,5 +94,8 @@ export var usePrevAndNext = function usePrevAndNext() {
 
 export function ic(v) {
   var locale = useLocale();
-  return _typeof(v) === 'object' ? get(v, [locale.id]) : v;
+  return icWithLocale(v, locale.id);
+}
+export function icWithLocale(v, locale) {
+  return _typeof(v) === 'object' ? get(v, [locale]) : v;
 }

package/dist/slots/utils.js

@@ -18,6 +18,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
+import { icWithLocale } from "./hooks";
 export function ping() {
   return _ping.apply(this, arguments);
 }
@@ -102,7 +103,11 @@ export var filterTreeNode = function filterTreeNode(treeNode, keyValue, locale)
     }
   }
 
-  var isCurrentTreeNodeMatched = treeNode.title[locale].toLowerCase().includes(keyValue.toLowerCase()); // 当前节点自身匹配，那么其孩子直接匹配，可以直接返回当前节点
+  var title = icWithLocale(treeNode.title, locale) || '';
+  var matchFields = [title, treeNode.id, treeNode.filename];
+  var isCurrentTreeNodeMatched = matchFields.some(function (f) {
+    return (f ? f.toLowerCase() : '').includes(keyValue ? keyValue.toLowerCase() : '');
+  }); // 当前节点自身匹配，那么其孩子直接匹配，可以直接返回当前节点
 
   if (isCurrentTreeNodeMatched) {
     return treeNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/dumi-theme-antv",
-  "version": "0.3.0-beta.9",
+  "version": "0.3.1",
   "description": "AntV website theme based on dumi2.",
   "types": "dist/types.d.ts",
   "scripts": {
@@ -75,7 +75,9 @@
     "rc-footer": "^0.6.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-error-boundary": "^3.1.4",
     "react-github-button": "^0.1.11",
+    "react-helmet": "^6.1.0",
     "react-router-dom": "^6.4.2",
     "react-slick": "^0.29.0",
     "react-split-pane": "^0.1.92",
@@ -83,7 +85,8 @@
     "reading-time": "^1.5.0",
     "size-sensor": "^1.0.1",
     "slick-carousel": "^1.8.1",
-    "uri-parse": "^1.0.0"
+    "uri-parse": "^1.0.0",
+    "video-react": "^0.16.0"
   },
   "peerDependencies": {
     "dumi": "^2.0.0-beta.15",