@arcblock/ux 1.16.53 → 1.16.56

package/lib/Spinner/index.js

@@ -7,8 +7,6 @@ exports.default = Spinner;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -28,29 +26,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * - color 默认使用 #4598fa, 如果调用方传入了 color prop 或 style#color, 则默认 color 被覆盖
  */
 function Spinner(props) {
-  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 = {
-  // 改为基于 @material-ui/core/CircularProgress 的实现后, 该 prop 将被废弃
-  duration: _propTypes.default.array
-};
-Spinner.defaultProps = {
-  duration: [1, 1.6]
-};
+}

package/lib/SplitButton/index.js

@@ -27,7 +27,7 @@ var _ButtonGroup = _interopRequireDefault(require("@material-ui/core/ButtonGroup
 
 var _Button = _interopRequireDefault(require("../Button"));
 
-const _excluded = ["size", "color", "menu", "children", "variant", "onClick"];
+const _excluded = ["size", "color", "menu", "children", "variant", "onClick", "menuButtonProps"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -46,7 +46,8 @@ function SplitButton(_ref) {
     menu,
     children,
     variant,
-    onClick
+    onClick,
+    menuButtonProps
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
@@ -80,10 +81,10 @@ function SplitButton(_ref) {
   }, rest), typeof children === 'function' ? children() : /*#__PURE__*/_react.default.createElement(_Button.default, {
     onClick: onClick,
     color: color
-  }, children), /*#__PURE__*/_react.default.createElement(_Button.default, {
+  }, children), /*#__PURE__*/_react.default.createElement(_Button.default, Object.assign({
     onClick: onToggle,
     color: color
-  }, /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null))), /*#__PURE__*/_react.default.createElement(StyledPopper, {
+  }, menuButtonProps), /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null))), /*#__PURE__*/_react.default.createElement(StyledPopper, {
     open: open,
     anchorEl: anchorRef.current,
     placement: "bottom-end",
@@ -102,7 +103,8 @@ SplitButton.propTypes = {
   // 也可以是用于渲染主按钮的 function
   children: _propTypes.default.any,
   variant: _propTypes.default.oneOf(['outlined', 'contained']),
-  onClick: _propTypes.default.func
+  onClick: _propTypes.default.func,
+  menuButtonProps: _propTypes.default.object
 };
 SplitButton.defaultProps = {
   size: 'medium',
@@ -110,7 +112,8 @@ SplitButton.defaultProps = {
   menu: [],
   children: null,
   variant: 'contained',
-  onClick: () => {}
+  onClick: () => {},
+  menuButtonProps: {}
 };
 SplitButton.Item = _MenuItem.default;
 const StyledButtonGroup = (0, _styledComponents.default)(_ButtonGroup.default).withConfig({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "1.16.53",
+  "version": "1.16.56",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -53,10 +53,10 @@
     "react": ">=16.12.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "a119bd971ea9b7d5cc0ddd26dd198f7110cd3ced",
+  "gitHead": "4c7f0557738e4339b364c192b97ebdb06cde16c1",
   "dependencies": {
-    "@arcblock/icons": "^1.16.53",
-    "@arcblock/react-hooks": "^1.16.53",
+    "@arcblock/icons": "^1.16.56",
+    "@arcblock/react-hooks": "^1.16.56",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@fontsource/lato": "^4.5.3",
     "@material-ui/core": "^4.12.3",

package/src/Spinner/index.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import CircularProgress from '@material-ui/core/CircularProgress';
 
 /**
@@ -16,18 +15,5 @@ export default function Spinner(props) {
   if (_props.size && Array.isArray(_props.size)) {
     [_props.size] = _props.size;
   }
-  // 默认 color: #4598fa
-  if (!(_props.color || _props.style?.color)) {
-    _props.style = { ..._props.style, color: '#4598fa' };
-  }
   return <CircularProgress {..._props} />;
 }
-
-Spinner.propTypes = {
-  // 改为基于 @material-ui/core/CircularProgress 的实现后, 该 prop 将被废弃
-  duration: PropTypes.array,
-};
-
-Spinner.defaultProps = {
-  duration: [1, 1.6],
-};

package/src/SplitButton/index.js

@@ -10,7 +10,16 @@ import MenuItem from '@material-ui/core/MenuItem';
 import ButtonGroup from '@material-ui/core/ButtonGroup';
 import Button from '../Button';
 
-export default function SplitButton({ size, color, menu, children, variant, onClick, ...rest }) {
+export default function SplitButton({
+  size,
+  color,
+  menu,
+  children,
+  variant,
+  onClick,
+  menuButtonProps,
+  ...rest
+}) {
   const [open, setOpen] = useState(false);
   const anchorRef = useRef(null);
 
@@ -42,7 +51,7 @@ export default function SplitButton({ size, color, menu, children, variant, onCl
             {children}
           </Button>
         )}
-        <Button onClick={onToggle} color={color}>
+        <Button onClick={onToggle} color={color} {...menuButtonProps}>
           <ExpandMore />
         </Button>
       </StyledButtonGroup>
@@ -69,6 +78,7 @@ SplitButton.propTypes = {
   children: PropTypes.any,
   variant: PropTypes.oneOf(['outlined', 'contained']),
   onClick: PropTypes.func,
+  menuButtonProps: PropTypes.object,
 };
 
 SplitButton.defaultProps = {
@@ -78,6 +88,7 @@ SplitButton.defaultProps = {
   children: null,
   variant: 'contained',
   onClick: () => {},
+  menuButtonProps: {},
 };
 
 SplitButton.Item = MenuItem;