assui 3.1.25 → 3.1.28

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.
Files changed (8) hide show
  1. package/README.md +1 -1
  2. package/es/step-number-input/index.js +13 -11
  3. package/es/step-number-input/style/index.css +17 -11
  4. package/es/step-number-input/style/index.less +6 -7
  5. package/lib/step-number-input/index.js +13 -11
  6. package/lib/step-number-input/style/index.css +17 -11
  7. package/lib/step-number-input/style/index.less +6 -7
  8. package/package.json +2 -2
package/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  ## 轻松上手
2
2
 
3
3
  ```bash
4
- // 安装依赖1
4
+ // 安装依赖2
5
5
  npm i assui --save
6
6
  ```
package/es/step-number-input/index.js CHANGED
@@ -49,6 +49,7 @@ import classNames from 'classnames';
49
49
  import BigNumber from 'bignumber.js';
50
50
  import isUndefined from 'lodash/isUndefined';
51
51
  import useControllableValue from "ahooks/es/useControllableValue";
52
+ import DisabledContext from "antd/es/config-provider/DisabledContext";
52
53
  import { INT } from './const/numberType';
53
54
  import { PLUS, MINUS } from './const/countType';
54
55
  import NumberInput from '../number-input';
@@ -65,13 +66,16 @@ var StepNumberInput = function StepNumberInput(props) {
65
66
  step = props.step,
66
67
  max = props.max,
67
68
  min = props.min,
68
- disabled = props.disabled,
69
+ customDisabled = props.disabled,
69
70
  restProps = __rest(props, ["onChange", "onBlur", "numberType", "precision", "step", "max", "min", "disabled"]);
70
71
  var isEmpty = isUndefined(value) || value === '';
71
72
  var plusNumber = new BigNumber(value).plus(step).toString();
72
73
  var minusNumber = new BigNumber(value).minus(step).toString();
73
74
  var maxCondition = isUndefined(max) ? false : max === Number(value) || Number(max) < Number(plusNumber);
74
75
  var minCondition = isUndefined(min) ? false : min === Number(value) || Number(min) > Number(minusNumber);
76
+ // ===================== Disabled =====================
77
+ var disabled = React.useContext(DisabledContext);
78
+ var mergedDisabled = customDisabled !== null && customDisabled !== void 0 ? customDisabled : disabled;
75
79
  var onNumberChange = function onNumberChange(lastValue) {
76
80
  if (value !== lastValue) {
77
81
  setValue(lastValue);
@@ -104,30 +108,28 @@ var StepNumberInput = function StepNumberInput(props) {
104
108
  onBlur === null || onBlur === void 0 ? void 0 : onBlur(resultValue);
105
109
  };
106
110
  return /*#__PURE__*/React.createElement("div", {
107
- className: "number-range-input"
111
+ className: classNames('number-range-input', {
112
+ 'number-range-input-disabled': isEmpty || minCondition || mergedDisabled
113
+ })
108
114
  }, /*#__PURE__*/React.createElement(NumberInput, __assign({
109
115
  addonBefore: /*#__PURE__*/React.createElement("span", {
110
- onClick: disabled ? undefined : function () {
116
+ onClick: mergedDisabled ? undefined : function () {
111
117
  return onClickCount(MINUS);
112
118
  },
113
- className: classNames('count-minus-btn', {
114
- 'disabled-btn': isEmpty || minCondition || disabled
115
- })
119
+ className: "count-minus-btn"
116
120
  }, "-"),
117
121
  addonAfter: /*#__PURE__*/React.createElement("span", {
118
- onClick: disabled ? undefined : function () {
122
+ onClick: mergedDisabled ? undefined : function () {
119
123
  return onClickCount(PLUS);
120
124
  },
121
- className: classNames('count-add-btn', {
122
- 'disabled-btn': isEmpty || maxCondition || disabled
123
- })
125
+ className: "count-add-btn"
124
126
  }, "+"),
125
127
  value: "".concat(value),
126
128
  onChange: onNumberChange,
127
129
  onBlur: onNumberBlur,
128
130
  numberType: numberType,
129
131
  precision: precision,
130
- disabled: disabled
132
+ disabled: mergedDisabled
131
133
  }, restProps)));
132
134
  };
133
135
  StepNumberInput.defaultProps = {
package/es/step-number-input/style/index.css CHANGED
@@ -1268,16 +1268,22 @@ html {
1268
1268
  background-color: #02a6e3;
1269
1269
  cursor: pointer;
1270
1270
  }
1271
- .disabled-btn {
1272
- color: rgba(0, 0, 0, 0.25);
1273
- background-color: #f5f5f5;
1274
- cursor: not-allowed;
1275
- }
1276
- .disabled-btn:hover,
1277
- .disabled-btn:focus,
1278
- .disabled-btn:active,
1279
- .disabled-btn:focus-within {
1280
- color: rgba(0, 0, 0, 0.25);
1281
- background-color: #f5f5f5;
1271
+ .number-range-input-disabled .ant-input-group-addon,
1272
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn,
1273
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn,
1274
+ .number-range-input-disabled .ant-input-group-addon:hover,
1275
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn:hover,
1276
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn:hover,
1277
+ .number-range-input-disabled .ant-input-group-addon:focus,
1278
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn:focus,
1279
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn:focus,
1280
+ .number-range-input-disabled .ant-input-group-addon:active,
1281
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn:active,
1282
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn:active,
1283
+ .number-range-input-disabled .ant-input-group-addon:focus-within,
1284
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn:focus-within,
1285
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn:focus-within {
1286
+ color: rgba(0, 0, 0, 0.25) !important;
1287
+ background-color: #f5f5f5 !important;
1282
1288
  cursor: not-allowed;
1283
1289
  }
package/es/step-number-input/style/index.less CHANGED
@@ -43,17 +43,16 @@
43
43
  }
44
44
  }
45
45
 
46
- .disabled-btn {
47
- color: rgba(0, 0, 0, 0.25);
48
- background-color: @color_f5f5f5;
49
- cursor: not-allowed;
50
-
46
+ .number-range-input-disabled .@{ant-prefix}-input-group-addon,
47
+ .number-range-input-disabled .@{ant-prefix}-input-group-addon > .count-minus-btn,
48
+ .number-range-input-disabled .@{ant-prefix}-input-group-addon > .count-add-btn {
49
+ &,
51
50
  &:hover,
52
51
  &:focus,
53
52
  &:active,
54
53
  &:focus-within {
55
- color: rgba(0, 0, 0, 0.25);
56
- background-color: @color_f5f5f5;
54
+ color: rgba(0, 0, 0, 0.25) !important;
55
+ background-color: @color_f5f5f5 !important;
57
56
  cursor: not-allowed;
58
57
  }
59
58
  }
package/lib/step-number-input/index.js CHANGED
@@ -92,6 +92,7 @@ var classnames_1 = __importDefault(require("classnames"));
92
92
  var bignumber_js_1 = __importDefault(require("bignumber.js"));
93
93
  var isUndefined_1 = __importDefault(require("lodash/isUndefined"));
94
94
  var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
95
+ var DisabledContext_1 = __importDefault(require("antd/lib/config-provider/DisabledContext"));
95
96
  var numberType_1 = require("./const/numberType");
96
97
  var countType_1 = require("./const/countType");
97
98
  var number_input_1 = __importDefault(require("../number-input"));
@@ -108,13 +109,16 @@ var StepNumberInput = function StepNumberInput(props) {
108
109
  step = props.step,
109
110
  max = props.max,
110
111
  min = props.min,
111
- disabled = props.disabled,
112
+ customDisabled = props.disabled,
112
113
  restProps = __rest(props, ["onChange", "onBlur", "numberType", "precision", "step", "max", "min", "disabled"]);
113
114
  var isEmpty = (0, isUndefined_1["default"])(value) || value === '';
114
115
  var plusNumber = new bignumber_js_1["default"](value).plus(step).toString();
115
116
  var minusNumber = new bignumber_js_1["default"](value).minus(step).toString();
116
117
  var maxCondition = (0, isUndefined_1["default"])(max) ? false : max === Number(value) || Number(max) < Number(plusNumber);
117
118
  var minCondition = (0, isUndefined_1["default"])(min) ? false : min === Number(value) || Number(min) > Number(minusNumber);
119
+ // ===================== Disabled =====================
120
+ var disabled = React.useContext(DisabledContext_1["default"]);
121
+ var mergedDisabled = customDisabled !== null && customDisabled !== void 0 ? customDisabled : disabled;
118
122
  var onNumberChange = function onNumberChange(lastValue) {
119
123
  if (value !== lastValue) {
120
124
  setValue(lastValue);
@@ -147,30 +151,28 @@ var StepNumberInput = function StepNumberInput(props) {
147
151
  onBlur === null || onBlur === void 0 ? void 0 : onBlur(resultValue);
148
152
  };
149
153
  return React.createElement("div", {
150
- className: "number-range-input"
154
+ className: (0, classnames_1["default"])('number-range-input', {
155
+ 'number-range-input-disabled': isEmpty || minCondition || mergedDisabled
156
+ })
151
157
  }, React.createElement(number_input_1["default"], __assign({
152
158
  addonBefore: React.createElement("span", {
153
- onClick: disabled ? undefined : function () {
159
+ onClick: mergedDisabled ? undefined : function () {
154
160
  return onClickCount(countType_1.MINUS);
155
161
  },
156
- className: (0, classnames_1["default"])('count-minus-btn', {
157
- 'disabled-btn': isEmpty || minCondition || disabled
158
- })
162
+ className: "count-minus-btn"
159
163
  }, "-"),
160
164
  addonAfter: React.createElement("span", {
161
- onClick: disabled ? undefined : function () {
165
+ onClick: mergedDisabled ? undefined : function () {
162
166
  return onClickCount(countType_1.PLUS);
163
167
  },
164
- className: (0, classnames_1["default"])('count-add-btn', {
165
- 'disabled-btn': isEmpty || maxCondition || disabled
166
- })
168
+ className: "count-add-btn"
167
169
  }, "+"),
168
170
  value: "".concat(value),
169
171
  onChange: onNumberChange,
170
172
  onBlur: onNumberBlur,
171
173
  numberType: numberType,
172
174
  precision: precision,
173
- disabled: disabled
175
+ disabled: mergedDisabled
174
176
  }, restProps)));
175
177
  };
176
178
  StepNumberInput.defaultProps = {
package/lib/step-number-input/style/index.css CHANGED
@@ -1268,16 +1268,22 @@ html {
1268
1268
  background-color: #02a6e3;
1269
1269
  cursor: pointer;
1270
1270
  }
1271
- .disabled-btn {
1272
- color: rgba(0, 0, 0, 0.25);
1273
- background-color: #f5f5f5;
1274
- cursor: not-allowed;
1275
- }
1276
- .disabled-btn:hover,
1277
- .disabled-btn:focus,
1278
- .disabled-btn:active,
1279
- .disabled-btn:focus-within {
1280
- color: rgba(0, 0, 0, 0.25);
1281
- background-color: #f5f5f5;
1271
+ .number-range-input-disabled .ant-input-group-addon,
1272
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn,
1273
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn,
1274
+ .number-range-input-disabled .ant-input-group-addon:hover,
1275
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn:hover,
1276
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn:hover,
1277
+ .number-range-input-disabled .ant-input-group-addon:focus,
1278
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn:focus,
1279
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn:focus,
1280
+ .number-range-input-disabled .ant-input-group-addon:active,
1281
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn:active,
1282
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn:active,
1283
+ .number-range-input-disabled .ant-input-group-addon:focus-within,
1284
+ .number-range-input-disabled .ant-input-group-addon > .count-minus-btn:focus-within,
1285
+ .number-range-input-disabled .ant-input-group-addon > .count-add-btn:focus-within {
1286
+ color: rgba(0, 0, 0, 0.25) !important;
1287
+ background-color: #f5f5f5 !important;
1282
1288
  cursor: not-allowed;
1283
1289
  }
package/lib/step-number-input/style/index.less CHANGED
@@ -43,17 +43,16 @@
43
43
  }
44
44
  }
45
45
 
46
- .disabled-btn {
47
- color: rgba(0, 0, 0, 0.25);
48
- background-color: @color_f5f5f5;
49
- cursor: not-allowed;
50
-
46
+ .number-range-input-disabled .@{ant-prefix}-input-group-addon,
47
+ .number-range-input-disabled .@{ant-prefix}-input-group-addon > .count-minus-btn,
48
+ .number-range-input-disabled .@{ant-prefix}-input-group-addon > .count-add-btn {
49
+ &,
51
50
  &:hover,
52
51
  &:focus,
53
52
  &:active,
54
53
  &:focus-within {
55
- color: rgba(0, 0, 0, 0.25);
56
- background-color: @color_f5f5f5;
54
+ color: rgba(0, 0, 0, 0.25) !important;
55
+ background-color: @color_f5f5f5 !important;
57
56
  cursor: not-allowed;
58
57
  }
59
58
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "assui",
3
- "version": "3.1.25",
3
+ "version": "3.1.28",
4
4
  "description": "react ui library",
5
5
  "author": "jason <usochen@gmail.com>",
6
6
  "main": "./lib/index.js",
@@ -80,5 +80,5 @@
80
80
  "node": ">=10.0.0"
81
81
  },
82
82
  "license": "MIT",
83
- "gitHead": "06ab81778621575a1d0a2dd7e041932108a8fc8b"
83
+ "gitHead": "6f86903dac0cc5dc1c7ae912602b4372e707c7af"
84
84
  }