@arcblock/ux 1.15.9 → 1.15.13
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/Button/wrap.js +27 -3
- package/lib/Dialog/confirm.js +1 -1
- package/package.json +4 -4
package/lib/Button/wrap.js
CHANGED
|
@@ -9,11 +9,13 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
11
|
|
|
12
|
+
var _Spinner = _interopRequireDefault(require("../Spinner"));
|
|
13
|
+
|
|
12
14
|
var _Theme = require("../Theme");
|
|
13
15
|
|
|
14
16
|
var _Util = require("../Util");
|
|
15
17
|
|
|
16
|
-
const _excluded = ["children", "rounded", "style", "forwardedRef"];
|
|
18
|
+
const _excluded = ["children", "rounded", "loading", "disabled", "style", "forwardedRef"];
|
|
17
19
|
|
|
18
20
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
19
21
|
|
|
@@ -28,11 +30,27 @@ function _default(BaseComponent) {
|
|
|
28
30
|
const {
|
|
29
31
|
children,
|
|
30
32
|
rounded,
|
|
33
|
+
loading,
|
|
34
|
+
disabled,
|
|
31
35
|
style,
|
|
32
36
|
forwardedRef
|
|
33
37
|
} = newProps,
|
|
34
38
|
rest = _objectWithoutProperties(newProps, _excluded);
|
|
35
39
|
|
|
40
|
+
let loadingSize = 16;
|
|
41
|
+
|
|
42
|
+
switch (rest.size) {
|
|
43
|
+
case 'small':
|
|
44
|
+
loadingSize = 14;
|
|
45
|
+
break;
|
|
46
|
+
|
|
47
|
+
case 'large':
|
|
48
|
+
loadingSize = 18;
|
|
49
|
+
break;
|
|
50
|
+
|
|
51
|
+
default:
|
|
52
|
+
}
|
|
53
|
+
|
|
36
54
|
const styles = Object.assign({}, style, {
|
|
37
55
|
boxShadow: 'none',
|
|
38
56
|
textTransform: 'capitalize'
|
|
@@ -75,8 +93,14 @@ function _default(BaseComponent) {
|
|
|
75
93
|
|
|
76
94
|
return /*#__PURE__*/_react.default.createElement(BaseComponent, Object.assign({
|
|
77
95
|
style: styles,
|
|
78
|
-
ref: forwardedRef
|
|
79
|
-
|
|
96
|
+
ref: forwardedRef,
|
|
97
|
+
disabled: disabled || loading
|
|
98
|
+
}, rest), loading && /*#__PURE__*/_react.default.createElement(_Spinner.default, {
|
|
99
|
+
size: loadingSize,
|
|
100
|
+
style: {
|
|
101
|
+
marginRight: 5
|
|
102
|
+
}
|
|
103
|
+
}), children);
|
|
80
104
|
}
|
|
81
105
|
|
|
82
106
|
WrappedComponent.propTypes = {
|
package/lib/Dialog/confirm.js
CHANGED
|
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
11
|
|
|
12
|
-
var _Button = _interopRequireDefault(require("
|
|
12
|
+
var _Button = _interopRequireDefault(require("../Button"));
|
|
13
13
|
|
|
14
14
|
var _dialog = _interopRequireDefault(require("./dialog"));
|
|
15
15
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/ux",
|
|
3
|
-
"version": "1.15.
|
|
3
|
+
"version": "1.15.13",
|
|
4
4
|
"description": "Common used react components for arcblock products",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -52,10 +52,10 @@
|
|
|
52
52
|
"react": ">=16.12.0",
|
|
53
53
|
"react-ga": "^2.7.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "513b978efbec23ea990feefb95cf5403f94cbedb",
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@arcblock/icons": "^1.15.
|
|
58
|
-
"@arcblock/react-hooks": "^1.15.
|
|
57
|
+
"@arcblock/icons": "^1.15.13",
|
|
58
|
+
"@arcblock/react-hooks": "^1.15.13",
|
|
59
59
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
60
60
|
"@material-ui/core": "^4.12.3",
|
|
61
61
|
"@material-ui/icons": "4.11.2",
|