@qsxy/element-plus-react 1.0.2 → 2.0.0

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);
@@ -90,7 +106,7 @@ var TextArea = /*#__PURE__*/forwardRef(function (props, ref) {
       return;
     }
     if (autosize) {
-      var minRows = typeof autosize !== 'boolean' ? autosize.minRows : undefined;
+      var minRows = typeof autosize !== 'boolean' ? autosize.minRows : rows;
       var maxRows = typeof autosize !== 'boolean' ? autosize.maxRows : undefined;
       var textareaStyle = calcTextareaHeight(textareaRef.current, minRows, maxRows);
       setTextareaCalcStyle(function (prev) {
@@ -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';

package/dist/Input/index.js

@@ -1,3 +1,4 @@
 export { default as InputRange } from "../Input/InputRange";
 export { default as Input } from "./Input";
-export { default as InputGroup } from "./InputGroup";
+export { default as InputGroup } from "./InputGroup";
+export { default as TextArea } from "./TextArea";

package/dist/Input/typings.d.ts

@@ -2,6 +2,11 @@ import React from 'react';
 import { BaseProps, FormControlBaseProps, NativeProps, TypeAttributes } from '../types/common';
 export type LiteralUnion<T extends U, U> = T | (U & {});
 export type ValueType = string | number;
+export interface ModelModifiers {
+    trim?: boolean;
+    number?: boolean;
+    lazy?: boolean;
+}
 export type BaseInputRef = {
     /** 获取值 */
     getValue: () => ValueType;
@@ -14,6 +19,8 @@ export type BaseInputRef = {
     focus: () => void;
     /** 使 input 组件失去焦点 */
     blur: () => void;
+    /** 选中所有文本 */
+    select?: () => void;
     showClear?: (value: ValueType) => void;
     hideClear?: () => void;
 };
@@ -24,7 +31,7 @@ export type InputRef = {
 export type TextareaRef = {
     input: HTMLTextAreaElement;
 } & BaseInputRef;
-export interface InputProps extends FormControlBaseProps<string | number>, BaseProps, NativeProps, Omit<React.AllHTMLAttributes<HTMLInputElement>, 'value' | 'defaultValue' | 'size' | 'prefix' | 'type' | 'onInput' | 'onChange' | 'style' | 'children'> {
+export interface InputProps extends FormControlBaseProps<string | number>, BaseProps, NativeProps<'--el-input-text-color' | '--el-input-border' | '--el-input-hover-border' | '--el-input-focus-border' | '--el-input-transparent-border' | '--el-input-border-color' | '--el-input-border-radius' | '--el-input-bg-color' | '--el-input-icon-color' | '--el-input-placeholder-color' | '--el-input-hover-border-color' | '--el-input-clear-hover-color' | '--el-input-focus-border-color' | '--el-input-width' | '--el-input-height' | '--el-input-inner-height'>, Omit<React.AllHTMLAttributes<HTMLInputElement>, 'value' | 'defaultValue' | 'size' | 'prefix' | 'type' | 'onInput' | 'onChange' | 'style' | 'children'> {
     size?: TypeAttributes.Size;
     value?: string | number;
     /** 初始值 */
@@ -33,6 +40,8 @@ export interface InputProps extends FormControlBaseProps<string | number>, BaseP
      * text，textarea 和其他原生 input 的 type 值
      * ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#%3Cinput%3E_types */
     type?: LiteralUnion<'color' | 'date' | 'datetime-local' | 'email' | 'file' | 'hidden' | 'image' | 'number' | 'password' | 'range' | 'search' | 'tel' | 'text' | 'time' | 'url' | 'week', string>;
+    /** 输入框唯一标识 */
+    id?: string;
     /** 输入框头部内容，只对 type="text" 有效 */
     prefix?: React.ReactElement<any> | string | number;
     /** 输入框尾部内容，只对 type="text" 有效 */
@@ -44,37 +53,54 @@ export interface InputProps extends FormControlBaseProps<string | number>, BaseP
     /** 是否可清空 */
     clearable?: boolean;
     /** 指定输入值的格式。(只有当 type 是"text"时才能工作) */
-    formatter?: (value: ValueType) => ValueType;
+    formatter?: (value: ValueType) => string;
     /** 是否显示切换密码图标 */
     showPassword?: boolean;
     /** 是否纯文本模式，即无边框 */
     plain?: boolean;
-    /** 表单校验错误提示 */
-    error?: boolean;
-    /** 表单校验警告提示 */
-    warning?: boolean;
     /** 输入是否防抖动 */
     debounceInput?: boolean;
     /** 获取输入建议的防抖延时，单位为毫秒 */
     debounceTime?: number;
     /** input自定义内联样式 */
     innerStyle?: React.CSSProperties;
-    /** 范围选择时开始输入框的占位内容 */
-    startPlaceholder?: string;
-    /** 范围选择时结束输入框的占位内容 */
-    endPlaceholder?: string;
     /** 最大输入长度 */
     maxLength?: number;
     /** 原生属性，最小输入长度 */
     minLength?: number;
     /** 是否显示统计字数, 只在 type 为 'text' 或 'textarea' 的时候生效	 */
     showWordLimit?: boolean;
+    /** 字数统计的位置，仅当 show-word-limit 为 true 时生效。 */
     /** 是否隐藏值 */
     hiddenValue?: boolean;
+    /** 原生属性 autocomplete */
+    autocomplete?: string;
+    /** 原生属性 tabindex */
+    tabindex?: number;
+    /** 原生属性 aria-label */
+    ariaLabel?: string;
+    /** 原生属性 form */
+    form?: string;
+    /** 原生属性 autofocus */
+    autofocus?: boolean;
+    /** 原生属性 inputmode */
+    inputmode?: 'none' | 'text' | 'decimal' | 'numeric' | 'tel' | 'search' | 'email' | 'url';
     /** 在点击由 clearable 属性生成的清空按钮时触发 */
     onClear?: (e: React.MouseEvent) => void;
     /** 在 Input 值改变时触发 */
     onChange?: (value: ValueType, event?: React.ChangeEvent) => void;
+    /** 在 Input 输入时触发 */
+    onInput?: (value: ValueType) => void;
+    /** 在 Input 获得焦点时触发 */
+    onFocus?: (event: React.FocusEvent) => void;
+    /** 在 Input 失去焦点时触发 */
+    onBlur?: (event: React.FocusEvent) => void;
+    /** 在 Input 按下键盘时触发 */
+    onKeyDown?: (event: React.KeyboardEvent) => void;
+    /** 鼠标进入时触发 */
+    onMouseEnter?: (event: React.MouseEvent) => void;
+    /** 鼠标离开时触发 */
+    onMouseLeave?: (event: React.MouseEvent) => void;
 }
 export interface InputGroupProps extends BaseProps, NativeProps {
     /** 输入框前置内容，只对 type="text" 有效 */
@@ -85,10 +111,6 @@ export interface InputGroupProps extends BaseProps, NativeProps {
 export interface TextareaProps extends Omit<React.AllHTMLAttributes<HTMLInputElement>, 'value' | 'defaultValue' | 'size' | 'prefix' | 'type' | 'onInput' | 'onChange' | 'style' | 'children'>, FormControlBaseProps<ValueType>, BaseProps, NativeProps {
     /** 初始值 */
     defaultValue?: ValueType;
-    /** 表单校验错误提示 */
-    error?: boolean;
-    /** 表单校验警告提示 */
-    warning?: boolean;
     /** 是否纯文本模式，即无边框 */
     plain?: boolean;
     rows?: number;
@@ -107,6 +129,8 @@ export interface TextareaProps extends Omit<React.AllHTMLAttributes<HTMLInputEle
         minRows?: number;
         maxRows?: number;
     };
+    /** 是否可清空 */
+    clearable?: boolean;
     /** 在 Input 值改变时触发 */
     onChange?: (value: ValueType, event?: React.ChangeEvent) => void;
 }
@@ -137,14 +161,9 @@ export interface InputRangeProps<T = InputRangeValueType> extends Omit<FormContr
     clearable?: boolean;
     /** 是否纯文本模式，即无边框 */
     plain?: boolean;
-    /** 表单校验失败 */
-    error?: boolean;
-    /** 表单校验失败 */
-    warning?: boolean;
     /** 选择范围时的分隔符 */
     rangeSeparator?: string;
     /** 输入是否防抖动 */
-    debounceInput?: boolean;
     /** input自定义内联样式 */
     innerStyle?: React.CSSProperties;
     /** 范围选择时开始输入框的占位内容 */

package/dist/Input/utils.d.ts

@@ -3,4 +3,5 @@ type TextAreaHeight = {
     minHeight?: string;
 };
 export declare function calcTextareaHeight(targetElement: HTMLTextAreaElement, minRows?: number, maxRows?: number): TextAreaHeight;
+export declare const looseToNumber: (val: any) => any;
 export {};

package/dist/Input/utils.js

@@ -88,4 +88,8 @@ export function calcTextareaHeight(targetElement) {
   (_hiddenTextarea$paren = hiddenTextarea.parentNode) === null || _hiddenTextarea$paren === void 0 || _hiddenTextarea$paren.removeChild(hiddenTextarea);
   hiddenTextarea = undefined;
   return result;
-}
+}
+export var looseToNumber = function looseToNumber(val) {
+  var n = Number.parseFloat(val);
+  return Number.isNaN(n) ? val : n;
+};