@arcblock/ux 1.14.54 → 1.14.58

package/lib/Spinner/index.js

@@ -9,37 +9,48 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
 
-var _SpinnerInner = _interopRequireDefault(require("@arcblock/icons/lib/SpinnerInner"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _SpinnerOuter = _interopRequireDefault(require("@arcblock/icons/lib/SpinnerOuter"));
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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; }
 
 /**
  * Spinner
+ *
+ * 之前的 Spinner 实现由内外 2 个环构成, 现在改为基于 @material-ui/core/CircularProgress 的实现
+ *
+ * - 之前 size prop 是 array 类型, 需要与 CircularProgress#size 兼容
+ * - color 默认使用 #4598fa, 如果调用方传入了 color prop 或 style#color, 则默认 color 被覆盖
  */
 function Spinner(props) {
-  return /*#__PURE__*/_react.default.createElement(Root, props, /*#__PURE__*/_react.default.createElement(_SpinnerOuter.default, {
-    className: "scanned-spinner_outer"
-  }), /*#__PURE__*/_react.default.createElement(_SpinnerInner.default, {
-    className: "scanned-spinner_inner"
-  }));
+  var _props$style;
+
+  const _props = _objectSpread({}, props); // 兼容之前的 size prop (设置外圈/内圈的尺寸)
+
+
+  if (_props.size && Array.isArray(_props.size)) {
+    [_props.size] = _props.size;
+  } // 默认 color: #4598fa
+
+
+  if (!(_props.color || (_props$style = _props.style) !== null && _props$style !== void 0 && _props$style.color)) {
+    _props.style = _objectSpread(_objectSpread({}, _props.style), {}, {
+      color: '#4598fa'
+    });
+  }
+
+  return /*#__PURE__*/_react.default.createElement(_CircularProgress.default, _props);
 }
 
 Spinner.propTypes = {
-  size: _propTypes.default.array,
+  // 改为基于 @material-ui/core/CircularProgress 的实现后, 该 prop 将被废弃
   duration: _propTypes.default.array
 };
 Spinner.defaultProps = {
-  // 外圈/内圈 尺寸
-  size: [56, 32],
-  // 外圈/内圈 动画 duration
   duration: [1, 1.6]
-};
-
-const Root = _styledComponents.default.div.withConfig({
-  displayName: "Spinner__Root",
-  componentId: "sc-r57khp-0"
-})(["display:inline-block;position:relative;width:", "px;height:", "px;font-size:0;.scanned-spinner_outer{width:100%;height:100%;animation:rota ", "s linear infinite;}.scanned-spinner_inner{position:absolute;top:50%;left:50%;width:", "px;height:", "px;margin:", ";animation:rota ", "s linear infinite;}.scanned-spinner_outer,.scanned-spinner_inner{fill:none !important;}@keyframes rota{0%{transform:rotate(0deg);}100%{transform:rotate(360deg);}}"], props => props.size[0], props => props.size[0], props => props.duration[0], props => props.size[1], props => props.size[1], props => "-".concat(props.size[1] / 2, "px 0 0 -").concat(props.size[1] / 2, "px"), props => props.duration[1]);
+};

package/lib/Theme/index.js

@@ -43,7 +43,7 @@ const create = function create() {
     typography,
     overrides
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  const theme = (0, _styles.createMuiTheme)({
+  const theme = (0, _styles.createTheme)({
     themeName: 'ArcBlock',
     palette: Object.assign({
       primary: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "1.14.54",
+  "version": "1.14.58",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -52,13 +52,13 @@
     "react": ">=16.12.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "0951b13e7242a4285e7c6e7e6125ff1d7653507f",
+  "gitHead": "7348f59953fdc41f964298115a9f7a770fd25d54",
   "dependencies": {
-    "@arcblock/icons": "^1.14.54",
-    "@arcblock/react-hooks": "^1.14.54",
+    "@arcblock/icons": "^1.14.58",
+    "@arcblock/react-hooks": "^1.14.58",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@material-ui/core": "^4.10.1",
-    "@material-ui/icons": "4.5.1",
+    "@material-ui/core": "^4.12.3",
+    "@material-ui/icons": "4.11.2",
     "axios": "^0.21.1",
     "base64-url": "^2.3.3",
     "copy-to-clipboard": "^3.2.0",