@qsxy/element-plus-react 1.0.3 → 2.0.0

package/dist/Input/Input.js

@@ -1,13 +1,32 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19;
-var _excluded = ["name", "title", "prefix", "suffix", "prepend", "append", "error", "warning", "debounceInput", "debounceTime", "placeholder", "readOnly", "plain", "classPrefix", "onInput", "onChange", "onClear", "showPassword", "onFocus", "onBlur", "maxLength", "showWordLimit", "hiddenValue", "defaultValue", "formatter"];
+var _excluded = ["name", "title", "prefix", "suffix", "prepend", "append", "debounceInput", "debounceTime", "placeholder", "readOnly", "plain", "classPrefix", "clearable", "onInput", "onChange", "onClear", "showPassword", "onFocus", "onBlur", "maxLength", "showWordLimit", "hiddenValue", "defaultValue", "formatter"];
+var _this = this,
+  _templateObject,
+  _templateObject2,
+  _templateObject3,
+  _templateObject4,
+  _templateObject5,
+  _templateObject6,
+  _templateObject7,
+  _templateObject8,
+  _templateObject9,
+  _templateObject10,
+  _templateObject11,
+  _templateObject12,
+  _templateObject13,
+  _templateObject14,
+  _templateObject15,
+  _templateObject16,
+  _templateObject17,
+  _templateObject18,
+  _templateObject19;
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -19,26 +38,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import classNames from 'classnames';
 import { addStyle, hasClass } from 'dom-lib';
 import isObject from 'lodash/isObject';
-import React, { cloneElement, forwardRef, useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useConfigProvider } from "../ConfigProvider/ConfigProviderContext";
+import React, { cloneElement, forwardRef, memo, useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Icon from "../Icon/Icon";
 import { isNotEmpty, mergeDefaultProps } from "../Util";
-import { partitionHTMLProps, useClassNames, useControlled, useDisabled, useSize } from "../hooks";
-import InputRange from "./InputRange";
-import TextArea from "./TextArea";
-function InternalInput(props, ref) {
-  var _this = this;
-  var _useConfigProvider = useConfigProvider(),
-    locale = _useConfigProvider.locale;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
+import { ValidateComponentsMap } from "../Util/icons";
+import { partitionHTMLProps, useClassNames, useControlled, useDisabled, useSize, useStatusIcon } from "../hooks";
+var Input = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, ref) {
   props = mergeDefaultProps({
     type: 'text',
-    placeholder: t('el.input.placeholder', {
-      lng: locale
-    }),
-    clearable: true,
+    placeholder: '',
+    clearable: false,
     debounceTime: 200,
     defaultValue: ''
   }, props);
@@ -49,8 +58,6 @@ function InternalInput(props, ref) {
     suffix = _props.suffix,
     prepend = _props.prepend,
     append = _props.append,
-    error = _props.error,
-    warning = _props.warning,
     debounceInput = _props.debounceInput,
     debounceTime = _props.debounceTime,
     placeholder = _props.placeholder,
@@ -58,6 +65,7 @@ function InternalInput(props, ref) {
     plain = _props.plain,
     _props$classPrefix = _props.classPrefix,
     classPrefix = _props$classPrefix === void 0 ? 'input' : _props$classPrefix,
+    clearable = _props.clearable,
     onInput = _props.onInput,
     onChange = _props.onChange,
     onClear = _props.onClear,
@@ -94,6 +102,9 @@ function InternalInput(props, ref) {
     setFocused = _useState4[1];
   var disabled = useDisabled(props.disabled);
   var size = useSize(props.size);
+  var _useStatusIcon = useStatusIcon(),
+    statusIcon = _useStatusIcon.statusIcon,
+    validateState = _useStatusIcon.validateState;
   var containerRef = useRef(null);
   var inputRef = useRef(null);
   var wrapperRef = useRef(null);
@@ -112,42 +123,59 @@ function InternalInput(props, ref) {
     }
     return val;
   }, [formatter, value]);
-
-  /** 是否可清空 */
-  var clearable = useMemo(function () {
-    // 只读不显示清除按钮只有input组件适用，加上了那些引用input组件就无法显示清空按钮了，这里添加说明，下次别再添加了
-    return Boolean(showPassword ? false : props.clearable /*  && !readOnly */);
-  }, [props.clearable, showPassword]);
+  var validateIcon = useMemo(function () {
+    return validateState && ValidateComponentsMap[validateState];
+  }, [validateState]);
+  var showPwdVisible = useMemo(function () {
+    return showPassword && isNotEmpty(value) && !disabled;
+  }, [showPassword, value, disabled]);
+  var isWordLimitVisible = useMemo(function () {
+    return showWordLimit && maxLength && type === 'text' && !disabled && !readOnly && !showPassword;
+  }, [showWordLimit, maxLength, type, disabled, readOnly, showPassword]);
+  var suffixVisible = useMemo(function () {
+    return !!suffix || clearable || showPassword || isWordLimitVisible || !!validateState && statusIcon;
+  }, [suffix, clearable, showPassword, isWordLimitVisible, validateState, statusIcon]);
 
   /** 输入框尾部内容 */
-  var suffixSlot = useMemo(function () {
-    if (type === 'text' && maxLength && showWordLimit) {
-      return /*#__PURE__*/React.createElement("span", {
-        className: e(_templateObject || (_templateObject = _taggedTemplateLiteral(["count"])))
-      }, /*#__PURE__*/React.createElement("span", {
-        className: e(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["count-inner"])))
-      }, typeof value === 'string' ? value.length : 0, " / ", maxLength));
-    } else if (['text', 'password'].includes(type) && suffix) {
-      if (isObject(suffix)) {
-        var _nodeType;
-        var nodeType = suffix === null || suffix === void 0 ? void 0 : suffix.type;
-        nodeType = ((_nodeType = nodeType) === null || _nodeType === void 0 ? void 0 : _nodeType.displayName) || nodeType;
-        if (nodeType.toString().startsWith('Icon')) {
-          var _suffix$props;
-          return /*#__PURE__*/cloneElement(suffix, _objectSpread(_objectSpread({}, suffix.props), {}, {
-            className: classNames((_suffix$props = suffix.props) === null || _suffix$props === void 0 ? void 0 : _suffix$props.className, e(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["icon"]))))
-          }));
-        }
+  var suffixContent = useMemo(function () {
+    // if (type === 'text' && maxLength && showWordLimit) {
+    //     return (
+    //         <span className={e`count`}>
+    //             <span className={e`count-inner`}>
+    //                 {typeof value === 'string' ? value.length : 0} / {maxLength}
+    //             </span>
+    //         </span>
+    //     );
+    // } else if (['text', 'password'].includes(type) && suffix) {
+    //     if (isObject(suffix)) {
+    //         let nodeType = suffix?.type;
+    //         nodeType = (nodeType as ComponentType)?.displayName || nodeType;
+
+    //         if (nodeType.toString().startsWith('Icon')) {
+    //             return cloneElement(suffix as React.ReactElement<IconProps>, {
+    //                 ...suffix.props,
+    //                 className: classNames(suffix.props?.className, e`icon`),
+    //             });
+    //         }
+    //     }
+    //     return suffix;
+    // } else if (showPassword && isNotEmpty(value)) {
+    //     return <Icon name={type === 'text' ? 'eye' : 'eye-slash'} className={classNames(e`icon`, e`clear`)} />;
+    // }
+    // return null;
+    if (isObject(suffix)) {
+      var _nodeType;
+      var nodeType = suffix === null || suffix === void 0 ? void 0 : suffix.type;
+      nodeType = ((_nodeType = nodeType) === null || _nodeType === void 0 ? void 0 : _nodeType.displayName) || nodeType;
+      if (nodeType.toString().startsWith('Icon')) {
+        var _suffix$props;
+        return /*#__PURE__*/cloneElement(suffix, _objectSpread(_objectSpread({}, suffix.props), {}, {
+          className: classNames((_suffix$props = suffix.props) === null || _suffix$props === void 0 ? void 0 : _suffix$props.className, e(_templateObject || (_templateObject = _taggedTemplateLiteral(["icon"]))))
+        }));
       }
-      return suffix;
-    } else if (showPassword && isNotEmpty(value)) {
-      return /*#__PURE__*/React.createElement(Icon, {
-        name: type === 'text' ? 'eye' : 'eye-slash',
-        className: classNames(e(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["icon"]))), e(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["clear"]))))
-      });
     }
-    return null;
-  }, [type, maxLength, showWordLimit, suffix, showPassword, value, e]);
+    return suffix;
+  }, [suffix, e]);
 
   /** 后缀是否可点击 */
   var suffixCanClick = useMemo(function () {
@@ -158,26 +186,26 @@ function InternalInput(props, ref) {
   var showClear = useCallback(function (_value) {
     if (clearable && isNotEmpty(_value) && !disabled && clearRef.current) {
       addStyle(clearRef.current, 'display', '');
-      if (suffixRef.current) {
-        if (type === 'text' && maxLength && showWordLimit) {
-          return;
-        }
-        addStyle(suffixRef.current, 'display', 'none');
-      }
+      // if (suffixRef.current) {
+      //     if (type === 'text' && maxLength && showWordLimit) {
+      //         return;
+      //     }
+      //     addStyle(suffixRef.current, 'display', 'none');
+      // }
     } else {
-      if (suffixRef.current) {
-        addStyle(suffixRef.current, 'display', '');
-      }
+      // if (suffixRef.current) {
+      //     addStyle(suffixRef.current, 'display', '');
+      // }
     }
     // addClass((ref ?? contentRef).current, m`suffix`);
-  }, [clearable, disabled, maxLength, showWordLimit, type]);
+  }, [clearable, disabled]);
   var hideClear = useCallback(function () {
     if (clearRef.current) {
       addStyle(clearRef.current, 'display', 'none');
     }
-    if (suffixRef.current) {
-      addStyle(suffixRef.current, 'display', '');
-    }
+    // if (suffixRef.current) {
+    //     addStyle(suffixRef.current, 'display', '');
+    // }
     // if (!suffixSlot) {
     //     removeClass((ref ?? contentRef).current, m`suffix`);
     // }
@@ -185,7 +213,7 @@ function InternalInput(props, ref) {
 
   /** 在点击由 clearable 属性生成的清空按钮时触发 */
   var handelClear = useCallback(function (event) {
-    event.stopPropagation();
+    event === null || event === void 0 || event.stopPropagation();
     setValue('');
     if (clearRef.current) {
       addStyle(clearRef.current, 'display', 'none');
@@ -204,11 +232,9 @@ function InternalInput(props, ref) {
   }, [disabled, hideClear, onChange, onClear, readOnly, setValue]);
 
   /** 后缀点击事件 */
-  var onClickSuffix = useCallback(function () {
-    if (showPassword) {
-      setType(type === 'text' ? 'password' : 'text');
-    }
-  }, [type, showPassword]);
+  var handlePasswordVisible = useCallback(function () {
+    setType(type === 'text' ? 'password' : 'text');
+  }, [type]);
 
   /** 输入事件 */
   var handleInput = useCallback(function (event) {
@@ -296,7 +322,7 @@ function InternalInput(props, ref) {
         if (nodeType.toString().startsWith('ElIcon')) {
           var _prefix$props;
           return /*#__PURE__*/cloneElement(prefix, _objectSpread(_objectSpread({}, prefix.props), {}, {
-            className: classNames((_prefix$props = prefix.props) === null || _prefix$props === void 0 ? void 0 : _prefix$props.className, e(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["icon"]))))
+            className: classNames((_prefix$props = prefix.props) === null || _prefix$props === void 0 ? void 0 : _prefix$props.className, e(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["icon"]))))
           }));
         }
       }
@@ -312,7 +338,7 @@ function InternalInput(props, ref) {
   }, [focused, formatValue, hiddenValue, value]);
   return /*#__PURE__*/React.createElement("div", {
     ref: containerRef,
-    className: classNames(b(), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, bm('group', 'prepend'), prepend), bm('group', 'append'), append), m(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["prefix"]))), preffixSlot), m(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["suffix"]))), suffixSlot || clearable), m(size), size), b(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["hidden"]))), type === 'hidden'), is({
+    className: classNames(b(), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, bm('group', 'prepend'), prepend), bm('group', 'append'), append), m(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["prefix"]))), preffixSlot), m(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["suffix"]))), suffixContent || clearable), m(size), size), b(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["hidden"]))), type === 'hidden'), is({
       disabled: disabled,
       plain: plain
     }), props.className),
@@ -324,9 +350,7 @@ function InternalInput(props, ref) {
     className: be('group', 'prepend')
   }, prepend) : null, /*#__PURE__*/React.createElement("div", {
     ref: wrapperRef,
-    className: classNames(e(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["wrapper"]))), is({
-      error: error,
-      warning: warning,
+    className: classNames(e(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["wrapper"]))), is({
       focus: focused
     })),
     onMouseEnter: function onMouseEnter() {
@@ -338,16 +362,16 @@ function InternalInput(props, ref) {
       }
     }
   }, ['text', 'password'].includes(type) && preffixSlot && /*#__PURE__*/React.createElement("span", {
-    className: e(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["prefix"])))
+    className: e(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["prefix"])))
   }, /*#__PURE__*/React.createElement("span", {
-    className: e(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["prefix-inner"])))
+    className: e(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["prefix-inner"])))
   }, preffixSlot)), /*#__PURE__*/React.createElement("input", _extends({
     ref: inputRef,
     type: type,
     name: name,
     title: title,
     value: inputValue,
-    className: e(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["inner"]))),
+    className: e(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["inner"]))),
     style: props.innerStyle,
     placeholder: placeholder,
     autoComplete: "off",
@@ -380,38 +404,36 @@ function InternalInput(props, ref) {
       _onBlur === null || _onBlur === void 0 || _onBlur.call(_this, event);
       // handleChange(event);
     }
-  }, htmlInputProps)), /*#__PURE__*/React.createElement("span", {
+  }, htmlInputProps)), suffixVisible && /*#__PURE__*/React.createElement("span", {
+    className: classNames(e(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["suffix"]))), _defineProperty({}, b('click', false), suffixCanClick))
+  }, /*#__PURE__*/React.createElement("span", {
+    className: e(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["suffix-inner"])))
+  }, /*#__PURE__*/React.createElement(Icon, {
     ref: clearRef,
-    key: "clearIcon",
-    className: e(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["suffix"]))),
     style: {
       display: 'none'
     },
-    onClick: handelClear
-  }, /*#__PURE__*/React.createElement("span", {
-    className: e(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["suffix-inner"])))
-  }, /*#__PURE__*/React.createElement(Icon, {
     prefix: "fal",
     name: "circle-xmark",
-    className: classNames(e(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["icon"]))), e(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["clear"])))),
+    className: classNames(e(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["icon"]))), e(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["clear"])))),
+    onClick: handelClear,
     onMouseDown: function onMouseDown(event) {
       event.preventDefault();
       event.stopPropagation();
     }
-  }))), suffixSlot && /*#__PURE__*/React.createElement("span", {
-    ref: suffixRef,
-    key: "suffixSlot",
-    className: classNames(e(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["suffix"]))), _defineProperty({}, b('click', false), suffixCanClick)),
-    onClick: onClickSuffix
+  }), !showPwdVisible || !isWordLimitVisible ? suffixContent : null, showPwdVisible && /*#__PURE__*/React.createElement(Icon, {
+    name: type === 'text' ? 'eye' : 'eye-slash',
+    className: classNames(e(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["icon"]))), e(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["password"])))),
+    onClick: handlePasswordVisible
+  }), isWordLimitVisible && /*#__PURE__*/React.createElement("span", {
+    className: e(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["count"])))
   }, /*#__PURE__*/React.createElement("span", {
-    className: e(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["suffix-inner"])))
-  }, suffixSlot))), append ? /*#__PURE__*/React.createElement("div", {
+    className: e(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["count-inner"])))
+  }, typeof value === 'string' ? value.length : 0, " / ", maxLength)), validateState && validateIcon && statusIcon && /*#__PURE__*/React.createElement(Icon, _extends({}, ValidateComponentsMap[validateState], {
+    className: classNames(e(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["icon"]))), e(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["validateIcon"]))), is('loading', validateState === 'validating'))
+  }))))), append ? /*#__PURE__*/React.createElement("div", {
     className: be('group', 'append')
   }, append) : null);
-}
-var ForwardInput = /*#__PURE__*/forwardRef(InternalInput);
-var Input = ForwardInput;
-Input.TextArea = TextArea;
-Input.Range = InputRange;
+}));
 Input.displayName = 'ElInput';
 export default Input;

package/dist/Input/InputGroup.js

@@ -24,5 +24,5 @@ var InputGroup = /*#__PURE__*/forwardRef(function (props, ref) {
     className: e(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["append"])))
   }, append));
 });
-InputGroup.displayName = 'InputGroup';
+InputGroup.displayName = 'ElInputGroup';
 export default InputGroup;

package/dist/Input/InputRange.js

@@ -28,11 +28,11 @@ import InputGroup from "./InputGroup";
 var InputRange = /*#__PURE__*/forwardRef(function (props, ref) {
   props = mergeDefaultProps({
     name: ['', ''],
-    startPlaceholder: '请输入',
-    endPlaceholder: '请输入',
+    startPlaceholder: '',
+    endPlaceholder: '',
     type: 'text',
     clearable: true,
-    rangeSeparator: '到'
+    rangeSeparator: '-'
   }, props);
   var _props = props,
     name = _props.name,
@@ -49,9 +49,7 @@ var InputRange = /*#__PURE__*/forwardRef(function (props, ref) {
     append = _props.append,
     prepend = _props.prepend,
     _props$precision = _props.precision,
-    precision = _props$precision === void 0 ? 0 : _props$precision,
-    error = _props.error,
-    warning = _props.warning;
+    precision = _props$precision === void 0 ? 0 : _props$precision;
   var _useControlled = useControlled(props.value, props.defaultValue),
     _useControlled2 = _slicedToArray(_useControlled, 2),
     value = _useControlled2[0],
@@ -272,9 +270,7 @@ var InputRange = /*#__PURE__*/forwardRef(function (props, ref) {
     return /*#__PURE__*/React.createElement("div", {
       className: classNames(b(_templateObject || (_templateObject = _taggedTemplateLiteral(["range-editor"]))), b('input-range', false), be('input', 'wrapper', false), be('tooltip', 'trigger', false), is({
         focus: active || focus,
-        disabled: disabled,
-        warning: warning,
-        error: error
+        disabled: disabled
       }), _defineProperty({}, bm('input-range', size, false), size), append || prepend ? null : props.className),
       ref: ref,
       onClick: props.onClick,
@@ -327,7 +323,7 @@ var InputRange = /*#__PURE__*/forwardRef(function (props, ref) {
       className: classNames(be('input', 'icon', false), e(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["close-icon"]))), _defineProperty({}, ebm('close', 'icon', 'hidden'), !canClear)),
       onClick: onClear
     }));
-  }, [b, be, is, active, focus, warning, error, bm, size, append, prepend, props.className, props.onClick, props.style, props.readOnly, props.rangeSeparator, ref, onMouseEnter, onMouseLeave, preffixSlot, name, startPlaceholder, disabled, value, onFocus, type, onKeyUp, endPlaceholder, canClear, suffixSlot, e, ebm, onClear, _onInput, _onBlur, onKeyDown]);
+  }, [b, be, is, active, focus, bm, size, append, prepend, props.className, props.onClick, props.style, props.readOnly, props.rangeSeparator, ref, onMouseEnter, onMouseLeave, preffixSlot, name, startPlaceholder, disabled, value, onFocus, type, onKeyUp, endPlaceholder, canClear, suffixSlot, e, ebm, onClear, _onInput, _onBlur, onKeyDown]);
   if (append || prepend) {
     return /*#__PURE__*/React.createElement(InputGroup, {
       prepend: prepend,
@@ -339,5 +335,5 @@ var InputRange = /*#__PURE__*/forwardRef(function (props, ref) {
     return content;
   }
 });
-InputRange.displayName = 'InputRange';
+InputRange.displayName = 'ElInputRange';
 export default InputRange;

package/dist/Input/TextArea.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { TextareaProps, TextareaRef } from './typings';
-declare const TextArea: React.ForwardRefExoticComponent<TextareaProps & React.RefAttributes<TextareaRef>>;
+declare const TextArea: React.MemoExoticComponent<React.ForwardRefExoticComponent<TextareaProps & React.RefAttributes<TextareaRef>>>;
 export default TextArea;

package/dist/Input/TextArea.js

@@ -1,9 +1,11 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["name", "title", "error", "placeholder", "readOnly", "plain", "rows", "classPrefix", "onFocus", "onBlur", "onChange", "warning", "maxLength", "showWordLimit", "resize", "autosize", "inputStyle"];
+var _excluded = ["name", "title", "placeholder", "readOnly", "plain", "clearable", "rows", "classPrefix", "onFocus", "onBlur", "onChange", "maxLength", "showWordLimit", "resize", "autosize", "inputStyle"];
 var _this = this,
   _templateObject,
   _templateObject2,
-  _templateObject3;
+  _templateObject3,
+  _templateObject4,
+  _templateObject5;
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -20,34 +22,36 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import classNames from 'classnames';
-import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { mergeDefaultProps } from "../Util";
+import { addStyle } from 'dom-lib';
+import React, { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import Icon from "../Icon/Icon";
+import { cAF, mergeDefaultProps, rAF } from "../Util";
 import { partitionHTMLProps, useClassNames, useControlled, useDisabled } from "../hooks";
 import { useResizeObserver } from "../hooks/useResizeObserver";
 import { calcTextareaHeight } from "./utils";
-var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
+var TextArea = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, ref) {
   props = mergeDefaultProps({
-    placeholder: '请输入',
+    placeholder: '',
     style: {
       width: '100%'
     },
     autosize: true,
+    rows: 2,
     inputStyle: {}
   }, props);
   var _props = props,
     name = _props.name,
     title = _props.title,
-    error = _props.error,
     placeholder = _props.placeholder,
     readOnly = _props.readOnly,
     plain = _props.plain,
+    clearable = _props.clearable,
     rows = _props.rows,
     _props$classPrefix = _props.classPrefix,
     classPrefix = _props$classPrefix === void 0 ? 'textarea' : _props$classPrefix,
     onFocus = _props.onFocus,
     onBlur = _props.onBlur,
     onChange = _props.onChange,
-    warning = _props.warning,
     maxLength = _props.maxLength,
     showWordLimit = _props.showWordLimit,
     resize = _props.resize,
@@ -67,20 +71,32 @@ var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     focus = _useState2[0],
     setFocus = _useState2[1];
-  var _useState3 = useState({}),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    textareaCalcStyle = _useState4[0],
-    setTextareaCalcStyle = _useState4[1];
+    hovering = _useState4[0],
+    setHovering = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    textareaCalcStyle = _useState6[0],
+    setTextareaCalcStyle = _useState6[1];
   var disabled = useDisabled(props.disabled);
   var containerRef = useRef(null);
   var textareaRef = useRef(null);
   var countRef = useRef(null);
+  var iconRef = useRef(null);
+  var rAFId;
   var _partitionHTMLProps = partitionHTMLProps(rest),
     _partitionHTMLProps2 = _slicedToArray(_partitionHTMLProps, 1),
     htmlInputProps = _partitionHTMLProps2[0];
   var isWordLimitVisible = useMemo(function () {
     return showWordLimit && !!maxLength && !disabled && !readOnly;
   }, [showWordLimit, maxLength, disabled, readOnly]);
+  var renderClear = useMemo(function () {
+    return clearable && !disabled && !readOnly;
+  }, [clearable, disabled, readOnly]);
+  var showClear = useMemo(function () {
+    return renderClear && !!value && (focus || hovering);
+  }, [renderClear, value, focus, hovering]);
   var handleInput = useCallback(function (event) {
     setValue(event.target.value);
     onChange === null || onChange === void 0 || onChange(event.target.value);
@@ -103,7 +119,7 @@ var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
         });
       });
     }
-  }, [autosize]);
+  }, [autosize, rows]);
   var createOnceInitResize = useCallback(function () {
     var isInit = false;
     return function () {
@@ -119,22 +135,46 @@ var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }, [autosize, resizeTextarea]);
   var onceInitSizeTextarea = createOnceInitResize();
+
+  // useResizeObserver(textareaRef, entries => {
+  //     onceInitSizeTextarea();
+  //    if ((!isWordLimitVisible && !renderClear) || (props.resize !== 'both' && props.resize !== 'horizontal')) {
+  //        return;
+  //    }
+  //     const entry = entries[0];
+  //     const { width } = entry.contentRect;
+  //     if (countRef.current) {
+  //         countRef.current.style.right = `calc(100% - ${width + 15 + 6}px)`;
+  //     }
+  // });
+
+  useEffect(function () {
+    if (autosize) {
+      resizeTextarea();
+    }
+  }, [value]);
   useResizeObserver(textareaRef, function (entries) {
     onceInitSizeTextarea();
-    if (!isWordLimitVisible || resize !== 'both') {
+    if (!isWordLimitVisible && !renderClear || props.resize !== 'both' && props.resize !== 'horizontal') {
       return;
     }
     var entry = entries[0];
-    var width = entry.contentRect.width;
-    if (countRef.current) {
-      countRef.current.style.right = "calc(100% - ".concat(width + 15 + 6, "px)");
-    }
+    var _entry$target$getBoun = entry.target.getBoundingClientRect(),
+      width = _entry$target$getBoun.width;
+    var updateStyle = function updateStyle() {
+      rAFId = undefined;
+      addStyle(countRef.current, {
+        /** right: 100% - (width - right(10)) */
+        right: "calc(100% - ".concat(width - 10, "px)")
+      });
+      addStyle(iconRef.current, {
+        /** right: 100% - (width - right(11)) */
+        right: "calc(100% - ".concat(width - 11, "px)")
+      });
+    };
+    rAFId && cAF(rAFId);
+    rAFId = rAF(updateStyle);
   });
-  useEffect(function () {
-    if (autosize) {
-      resizeTextarea();
-    }
-  }, [value]);
   useImperativeHandle(ref, function () {
     return {
       get input() {
@@ -168,6 +208,12 @@ var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
       disabled: disabled,
       plain: plain
     }), props.className),
+    onMouseEnter: function onMouseEnter() {
+      return setHovering(true);
+    },
+    onMouseLeave: function onMouseLeave() {
+      return setHovering(false);
+    },
     style: props.style,
     ref: containerRef
   }, /*#__PURE__*/React.createElement("textarea", _extends({
@@ -176,10 +222,9 @@ var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
     name: name,
     title: title,
     value: value,
-    className: classNames(e(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["inner"]))), props.className, is({
-      error: error,
-      warning: warning
-    })),
+    className: classNames(e(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["inner"]))), is({
+      clearable: clearable
+    }), props.className),
     style: _objectSpread(_objectSpread({
       minHeight: 31,
       resize: disabled ? 'none' : resize
@@ -197,10 +242,20 @@ var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
       setFocus(false);
       onBlur === null || onBlur === void 0 || onBlur.call(_this, event);
     }, [onBlur])
-  }, htmlInputProps)), maxLength && showWordLimit ? /*#__PURE__*/React.createElement("span", {
+  }, htmlInputProps)), showClear && /*#__PURE__*/React.createElement(Icon, {
+    ref: iconRef,
+    name: "circle-xmark",
+    className: classNames(e(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["icon"]))), e(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["clear"]))))
+    // style={{ right: `calc(100% - ${width - 11}px)` }}
+    ,
+    onClick: function onClick() {
+      setValue('');
+      onChange === null || onChange === void 0 || onChange('');
+    }
+  }), maxLength && showWordLimit ? /*#__PURE__*/React.createElement("span", {
     ref: countRef,
-    className: e(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["count"])))
+    className: e(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["count"])))
   }, typeof value === 'string' ? value.length : 0, " / ", maxLength) : null);
-});
+}));
 TextArea.displayName = 'ElTextArea';
 export default TextArea;

package/dist/Input/index.d.ts

@@ -1,4 +1,5 @@
 export { default as InputRange } from '../Input/InputRange';
 export { default as Input } from './Input';
 export { default as InputGroup } from './InputGroup';
+export { default as TextArea } from './TextArea';
 export type { InputProps, InputRangeProps, InputRef, TextareaProps, TextareaRef } from './typings';