@titaui/pc 1.11.27-beta.3 → 1.11.27-beta.4

package/lib/components/textarea/index.css

@@ -4,7 +4,7 @@
   min-height: 36px;
   background: #ffffff;
   cursor: text;
-  border-radius: 4px;
+  border-radius: 8px;
   display: flex;
   align-items: center;
   padding: 7px 0;
@@ -118,3 +118,25 @@
   line-height: 18px;
   padding-left: 12px;
 }
+
+.commonTextAreaWrapperTopShadow::before {
+  content: '';
+  border-radius: 8px;
+  height: 30px;
+  background: linear-gradient(180deg, #ffffff 0%, rgba(255, 255, 255, 0) 100%);
+  position: absolute;
+  top: 0;
+  width: 100%;
+  z-index: 2;
+}
+
+.commonTextAreaWrapperBottomShadow::after {
+  content: '';
+  border-radius: 8px;
+  height: 30px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #ffffff 100%);
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 2;
+}

package/lib/components/textarea/index.js

@@ -9,9 +9,13 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 require("./index.css");
 
-var _excluded = ["disabled", "onFocus", "onBlur", "inputRef", "onChange", "autoHeight", "style", "className", "value", "placeholder", "maxLine", "maxLength", "initValue", "onErrorChange", "validator", "onKeyDown"];
+var _excluded = ["disabled", "onFocus", "onBlur", "inputRef", "onChange", "className", "value", "placeholder", "maxLine", "maxLength", "initValue", "onErrorChange", "validator", "onKeyDown"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -19,12 +23,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _extends() { _extends = Object.assign || 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 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; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 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."); }
@@ -47,13 +45,11 @@ var Textarea = function Textarea(p) {
       _onBlur = p.onBlur,
       inputRef = p.inputRef,
       _onChange = p.onChange,
-      _p$autoHeight = p.autoHeight,
-      autoHeight = _p$autoHeight === void 0 ? true : _p$autoHeight,
-      style = p.style,
       className = p.className,
       value = p.value,
       placeholder = p.placeholder,
-      maxLine = p.maxLine,
+      _p$maxLine = p.maxLine,
+      maxLine = _p$maxLine === void 0 ? 4 : _p$maxLine,
       maxLength = p.maxLength,
       initValue = p.initValue,
       onErrorChange = p.onErrorChange,
@@ -68,65 +64,54 @@ var Textarea = function Textarea(p) {
       active = _useState2[0],
       setActive = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(),
+  var _useState3 = (0, _react.useState)(initValue || ""),
       _useState4 = _slicedToArray(_useState3, 2),
-      height = _useState4[0],
-      setHeight = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(initValue || ""),
-      _useState6 = _slicedToArray(_useState5, 2),
-      selfValue = _useState6[0],
-      setSelfValue = _useState6[1];
+      selfValue = _useState4[0],
+      setSelfValue = _useState4[1];
 
-  var hiddenRef = (0, _react.useRef)();
   var selfInputRef = (0, _react.useRef)();
   var realInputRef = inputRef || selfInputRef;
   var isControlled = ("value" in p);
   var realValue = isControlled ? value : selfValue;
 
-  var _useState7 = (0, _react.useState)(false),
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      error = _useState6[0],
+      setError = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(""),
       _useState8 = _slicedToArray(_useState7, 2),
-      error = _useState8[0],
-      setError = _useState8[1];
+      errorText = _useState8[0],
+      setErrorText = _useState8[1];
+
+  var wrapperRef = (0, _react.useRef)();
 
-  var _useState9 = (0, _react.useState)(""),
+  var _useState9 = (0, _react.useState)(false),
       _useState10 = _slicedToArray(_useState9, 2),
-      errorText = _useState10[0],
-      setErrorText = _useState10[1];
+      validateEnable = _useState10[0],
+      setvalidateEnable = _useState10[1];
 
-  var _useState11 = (0, _react.useState)("auto"),
+  var _useState11 = (0, _react.useState)(false),
       _useState12 = _slicedToArray(_useState11, 2),
-      maxHeight = _useState12[0],
-      setMaxheight = _useState12[1];
-
-  var wrapperRef = (0, _react.useRef)();
+      isTrue = _useState12[0],
+      setIsTrue = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(false),
+  var _useState13 = (0, _react.useState)(1),
       _useState14 = _slicedToArray(_useState13, 2),
-      validateEnable = _useState14[0],
-      setvalidateEnable = _useState14[1];
+      textAreaRows = _useState14[0],
+      setTextAreaRows = _useState14[1];
 
   var _useState15 = (0, _react.useState)(false),
       _useState16 = _slicedToArray(_useState15, 2),
-      isTrue = _useState16[0],
-      setIsTrue = _useState16[1];
-
-  (0, _react.useEffect)(function () {
-    if (autoHeight && hiddenRef.current && realInputRef.current) {
-      // 自适应高度
-      hiddenRef.current.value = "".concat(realValue || "");
-      hiddenRef.current.style.width = window.getComputedStyle(realInputRef.current).width;
-      var _height = hiddenRef.current.scrollHeight;
+      showTopShadow = _useState16[0],
+      setShowTopShadow = _useState16[1];
 
-      if (maxLine && maxLine > 0) {
-        var lineHeight = Number(window.getComputedStyle(realInputRef.current).lineHeight.replace("px", "")); // setMaxheight(maxLine * lineHeight + "px");
-
-        setMaxheight("".concat(maxLine * lineHeight, "px"));
-      }
-
-      setHeight(_height);
-    }
+  var _useState17 = (0, _react.useState)(false),
+      _useState18 = _slicedToArray(_useState17, 2),
+      showBottomShadow = _useState18[0],
+      setShowBottomShadow = _useState18[1];
 
+  (0, _react.useEffect)(function () {
     if (!validateEnable) return;
     var hasError = false;
     var eText = "";
@@ -158,7 +143,40 @@ var Textarea = function Textarea(p) {
 
       setError(hasError);
     }
-  }, [realValue]); // 鼠标移入
+  }, [realValue]);
+
+  var handleShadowVisible = function handleShadowVisible() {
+    setTimeout(function () {
+      if (realInputRef.current) {
+        if (Math.abs(realInputRef.current.scrollHeight - realInputRef.current.offsetHeight) <= 3) {
+          setShowTopShadow(false);
+          setShowBottomShadow(false);
+        } else if (realInputRef.current.scrollTop > 0 && Math.abs(realInputRef.current.scrollHeight - realInputRef.current.scrollTop - realInputRef.current.offsetHeight) > 3) {
+          setShowTopShadow(true);
+          setShowBottomShadow(true);
+        } else if (realInputRef.current.scrollTop > 0) {
+          setShowTopShadow(true);
+          setShowBottomShadow(false);
+        } else {
+          setShowTopShadow(false);
+          setShowBottomShadow(true);
+        }
+      }
+    }, 0);
+  };
+
+  var resetTextareaHeight = function resetTextareaHeight() {
+    setTimeout(function () {
+      var rows = realInputRef.current && Math.ceil(realInputRef.current.scrollHeight / 22);
+
+      if (rows && rows <= maxLine) {
+        setTextAreaRows(rows);
+      } else {
+        setTextAreaRows(maxLine);
+      }
+    }, 0);
+  }; // 鼠标移入
+
 
   var changeMoveOver = function changeMoveOver() {
     setIsTrue(true);
@@ -173,7 +191,7 @@ var Textarea = function Textarea(p) {
   var areaFocus = active ? "area-focus" : areaNormal;
   var areaError = error ? "area-error" : areaFocus;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "\n          ".concat(prefixCls, "\n          ").concat(areaError, " \n          ").concat(disabled ? " disabled" : "", "\n        "),
+    className: "\n          ".concat(prefixCls, "\n          ").concat(areaError, "\n          ").concat(disabled ? " disabled" : "", "\n        "),
     onFocus: function onFocus() {},
     onBlur: function onBlur() {},
     onMouseOver: changeMoveOver,
@@ -185,24 +203,18 @@ var Textarea = function Textarea(p) {
       (_realInputRef$current = realInputRef.current) === null || _realInputRef$current === void 0 ? void 0 : _realInputRef$current.focus();
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "inner scrollbar-size-sm",
-    style: autoHeight ? {
-      maxHeight: maxHeight
-    } : {
-      height: "100%"
-    }
+    className: (0, _classnames["default"])("inner scrollbar-size-sm", {
+      commonTextAreaWrapperTopShadow: showTopShadow,
+      commonTextAreaWrapperBottomShadow: showBottomShadow
+    })
   }, /*#__PURE__*/_react["default"].createElement("textarea", _extends({
     className: "".concat(className, " scrollbar-size-sm"),
     disabled: disabled,
     ref: realInputRef,
-    style: _objectSpread(_objectSpread({}, style || {}), autoHeight ? {
-      height: height
-    } : {
-      height: "100%"
-    }),
     value: realValue,
-    rows: 1,
+    rows: textAreaRows,
     placeholder: placeholder,
+    onScroll: handleShadowVisible,
     onChange: function onChange(e) {
       if (!isControlled) {
         setSelfValue(e.target.value);
@@ -212,6 +224,7 @@ var Textarea = function Textarea(p) {
         _onChange(e);
       }
 
+      resetTextareaHeight();
       setvalidateEnable(true);
     },
     onFocus: function onFocus(e) {
@@ -237,18 +250,7 @@ var Textarea = function Textarea(p) {
         _onBlur(e);
       }
     }
-  }, others)), /*#__PURE__*/_react["default"].createElement("textarea", {
-    className: className,
-    ref: hiddenRef,
-    placeholder: placeholder,
-    value: realValue,
-    rows: 1,
-    style: _objectSpread(_objectSpread({}, style || {}), {
-      height: "0!important",
-      visibility: "hidden",
-      position: "absolute"
-    })
-  }))), error && /*#__PURE__*/_react["default"].createElement("div", {
+  }, others)))), error && /*#__PURE__*/_react["default"].createElement("div", {
     className: "err-color"
   }, errorText));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.27-beta.3",
+  "version": "1.11.27-beta.4",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",