@antv/dumi-theme-antv 0.5.7-beta.2 → 0.6.0

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,15 +110,26 @@ 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;
     });
     if (firstValidMenuItem) {
       navigate(firstValidMenuItem.link);
+      selectedKey = firstValidMenuItem.link;
     }
   }
   return [menuData, selectedKey, flattedMenuData];

package/dist/locales/en.json

@@ -157,7 +157,7 @@
   "如果问题持续，请前往 GitHub 提交 issue。": "Go head to GitHub issue if the problem persists.",
   "你遇到的问题是什么？": "What kind of problem are you facing?",
   "🚀 留下你的真实感受": "🚀 What is the reason for your feedback?",
-  "易于理解": "Easy to understand",
+  "容易理解": "Easy to understand",
   "解决了我的问题": "Resolved my problem",
   "其它": "Other",
   "缺少我需要的信息": "Missing the information I need",

package/dist/locales/zh.json

@@ -156,7 +156,7 @@
   "如果问题持续，请前往 GitHub 提交 issue。": "如果问题持续，请前往 GitHub 提交 issue。",
   "你遇到的问题是什么？": "你遇到的问题是什么？",
   "🚀 留下你的真实感受": "🚀 留下你的真实感受",
-  "易于理解": "易于理解",
+  "容易理解": "容易理解",
   "解决了我的问题": "有效解决了我的问题",
   "其它": "其它",
   "缺少我需要的信息": "缺少我需要的信息",

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 = [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/Feedback/Contributors.js

@@ -12,16 +12,15 @@ var StyledContributorsWrapper = styled.div.withConfig({
 export var Contributors = function Contributors() {
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var _useSiteData$themeCon = useSiteData().themeConfig,
-    _useSiteData$themeCon2 = _useSiteData$themeCon.branch,
-    branch = _useSiteData$themeCon2 === void 0 ? 'main' : _useSiteData$themeCon2,
-    siteRelativePath = _useSiteData$themeCon.siteRelativePath;
+  var _useSiteData$themeCon = useSiteData().themeConfig.sitePackagePath,
+    sitePackagePath = _useSiteData$themeCon === void 0 ? '/packages/site' : _useSiteData$themeCon;
   var _useGithubRepo = useGithubRepo(),
     owner = _useGithubRepo.owner,
-    repo = _useGithubRepo.repo;
+    repo = _useGithubRepo.repo,
+    defaultBranch = _useGithubRepo.defaultBranch;
   var meta = useRouteMeta();
   var editable = !meta.frontmatter.readonly;
-  if (!editable) {
+  if (!editable || !meta.frontmatter.filename) {
     return null;
   }
   return /*#__PURE__*/React.createElement(StyledContributorsWrapper, null, /*#__PURE__*/React.createElement("div", {
@@ -32,7 +31,7 @@ export var Contributors = function Contributors() {
     cache: true,
     repo: repo,
     owner: owner,
-    fileName: path.join(siteRelativePath, meta.frontmatter.filename),
+    fileName: path.join(sitePackagePath, meta.frontmatter.filename),
     className: "list",
     renderItem: function renderItem(item, loading) {
       return /*#__PURE__*/React.createElement(ContributorAvatar, {
@@ -41,6 +40,6 @@ export var Contributors = function Contributors() {
         key: item === null || item === void 0 ? void 0 : item.url
       });
     },
-    branch: branch
+    branch: defaultBranch
   }));
 };

package/dist/slots/Feedback/EditButton.js

@@ -2,6 +2,7 @@ import { FormOutlined } from '@ant-design/icons';
 import { useIntl, useRouteMeta, useSiteData } from 'dumi';
 import path from 'path';
 import React from 'react';
+import { useGithubRepo } from "../../utils/github";
 export var EditButton = function EditButton() {
   var meta = useRouteMeta();
   var _useIntl = useIntl(),
@@ -9,16 +10,16 @@ export var EditButton = function EditButton() {
   var _useSiteData = useSiteData(),
     themeConfig = _useSiteData.themeConfig;
   var githubUrl = themeConfig.githubUrl,
-    _themeConfig$branch = themeConfig.branch,
-    branch = _themeConfig$branch === void 0 ? 'main' : _themeConfig$branch,
-    _themeConfig$siteRela = themeConfig.siteRelativePath,
-    siteRelativePath = _themeConfig$siteRela === void 0 ? '/packages/site' : _themeConfig$siteRela;
+    _themeConfig$sitePack = themeConfig.sitePackagePath,
+    sitePackagePath = _themeConfig$sitePack === void 0 ? '/packages/site' : _themeConfig$sitePack;
+  var _useGithubRepo = useGithubRepo(),
+    defaultBranch = _useGithubRepo.defaultBranch;
   var editable = !meta.frontmatter.readonly;
   if (!editable) {
     return null;
   }
-  var branchUrl = "".concat(githubUrl, "/edit/").concat(branch);
-  var url = meta.frontmatter.redirect ? path.join(branchUrl, meta.frontmatter.redirect) : path.join(branchUrl, siteRelativePath, meta.frontmatter.filename || '');
+  var branchUrl = "".concat(githubUrl, "/edit/").concat(defaultBranch);
+  var url = meta.frontmatter.redirect ? path.join(branchUrl, meta.frontmatter.redirect) : path.join(branchUrl, sitePackagePath, meta.frontmatter.filename || '');
   return /*#__PURE__*/React.createElement("a", {
     onClick: function onClick() {
       return window.open(url, '_blank');

package/dist/slots/ManualContent/Main.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -6,20 +12,23 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { VerticalAlignTopOutlined } from '@ant-design/icons';
 import { BackTop, Layout } from 'antd';
-import { useRouteMeta } from 'dumi';
+import { useRouteMeta, useSiteData } from 'dumi';
 import React from 'react';
 import { useMedia } from 'react-use';
 import readingTime from 'reading-time';
 import { useMenu } from "../../hooks/useMenu";
 import { ContentTable } from "dumi/theme/slots/ContentTable";
 import { Feedback } from "dumi/theme/slots/Feedback";
+import styles from "./index.module.less";
 import { PrevAndNext } from "./PrevAndNext";
 import ReadingTime from "./ReadingTime";
-import styles from "./index.module.less";
 import { usePreview } from "./usePreview";
 export var Main = function Main(_ref) {
   var children = _ref.children;
   var meta = useRouteMeta();
+  var _useSiteData = useSiteData(),
+    themeConfig = _useSiteData.themeConfig;
+  var feedback = themeConfig.feedback;
   var text = meta.texts.reduce(function (prev, next) {
     return prev + next.value;
   }, '');
@@ -45,10 +54,11 @@ export var Main = function Main(_ref) {
   })), /*#__PURE__*/React.createElement("div", {
     className: styles.markdown
   }, children), /*#__PURE__*/React.createElement(Feedback, null), /*#__PURE__*/React.createElement(PrevAndNext, null)), /*#__PURE__*/React.createElement(BackTop, {
-    style: {
-      right: 32,
+    style: _objectSpread({
+      right: 32
+    }, feedback && {
       bottom: 100
-    }
+    })
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.backTop
   }, /*#__PURE__*/React.createElement(VerticalAlignTopOutlined, null)))), showToc && /*#__PURE__*/React.createElement(Layout.Sider, {

package/dist/utils/github.js

@@ -9,6 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSiteData } from 'dumi';
+import useSWR from 'swr';
 export var useGithubRepo = function useGithubRepo() {
   var githubUrl = useSiteData().themeConfig.githubUrl;
   var regex = /https:\/\/github\.com\/([^\/]+)\/([^\/]+)/;
@@ -16,9 +17,14 @@ export var useGithubRepo = function useGithubRepo() {
     _githubUrl$match2 = _slicedToArray(_githubUrl$match, 3),
     owner = _githubUrl$match2[1],
     repo = _githubUrl$match2[2];
+  var _useSWR = useSWR("/repos/".concat(owner, "/").concat(repo), function () {
+      return getRepoDetails(owner, repo);
+    }),
+    details = _useSWR.data;
   return {
     owner: owner,
-    repo: repo
+    repo: repo,
+    defaultBranch: details === null || details === void 0 ? void 0 : details.default_branch
   };
 };
 export function getLatestVersion(_x, _x2) {
@@ -51,4 +57,35 @@ function _getLatestVersion() {
     }, _callee, null, [[0, 10]]);
   }));
   return _getLatestVersion.apply(this, arguments);
+}
+export function getRepoDetails(_x3, _x4) {
+  return _getRepoDetails.apply(this, arguments);
+}
+function _getRepoDetails() {
+  _getRepoDetails = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(owner, repo) {
+    var response, data;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return fetch("https://api.github.com/repos/".concat(owner, "/").concat(repo));
+        case 3:
+          response = _context2.sent;
+          _context2.next = 6;
+          return response.json();
+        case 6:
+          data = _context2.sent;
+          return _context2.abrupt("return", data);
+        case 10:
+          _context2.prev = 10;
+          _context2.t0 = _context2["catch"](0);
+          return _context2.abrupt("return", undefined);
+        case 13:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 10]]);
+  }));
+  return _getRepoDetails.apply(this, arguments);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/dumi-theme-antv",
-  "version": "0.5.7-beta.2",
+  "version": "0.6.0",
   "description": "AntV website theme based on dumi2.",
   "keywords": [
     "dumi",