@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

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

@@ -8,67 +8,19 @@ export type TabsTitle = {
     value: string | number;
 };
 export interface TabsProps extends BasicComponent {
-    /**
-    * 标签栏样式
-    * @default {}
-    */
-    tabStyle: React.CSSProperties
-    /**
-    * 当前激活 tab 面板的值
-    * @default 0
-    */
-    value: string | number
-    /**
-    * 初始化激活 tab 的值
-    * @default 0
-    */
-    defaultValue: string | number
-    /**
-    * 标签选中色
-    * @default #1A1A1A
-    */
-    activeColor: string
+    tabStyle: React.CSSProperties;
+    value: string | number;
+    defaultValue: string | number;
+    activeColor: string;
     name: string;
-    /**
-    * 使用横纵方向
-    * @default horizontal
-    */
-    direction: 'horizontal' | 'vertical'
-    /**
-    * 选中底部展示样式 可选值 line、smile、simple、card、button、divider
-    * @default line
-    */
-    activeType: 'line' | 'smile' | 'simple' | 'card' | 'button' | 'divider'
-    /**
-    * 切换动画时长,单位 ms 0 代表无动画
-    * @default 300
-    */
-    duration: number | string
-    /**
-    * 标题对齐方式
-    * @default -
-    */
-    align: 'left' | 'right'
-    /**
-    * 自定义导航区域
-    * @default -
-    */
-    title: () => JSX.Element[]
-    /**
-    * 当前激活的标签改变时触发
-    * @default -
-    */
-    onChange: (index: string | number) => void
-    /**
-    * 点击标签时触发
-    * @default -
-    */
-    onClick: (index: string | number) => void
-    /**
-    * 自动高度。设置为 true 时，nut-tabs 和 nut-tabs\_\_content 会随着当前 nut-tabpane 的高度而发生变化。
-    * @default false
-    */
-    autoHeight: boolean
+    direction: 'horizontal' | 'vertical';
+    activeType: 'line' | 'smile' | 'simple' | 'card' | 'button' | 'divider';
+    duration: number | string;
+    align: 'left' | 'right';
+    title: () => JSX.Element[];
+    onChange: (index: string | number) => void;
+    onClick: (index: string | number) => void;
+    autoHeight: boolean;
     children?: React.ReactNode;
 }
 export declare const Tabs: FunctionComponent<Partial<TabsProps>> & {

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

@@ -51,7 +51,6 @@ export var Tabs = function(props) {
         onChange: onChange
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
     var titleItemsRef = useRef([]);
-    var navRef = useRef(null);
     var getTitles = function() {
         var titles = [];
         React.Children.forEach(children, function(child, idx) {
@@ -88,7 +87,7 @@ 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 classesTitle = classNames("".concat(classPrefix, "-titles"), (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-titles-").concat(activeType), activeType), _define_property(_obj, "".concat(classPrefix, "-titles-").concat(align), align), _obj));
     var tabsActiveStyle = {
         color: activeType === 'smile' ? activeColor : '',
         background: activeType === 'line' ? activeColor : ''
@@ -152,6 +151,8 @@ export var Tabs = function(props) {
                         return prev + curr.width;
                     }, 0);
                     to = left - (navRectRef.current.width - titleRect.width) / 2;
+                    // to < 0 说明不需要进行滚动，页面元素已全部显示出来
+                    if (to < 0) return;
                     to = rtl ? -to : to;
                 }
                 nextTick(function() {
@@ -201,8 +202,7 @@ export var Tabs = function(props) {
         className: classesTitle,
         style: _object_spread({}, tabStyle)
     }, /*#__PURE__*/ React.createElement(View, {
-        className: "nut-tabs-list",
-        ref: navRef
+        className: "nut-tabs-list"
     }, !!title && typeof title === 'function' ? title() : titles.current.map(function(item, index) {
         var _obj;
         return /*#__PURE__*/ React.createElement(View, {

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

@@ -1,10 +1,14 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-tag {
   padding: var(--nutui-tag-padding, 0px 2px);
   display: flex;
   flex-direction: row;
   justify-content: center;
   align-items: center;
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-1, 10px));
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
   border-radius: var(--nutui-tag-border-radius, 2px);
   height: var(--nutui-tag-height, 14px);
   color: var(--nutui-tag-color, #ffffff);
@@ -13,31 +17,32 @@
 .nut-tag .nut-icon {
   vertical-align: middle;
   margin-left: 4px;
+  color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text {
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-1, 10px));
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
   color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text-plain {
-  color: var(--nutui-gray-7, #1a1a1a);
+  color: var(--nutui-gray-7);
 }
 .nut-tag-default {
-  background: var(--nutui-tag-background-color, var(--nutui-gray-7, #1a1a1a));
+  background: var(--nutui-tag-background-color, var(--nutui-gray-7));
 }
 .nut-tag-primary {
   background: #fa2c19;
 }
 .nut-tag-info {
-  background: var(--nutui-tag-info-background-color, var(--nutui-color-info, #1988fa));
+  background: var(--nutui-tag-info-background-color, var(--nutui-color-info, #0073ff));
 }
 .nut-tag-success {
   background: var(--nutui-tag-success-background-color, #4fc08d);
 }
 .nut-tag-danger {
-  background: var(--nutui-tag-danger-background-color, var(--nutui-color-danger, #ff0f23));
+  background: var(--nutui-tag-danger-background-color, var(--nutui-red-2));
 }
 .nut-tag-warning {
-  background: var(--nutui-tag-warning-background-color, var(--nutui-color-warning, #c47600));
+  background: var(--nutui-tag-warning-background-color, var(--nutui-yellow-2));
 }
 .nut-tag-round {
   border-radius: var(--nutui-tag-round-border-radius, 8px);
@@ -52,11 +57,13 @@
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-1, 10px));
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
+  color: var(--nutui-tag-color, #ffffff);
+  margin-left: 4px;
 }
 .nut-tag-plain {
   background-color: #fff;
-  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-gray-7, #1a1a1a);
+  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-gray-7);
 }
 
 [dir=rtl] .nut-tag .nut-icon,

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

@@ -13,6 +13,7 @@
   .nut-icon {
     vertical-align: middle;
     margin-left: 4px;
+    color: $tag-color;
   }
 
   &-text {
@@ -67,6 +68,8 @@
     align-items: center;
     justify-content: center;
     font-size: $tag-font-size;
+    color: $tag-color;
+    margin-left: 4px;
   }
 
   &-plain {

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

@@ -1,5 +1,5 @@
-import React, { FunctionComponent, ReactNode } from 'react';
 import type { MouseEvent } from 'react';
+import React, { FunctionComponent, ReactNode } from 'react';
 import { ITouchEvent } from '@tarojs/components';
 import { BasicComponent } from "../../utils/typings";
 export type TagType = 'default' | 'primary' | 'info' | 'success' | 'warning' | 'danger';

package/dist/es/packages/tag/tag.js

@@ -3,8 +3,8 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useState } from "react";
-import { View, Text } from "@tarojs/components";
-// import { Close } from '@nutui/icons-react-taro'
+import { View } from "@tarojs/components";
+import { Close } from "@nutui/icons-react-taro";
 import classNames from "classnames";
 import { ComponentDefaults } from "../../utils/typings";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
@@ -65,21 +65,13 @@ export var Tag = function(props) {
             setVisible(false);
             onClose && onClose(e);
         }
-    }, closeIcon) : // TODO: icon 适配
-    // <Close
-    //   size={8}
-    //   onClick={(e) => {
-    //     setVisible(false)
-    //     onClose && onClose(e)
-    //   }}
-    // />
-    /*#__PURE__*/ React.createElement(Text, {
+    }, closeIcon) : /*#__PURE__*/ React.createElement(Close, {
+        size: 8,
         onClick: function(e) {
             setVisible(false);
             onClose && onClose(e);
-        },
-        className: "".concat(classPrefix, "-custom-icon")
-    }, "X")) : /*#__PURE__*/ React.createElement(View, {
+        }
+    })) : /*#__PURE__*/ React.createElement(View, {
         className: classes,
         style: _object_spread({}, style, getStyle()),
         onClick: function(e) {

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

@@ -1,23 +1,34 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-textarea {
+  display: flex;
+  flex-direction: column;
   position: relative;
   width: 100%;
   box-sizing: border-box;
-  display: flex;
-  flex-direction: row;
-  background-color: var(--nutui-gray-1, #ffffff);
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-3, 14px));
-  padding: var(--nutui-textarea-padding, 10px 25px);
+  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-gray-1);
+}
+.nut-textarea-error {
+  border: 0.5px solid var(--nutui-red-2);
+  background-color: var(--nutui-red-1);
 }
 .nut-textarea-limit {
-  position: absolute;
-  right: 15px;
-  bottom: 12px;
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-3, 14px));
-  color: var(--nutui-textarea-limit-color, var(--nutui-gray-6, #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-gray-5);
 }
 .nut-textarea-limit-disabled {
   cursor: not-allowed;
-  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-gray-4);
 }
 .nut-textarea-textarea {
   outline: none;
@@ -28,35 +39,39 @@
   min-width: 0;
   margin: 0;
   padding: 0;
-  font-size: var(--nutui-textarea-font, var(--nutui-font-size-3, 14px));
-  color: var(--nutui-textarea-text-color, var(--nutui-gray-7, #1a1a1a));
-  caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-gray-7, #1a1a1a));
+  font-size: var(--nutui-font-size-base, 14px);
+  color: var(--nutui-textarea-text-color, var(--nutui-gray-7));
+  caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-brand-6));
   text-align: left;
   background-color: transparent;
   border: 0;
   resize: none;
 }
 .nut-textarea-textarea .taro-textarea {
+  color: var(--nutui-textarea-text-color, var(--nutui-gray-7));
   background-color: transparent;
   resize: none;
 }
+.nut-textarea-textarea::placeholder {
+  color: var(--nutui-gray-5);
+}
 .nut-textarea-textarea-disabled {
   cursor: not-allowed;
-  color: var(--nutui-textarea-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-gray-4);
+}
+.nut-textarea-textarea-disabled::placeholder {
+  color: var(--nutui-gray-4);
 }
-.nut-textarea .cpoyText {
-  position: absolute;
-  top: -999999px;
-  left: -999999px;
+.nut-textarea-textarea-disabled .taro-textarea {
+  color: var(--nutui-gray-4);
+}
+.nut-textarea-textarea-disabled .taro-textarea::placeholder {
+  color: var(--nutui-gray-4);
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;
   left: 15px;
 }
-.nut-textarea.nut-textarea-rtl .cpoyText {
-  left: auto;
-  right: -999999px;
-}
 
 .taro-textarea {
   background-color: transparent;

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;
     }
   }
 
@@ -29,7 +38,7 @@
     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;
@@ -37,32 +46,49 @@
     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: $color-text-disabled;
+      }
+      .taro-textarea {
+        color: $color-text-disabled;
+        &::placeholder {
+          color: $color-text-disabled;
+        }
+      }
     }
   }
-  .cpoyText {
-    position: absolute;
-    top: -999999px;
-    left: -999999px;
-  }
 
   &.nut-textarea-rtl {
     &-limit {
       right: auto;
       left: 15px;
     }
-
-    .cpoyText {
-      left: auto;
-      right: -999999px;
-    }
   }
 }
 

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

@@ -11,6 +11,8 @@ export interface TextAreaProps extends Omit<TextareaProps, 'showCount' | 'onFocu
     readOnly: boolean;
     disabled: boolean;
     autoSize: boolean;
+    plain: boolean;
+    status: 'error' | 'default';
     onChange: (value: string) => void;
     onBlur: (event: Event) => void;
     onFocus: (event: Event) => void;

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

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
@@ -17,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",
@@ -33,6 +34,8 @@ export var TextArea = function(props) {
         "disabled",
         "autoSize",
         "style",
+        "plain",
+        "status",
         "onChange",
         "onBlur",
         "onFocus"
@@ -72,9 +75,8 @@ export var TextArea = function(props) {
         if (readOnly) return;
         onBlur && onBlur(event);
     };
-    var _obj;
-    return /*#__PURE__*/ React.createElement(View, {
-        className: classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-disabled"), disabled), _define_property(_obj, "".concat(classPrefix, "-rtl"), rtl), _obj), className)
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(View, {
+        className: classNames(classPrefix, disabled ? "".concat(classPrefix, "-disabled") : '', readOnly ? "".concat(classPrefix, "-readonly") : '', rtl ? "".concat(classPrefix, "-rtl") : '', plain ? "".concat(classPrefix, "-plain") : "".concat(classPrefix, "-container"), status ? "".concat(classPrefix, "-").concat(status) : '', className)
     }, /*#__PURE__*/ React.createElement(Textarea, _object_spread({
         nativeProps: {
             style: style,
@@ -90,8 +92,8 @@ export var TextArea = function(props) {
         className: "".concat(classPrefix, "-textarea ").concat(disabled ? "".concat(classPrefix, "-textarea-disabled") : ''),
         style: Taro.getEnv() === 'WEB' ? undefined : style,
         disabled: Taro.getEnv() === 'WEB' ? disabled : disabled || readOnly,
-        value: inputValue,
         // @ts-ignore
+        value: inputValue,
         onInput: function(e) {
             return handleChange(e);
         },
@@ -106,6 +108,6 @@ export var TextArea = function(props) {
         placeholder: placeholder || locale.placeholder
     }, rest)), showCount && /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-limit ").concat(disabled ? "".concat(classPrefix, "-limit-disabled") : '')
-    }, inputValue.length, "/", maxLength < 0 ? 0 : maxLength));
+    }, inputValue.length, "/", maxLength < 0 ? 0 : maxLength)));
 };
 TextArea.displayName = 'NutTextArea';

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

@@ -1,6 +1,12 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-timedetail {
   display: flex;
   align-content: flex-start;
+  flex: 1;
+  min-width: 0;
   flex-wrap: wrap;
   padding: 0 0 50px 12px;
 }
@@ -10,16 +16,16 @@
   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-gray-3, #f5f6fa));
+  background: var(--nutui-timeselect-time-background, var(--nutui-gray-3));
   border-radius: 5px;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
   border: 1px solid transparent;
 }
 .nut-timedetail-item.active {
-  background-color: var(--nutui-color-primary-light, #ffebf1);
-  border: 1px solid var(--nutui-color-primary, #ff0f23);
-  color: var(--nutui-color-primary, #ff0f23);
-  font-weight: var(--nutui-font-weight-bold, 500);
+  background-color: var(--nutui-brand-1);
+  border: 1px solid var(--nutui-brand-6);
+  color: var(--nutui-brand-6);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 
 [dir=rtl] .nut-timedetail,

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

@@ -1,6 +1,8 @@
 .nut-timedetail {
   display: flex;
   align-content: flex-start;
+  flex: 1;
+  min-width: 0;
   flex-wrap: wrap;
   padding: 0 0 50px 12px;
 
@@ -16,7 +18,7 @@
     border: 1px solid transparent;
 
     &.active {
-      background-color: $color-primary-light;
+      background-color: $color-primary-light-pressed;
       border: 1px solid $color-primary;
       color: $color-primary;
       font-weight: $font-weight-bold;

package/dist/es/packages/timedetail/timedetail.js

@@ -3,6 +3,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import React, { useCallback, useMemo } from "react";
 import classNames from "classnames";
+import { View } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     activeDate: '',
@@ -43,10 +44,10 @@ export var TimeDetail = function(props) {
         optionKey,
         activeDate
     ]);
-    return /*#__PURE__*/ React.createElement("div", {
+    return /*#__PURE__*/ React.createElement(View, {
         className: classNames(classPrefix, className)
     }, timeList[optionKey.childrenKey].map(function(item) {
-        return /*#__PURE__*/ React.createElement("span", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: classNames("".concat(classPrefix, "-item"), {
                 active: isActive(item[optionKey.valueKey])
             }),