assui 3.1.27 → 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 (3) hide show
  1. package/es/step-number-input/index.js +9 -5
  2. package/lib/step-number-input/index.js +9 -5
  3. package/package.json +2 -2
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);
@@ -105,17 +109,17 @@ var StepNumberInput = function StepNumberInput(props) {
105
109
  };
106
110
  return /*#__PURE__*/React.createElement("div", {
107
111
  className: classNames('number-range-input', {
108
- 'number-range-input-disabled': isEmpty || minCondition || disabled
112
+ 'number-range-input-disabled': isEmpty || minCondition || mergedDisabled
109
113
  })
110
114
  }, /*#__PURE__*/React.createElement(NumberInput, __assign({
111
115
  addonBefore: /*#__PURE__*/React.createElement("span", {
112
- onClick: disabled ? undefined : function () {
116
+ onClick: mergedDisabled ? undefined : function () {
113
117
  return onClickCount(MINUS);
114
118
  },
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
125
  className: "count-add-btn"
@@ -125,7 +129,7 @@ var StepNumberInput = function StepNumberInput(props) {
125
129
  onBlur: onNumberBlur,
126
130
  numberType: numberType,
127
131
  precision: precision,
128
- disabled: disabled
132
+ disabled: mergedDisabled
129
133
  }, restProps)));
130
134
  };
131
135
  StepNumberInput.defaultProps = {
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);
@@ -148,17 +152,17 @@ var StepNumberInput = function StepNumberInput(props) {
148
152
  };
149
153
  return React.createElement("div", {
150
154
  className: (0, classnames_1["default"])('number-range-input', {
151
- 'number-range-input-disabled': isEmpty || minCondition || disabled
155
+ 'number-range-input-disabled': isEmpty || minCondition || mergedDisabled
152
156
  })
153
157
  }, React.createElement(number_input_1["default"], __assign({
154
158
  addonBefore: React.createElement("span", {
155
- onClick: disabled ? undefined : function () {
159
+ onClick: mergedDisabled ? undefined : function () {
156
160
  return onClickCount(countType_1.MINUS);
157
161
  },
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
168
  className: "count-add-btn"
@@ -168,7 +172,7 @@ var StepNumberInput = function StepNumberInput(props) {
168
172
  onBlur: onNumberBlur,
169
173
  numberType: numberType,
170
174
  precision: precision,
171
- disabled: disabled
175
+ disabled: mergedDisabled
172
176
  }, restProps)));
173
177
  };
174
178
  StepNumberInput.defaultProps = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "assui",
3
- "version": "3.1.27",
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": "a4b8a3f3aee6ab8b44e44e1f95b6394060fe4142"
83
+ "gitHead": "6f86903dac0cc5dc1c7ae912602b4372e707c7af"
84
84
  }