@nutui/nutui-react 1.5.1 → 2.0.0-alpha.1

package/dist/esm/InputNumber.js

@@ -1,277 +1,243 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["children", "disabled", "buttonSize", "min", "max", "inputWidth", "readonly", "modelValue", "decimalPlaces", "step", "isAsync", "className", "style", "formatter", "add", "reduce", "change", "overlimit", "blur", "focus", "onAdd", "onReduce", "onOverlimit", "onBlurFuc", "onFocus", "onChangeFuc", "iconClassPrefix", "iconFontClassName"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React__default, { useState, useRef, useEffect } from 'react';
-import classNames from 'classnames';
-import Icon from './Icon.js';
-import { c as cn } from './bem-3b438e61.js';
-import { C as ComponentDefaults } from './typings-f27b58f4.js';
-import '@bem-react/classname';
+var _excluded = ["children", "disabled", "min", "max", "readonly", "value", "defaultValue", "allowEmpty", "digits", "step", "async", "className", "style", "formatter", "onPlus", "onMinus", "onOverlimit", "onBlur", "onFocus", "onChange"];
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function(sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _objectSpread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), true).forEach(function(key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
+}
+import React__default, { useRef, useEffect } from "react";
+import { Minus, Plus } from "@nutui/icons-react";
+import classNames from "classnames";
+import { u as usePropsValue } from "./use-props-value.js";
+import { C as ComponentDefaults } from "./typings.js";
 var defaultProps = _objectSpread(_objectSpread({}, ComponentDefaults), {}, {
   disabled: false,
-  buttonSize: '',
   min: 1,
   max: 9999,
-  inputWidth: '',
   readonly: false,
-  modelValue: 0,
+  allowEmpty: false,
+  defaultValue: 0,
   step: 1,
-  decimalPlaces: 0,
-  isAsync: false
+  digits: 0,
+  async: false
 });
-function pxCheck(value) {
-  return Number.isNaN(Number(value)) ? String(value) : "".concat(value, "px");
-}
-var InputNumber = function InputNumber(props) {
-  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props),
-    children = _defaultProps$props.children,
-    disabled = _defaultProps$props.disabled,
-    buttonSize = _defaultProps$props.buttonSize,
-    min = _defaultProps$props.min,
-    max = _defaultProps$props.max,
-    inputWidth = _defaultProps$props.inputWidth,
-    readonly = _defaultProps$props.readonly,
-    modelValue = _defaultProps$props.modelValue,
-    decimalPlaces = _defaultProps$props.decimalPlaces,
-    step = _defaultProps$props.step,
-    isAsync = _defaultProps$props.isAsync,
-    className = _defaultProps$props.className,
-    style = _defaultProps$props.style,
-    formatter = _defaultProps$props.formatter,
-    add = _defaultProps$props.add,
-    reduce = _defaultProps$props.reduce,
-    change = _defaultProps$props.change,
-    overlimit = _defaultProps$props.overlimit,
-    blur = _defaultProps$props.blur,
-    focus = _defaultProps$props.focus,
-    onAdd = _defaultProps$props.onAdd,
-    onReduce = _defaultProps$props.onReduce,
-    onOverlimit = _defaultProps$props.onOverlimit,
-    onBlurFuc = _defaultProps$props.onBlurFuc,
-    onFocus = _defaultProps$props.onFocus,
-    onChangeFuc = _defaultProps$props.onChangeFuc,
-    iconClassPrefix = _defaultProps$props.iconClassPrefix,
-    iconFontClassName = _defaultProps$props.iconFontClassName,
-    restProps = _objectWithoutProperties(_defaultProps$props, _excluded);
-  var _useState = useState(modelValue),
-    _useState2 = _slicedToArray(_useState, 2),
-    inputValue = _useState2[0],
-    setInputValue = _useState2[1];
-  var inputRef = useRef('');
-  useEffect(function () {
+var classPrefix = "nut-inputnumber";
+var InputNumber = function InputNumber2(props) {
+  var _classNames;
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props), children = _defaultProps$props.children, disabled = _defaultProps$props.disabled, min = _defaultProps$props.min, max = _defaultProps$props.max, readonly = _defaultProps$props.readonly, value = _defaultProps$props.value, defaultValue = _defaultProps$props.defaultValue, allowEmpty = _defaultProps$props.allowEmpty, digits = _defaultProps$props.digits, step = _defaultProps$props.step, async = _defaultProps$props.async, className = _defaultProps$props.className, style = _defaultProps$props.style, formatter = _defaultProps$props.formatter, onPlus = _defaultProps$props.onPlus, onMinus = _defaultProps$props.onMinus, onOverlimit = _defaultProps$props.onOverlimit, onBlur = _defaultProps$props.onBlur, onFocus = _defaultProps$props.onFocus, onChange = _defaultProps$props.onChange, restProps = _objectWithoutProperties(_defaultProps$props, _excluded);
+  var inputRef = useRef("");
+  var _usePropsValue = usePropsValue({
+    value,
+    defaultValue
+  }), _usePropsValue2 = _slicedToArray(_usePropsValue, 2), _checked = _usePropsValue2[0], setChecked = _usePropsValue2[1];
+  useEffect(function() {
     if (formatter) {
-      inputRef.current = formatter(modelValue);
-      setInputValue(formatter(modelValue));
-    } else {
-      setInputValue(modelValue);
+      if (_checked || _checked === 0) {
+        inputRef.current = formatter(_checked);
+        setChecked(formatter(_checked));
+      }
     }
-  }, [modelValue, formatter]);
-  var b = cn('inputnumber');
-  var classes = classNames(_defineProperty({}, "".concat(b(''), "--disabled"), disabled), className, b(''));
-  var styles = _objectSpread({
-    height: pxCheck(buttonSize)
-  }, style);
-  var addAllow = function addAllow() {
-    var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : inputValue;
+  }, []);
+  var classes = classNames((_classNames = {}, _defineProperty(_classNames, "".concat(classPrefix), true), _defineProperty(_classNames, "".concat(classPrefix, "--disabled"), disabled), _classNames), className);
+  var styles = _objectSpread({}, style);
+  var addAllow = function addAllow2() {
+    var value2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : _checked;
     if (formatter) {
-      var numValue = String(value).replace(/[^0-9|\.]/gi, '');
+      var numValue = String(value2).replace(/[^0-9|\.]/gi, "");
       return Number(numValue) < Number(max) && !disabled;
     }
-    if (value || typeof value === 'number') {
-      return value < Number(max) && !disabled;
-    }
-    return false;
+    return Number(value2) < Number(max) && !disabled;
   };
-  var reduceAllow = function reduceAllow() {
-    var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : inputValue;
+  var reduceAllow = function reduceAllow2() {
+    var value2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : _checked;
     if (formatter) {
-      var numValue = String(value).replace(/[^0-9|\.]/gi, '');
+      var numValue = String(value2).replace(/[^0-9|\.]/gi, "");
       return Number(numValue) > Number(min) && !disabled;
     }
-    if (value || typeof value === 'number') {
-      return value > Number(min) && !disabled;
-    }
-    return false;
+    return Number(value2) > Number(min) && !disabled;
   };
-  var iconMinusClasses = classNames('nut-inputnumber__icon', {
-    'nut-inputnumber__icon--disabled': !reduceAllow()
+  var iconMinusClasses = classNames("nut-inputnumber__icon icon-minus", {
+    "nut-inputnumber__icon--disabled": !reduceAllow()
   });
-  var iconAddClasses = classNames('nut-inputnumber__icon', {
-    'nut-inputnumber__icon--disabled': !addAllow()
+  var iconAddClasses = classNames("nut-inputnumber__icon icon-plus", {
+    "nut-inputnumber__icon--disabled": !addAllow()
   });
-  var fixedDecimalPlaces = function fixedDecimalPlaces(v) {
-    return Number(v).toFixed(Number(decimalPlaces));
+  var fixedDecimalPlaces = function fixedDecimalPlaces2(v) {
+    return Number(v).toFixed(Number(digits));
   };
-  var emitChange = function emitChange(value, e) {
-    var outputValue = fixedDecimalPlaces(value);
-    onChangeFuc && onChangeFuc(outputValue, e);
-    change && change(outputValue, e);
-    if (!isAsync) {
+  var emitChange = function emitChange2(value2, e) {
+    var outputValue = fixedDecimalPlaces(value2);
+    onChange && onChange(outputValue, e);
+    if (!async) {
       if (Number(outputValue) < Number(min)) {
-        formatter ? setInputValue(formatter(Number(min))) : setInputValue(Number(min));
+        formatter ? setChecked(formatter(Number(min))) : setChecked(Number(min));
       } else if (Number(outputValue) > Number(max)) {
-        formatter ? setInputValue(formatter(Number(max))) : setInputValue(Number(max));
+        formatter ? setChecked(formatter(Number(max))) : setChecked(Number(max));
       } else {
-        formatter ? setInputValue(formatter(outputValue)) : setInputValue(outputValue);
+        formatter ? setChecked(formatter(outputValue)) : setChecked(outputValue);
       }
     }
   };
-  var reduceNumber = function reduceNumber(e) {
-    onReduce && onReduce(e);
-    reduce && reduce(e);
+  var reduceNumber = function reduceNumber2(e) {
+    onMinus && onMinus(e);
     if (reduceAllow()) {
       if (formatter) {
-        var numValue = String(inputValue).replace(/[^0-9|\.]/gi, '');
+        var numValue = String(_checked).replace(/[^0-9|\.]/gi, "");
         var outputValue = Number(numValue) - Number(step);
         inputRef.current = formatter(outputValue);
         emitChange(outputValue, e);
       } else {
-        var _outputValue = Number(inputValue) - Number(step);
+        var _outputValue = Number(_checked) - Number(step);
         emitChange(_outputValue, e);
       }
     } else {
       onOverlimit && onOverlimit(e);
-      overlimit && overlimit(e);
     }
   };
-  var addNumber = function addNumber(e) {
-    onAdd && onAdd(e);
-    add && add(e);
+  var addNumber = function addNumber2(e) {
+    onPlus && onPlus(e);
     if (addAllow()) {
       if (formatter) {
-        var numValue = String(inputValue).replace(/[^0-9|\.]/gi, '');
+        var numValue = String(_checked).replace(/[^0-9|\.]/gi, "");
         var outputValue = Number(numValue) + Number(step);
         inputRef.current = formatter(outputValue);
         emitChange(outputValue, e);
       } else {
-        var _outputValue2 = Number(inputValue) + Number(step);
+        var _outputValue2 = Number(_checked) + Number(step);
         emitChange(_outputValue2, e);
       }
     } else {
       onOverlimit && onOverlimit(e);
-      overlimit && overlimit(e);
     }
   };
-  var changeValue = function changeValue(e) {
+  var changeValue = function changeValue2(e) {
     var input = e.target;
-    change && change(input.valueAsNumber, e);
-    onChangeFuc && onChangeFuc(input.valueAsNumber, e);
-    if (!isAsync) {
+    onChange && onChange(input.valueAsNumber, e);
+    if (!async) {
       if (Number.isNaN(input.valueAsNumber)) {
-        setInputValue('');
+        setChecked("");
       } else {
-        setInputValue(input.valueAsNumber);
+        setChecked(input.valueAsNumber);
       }
     }
   };
-  var changeFormatValue = function changeFormatValue(e) {
+  var changeFormatValue = function changeFormatValue2(e) {
     var input = e.target.value;
-    var numReg = new RegExp('^[0-9]*$');
-    var numValue = input.replace(/[^0-9|\.]/gi, '');
+    var numReg = new RegExp("^[0-9]*$");
+    var numValue = input.replace(/[^0-9|\.]/gi, "");
     if (formatter) {
       if (!numReg.test(input[0]) && numValue) {
-        setInputValue(formatter(numValue));
+        setChecked(formatter(numValue));
       } else if (!numReg.test(input[0]) && !numValue) {
-        setInputValue(input);
+        setChecked(input);
       } else if (numReg.test(input[0])) {
-        console.log('inputRef.current', inputRef.current);
-        console.log('formatter(numValue)', formatter(numValue));
-        // 针对于100%这种尾字符例子，直接删除会进行匹配
         if (formatter(numValue) === inputRef.current) {
-          setInputValue(numValue);
+          setChecked(numValue);
         } else {
-          setInputValue(formatter(numValue));
+          setChecked(formatter(numValue));
           inputRef.current = formatter(numValue);
         }
       }
     }
   };
-  var burFormatValue = function burFormatValue(e) {
+  var burFormatValue = function burFormatValue2(e) {
     var input = e.target.value;
-    var numReg = new RegExp('^[0-9]*$');
-    var numValue = input.replace(/[^0-9|\.]/gi, '');
+    var numReg = new RegExp("^[0-9]*$");
+    var numValue = input.replace(/[^0-9|\.]/gi, "");
     if (formatter) {
       if (formatter(numValue) === input) {
         emitChange(numValue, e);
         return;
       }
       if (!numReg.test(input) || !input) {
-        setInputValue(formatter(''));
+        setChecked(formatter(""));
       }
     }
   };
-  var focusValue = function focusValue(e) {
-    if (disabled) return;
-    if (readonly) return;
+  var focusValue = function focusValue2(e) {
+    if (disabled)
+      return;
+    if (readonly)
+      return;
     onFocus && onFocus(e);
-    focus && focus(e);
   };
-  var burValue = function burValue(e) {
-    if (disabled) return;
-    if (readonly) return;
+  var burValue = function burValue2(e) {
+    if (disabled)
+      return;
+    if (readonly)
+      return;
     var input = e.target;
-    var value = input.valueAsNumber;
-    if (value < Number(min)) {
-      value = Number(min);
-    } else if (value > Number(max)) {
-      value = Number(max);
+    var value2 = input.valueAsNumber;
+    if (Number.isNaN(value2) && !allowEmpty) {
+      value2 = Number(defaultValue);
+    }
+    if (value2 < Number(min)) {
+      value2 = Number(min);
+    } else if (value2 > Number(max)) {
+      value2 = Number(max);
     }
-    emitChange(value, e);
-    onBlurFuc && onBlurFuc(e);
-    blur && blur(e);
+    emitChange(value2, e);
+    onBlur && onBlur(e);
   };
   return React__default.createElement("div", _objectSpread({
     className: classes,
     style: styles
   }, restProps), React__default.createElement("div", {
     className: "nut-input-minus"
-  }, React__default.createElement(Icon, {
-    classPrefix: iconClassPrefix,
-    fontClassName: iconFontClassName,
+  }, React__default.createElement(Minus, {
     className: iconMinusClasses,
-    size: buttonSize,
-    name: "minus",
-    onClick: reduceNumber
+    onClick: function onClick(e) {
+      return reduceNumber(e);
+    }
   })), React__default.createElement(React__default.Fragment, null, formatter ? React__default.createElement("input", {
     type: "text",
-    min: min,
-    max: max,
-    style: {
-      width: pxCheck(inputWidth)
-    },
-    disabled: disabled,
+    min,
+    max,
+    disabled,
     readOnly: readonly,
-    value: inputValue,
+    value: _checked,
     onInput: changeFormatValue,
     onBlur: burFormatValue,
     onFocus: focusValue
   }) : React__default.createElement("input", {
     type: "number",
-    min: min,
-    max: max,
-    style: {
-      width: pxCheck(inputWidth)
-    },
-    disabled: disabled,
+    min,
+    max,
+    disabled,
     readOnly: readonly,
-    value: inputValue,
+    value: _checked,
     onInput: changeValue,
     onBlur: burValue,
     onFocus: focusValue
   })), React__default.createElement("div", {
     className: "nut-input-add"
-  }, React__default.createElement(Icon, {
-    classPrefix: iconClassPrefix,
-    fontClassName: iconFontClassName,
+  }, React__default.createElement(Plus, {
     className: iconAddClasses,
-    size: buttonSize,
-    name: "plus",
-    onClick: addNumber
+    onClick: function onClick(e) {
+      return addNumber(e);
+    }
   })));
 };
 InputNumber.defaultProps = defaultProps;
-InputNumber.displayName = 'NutInputNumber';
-export { InputNumber as default };
+InputNumber.displayName = "NutInputNumber";
+export {
+  InputNumber as default
+};

package/dist/esm/Layout.js

@@ -1,14 +1,35 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React__default from 'react';
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function(sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _objectSpread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), true).forEach(function(key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
+}
+import React__default from "react";
 var defaultProps = {};
-var Layout = function Layout(props) {
+var Layout = function Layout2(props) {
   _objectSpread(_objectSpread({}, defaultProps), props);
   return React__default.createElement("div", {
     className: "nut-layout"
   }, "Layout");
 };
 Layout.defaultProps = defaultProps;
-Layout.displayName = 'NutLayout';
-export { Layout as default };
+Layout.displayName = "NutLayout";
+export {
+  Layout as default
+};