@nutui/nutui-react 3.0.0-beta.8 → 3.0.0

package/dist/es/packages/tabs/tabs.js

@@ -9,8 +9,8 @@ import { JoySmile } from "@nutui/icons-react";
 import { ComponentDefaults } from "../../utils/typings";
 import TabPane from "../tabpane";
 import raf from "../../utils/raf";
-import { usePropsValue } from "../../utils/use-props-value";
-import { useForceUpdate } from "../../utils/use-force-update";
+import { usePropsValue } from "../../hooks/use-props-value";
+import { useForceUpdate } from "../../hooks/use-force-update";
 import { useRtl } from "../configprovider";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     tabStyle: {},
@@ -42,32 +42,26 @@ export var Tabs = function(props) {
     var _usePropsValue = _sliced_to_array(usePropsValue({
         value: outerValue,
         defaultValue: outerDefaultValue,
-        finalValue: 0,
         onChange: onChange
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
     var titleItemsRef = useRef([]);
     var navRef = useRef(null);
-    var scrollDirection = function(nav, to, duration, direction) {
-        var count = 0;
+    var scrollDirection = function(nav, to, duration) {
         var from = direction === 'horizontal' ? nav.scrollLeft : nav.scrollTop;
         var frames = duration === 0 ? 1 : Math.round(duration * 1000 / 16);
-        function animate() {
-            if (direction === 'horizontal') {
-                nav.scrollLeft += (to - from) / frames;
-            } else {
-                nav.scrollTop += (to - from) / frames;
-            }
-            if (++count < frames) {
-                raf(animate);
-            }
-        }
+        var count = 0;
+        var animate = function() {
+            if (direction === 'horizontal') nav.scrollLeft += (to - from) / frames;
+            else nav.scrollTop += (to - from) / frames;
+            if (++count < frames) raf(animate);
+        };
         animate();
     };
     var scrollIntoView = function(index, immediate) {
         var nav = navRef.current;
         var titleItem = titleItemsRef.current;
         var titlesLength = titles.current.length;
-        var itemLength = titleItemsRef.current.length;
+        var itemLength = titleItem.length;
         if (!nav || !titleItem || !titleItem[itemLength - titlesLength + index]) {
             return;
         }
@@ -79,13 +73,13 @@ export var Tabs = function(props) {
         } else {
             to = title.offsetLeft - (nav.offsetWidth - title.offsetWidth) / 2;
         }
-        scrollDirection(nav, to, immediate ? 0 : 0.3, direction);
+        scrollDirection(nav, to, immediate ? 0 : 0.3);
     };
     var getTitles = function() {
         var titles = [];
         React.Children.forEach(children, function(child, idx) {
             if (/*#__PURE__*/ React.isValidElement(child)) {
-                var _$props = child === null || child === void 0 ? void 0 : child.props;
+                var _$props = child.props;
                 if ((_$props === null || _$props === void 0 ? void 0 : _$props.title) || (_$props === null || _$props === void 0 ? void 0 : _$props.value)) {
                     titles.push({
                         title: _$props.title,
@@ -103,7 +97,6 @@ export var Tabs = function(props) {
         titles.current = getTitles();
         var current = '';
         titles.current.forEach(function(title) {
-            // eslint-disable-next-line eqeqeq
             if (title.value === value) {
                 current = value;
             }
@@ -119,25 +112,19 @@ export var Tabs = function(props) {
     var classes = classNames(classPrefix, "".concat(classPrefix, "-").concat(direction), className);
     var _obj;
     var classesTitle = classNames("".concat(classPrefix, "-titles"), (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-titles-").concat(activeType), activeType), _define_property(_obj, "".concat(classPrefix, "-titles-scrollable"), true), _define_property(_obj, "".concat(classPrefix, "-titles-").concat(align), align), _obj));
-    var tabsActiveStyle = {
-        color: activeType === 'smile' ? activeColor : '',
-        background: activeType === 'line' ? activeColor : ''
-    };
     var getContentStyle = function() {
-        // eslint-disable-next-line eqeqeq
         var index = titles.current.findIndex(function(t) {
-            return t.value == value;
+            return t.value === value;
         });
         index = index < 0 ? 0 : index;
         return {
-            transform: direction === 'horizontal' ? "translate3d(".concat(rtl ? '' : '-').concat(index * 100, "%, 0, 0)") : "translate3d( 0,-".concat(index * 100, "%, 0)"),
+            transform: direction === 'horizontal' ? "translate3d(".concat(rtl ? '' : '-').concat(index * 100, "%, 0, 0)") : "translate3d( 0, -".concat(index * 100, "%, 0)"),
             transitionDuration: "".concat(duration, "ms")
         };
     };
     useEffect(function() {
-        // eslint-disable-next-line eqeqeq
         var index = titles.current.findIndex(function(t) {
-            return t.value == value;
+            return t.value === value;
         });
         index = index < 0 ? 0 : index;
         setTimeout(function() {
@@ -148,40 +135,43 @@ export var Tabs = function(props) {
     ]);
     var tabChange = function(item) {
         onClick && onClick(item.value);
-        if (item.disabled) {
-            return;
+        if (!item.disabled) {
+            setValue(item.value);
         }
-        setValue(item.value);
     };
     return /*#__PURE__*/ React.createElement("div", _object_spread({
         className: classes
     }, rest), /*#__PURE__*/ React.createElement("div", {
         className: classesTitle,
-        style: _object_spread({}, tabStyle),
+        style: tabStyle,
         ref: navRef
     }, !!title && typeof title === 'function' ? title() : titles.current.map(function(item) {
         var _obj;
         return /*#__PURE__*/ React.createElement("div", {
-            onClick: function() {
-                tabChange(item);
-            },
-            className: classNames("".concat(classPrefix, "-titles-item"), (_obj = {}, _define_property(_obj, "nut-tabs-titles-item-active", !item.disabled && String(item.value) === String(value)), _define_property(_obj, "nut-tabs-titles-item-disabled", item.disabled), _define_property(_obj, "nut-tabs-titles-item-".concat(align), align), _obj)),
+            key: item.value,
             ref: function(ref) {
                 return titleItemsRef.current.push(ref);
             },
-            key: item.value
+            onClick: function() {
+                return tabChange(item);
+            },
+            className: classNames("".concat(classPrefix, "-titles-item"), (_obj = {}, _define_property(_obj, "nut-tabs-titles-item-active", !item.disabled && String(item.value) === String(value)), _define_property(_obj, "nut-tabs-titles-item-disabled", item.disabled), _define_property(_obj, "nut-tabs-titles-item-".concat(align), align), _obj))
         }, activeType === 'line' && /*#__PURE__*/ React.createElement("div", {
-            className: classNames("".concat(classPrefix, "-titles-item-line"), _define_property({}, "".concat(classPrefix, "-titles-item-line-").concat(direction), true)),
-            style: tabsActiveStyle
+            className: classNames("".concat(classPrefix, "-titles-item-line"), "".concat(classPrefix, "-titles-item-line-").concat(direction)),
+            style: {
+                background: activeColor
+            }
         }), activeType === 'smile' && /*#__PURE__*/ React.createElement("div", {
-            className: "".concat(classPrefix, "-titles-item-smile"),
-            style: tabsActiveStyle
+            className: "".concat(classPrefix, "-titles-item-smile")
         }, /*#__PURE__*/ React.createElement(JoySmile, {
             color: activeColor,
             width: 40,
             height: 20
         })), /*#__PURE__*/ React.createElement("div", {
-            className: classNames("".concat(classPrefix, "-ellipsis"), "".concat(classPrefix, "-titles-item-text"))
+            className: classNames(_define_property({}, "".concat(classPrefix, "-ellipsis"), direction === 'vertical'), "".concat(classPrefix, "-titles-item-text")),
+            style: {
+                color: activeColor
+            }
         }, item.title));
     })), /*#__PURE__*/ React.createElement("div", {
         className: "".concat(classPrefix, "-content-wrap")
@@ -189,18 +179,11 @@ export var Tabs = function(props) {
         className: "".concat(classPrefix, "-content"),
         style: getContentStyle()
     }, React.Children.map(children, function(child, idx) {
-        if (!/*#__PURE__*/ React.isValidElement(child)) {
-            return null;
-        }
-        var childProps = _object_spread_props(_object_spread({}, child.props), {
-            active: value === child.props.value
-        });
-        if (String(value) !== String(child.props.value || idx) && autoHeight) {
-            childProps = _object_spread_props(_object_spread({}, childProps), {
-                autoHeightClassName: 'inactive'
-            });
-        }
-        return /*#__PURE__*/ React.cloneElement(child, childProps);
+        if (!/*#__PURE__*/ React.isValidElement(child)) return null;
+        return /*#__PURE__*/ React.cloneElement(child, _object_spread_props(_object_spread({}, child.props), {
+            active: value === child.props.value,
+            autoHeightClassName: autoHeight && String(value) !== String(child.props.value || idx) ? 'inactive' : ''
+        }));
     }))));
 };
 Tabs.displayName = 'NutTabs';

package/dist/es/packages/tag/style/tag.scss

@@ -31,8 +31,6 @@
 
   &-primary {
     background: #fa2c19;
-    // RN 不支持渐变色
-    // background: $tag-primary-background-color;
   }
 
   &-info {

package/dist/es/packages/textarea/style/style.css

@@ -3,37 +3,45 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-textarea {
+  display: flex;
+  flex-direction: column;
   position: relative;
   width: 100%;
   box-sizing: border-box;
-  display: flex;
-  flex-direction: row;
+  font-size: var(--nutui-font-size-base, 14px);
+  border-radius: var(--nutui-radius-s, 6px);
+}
+.nut-textarea-container {
+  padding: var(--nutui-textarea-padding, 12px);
   background-color: var(--nutui-color-background-overlay, #ffffff);
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-base, 14px));
-  padding: var(--nutui-textarea-padding, 10px 25px);
+}
+.nut-textarea-error {
+  border: 0.5px solid var(--nutui-color-danger, #ff0f23);
+  background-color: var(--nutui-color-danger-light, #ffebef);
 }
 .nut-textarea-limit {
-  position: absolute;
-  right: 15px;
-  bottom: 12px;
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-textarea-limit-color, var(--nutui-color-text, #505259));
+  text-align: right;
+  font-size: var(--nutui-font-size-base, 14px);
+  line-height: var(--nutui-font-size-base, 14px);
+  margin-top: var(--nutui-spacing-base, 8px);
+  color: var(--nutui-color-text-help, #888b94);
 }
 .nut-textarea-limit-disabled {
   cursor: not-allowed;
-  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea-textarea {
   outline: none;
   display: block;
   box-sizing: border-box;
   width: 100%;
+  height: 40px;
   min-width: 0;
   margin: 0;
   padding: 0;
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-font-size-base, 14px);
   color: var(--nutui-textarea-text-color, var(--nutui-color-title, #1a1a1a));
-  caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-color-title, #1a1a1a));
+  caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-color-primary, #ff0f23));
   text-align: left;
   background-color: transparent;
   border: 0;
@@ -44,18 +52,21 @@
   background-color: transparent;
   resize: none;
 }
+.nut-textarea-textarea::placeholder {
+  color: var(--nutui-color-text-help, #888b94);
+}
 .nut-textarea-textarea-disabled {
   cursor: not-allowed;
-  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea-textarea-disabled::placeholder {
-  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea-textarea-disabled .taro-textarea {
-  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea-textarea-disabled .taro-textarea::placeholder {
-  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;

package/dist/es/packages/textarea/style/textarea.scss

@@ -1,22 +1,31 @@
 .nut-textarea {
+  display: flex;
+  flex-direction: column;
   position: relative;
   width: 100%;
   box-sizing: border-box;
-  display: flex;
-  flex-direction: row;
-  background-color: $color-background-overlay;
-  font-size: $textarea-font;
-  padding: $textarea-padding;
+  font-size: $font-size-base;
+  border-radius: $radius-s;
+
+  &-container {
+    padding: $textarea-padding;
+    background-color: $color-background-overlay;
+  }
+
+  &-error {
+    border: 0.5px solid $color-danger;
+    background-color: $color-danger-light;
+  }
 
   &-limit {
-    position: absolute;
-    right: 15px;
-    bottom: 12px;
-    font-size: $textarea-font;
-    color: $textarea-limit-color;
+    text-align: right;
+    font-size: $font-size-base;
+    line-height: $font-size-base;
+    margin-top: $spacing-base;
+    color: $color-text-help;
     &-disabled {
       cursor: not-allowed;
-      color: $textarea-disabled-color;
+      color: $color-text-disabled;
     }
   }
 
@@ -25,10 +34,11 @@
     display: block;
     box-sizing: border-box;
     width: 100%;
+    height: 40px;
     min-width: 0;
     margin: 0;
     padding: 0;
-    font-size: $textarea-font;
+    font-size: $font-size-base;
     color: $textarea-text-color;
     caret-color: $textarea-text-curror-color;
     text-align: left;
@@ -36,22 +46,39 @@
     border: 0;
     resize: none;
 
+    // &::after{
+    //   content: '';
+    //   position: absolute;
+    //   width: 2px;
+    //   height: 14px;
+    //   background-color: red;
+    //   // left: 10px;
+    //   // top: 50%;
+    //   transform: translateY(-50%);
+    //   z-index: 1;
+    //   pointer-events: none;
+    // }
+
     .taro-textarea {
       color: $textarea-text-color;
       background-color: transparent;
       resize: none;
     }
 
+    &::placeholder {
+      color: $color-text-help;
+    }
+
     &-disabled {
       cursor: not-allowed;
-      color: $textarea-disabled-color;
+      color: $color-text-disabled;
       &::placeholder {
-        color: $textarea-disabled-color;
+        color: $color-text-disabled;
       }
       .taro-textarea {
-        color: $textarea-disabled-color;
+        color: $color-text-disabled;
         &::placeholder {
-          color: $textarea-disabled-color;
+          color: $color-text-disabled;
         }
       }
     }

package/dist/es/packages/textarea/textarea.d.ts

@@ -1,5 +1,5 @@
-import React, { FunctionComponent } from 'react';
 import type { FocusEvent } from 'react';
+import React, { FunctionComponent } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export interface TextAreaProps extends BasicComponent {
     value: string;
@@ -11,6 +11,8 @@ export interface TextAreaProps extends BasicComponent {
     readOnly: boolean;
     disabled: boolean;
     autoSize: boolean;
+    plain: boolean;
+    status: 'error' | 'default';
     onChange: (value: string) => void;
     onBlur: (event: FocusEvent<HTMLTextAreaElement>) => void;
     onFocus: (event: FocusEvent<HTMLTextAreaElement>) => void;

package/dist/es/packages/textarea/textarea.js

@@ -7,7 +7,7 @@ import React, { useEffect, useRef } from "react";
 import classNames from "classnames";
 import { useConfig, useRtl } from "../configprovider";
 import { ComponentDefaults } from "../../utils/typings";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     defaultValue: '',
     showCount: false,
@@ -16,11 +16,13 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     placeholder: '',
     readOnly: false,
     disabled: false,
-    autoSize: false
+    autoSize: false,
+    plain: false,
+    status: 'default'
 });
 export var TextArea = function(props) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, value = _ref.value, defaultValue = _ref.defaultValue, showCount = _ref.showCount, maxLength = _ref.maxLength, rows = _ref.rows, placeholder = _ref.placeholder, readOnly = _ref.readOnly, disabled = _ref.disabled, autoSize = _ref.autoSize, style = _ref.style, onChange = _ref.onChange, onBlur = _ref.onBlur, onFocus = _ref.onFocus, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, value = _ref.value, defaultValue = _ref.defaultValue, showCount = _ref.showCount, maxLength = _ref.maxLength, rows = _ref.rows, placeholder = _ref.placeholder, readOnly = _ref.readOnly, disabled = _ref.disabled, autoSize = _ref.autoSize, style = _ref.style, plain = _ref.plain, status = _ref.status, onChange = _ref.onChange, onBlur = _ref.onBlur, onFocus = _ref.onFocus, rest = _object_without_properties(_ref, [
         "className",
         "value",
         "defaultValue",
@@ -32,6 +34,8 @@ export var TextArea = function(props) {
         "disabled",
         "autoSize",
         "style",
+        "plain",
+        "status",
         "onChange",
         "onBlur",
         "onFocus"
@@ -53,9 +57,7 @@ export var TextArea = function(props) {
         onChange: onChange
     }), 2), inputValue = _usePropsValue[0], setInputValue = _usePropsValue[1];
     useEffect(function() {
-        if (autoSize) {
-            setContentHeight();
-        }
+        if (autoSize) setContentHeight();
     }, [
         autoSize,
         defaultValue,
@@ -76,35 +78,30 @@ export var TextArea = function(props) {
         var value = compositionRef.current ? text.value : format(text.value);
         setInputValue(value);
     };
+    var isDisabled = function() {
+        return disabled || readOnly;
+    };
     var handleFocus = function(event) {
-        if (disabled) return;
-        if (readOnly) return;
-        onFocus && onFocus(event);
+        if (isDisabled()) return;
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
     };
     var handleBlur = function(event) {
-        if (disabled) return;
-        if (readOnly) return;
-        onBlur && onBlur(event);
+        if (isDisabled()) return;
+        onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
     };
     var _obj;
-    return /*#__PURE__*/ React.createElement("div", {
-        className: classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-disabled"), disabled), _define_property(_obj, "".concat(classPrefix, "-rtl"), rtl), _obj), className)
-    }, /*#__PURE__*/ React.createElement("textarea", _object_spread({
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement("div", {
+        className: classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-disabled"), disabled), _define_property(_obj, "".concat(classPrefix, "-readonly"), readOnly), _define_property(_obj, "".concat(classPrefix, "-rtl"), rtl), _define_property(_obj, "".concat(classPrefix, "-plain"), plain), _define_property(_obj, "".concat(classPrefix, "-container"), !plain), _define_property(_obj, "".concat(classPrefix, "-").concat(status), status), _obj), className)
+    }, /*#__PURE__*/ React.createElement("textarea", _object_spread_props(_object_spread({}, rest), {
         ref: textareaRef,
-        className: "".concat(classPrefix, "-textarea ").concat(disabled ? "".concat(classPrefix, "-textarea-disabled") : ''),
+        className: classNames("".concat(classPrefix, "-textarea"), _define_property({}, "".concat(classPrefix, "-textarea-disabled"), disabled)),
         style: style,
         disabled: disabled,
         readOnly: readOnly,
         value: inputValue,
-        onChange: function(e) {
-            return handleChange(e);
-        },
-        onBlur: function(e) {
-            return handleBlur(e);
-        },
-        onFocus: function(e) {
-            return handleFocus(e);
-        },
+        onChange: handleChange,
+        onBlur: handleBlur,
+        onFocus: handleFocus,
         onCompositionEnd: function() {
             compositionRef.current = false;
         },
@@ -113,9 +110,9 @@ export var TextArea = function(props) {
         },
         rows: rows,
         maxLength: maxLength === -1 ? undefined : maxLength,
-        placeholder: placeholder || locale.placeholder
-    }, rest)), showCount && /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-limit ").concat(disabled ? "".concat(classPrefix, "-limit-disabled") : '')
-    }, inputValue.length, "/", maxLength < 0 ? 0 : maxLength));
+        placeholder: placeholder !== undefined ? placeholder : locale.placeholder
+    })), showCount && /*#__PURE__*/ React.createElement("div", {
+        className: classNames("".concat(classPrefix, "-limit"), _define_property({}, "".concat(classPrefix, "-limit-disabled"), disabled))
+    }, inputValue.length, "/", maxLength < 0 ? 0 : maxLength)));
 };
 TextArea.displayName = 'NutTextArea';

package/dist/es/packages/timedetail/style/style.css

@@ -16,7 +16,7 @@
   line-height: var(--nutui-timeselect-time-height, 50px);
   text-align: center;
   margin: var(--nutui-timeselect-time-margin, 0 10px 10px 0);
-  background: var(--nutui-timeselect-time-background, var(--nutui-color-background, #f5f6fa));
+  background: var(--nutui-timeselect-time-background, var(--nutui-color-background, #f2f3f5));
   border-radius: 5px;
   font-size: var(--nutui-font-size-base, 14px);
   border: 1px solid transparent;