@antv/dumi-theme-antv 0.3.0-beta.18 → 0.3.0-beta.19

package/dist/builtins/Playground/index.js

@@ -15,7 +15,7 @@ import { get } from 'lodash-es';
 import React, { useContext } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { ThemeAntVContext } from "../../context";
-import { CodeRunner } from "../../slots/CodeRunner";
+import { CodeRunner } from "dumi/theme/slots/CodeRunner";
 import styles from "./index.module.less";
 
 /**

package/dist/layouts/entry/Index.js

@@ -6,13 +6,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import React from 'react';
 import { useLocale, useSiteData, FormattedMessage } from 'dumi';
-import { SEO } from "../../slots/SEO";
-import { Header } from "../../slots/Header";
+import { SEO } from "dumi/theme/slots/SEO";
+import { Header } from "dumi/theme/slots/Header";
 import { Detail } from 'dumi/theme/slots/Detail';
-import { Features } from "../../slots/Features";
-import { Cases } from "../../slots/Cases";
-import { Companies } from "../../slots/Companies";
-import { Footer } from "../../slots/Footer";
+import { Features } from "dumi/theme/slots/Features";
+import { Cases } from "dumi/theme/slots/Cases";
+import { Companies } from "dumi/theme/slots/Companies";
+import { Footer } from "dumi/theme/slots/Footer";
+import { size } from 'lodash-es';
 /**
  * Index 路由下的入口
  * - 获取数据
@@ -71,10 +72,10 @@ export var Index = function Index() {
     title: "".concat(metaTitle[locale.id]),
     titleSuffix: "AntV",
     lang: locale.id
-  }), /*#__PURE__*/React.createElement(Header, null), detail && /*#__PURE__*/React.createElement(Detail, detailProps), features && /*#__PURE__*/React.createElement(Features, featuresProps), cases && /*#__PURE__*/React.createElement(Cases, casesProps), /*#__PURE__*/React.createElement(Companies, {
+  }), /*#__PURE__*/React.createElement(Header, null), size(detail) ? /*#__PURE__*/React.createElement(Detail, detailProps) : null, size(features) ? /*#__PURE__*/React.createElement(Features, featuresProps) : null, size(cases) ? /*#__PURE__*/React.createElement(Cases, casesProps) : null, size(companies) ? /*#__PURE__*/React.createElement(Companies, {
     title: /*#__PURE__*/React.createElement(FormattedMessage, {
       id: isAntVSite ? "2000+ 公司正在使用" : "感谢信赖"
     }),
     companies: companies
-  }), /*#__PURE__*/React.createElement(Footer, null));
+  }) : null, /*#__PURE__*/React.createElement(Footer, null));
 };

package/dist/layouts/entry/Manual.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { ManualContent } from "../../slots/ManualContent";
-import { Header } from "../../slots/Header";
-import { Footer } from "../../slots/Footer";
+import { ManualContent } from "dumi/theme/slots/ManualContent";
+import { Header } from "dumi/theme/slots/Header";
+import { Footer } from "dumi/theme/slots/Footer";
 
 /**
  * Manual 路由下的入口

package/dist/pages/404.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { SEO } from "../slots/SEO";
-import { Header } from "../slots/Header";
-import { NotFound as NotFoundPage } from "../slots/404";
-import { Footer } from "../slots/Footer";
+import { SEO } from "dumi/theme/slots/SEO";
+import { Header } from "dumi/theme/slots/Header";
+import { NotFound as NotFoundPage } from "dumi/theme/slots/404";
+import { Footer } from "dumi/theme/slots/Footer";
 /**
  * 404 页面
  */

package/dist/pages/Example/index.js

@@ -15,10 +15,10 @@ import { useParams, useLocation, useNavigate } from 'react-router-dom';
 import { get } from 'lodash-es';
 import { Layout } from 'antd';
 import { useLocale, useSiteData } from 'dumi';
-import { SEO } from "../../slots/SEO";
-import { Header } from "../../slots/Header";
-import { ExampleSider } from "../../slots/ExampleSider";
-import { CodeRunner } from "../../slots/CodeRunner";
+import { SEO } from "dumi/theme/slots/SEO";
+import { Header } from "dumi/theme/slots/Header";
+import { ExampleSider } from "dumi/theme/slots/ExampleSider";
+import { CodeRunner } from "dumi/theme/slots/CodeRunner";
 import { getDemoInfo } from "../../slots/CodeRunner/utils";
 import { ThemeAntVContext } from "../../context";
 import styles from "./index.module.less";

package/dist/pages/Examples/components/ExampleTopicMenu/components/LeftMenu/index.js

@@ -19,6 +19,10 @@ var MenuIcon = createFromIconfontCN({
   scriptUrl: '//at.alicdn.com/t/font_470089_1lnym745udm.js' // generated by iconfont.cn
 
 });
+
+function getCategoryId(tid, eid) {
+  return [tid, eid].join('-').replace(/\s/g, '');
+}
 /**
  * LeftMenu
  *
@@ -27,6 +31,7 @@ var MenuIcon = createFromIconfontCN({
  * @author YuZhanglong <loveyzl1123@gmail.com>
  */
 
+
 export var LeftMenu = function LeftMenu(props) {
   var exampleTopics = props.exampleTopics;
 
@@ -66,7 +71,7 @@ export var LeftMenu = function LeftMenu(props) {
       return /*#__PURE__*/React.createElement(Menu.Item, {
         key: example.id
       }, /*#__PURE__*/React.createElement(Anchor.Link, {
-        href: "#category-".concat(example.id.replace(/\s/g, '')),
+        href: "#".concat(getCategoryId(topic.id, example.id)),
         title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, example.title[locale.id]))
       }));
     }));

package/dist/pages/Examples/index.js

@@ -15,9 +15,9 @@ import { useContext, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { BackTop, Layout as AntLayout } from 'antd';
 import { useLocale } from 'dumi';
-import { SEO } from "../../slots/SEO";
-import { Header } from "../../slots/Header";
-import { Footer } from "../../slots/Footer";
+import { SEO } from "dumi/theme/slots/SEO";
+import { Header } from "dumi/theme/slots/Header";
+import { Footer } from "dumi/theme/slots/Footer";
 import NavigatorBanner from "../../slots/Header/Products/NavigatorBanner";
 import { VerticalAlignTopOutlined } from '@ant-design/icons';
 import { Article } from "./components/Article";

package/dist/pages/Examples/index.module.less

@@ -199,6 +199,11 @@
 
 .layout {
   margin: 24px 0 32px;
+  :global {
+    .ant-layout-content {
+      background-color: #ffffff;
+    }
+  }
 }
 
 .main {
@@ -206,6 +211,7 @@
   width: calc(100% - @toc-width);
   padding-left: 48px;
   padding-right: 24px;
+  padding-bottom: 24px;
   overflow: hidden;
 
   .meta {
@@ -521,6 +527,7 @@
       margin-top: 30px;
       padding-left: 24px;
       padding-right: 24px;
+      margin-bottom: 30px;
     }
   }
 }

package/dist/slots/CodeEditor/index.js

@@ -17,7 +17,7 @@ import { debounce, noop } from 'lodash-es';
 import { bind, clear } from 'size-sensor';
 import { replaceInsertCss, execute, compile } from "./utils";
 import { Toolbar, EDITOR_TABS } from "./Toolbar";
-import { Loading } from "../Loading";
+import { Loading } from "dumi/theme/slots/Loading";
 import styles from "./index.module.less";
 loader.config({
   'vs/nls': {

package/dist/slots/CodeRunner/index.js

@@ -14,11 +14,11 @@ import React, { useState } from 'react';
 import { useSiteData, useLocale } from 'dumi';
 import { noop } from 'lodash-es';
 import SplitPane from 'react-split-pane';
-import { CodeEditor } from "../CodeEditor";
-import { CodePreview } from "../CodePreview";
+import { CodeEditor } from "dumi/theme/slots/CodeEditor";
+import { CodePreview } from "dumi/theme/slots/CodePreview";
 import { CodeHeader } from "../CodePreview/CodeHeader";
 import { getDemoInfo } from "./utils";
-import { NotFound } from "../404";
+import { NotFound } from "dumi/theme/slots/404";
 import { ic } from "../hooks";
 
 /**

package/dist/slots/ExampleSider/index.js

@@ -18,7 +18,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useEffect, useRef, useState } from 'react';
 import { Input, Menu, Tooltip } from 'antd';
-import { useLocale, FormattedMessage } from 'dumi';
+import { useLocale, FormattedMessage, useIntl } from 'dumi';
+import { cloneDeep } from 'lodash-es';
 import { createFromIconfontCN, SearchOutlined, VerticalAlignTopOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
 import { filterTreeNode } from "../utils";
@@ -56,22 +57,19 @@ export var ExampleSider = function ExampleSider(props) {
       setSearchValue = _useState6[1];
 
   var locale = useLocale();
+  var intl = useIntl();
 
   var getCurrentTopics = function getCurrentTopics() {
-    if (searchValue) {
-      var res = filterTreeNode({
-        id: 'FAKE_ID',
-        childrenKey: 'exampleTopics',
-        title: {
-          'zh': 'FAKE_TITLE',
-          'en': 'FAKE_TITLE'
-        },
-        exampleTopics: exampleTopics
-      }, searchValue, locale.id);
-      return (res === null || res === void 0 ? void 0 : res.exampleTopics) || [];
-    }
-
-    return exampleTopics;
+    var res = filterTreeNode({
+      id: 'FAKE_ID',
+      childrenKey: 'exampleTopics',
+      title: {
+        'zh': 'FAKE_TITLE',
+        'en': 'FAKE_TITLE'
+      },
+      exampleTopics: cloneDeep(exampleTopics)
+    }, searchValue, locale.id);
+    return (res === null || res === void 0 ? void 0 : res.exampleTopics) || [];
   }; // 初始化菜单栏展开keys
 
 
@@ -130,11 +128,11 @@ export var ExampleSider = function ExampleSider(props) {
         }, topic.title && getSearchValueTitle(topic.title[locale.id])))
       }, topic.examples.map(function (example) {
         return /*#__PURE__*/React.createElement(Menu.SubMenu, {
-          key: "EXAMPLE-".concat(example.id),
+          key: "EXAMPLE-".concat(topic.id, "-").concat(example.id),
           title: example.title[locale.id]
         }, example.demos.map(function (demo) {
           return /*#__PURE__*/React.createElement(Menu.Item, {
-            key: "DEMO-".concat(demo.id),
+            key: "DEMO-".concat(topic.id, "-").concat(example.id, "-").concat(demo.id),
             style: {
               height: 70,
               padding: 0,
@@ -160,8 +158,8 @@ export var ExampleSider = function ExampleSider(props) {
       className: styles.searchSider
     }, /*#__PURE__*/React.createElement(Input, {
       size: "small",
-      placeholder: /*#__PURE__*/React.createElement(FormattedMessage, {
-        id: "\u641C\u7D22\u2026"
+      placeholder: intl.formatMessage({
+        id: '搜索…'
       }),
       prefix: /*#__PURE__*/React.createElement(SearchOutlined, null),
       value: searchValue,

package/dist/slots/Features/index.js

@@ -88,7 +88,7 @@ export var Features = function Features(_ref) {
   }, /*#__PURE__*/React.createElement("p", {
     key: "title",
     className: styles.title
-  }, title), /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
     key: "block",
     className: styles.cardsContainer
   }, /*#__PURE__*/React.createElement(Row, {

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

@@ -58,7 +58,7 @@
     position: absolute;
     width: 95.83%;
     left: 4.17%;
-    top: 144px;
+    top: 88px;
     background: #fff;
     height: 65%;
     box-shadow: -5px 5px 15px rgba(0, 0, 0, 0.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 URI from 'uri-parse';
-import { SEO } from "../SEO";
+import { SEO } from "dumi/theme/slots/SEO";
 import { getBaseRoute, getIndexRoute, getOpenKeys, getNavigateUrl } from "./utils";
 import { NavigatorBanner } from "./NavigatorBanner";
 import ReadingTime from "./ReadingTime";
-import { ContentTable } from "../ContentTable";
+import { ContentTable } from "dumi/theme/slots/ContentTable";
 import { useScrollToTop } from "../hooks";
 import 'rc-drawer/assets/index.css';
 import styles from "./index.module.less";
@@ -308,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,

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

@@ -84,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;
   }
@@ -197,6 +205,10 @@
   > p > br {
     clear: both;
   }
+
+  img {
+    max-width: 100%;
+  }
 }
 
 .layout {

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

@@ -13,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

@@ -94,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.18",
+  "version": "0.3.0-beta.19",
   "description": "AntV website theme based on dumi2.",
   "types": "dist/types.d.ts",
   "scripts": {