@blocklet/ui-react 2.1.27 → 2.1.30

package/lib/Footer/brand.js

@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _useTheme = _interopRequireDefault(require("@mui/styles/useTheme"));
+var _styles = require("@mui/material/styles");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
@@ -37,7 +37,7 @@ function Brand(_ref) {
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  const theme = (0, _useTheme.default)();
+  const theme = (0, _styles.useTheme)();
 
   if (!name && !logo && !description) {
     return null;

package/lib/Footer/index.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _useTheme = _interopRequireDefault(require("@mui/styles/useTheme"));
+var _styles = require("@mui/material/styles");
 
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 
@@ -56,7 +56,7 @@ function Footer(_ref) {
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  const theme = (0, _useTheme.default)();
+  const theme = (0, _styles.useTheme)();
   const blocklet = Object.assign({}, window.blocklet, meta);
 
   if (!blocklet.appName) {

package/lib/Footer/links.js

@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _useTheme = _interopRequireDefault(require("@mui/styles/useTheme"));
+var _styles = require("@mui/material/styles");
 
 var _clsx = _interopRequireDefault(require("clsx"));
 
@@ -42,7 +42,7 @@ function Links(_ref) {
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  const theme = (0, _useTheme.default)();
+  const theme = (0, _styles.useTheme)();
   const [activeIndex, setActiveIndex] = (0, _react.useState)(-1);
 
   if (!(links !== null && links !== void 0 && links.length)) {

package/lib/Footer/row.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _useTheme = _interopRequireDefault(require("@mui/styles/useTheme"));
+var _styles = require("@mui/material/styles");
 
 var _clsx = _interopRequireDefault(require("clsx"));
 
@@ -36,7 +36,7 @@ function Row(_ref) {
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  const theme = (0, _useTheme.default)();
+  const theme = (0, _styles.useTheme)();
 
   if (!children) {
     return null;

package/lib/Footer/social-media.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
-var _useTheme = _interopRequireDefault(require("@mui/styles/useTheme"));
+var _styles = require("@mui/material/styles");
 
 var _Icon = _interopRequireDefault(require("../Icon"));
 
@@ -35,7 +35,7 @@ function SocialMedia(_ref) {
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  const theme = (0, _useTheme.default)();
+  const theme = (0, _styles.useTheme)();
 
   if (!(items !== null && items !== void 0 && items.length)) {
     return null;

package/lib/utils.js

@@ -56,7 +56,7 @@ const matchPath = path => {
 
   const pathname = ensureTrailingSlash(window.location.pathname);
   const normalizedPath = ensureTrailingSlash(new URL(path, window.location.origin).pathname);
-  return normalizedPath.startsWith(pathname);
+  return pathname.startsWith(normalizedPath);
 };
 /**
  * 从一组 paths 中, 找到匹配当前 location 的 path, 返回序号
@@ -74,13 +74,13 @@ const matchPaths = function matchPaths() {
 
   if (!(matched !== null && matched !== void 0 && matched.length)) {
     return -1;
-  } // 多个 path 都匹配时, 取一个最短的 path
+  } // 多个 path 都匹配时, 取一个最具体 (最长的) path
 
 
-  const shortest = matched.slice(1).reduce((prev, cur) => {
-    return prev.path.length <= cur.path.length ? prev : cur;
+  const mostSpecific = matched.slice(1).reduce((prev, cur) => {
+    return prev.path.length >= cur.path.length ? prev : cur;
   }, matched[0]);
-  return shortest.index;
+  return mostSpecific.index;
 };
 
 exports.matchPaths = matchPaths;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.1.27",
+  "version": "2.1.30",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -34,8 +34,8 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.1.27",
-    "@arcblock/ux": "^2.1.27",
+    "@arcblock/did-connect": "^2.1.30",
+    "@arcblock/ux": "^2.1.30",
     "@iconify/iconify": "^2.2.1",
     "@mui/material": "^5.6.4",
     "core-js": "^3.6.4",
@@ -57,5 +57,5 @@
     "eslint-plugin-react-hooks": "^4.2.0",
     "jest": "^24.1.0"
   },
-  "gitHead": "a5f51b0432dbdfe806276bdb10b68df19575687e"
+  "gitHead": "16c9e4b3d8664ef14440b248bdf34b46fc8396d1"
 }

package/src/Footer/brand.js

@@ -1,7 +1,7 @@
 import { isValidElement } from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import useTheme from '@mui/styles/useTheme';
+import { useTheme } from '@mui/material/styles';
 
 export default function Brand({ name, logo, description, ...rest }) {
   const theme = useTheme();

package/src/Footer/index.js

@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import useTheme from '@mui/styles/useTheme';
+import { useTheme } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import Container from '@mui/material/Container';
 import { withErrorBoundary } from 'react-error-boundary';

package/src/Footer/links.js

@@ -2,7 +2,7 @@
 import { useState } from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import useTheme from '@mui/styles/useTheme';
+import { useTheme } from '@mui/material/styles';
 import clsx from 'clsx';
 
 /**

package/src/Footer/row.js

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import useTheme from '@mui/styles/useTheme';
+import { useTheme } from '@mui/material/styles';
 import clsx from 'clsx';
 
 export default function Row({ children, autoCenter, ...rest }) {

package/src/Footer/social-media.js

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import useTheme from '@mui/styles/useTheme';
+import { useTheme } from '@mui/material/styles';
 import Icon from '../Icon';
 
 export default function SocialMedia({ items, ...rest }) {

package/src/utils.js

@@ -32,7 +32,7 @@ export const matchPath = (path) => {
   const ensureTrailingSlash = (str) => (str.endsWith('/') ? str : `${str}/`);
   const pathname = ensureTrailingSlash(window.location.pathname);
   const normalizedPath = ensureTrailingSlash(new URL(path, window.location.origin).pathname);
-  return normalizedPath.startsWith(pathname);
+  return pathname.startsWith(normalizedPath);
 };
 
 /**
@@ -43,9 +43,9 @@ export const matchPaths = (paths = []) => {
   if (!matched?.length) {
     return -1;
   }
-  // 多个 path 都匹配时, 取一个最短的 path
-  const shortest = matched.slice(1).reduce((prev, cur) => {
-    return prev.path.length <= cur.path.length ? prev : cur;
+  // 多个 path 都匹配时, 取一个最具体 (最长的) path
+  const mostSpecific = matched.slice(1).reduce((prev, cur) => {
+    return prev.path.length >= cur.path.length ? prev : cur;
   }, matched[0]);
-  return shortest.index;
+  return mostSpecific.index;
 };