@arcblock/ux 2.1.68 → 2.1.71

package/lib/CodeBlock/index.js

@@ -17,7 +17,7 @@ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 
 var _useMountedState = _interopRequireDefault(require("react-use/lib/useMountedState"));
 
-var _highlight = _interopRequireDefault(require("highlight.js/lib/highlight"));
+var _core = _interopRequireDefault(require("highlight.js/lib/core"));
 
 var _javascript = _interopRequireDefault(require("highlight.js/lib/languages/javascript"));
 
@@ -71,57 +71,57 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-_highlight.default.registerLanguage('javascript', _javascript.default);
+_core.default.registerLanguage('javascript', _javascript.default);
 
-_highlight.default.registerLanguage('js', _javascript.default);
+_core.default.registerLanguage('js', _javascript.default);
 
-_highlight.default.registerLanguage('jsx', _javascript.default);
+_core.default.registerLanguage('jsx', _javascript.default);
 
-_highlight.default.registerLanguage('typescript', _typescript.default);
+_core.default.registerLanguage('typescript', _typescript.default);
 
-_highlight.default.registerLanguage('ts', _typescript.default);
+_core.default.registerLanguage('ts', _typescript.default);
 
-_highlight.default.registerLanguage('tsx', _typescript.default);
+_core.default.registerLanguage('tsx', _typescript.default);
 
-_highlight.default.registerLanguage('json', _json.default);
+_core.default.registerLanguage('json', _json.default);
 
-_highlight.default.registerLanguage('elixir', _elixir.default);
+_core.default.registerLanguage('elixir', _elixir.default);
 
-_highlight.default.registerLanguage('java', _java.default);
+_core.default.registerLanguage('java', _java.default);
 
-_highlight.default.registerLanguage('kotlin', _kotlin.default);
+_core.default.registerLanguage('kotlin', _kotlin.default);
 
-_highlight.default.registerLanguage('kt', _kotlin.default);
+_core.default.registerLanguage('kt', _kotlin.default);
 
-_highlight.default.registerLanguage('protobuf', _protobuf.default);
+_core.default.registerLanguage('protobuf', _protobuf.default);
 
-_highlight.default.registerLanguage('protobuffer', _protobuf.default);
+_core.default.registerLanguage('protobuffer', _protobuf.default);
 
-_highlight.default.registerLanguage('python', _python.default);
+_core.default.registerLanguage('python', _python.default);
 
-_highlight.default.registerLanguage('py', _python.default);
+_core.default.registerLanguage('py', _python.default);
 
-_highlight.default.registerLanguage('yaml', _yaml.default);
+_core.default.registerLanguage('yaml', _yaml.default);
 
-_highlight.default.registerLanguage('yml', _yaml.default);
+_core.default.registerLanguage('yml', _yaml.default);
 
-_highlight.default.registerLanguage('shell', _shell.default);
+_core.default.registerLanguage('shell', _shell.default);
 
-_highlight.default.registerLanguage('sh', _shell.default);
+_core.default.registerLanguage('sh', _shell.default);
 
-_highlight.default.registerLanguage('plaintext', _plaintext.default);
+_core.default.registerLanguage('plaintext', _plaintext.default);
 
-_highlight.default.registerLanguage('text', _plaintext.default);
+_core.default.registerLanguage('text', _plaintext.default);
 
-_highlight.default.registerLanguage('patch', _diff.default);
+_core.default.registerLanguage('patch', _diff.default);
 
-_highlight.default.registerLanguage('diff', _diff.default);
+_core.default.registerLanguage('diff', _diff.default);
 
-_highlight.default.registerLanguage('swift', _swift.default);
+_core.default.registerLanguage('swift', _swift.default);
 
-_highlight.default.registerLanguage('objectivec', _objectivec.default);
+_core.default.registerLanguage('objectivec', _objectivec.default);
 
-_highlight.default.registerLanguage('oc', _objectivec.default);
+_core.default.registerLanguage('oc', _objectivec.default);
 
 function CodeBlock(_ref) {
   let {
@@ -152,7 +152,7 @@ function CodeBlock(_ref) {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("code", {
         className: "hljs ".concat(language),
         dangerouslySetInnerHTML: {
-          __html: _highlight.default.highlightAuto(source, [language]).value
+          __html: _core.default.highlightAuto(source, [language]).value
         }
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_IconButton.default, {

package/lib/Locale/selector.js

@@ -31,17 +31,15 @@ var _Box = _interopRequireDefault(require("@mui/material/Box"));
 
 var _Check = _interopRequireDefault(require("@mui/icons-material/Check"));
 
+var _Globe = _interopRequireDefault(require("@arcblock/icons/lib/Globe"));
+
 var _Util = require("../Util");
 
 var _context = require("./context");
 
-var _globeDark = _interopRequireDefault(require("./images/globe-dark.png"));
-
-var _globeLight = _interopRequireDefault(require("./images/globe-light.png"));
-
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["dark", "showText", "popperProps", "popperType", "icon"];
+const _excluded = ["showText", "popperProps", "popperType", "icon"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -56,8 +54,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 function LocaleSelector(props) {
+  var _theme$palette, _theme$palette2, _theme$palette2$text;
+
   const {
-    dark,
     showText,
     popperProps,
     popperType,
@@ -72,6 +71,7 @@ function LocaleSelector(props) {
   const anchorEl = (0, _react.useRef)(null);
   const [open, setOpen] = (0, _react.useState)(false);
   const theme = (0, _styles.useTheme)();
+  const dark = (theme === null || theme === void 0 ? void 0 : (_theme$palette = theme.palette) === null || _theme$palette === void 0 ? void 0 : _theme$palette.mode) === 'dark';
 
   const onSelect = newLocale => {
     changeLocale(newLocale);
@@ -107,12 +107,14 @@ function LocaleSelector(props) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(Icon, {});
     }
 
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-      src: dark ? _globeDark.default : _globeLight.default,
-      className: "trigger-image",
-      alt: "globe"
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Globe.default, {
+      style: {
+        width: 26,
+        height: 24.76,
+        color: theme.palette.text.secondary
+      }
     });
-  }, [Icon, dark]);
+  }, [Icon, theme === null || theme === void 0 ? void 0 : (_theme$palette2 = theme.palette) === null || _theme$palette2 === void 0 ? void 0 : (_theme$palette2$text = _theme$palette2.text) === null || _theme$palette2$text === void 0 ? void 0 : _theme$palette2$text.secondary]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, _objectSpread(_objectSpread(_objectSpread({
     component: "div",
     dark: dark,
@@ -162,7 +164,6 @@ function LocaleSelector(props) {
 }
 
 LocaleSelector.propTypes = {
-  dark: _propTypes.default.bool,
   size: _propTypes.default.number,
   showText: _propTypes.default.bool,
   popperProps: _propTypes.default.object,
@@ -171,7 +172,6 @@ LocaleSelector.propTypes = {
   icon: _propTypes.default.any
 };
 LocaleSelector.defaultProps = {
-  dark: false,
   showText: true,
   size: 24,
   popperProps: {},

package/lib/Theme/index.js

@@ -3,155 +3,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = void 0;
-
-var _styles = require("@mui/material/styles");
-
-require("@fontsource/lato/400.css");
-
-require("@fontsource/lato/700.css");
-
-var _Colors = _interopRequireDefault(require("../Colors"));
-
-const _excluded = ["mode", "pageWidth", "palette", "typography", "overrides"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-const muiDarkTheme = (0, _styles.createTheme)({
-  palette: {
-    mode: 'dark'
+var _exportNames = {
+  ThemeProvider: true
+};
+Object.defineProperty(exports, "ThemeProvider", {
+  enumerable: true,
+  get: function get() {
+    return _themeProvider.default;
   }
-}); // https://material-ui.com/customization/default-theme/
-// eslint-disable-next-line import/prefer-default-export
-
-const create = function create() {
-  let _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      {
-    mode = 'light',
-    pageWidth = 'md',
-    palette,
-    typography,
-    overrides
-  } = _ref,
-      rest = _objectWithoutProperties(_ref, _excluded);
-
-  // palette 考虑 light & dark mode, dark mode 需要持续完善
-  // - 能配合 ColorModeContext 使用
-  // - 为 dark mode 系统的设计整个 palette, 不要单个 color 设置
-  const _palette = mode === 'light' ? Object.assign(_objectSpread(_objectSpread({}, _Colors.default), {}, {
-    background: {
-      paper: _Colors.default.common.white,
-      default: _Colors.default.background.default
-    },
-    mode
-  }), palette || {}) : Object.assign(_objectSpread(_objectSpread({}, muiDarkTheme.palette), {}, {
-    background: {
-      paper: _Colors.default.grey[900],
-      default: _Colors.default.grey[900]
-    },
-    mode
-  }), palette || {});
+});
 
-  const theme = (0, _styles.createTheme)(_objectSpread({
-    themeName: 'ArcBlock',
-    palette: _palette,
-    typography: Object.assign({
-      useNextVariants: true,
-      color: {
-        // 此处 #222222 必须硬编码, layout/sidebar.js -> Icon/image 加载图片时 color 会影响加载路径
-        // TODO: 此处硬编码的色值后面需要改为 colors.grey[900],
-        //       或者如果可以的话直接删掉 typography#color, 文本颜色建议使用 theme.palette.text 中的色值?
-        //       layout 组件建议重构, sidebar 中建议使用 icon 替换 img (#366)
-        main: mode === 'light' ? '#222222' : _Colors.default.common.white,
-        gray: mode === 'light' ? _Colors.default.grey[500] : _Colors.default.grey[300]
-      },
-      fontFamily: ['Lato', 'Avenir', '-apple-system', 'BlinkMacSystemFont', '"Segoe UI"', 'Roboto', '"Helvetica Neue"', 'Arial', 'sans-serif', '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"'].join(','),
-      // 按最新设计规范, 只使用 400/700
-      fontWeightLight: 400,
-      fontWeightRegular: 400,
-      fontWeightMedium: 700,
-      fontWeightBold: 700,
-      // button 默认使用粗体
-      button: {
-        fontWeight: 700
-      }
-    }, typography || {}),
-    components: _objectSpread({
-      MuiButton: {
-        styleOverrides: {
-          root: {
-            boxShadow: 'none'
-          }
-        }
-      },
-      MuiButtonGroup: {
-        styleOverrides: {
-          root: {
-            boxShadow: 'none'
-          }
-        }
-      },
-      MuiTableCell: {
-        styleOverrides: {
-          root: {
-            borderBottomWidth: '0',
-            paddingTop: '14px',
-            paddingBottom: '14px',
-            paddingLeft: 0,
-            paddingRight: '30px'
-          },
-          head: {
-            textTransform: 'uppercase',
-            color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
-          },
-          body: {
-            color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
-          }
-        }
-      }
-    }, overrides),
-    pageWidth,
-    // TODO: 过时的 colors, 需要各项目负责人检查项目中是否使用 "theme.colors", 如果有需要清除,
-    //       可以从 Colors 模块/theme.palette/mui colors 中取值
-    colors: {
-      white: '#FFFFFF',
-      dark: '#4A707C',
-      gray: '#222222',
-      minor: '#9B9B9B',
-      darkText: '#DCDCDC',
-      background: '#F7F8F8',
-      yellow: '#FFCF71',
-      green: '#44cdc6',
-      red: '#D0021B',
-      blue: '#4E6AF6',
-      primary: '#222222',
-      black: '#222222',
-      secondary: '#44cdc6',
-      mint: '#44cdc6',
-      textSecondary: '#4A4A4A',
-      active: '#5b9025',
-      danger: '#D0021B',
-      lightGrey: '#BCBCBC'
-    },
-    mode
-  }, rest));
-  const enhanced = (0, _styles.responsiveFontSizes)(theme, {
-    breakpoints: ['xs', 'sm', 'md', 'lg'],
-    disableAlign: false,
-    factor: 3,
-    variants: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'subtitle1', 'subtitle2', 'body1', 'body2', 'caption', 'button', 'overline']
+var _theme = require("./theme");
+
+Object.keys(_theme).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _theme[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _theme[key];
+    }
   });
-  return enhanced;
-};
+});
+
+var _themeProvider = _interopRequireDefault(require("./theme-provider"));
 
-exports.create = create;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/Theme/theme-provider.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = ThemeProvider;
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _styledComponents = require("styled-components");
+
+var _styles = require("@mui/material/styles");
+
+var _StyledEngineProvider = _interopRequireDefault(require("@mui/material/StyledEngineProvider"));
+
+var _CssBaseline = _interopRequireDefault(require("@mui/material/CssBaseline"));
+
+var _theme = require("./theme");
+
+var _jsxRuntime = require("react/jsx-runtime");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const defaultTheme = (0, _theme.create)();
+/**
+ * 默认的 theme provider, 可以为 webapp/blocklet 快捷的配置好 mui theme provider
+ * 注: 目前 UX 依赖 styled-components, 所以该组件也内置了一个 StyledThemeProvider
+ */
+
+function ThemeProvider(_ref) {
+  let {
+    children,
+    theme
+  } = _ref;
+  return (
+    /*#__PURE__*/
+    // injectFirst 会影响 makeStyles 自定义样式和 mui styles 覆盖问题
+    (0, _jsxRuntime.jsx)(_StyledEngineProvider.default, {
+      injectFirst: true,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.ThemeProvider, {
+        theme: theme,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styledComponents.ThemeProvider, {
+          theme: theme,
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CssBaseline.default, {}), children]
+        })
+      })
+    })
+  );
+}
+
+ThemeProvider.propTypes = {
+  children: _propTypes.default.any,
+  theme: _propTypes.default.any
+};
+ThemeProvider.defaultProps = {
+  children: null,
+  theme: defaultTheme
+};

package/lib/Theme/theme.js

@@ -0,0 +1,157 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.create = void 0;
+
+var _styles = require("@mui/material/styles");
+
+require("@fontsource/lato/400.css");
+
+require("@fontsource/lato/700.css");
+
+var _Colors = _interopRequireDefault(require("../Colors"));
+
+const _excluded = ["mode", "pageWidth", "palette", "typography", "overrides"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+const muiDarkTheme = (0, _styles.createTheme)({
+  palette: {
+    mode: 'dark'
+  }
+}); // https://material-ui.com/customization/default-theme/
+// eslint-disable-next-line import/prefer-default-export
+
+const create = function create() {
+  let _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      {
+    mode = 'light',
+    pageWidth = 'md',
+    palette,
+    typography,
+    overrides
+  } = _ref,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  // palette 考虑 light & dark mode, dark mode 需要持续完善
+  // - 能配合 ColorModeContext 使用
+  // - 为 dark mode 系统的设计整个 palette, 不要单个 color 设置
+  const _palette = mode === 'light' ? Object.assign(_objectSpread(_objectSpread({}, _Colors.default), {}, {
+    background: {
+      paper: _Colors.default.common.white,
+      default: _Colors.default.background.default
+    },
+    mode
+  }), palette || {}) : Object.assign(_objectSpread(_objectSpread({}, muiDarkTheme.palette), {}, {
+    background: {
+      paper: _Colors.default.grey[900],
+      default: _Colors.default.grey[900]
+    },
+    mode
+  }), palette || {});
+
+  const theme = (0, _styles.createTheme)(_objectSpread({
+    themeName: 'ArcBlock',
+    palette: _palette,
+    typography: Object.assign({
+      useNextVariants: true,
+      color: {
+        // 此处 #222222 必须硬编码, layout/sidebar.js -> Icon/image 加载图片时 color 会影响加载路径
+        // TODO: 此处硬编码的色值后面需要改为 colors.grey[900],
+        //       或者如果可以的话直接删掉 typography#color, 文本颜色建议使用 theme.palette.text 中的色值?
+        //       layout 组件建议重构, sidebar 中建议使用 icon 替换 img (#366)
+        main: mode === 'light' ? '#222222' : _Colors.default.common.white,
+        gray: mode === 'light' ? _Colors.default.grey[500] : _Colors.default.grey[300]
+      },
+      fontFamily: ['Lato', 'Avenir', '-apple-system', 'BlinkMacSystemFont', '"Segoe UI"', 'Roboto', '"Helvetica Neue"', 'Arial', 'sans-serif', '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"'].join(','),
+      // 按最新设计规范, 只使用 400/700
+      fontWeightLight: 400,
+      fontWeightRegular: 400,
+      fontWeightMedium: 700,
+      fontWeightBold: 700,
+      // button 默认使用粗体
+      button: {
+        fontWeight: 700
+      }
+    }, typography || {}),
+    components: _objectSpread({
+      MuiButton: {
+        styleOverrides: {
+          root: {
+            boxShadow: 'none'
+          }
+        }
+      },
+      MuiButtonGroup: {
+        styleOverrides: {
+          root: {
+            boxShadow: 'none'
+          }
+        }
+      },
+      MuiTableCell: {
+        styleOverrides: {
+          root: {
+            borderBottomWidth: '0',
+            paddingTop: '14px',
+            paddingBottom: '14px',
+            paddingLeft: 0,
+            paddingRight: '30px'
+          },
+          head: {
+            textTransform: 'uppercase',
+            color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
+          },
+          body: {
+            color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
+          }
+        }
+      }
+    }, overrides),
+    pageWidth,
+    // TODO: 过时的 colors, 需要各项目负责人检查项目中是否使用 "theme.colors", 如果有需要清除,
+    //       可以从 Colors 模块/theme.palette/mui colors 中取值
+    colors: {
+      white: '#FFFFFF',
+      dark: '#4A707C',
+      gray: '#222222',
+      minor: '#9B9B9B',
+      darkText: '#DCDCDC',
+      background: '#F7F8F8',
+      yellow: '#FFCF71',
+      green: '#44cdc6',
+      red: '#D0021B',
+      blue: '#4E6AF6',
+      primary: '#222222',
+      black: '#222222',
+      secondary: '#44cdc6',
+      mint: '#44cdc6',
+      textSecondary: '#4A4A4A',
+      active: '#5b9025',
+      danger: '#D0021B',
+      lightGrey: '#BCBCBC'
+    },
+    mode
+  }, rest));
+  const enhanced = (0, _styles.responsiveFontSizes)(theme, {
+    breakpoints: ['xs', 'sm', 'md', 'lg'],
+    disableAlign: false,
+    factor: 3,
+    variants: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'subtitle1', 'subtitle2', 'body1', 'body2', 'caption', 'button', 'overline']
+  });
+  return enhanced;
+};
+
+exports.create = create;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.1.68",
+  "version": "2.1.71",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -48,10 +48,10 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "eb2261cc2a82cf9db7cec0dc66d1e32bc3bf7398",
+  "gitHead": "1f224c97d5d033351fde521ef22898492e8f40aa",
   "dependencies": {
-    "@arcblock/icons": "^2.1.68",
-    "@arcblock/react-hooks": "^2.1.68",
+    "@arcblock/icons": "^2.1.71",
+    "@arcblock/react-hooks": "^2.1.71",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
@@ -66,7 +66,7 @@
     "d3-geo": "^1.11.6",
     "dayjs": "^1.11.2",
     "devices.css": "^0.1.15",
-    "highlight.js": "^9.15.8",
+    "highlight.js": "^11.6.0",
     "is-svg": "^4.3.1",
     "js-cookie": "^2.2.0",
     "lodash": "^4.17.21",

package/src/CodeBlock/index.js

@@ -6,7 +6,7 @@ import Copy from 'copy-to-clipboard';
 import Button from '@mui/material/IconButton';
 import useMountedState from 'react-use/lib/useMountedState';
 
-import hljs from 'highlight.js/lib/highlight';
+import hljs from 'highlight.js/lib/core';
 import javascript from 'highlight.js/lib/languages/javascript';
 import typescript from 'highlight.js/lib/languages/typescript';
 import json from 'highlight.js/lib/languages/json';

package/src/Locale/selector.js

@@ -13,20 +13,19 @@ import MenuItem from '@mui/material/MenuItem';
 import MenuList from '@mui/material/MenuList';
 import Box from '@mui/material/Box';
 import CheckIcon from '@mui/icons-material/Check';
+import GlobeIcon from '@arcblock/icons/lib/Globe';
 
 import { getColor, getBackground } from '../Util';
 
 import { LocaleContext, languages } from './context';
 
-import globeDark from './images/globe-dark.png';
-import globeLight from './images/globe-light.png';
-
 function LocaleSelector(props) {
-  const { dark, showText, popperProps, popperType, icon: Icon, ...rest } = props;
+  const { showText, popperProps, popperType, icon: Icon, ...rest } = props;
   const { locale, changeLocale } = useContext(LocaleContext);
   const anchorEl = useRef(null);
   const [open, setOpen] = useState(false);
   const theme = useTheme();
+  const dark = theme?.palette?.mode === 'dark';
 
   const onSelect = (newLocale) => {
     changeLocale(newLocale);
@@ -64,8 +63,8 @@ function LocaleSelector(props) {
       return <Icon />;
     }
 
-    return <img src={dark ? globeDark : globeLight} className="trigger-image" alt="globe" />;
-  }, [Icon, dark]);
+    return <GlobeIcon style={{ width: 26, height: 24.76, color: theme.palette.text.secondary }} />;
+  }, [Icon, theme?.palette?.text?.secondary]);
 
   return (
     <Div component="div" dark={dark} theme={theme} {...rest} {...handleEventProps}>
@@ -105,7 +104,6 @@ function LocaleSelector(props) {
 }
 
 LocaleSelector.propTypes = {
-  dark: PropTypes.bool,
   size: PropTypes.number,
   showText: PropTypes.bool,
   popperProps: PropTypes.object,
@@ -115,7 +113,6 @@ LocaleSelector.propTypes = {
 };
 
 LocaleSelector.defaultProps = {
-  dark: false,
   showText: true,
   size: 24,
   popperProps: {},

package/src/Theme/index.js

@@ -1,164 +1,2 @@
-// https://app.zeplin.io/styleguide/5d1436f1e97c2156f49c0725/colors
-import { createTheme, responsiveFontSizes } from '@mui/material/styles';
-import '@fontsource/lato/400.css';
-import '@fontsource/lato/700.css';
-import colors from '../Colors';
-
-const muiDarkTheme = createTheme({ palette: { mode: 'dark' } });
-
-// https://material-ui.com/customization/default-theme/
-// eslint-disable-next-line import/prefer-default-export
-export const create = ({ mode = 'light', pageWidth = 'md', palette, typography, overrides, ...rest } = {}) => {
-  // palette 考虑 light & dark mode, dark mode 需要持续完善
-  // - 能配合 ColorModeContext 使用
-  // - 为 dark mode 系统的设计整个 palette, 不要单个 color 设置
-  const _palette =
-    mode === 'light'
-      ? Object.assign(
-          {
-            ...colors,
-            background: {
-              paper: colors.common.white,
-              default: colors.background.default,
-            },
-            mode,
-          },
-          palette || {}
-        )
-      : Object.assign(
-          {
-            ...muiDarkTheme.palette,
-            background: {
-              paper: colors.grey[900],
-              default: colors.grey[900],
-            },
-            mode,
-          },
-          palette || {}
-        );
-
-  const theme = createTheme({
-    themeName: 'ArcBlock',
-    palette: _palette,
-    typography: Object.assign(
-      {
-        useNextVariants: true,
-        color: {
-          // 此处 #222222 必须硬编码, layout/sidebar.js -> Icon/image 加载图片时 color 会影响加载路径
-          // TODO: 此处硬编码的色值后面需要改为 colors.grey[900],
-          //       或者如果可以的话直接删掉 typography#color, 文本颜色建议使用 theme.palette.text 中的色值?
-          //       layout 组件建议重构, sidebar 中建议使用 icon 替换 img (#366)
-          main: mode === 'light' ? '#222222' : colors.common.white,
-          gray: mode === 'light' ? colors.grey[500] : colors.grey[300],
-        },
-        fontFamily: [
-          'Lato',
-          'Avenir',
-          '-apple-system',
-          'BlinkMacSystemFont',
-          '"Segoe UI"',
-          'Roboto',
-          '"Helvetica Neue"',
-          'Arial',
-          'sans-serif',
-          '"Apple Color Emoji"',
-          '"Segoe UI Emoji"',
-          '"Segoe UI Symbol"',
-        ].join(','),
-        // 按最新设计规范, 只使用 400/700
-        fontWeightLight: 400,
-        fontWeightRegular: 400,
-        fontWeightMedium: 700,
-        fontWeightBold: 700,
-        // button 默认使用粗体
-        button: {
-          fontWeight: 700,
-        },
-      },
-      typography || {}
-    ),
-    components: {
-      MuiButton: {
-        styleOverrides: {
-          root: {
-            boxShadow: 'none',
-          },
-        },
-      },
-      MuiButtonGroup: {
-        styleOverrides: {
-          root: {
-            boxShadow: 'none',
-          },
-        },
-      },
-      MuiTableCell: {
-        styleOverrides: {
-          root: {
-            borderBottomWidth: '0',
-            paddingTop: '14px',
-            paddingBottom: '14px',
-            paddingLeft: 0,
-            paddingRight: '30px',
-          },
-          head: {
-            textTransform: 'uppercase',
-            color: mode === 'light' ? colors.grey[900] : colors.grey[300],
-          },
-          body: {
-            color: mode === 'light' ? colors.grey[900] : colors.grey[300],
-          },
-        },
-      },
-      ...overrides,
-    },
-    pageWidth,
-    // TODO: 过时的 colors, 需要各项目负责人检查项目中是否使用 "theme.colors", 如果有需要清除,
-    //       可以从 Colors 模块/theme.palette/mui colors 中取值
-    colors: {
-      white: '#FFFFFF',
-      dark: '#4A707C',
-      gray: '#222222',
-      minor: '#9B9B9B',
-      darkText: '#DCDCDC',
-      background: '#F7F8F8',
-      yellow: '#FFCF71',
-      green: '#44cdc6',
-      red: '#D0021B',
-      blue: '#4E6AF6',
-      primary: '#222222',
-      black: '#222222',
-      secondary: '#44cdc6',
-      mint: '#44cdc6',
-      textSecondary: '#4A4A4A',
-      active: '#5b9025',
-      danger: '#D0021B',
-      lightGrey: '#BCBCBC',
-    },
-    mode,
-    ...rest,
-  });
-
-  const enhanced = responsiveFontSizes(theme, {
-    breakpoints: ['xs', 'sm', 'md', 'lg'],
-    disableAlign: false,
-    factor: 3,
-    variants: [
-      'h1',
-      'h2',
-      'h3',
-      'h4',
-      'h5',
-      'h6',
-      'subtitle1',
-      'subtitle2',
-      'body1',
-      'body2',
-      'caption',
-      'button',
-      'overline',
-    ],
-  });
-
-  return enhanced;
-};
+export * from './theme';
+export { default as ThemeProvider } from './theme-provider';

package/src/Theme/theme-provider.js

@@ -0,0 +1,36 @@
+import PropTypes from 'prop-types';
+import { ThemeProvider as StyledThemeProvider } from 'styled-components';
+import { ThemeProvider as MuiThemeProvider } from '@mui/material/styles';
+import StyledEngineProvider from '@mui/material/StyledEngineProvider';
+import CssBaseline from '@mui/material/CssBaseline';
+import { create } from './theme';
+
+const defaultTheme = create();
+
+/**
+ * 默认的 theme provider, 可以为 webapp/blocklet 快捷的配置好 mui theme provider
+ * 注: 目前 UX 依赖 styled-components, 所以该组件也内置了一个 StyledThemeProvider
+ */
+export default function ThemeProvider({ children, theme }) {
+  return (
+    // injectFirst 会影响 makeStyles 自定义样式和 mui styles 覆盖问题
+    <StyledEngineProvider injectFirst>
+      <MuiThemeProvider theme={theme}>
+        <StyledThemeProvider theme={theme}>
+          <CssBaseline />
+          {children}
+        </StyledThemeProvider>
+      </MuiThemeProvider>
+    </StyledEngineProvider>
+  );
+}
+
+ThemeProvider.propTypes = {
+  children: PropTypes.any,
+  theme: PropTypes.any,
+};
+
+ThemeProvider.defaultProps = {
+  children: null,
+  theme: defaultTheme,
+};

package/src/Theme/theme.js

@@ -0,0 +1,164 @@
+// https://app.zeplin.io/styleguide/5d1436f1e97c2156f49c0725/colors
+import { createTheme, responsiveFontSizes } from '@mui/material/styles';
+import '@fontsource/lato/400.css';
+import '@fontsource/lato/700.css';
+import colors from '../Colors';
+
+const muiDarkTheme = createTheme({ palette: { mode: 'dark' } });
+
+// https://material-ui.com/customization/default-theme/
+// eslint-disable-next-line import/prefer-default-export
+export const create = ({ mode = 'light', pageWidth = 'md', palette, typography, overrides, ...rest } = {}) => {
+  // palette 考虑 light & dark mode, dark mode 需要持续完善
+  // - 能配合 ColorModeContext 使用
+  // - 为 dark mode 系统的设计整个 palette, 不要单个 color 设置
+  const _palette =
+    mode === 'light'
+      ? Object.assign(
+          {
+            ...colors,
+            background: {
+              paper: colors.common.white,
+              default: colors.background.default,
+            },
+            mode,
+          },
+          palette || {}
+        )
+      : Object.assign(
+          {
+            ...muiDarkTheme.palette,
+            background: {
+              paper: colors.grey[900],
+              default: colors.grey[900],
+            },
+            mode,
+          },
+          palette || {}
+        );
+
+  const theme = createTheme({
+    themeName: 'ArcBlock',
+    palette: _palette,
+    typography: Object.assign(
+      {
+        useNextVariants: true,
+        color: {
+          // 此处 #222222 必须硬编码, layout/sidebar.js -> Icon/image 加载图片时 color 会影响加载路径
+          // TODO: 此处硬编码的色值后面需要改为 colors.grey[900],
+          //       或者如果可以的话直接删掉 typography#color, 文本颜色建议使用 theme.palette.text 中的色值?
+          //       layout 组件建议重构, sidebar 中建议使用 icon 替换 img (#366)
+          main: mode === 'light' ? '#222222' : colors.common.white,
+          gray: mode === 'light' ? colors.grey[500] : colors.grey[300],
+        },
+        fontFamily: [
+          'Lato',
+          'Avenir',
+          '-apple-system',
+          'BlinkMacSystemFont',
+          '"Segoe UI"',
+          'Roboto',
+          '"Helvetica Neue"',
+          'Arial',
+          'sans-serif',
+          '"Apple Color Emoji"',
+          '"Segoe UI Emoji"',
+          '"Segoe UI Symbol"',
+        ].join(','),
+        // 按最新设计规范, 只使用 400/700
+        fontWeightLight: 400,
+        fontWeightRegular: 400,
+        fontWeightMedium: 700,
+        fontWeightBold: 700,
+        // button 默认使用粗体
+        button: {
+          fontWeight: 700,
+        },
+      },
+      typography || {}
+    ),
+    components: {
+      MuiButton: {
+        styleOverrides: {
+          root: {
+            boxShadow: 'none',
+          },
+        },
+      },
+      MuiButtonGroup: {
+        styleOverrides: {
+          root: {
+            boxShadow: 'none',
+          },
+        },
+      },
+      MuiTableCell: {
+        styleOverrides: {
+          root: {
+            borderBottomWidth: '0',
+            paddingTop: '14px',
+            paddingBottom: '14px',
+            paddingLeft: 0,
+            paddingRight: '30px',
+          },
+          head: {
+            textTransform: 'uppercase',
+            color: mode === 'light' ? colors.grey[900] : colors.grey[300],
+          },
+          body: {
+            color: mode === 'light' ? colors.grey[900] : colors.grey[300],
+          },
+        },
+      },
+      ...overrides,
+    },
+    pageWidth,
+    // TODO: 过时的 colors, 需要各项目负责人检查项目中是否使用 "theme.colors", 如果有需要清除,
+    //       可以从 Colors 模块/theme.palette/mui colors 中取值
+    colors: {
+      white: '#FFFFFF',
+      dark: '#4A707C',
+      gray: '#222222',
+      minor: '#9B9B9B',
+      darkText: '#DCDCDC',
+      background: '#F7F8F8',
+      yellow: '#FFCF71',
+      green: '#44cdc6',
+      red: '#D0021B',
+      blue: '#4E6AF6',
+      primary: '#222222',
+      black: '#222222',
+      secondary: '#44cdc6',
+      mint: '#44cdc6',
+      textSecondary: '#4A4A4A',
+      active: '#5b9025',
+      danger: '#D0021B',
+      lightGrey: '#BCBCBC',
+    },
+    mode,
+    ...rest,
+  });
+
+  const enhanced = responsiveFontSizes(theme, {
+    breakpoints: ['xs', 'sm', 'md', 'lg'],
+    disableAlign: false,
+    factor: 3,
+    variants: [
+      'h1',
+      'h2',
+      'h3',
+      'h4',
+      'h5',
+      'h6',
+      'subtitle1',
+      'subtitle2',
+      'body1',
+      'body2',
+      'caption',
+      'button',
+      'overline',
+    ],
+  });
+
+  return enhanced;
+};