dumi 2.0.0-rc.13 → 2.0.0-rc.15

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

@@ -13,19 +13,19 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { DumiDemo, useRouteMeta } from 'dumi';
-import React, { useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 export var DumiDemoGrid = function DumiDemoGrid(props) {
   var _useRouteMeta = useRouteMeta(),
       fm = _useRouteMeta.frontmatter;
 
-  var _useState = useState(function () {
+  var generator = useCallback(function (fm, items) {
     var _fm$demo;
 
     var cols = [];
 
-    if ((_fm$demo = fm.demo) !== null && _fm$demo !== void 0 && _fm$demo.cols && fm.demo.cols > 1) {
-      for (var i = 0; i < props.items.length; i += fm.demo.cols) {
-        props.items.slice(i, i + fm.demo.cols).forEach(function (item, j) {
+    if ((_fm$demo = fm.demo) !== null && _fm$demo !== void 0 && _fm$demo.cols && fm.demo.cols > 1 && window.innerWidth > 1024) {
+      for (var i = 0; i < items.length; i += fm.demo.cols) {
+        items.slice(i, i + fm.demo.cols).forEach(function (item, j) {
           var _cols$j;
 
           (_cols$j = cols[j]) !== null && _cols$j !== void 0 ? _cols$j : cols[j] = [];
@@ -35,14 +35,29 @@ export var DumiDemoGrid = function DumiDemoGrid(props) {
 
       return cols;
     } else {
-      cols.push(props.items);
+      cols.push(items);
     }
 
     return cols;
+  }, []);
+
+  var _useState = useState(function () {
+    return generator(fm, props.items);
   }),
-      _useState2 = _slicedToArray(_useState, 1),
-      cols = _useState2[0];
+      _useState2 = _slicedToArray(_useState, 2),
+      cols = _useState2[0],
+      setCols = _useState2[1];
+
+  useEffect(function () {
+    var handler = function handler() {
+      return setCols(generator(fm, props.items));
+    };
 
+    window.addEventListener('resize', handler);
+    return function () {
+      return window.removeEventListener('resize', handler);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',

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

@@ -223,7 +223,8 @@ export var useSidebarData = function useSidebarData() {
   // /a/b => /a
   // /en-US/a => /en-US/a
   // /en-US/a/b => /en-US/a
+  // /en-US/a/b/ => /en-US/a (also strip trailing /)
 
-  var parentPath = clearPath ? pathname.replace(/(\/[^/]+)(\/[^/]+)$/, '$1') : pathname;
+  var parentPath = clearPath ? pathname.replace(/(\/[^/]+)(\/[^/]+\/?)$/, '$1') : pathname;
   return parentPath ? sidebar[parentPath] : [];
 };

package/dist/client/theme-api/useSiteSearch/index.js

@@ -76,7 +76,7 @@ export var useSiteSearch = function useSiteSearch() {
     worker.postMessage({
       action: 'generate-metadata',
       args: {
-        routes: routes,
+        routes: JSON.parse(JSON.stringify(routes)),
         nav: navData,
         demos: demoData
       }

package/dist/features/routes.js

@@ -204,8 +204,16 @@ var routes_default = (api) => {
   });
   api.addEntryCodeAhead(() => `
 // always remove trailing slash from location.pathname
-if (typeof history !== 'undefined' && /(?<!^)\\/$/.test(location.pathname)) {
-  history.replaceState({}, '', location.pathname.slice(0, -1));
+if (
+  typeof history !== 'undefined' &&
+  location.pathname.length > 1 &&
+  location.pathname.endsWith('/')
+) {
+  history.replaceState(
+    {},
+    '',
+    location.pathname.slice(0, -1) + location.search + location.hash,
+  );
 }
 `);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",

package/theme-default/layouts/DocLayout/index.less

@@ -6,6 +6,7 @@ body {
 }
 
 .@{prefix}-doc-layout {
+  font-family: sans-serif;
   background-color: @c-site-bg;
 
   @media @mobile {