assui 3.1.27 → 3.1.28

package/es/step-number-input/index.js

@@ -49,6 +49,7 @@ import classNames from 'classnames';
 import BigNumber from 'bignumber.js';
 import isUndefined from 'lodash/isUndefined';
 import useControllableValue from "ahooks/es/useControllableValue";
+import DisabledContext from "antd/es/config-provider/DisabledContext";
 import { INT } from './const/numberType';
 import { PLUS, MINUS } from './const/countType';
 import NumberInput from '../number-input';
@@ -65,13 +66,16 @@ var StepNumberInput = function StepNumberInput(props) {
     step = props.step,
     max = props.max,
     min = props.min,
-    disabled = props.disabled,
+    customDisabled = props.disabled,
     restProps = __rest(props, ["onChange", "onBlur", "numberType", "precision", "step", "max", "min", "disabled"]);
   var isEmpty = isUndefined(value) || value === '';
   var plusNumber = new BigNumber(value).plus(step).toString();
   var minusNumber = new BigNumber(value).minus(step).toString();
   var maxCondition = isUndefined(max) ? false : max === Number(value) || Number(max) < Number(plusNumber);
   var minCondition = isUndefined(min) ? false : min === Number(value) || Number(min) > Number(minusNumber);
+  // ===================== Disabled =====================
+  var disabled = React.useContext(DisabledContext);
+  var mergedDisabled = customDisabled !== null && customDisabled !== void 0 ? customDisabled : disabled;
   var onNumberChange = function onNumberChange(lastValue) {
     if (value !== lastValue) {
       setValue(lastValue);
@@ -105,17 +109,17 @@ var StepNumberInput = function StepNumberInput(props) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('number-range-input', {
-      'number-range-input-disabled': isEmpty || minCondition || disabled
+      'number-range-input-disabled': isEmpty || minCondition || mergedDisabled
     })
   }, /*#__PURE__*/React.createElement(NumberInput, __assign({
     addonBefore: /*#__PURE__*/React.createElement("span", {
-      onClick: disabled ? undefined : function () {
+      onClick: mergedDisabled ? undefined : function () {
         return onClickCount(MINUS);
       },
       className: "count-minus-btn"
     }, "-"),
     addonAfter: /*#__PURE__*/React.createElement("span", {
-      onClick: disabled ? undefined : function () {
+      onClick: mergedDisabled ? undefined : function () {
         return onClickCount(PLUS);
       },
       className: "count-add-btn"
@@ -125,7 +129,7 @@ var StepNumberInput = function StepNumberInput(props) {
     onBlur: onNumberBlur,
     numberType: numberType,
     precision: precision,
-    disabled: disabled
+    disabled: mergedDisabled
   }, restProps)));
 };
 StepNumberInput.defaultProps = {

package/lib/step-number-input/index.js

@@ -92,6 +92,7 @@ var classnames_1 = __importDefault(require("classnames"));
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var isUndefined_1 = __importDefault(require("lodash/isUndefined"));
 var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
+var DisabledContext_1 = __importDefault(require("antd/lib/config-provider/DisabledContext"));
 var numberType_1 = require("./const/numberType");
 var countType_1 = require("./const/countType");
 var number_input_1 = __importDefault(require("../number-input"));
@@ -108,13 +109,16 @@ var StepNumberInput = function StepNumberInput(props) {
     step = props.step,
     max = props.max,
     min = props.min,
-    disabled = props.disabled,
+    customDisabled = props.disabled,
     restProps = __rest(props, ["onChange", "onBlur", "numberType", "precision", "step", "max", "min", "disabled"]);
   var isEmpty = (0, isUndefined_1["default"])(value) || value === '';
   var plusNumber = new bignumber_js_1["default"](value).plus(step).toString();
   var minusNumber = new bignumber_js_1["default"](value).minus(step).toString();
   var maxCondition = (0, isUndefined_1["default"])(max) ? false : max === Number(value) || Number(max) < Number(plusNumber);
   var minCondition = (0, isUndefined_1["default"])(min) ? false : min === Number(value) || Number(min) > Number(minusNumber);
+  // ===================== Disabled =====================
+  var disabled = React.useContext(DisabledContext_1["default"]);
+  var mergedDisabled = customDisabled !== null && customDisabled !== void 0 ? customDisabled : disabled;
   var onNumberChange = function onNumberChange(lastValue) {
     if (value !== lastValue) {
       setValue(lastValue);
@@ -148,17 +152,17 @@ var StepNumberInput = function StepNumberInput(props) {
   };
   return React.createElement("div", {
     className: (0, classnames_1["default"])('number-range-input', {
-      'number-range-input-disabled': isEmpty || minCondition || disabled
+      'number-range-input-disabled': isEmpty || minCondition || mergedDisabled
     })
   }, React.createElement(number_input_1["default"], __assign({
     addonBefore: React.createElement("span", {
-      onClick: disabled ? undefined : function () {
+      onClick: mergedDisabled ? undefined : function () {
         return onClickCount(countType_1.MINUS);
       },
       className: "count-minus-btn"
     }, "-"),
     addonAfter: React.createElement("span", {
-      onClick: disabled ? undefined : function () {
+      onClick: mergedDisabled ? undefined : function () {
         return onClickCount(countType_1.PLUS);
       },
       className: "count-add-btn"
@@ -168,7 +172,7 @@ var StepNumberInput = function StepNumberInput(props) {
     onBlur: onNumberBlur,
     numberType: numberType,
     precision: precision,
-    disabled: disabled
+    disabled: mergedDisabled
   }, restProps)));
 };
 StepNumberInput.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.1.27",
+  "version": "3.1.28",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "a4b8a3f3aee6ab8b44e44e1f95b6394060fe4142"
+  "gitHead": "6f86903dac0cc5dc1c7ae912602b4372e707c7af"
 }