@arcblock/ux 1.16.53 → 1.16.54
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Spinner/index.js +1 -20
- package/package.json +4 -4
- package/src/Spinner/index.js +0 -14
package/lib/Spinner/index.js
CHANGED
|
@@ -7,8 +7,6 @@ exports.default = Spinner;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
-
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
|
-
|
|
12
10
|
var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
|
|
13
11
|
|
|
14
12
|
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
|
|
|
28
26
|
* - color 默认使用 #4598fa, 如果调用方传入了 color prop 或 style#color, 则默认 color 被覆盖
|
|
29
27
|
*/
|
|
30
28
|
function Spinner(props) {
|
|
31
|
-
var _props$style;
|
|
32
|
-
|
|
33
29
|
const _props = _objectSpread({}, props); // 兼容之前的 size prop (设置外圈/内圈的尺寸)
|
|
34
30
|
|
|
35
31
|
|
|
36
32
|
if (_props.size && Array.isArray(_props.size)) {
|
|
37
33
|
[_props.size] = _props.size;
|
|
38
|
-
} // 默认 color: #4598fa
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
if (!(_props.color || (_props$style = _props.style) !== null && _props$style !== void 0 && _props$style.color)) {
|
|
42
|
-
_props.style = _objectSpread(_objectSpread({}, _props.style), {}, {
|
|
43
|
-
color: '#4598fa'
|
|
44
|
-
});
|
|
45
34
|
}
|
|
46
35
|
|
|
47
36
|
return /*#__PURE__*/_react.default.createElement(_CircularProgress.default, _props);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
Spinner.propTypes = {
|
|
51
|
-
// 改为基于 @material-ui/core/CircularProgress 的实现后, 该 prop 将被废弃
|
|
52
|
-
duration: _propTypes.default.array
|
|
53
|
-
};
|
|
54
|
-
Spinner.defaultProps = {
|
|
55
|
-
duration: [1, 1.6]
|
|
56
|
-
};
|
|
37
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/ux",
|
|
3
|
-
"version": "1.16.
|
|
3
|
+
"version": "1.16.54",
|
|
4
4
|
"description": "Common used react components for arcblock products",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -53,10 +53,10 @@
|
|
|
53
53
|
"react": ">=16.12.0",
|
|
54
54
|
"react-ga": "^2.7.0"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "070dd99f5cf6961813e61ce533dd2d54c0611b95",
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"@arcblock/icons": "^1.16.
|
|
59
|
-
"@arcblock/react-hooks": "^1.16.
|
|
58
|
+
"@arcblock/icons": "^1.16.54",
|
|
59
|
+
"@arcblock/react-hooks": "^1.16.54",
|
|
60
60
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
61
61
|
"@fontsource/lato": "^4.5.3",
|
|
62
62
|
"@material-ui/core": "^4.12.3",
|
package/src/Spinner/index.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import PropTypes from 'prop-types';
|
|
3
2
|
import CircularProgress from '@material-ui/core/CircularProgress';
|
|
4
3
|
|
|
5
4
|
/**
|
|
@@ -16,18 +15,5 @@ export default function Spinner(props) {
|
|
|
16
15
|
if (_props.size && Array.isArray(_props.size)) {
|
|
17
16
|
[_props.size] = _props.size;
|
|
18
17
|
}
|
|
19
|
-
// 默认 color: #4598fa
|
|
20
|
-
if (!(_props.color || _props.style?.color)) {
|
|
21
|
-
_props.style = { ..._props.style, color: '#4598fa' };
|
|
22
|
-
}
|
|
23
18
|
return <CircularProgress {..._props} />;
|
|
24
19
|
}
|
|
25
|
-
|
|
26
|
-
Spinner.propTypes = {
|
|
27
|
-
// 改为基于 @material-ui/core/CircularProgress 的实现后, 该 prop 将被废弃
|
|
28
|
-
duration: PropTypes.array,
|
|
29
|
-
};
|
|
30
|
-
|
|
31
|
-
Spinner.defaultProps = {
|
|
32
|
-
duration: [1, 1.6],
|
|
33
|
-
};
|