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

package/dist/cjs/packages/tabs/style/tabs.scss

@@ -4,13 +4,19 @@
   display: flex;
 }
 
+.nut-tabs-horizontal {
+  flex-direction: column;
+}
+
 .nut-tabs-titles {
   display: flex;
   box-sizing: border-box;
   height: $tabs-titles-height;
   user-select: none;
-  overflow: hidden;
+  overflow-x: auto;
+  overflow-y: hidden;
   background: $tabs-titles-background-color;
+  scrollbar-width: none;
 
   &::-webkit-scrollbar {
     display: none;
@@ -20,7 +26,6 @@
 
   .nut-tabs-list {
     width: 100%;
-    height: auto;
     display: flex;
     flex-shrink: 0;
   }
@@ -39,11 +44,6 @@
     }
   }
 
-  &-scrollable {
-    overflow-x: auto;
-    overflow-y: hidden;
-  }
-
   &-item {
     position: relative;
     display: flex;
@@ -59,13 +59,17 @@
     text-overflow: ellipsis;
     white-space: nowrap;
 
+    .nut-icon {
+      color: $tabs-titles-item-color;
+    }
+
     &-left,
     &-right {
       flex: none;
     }
 
     &-text {
-      text-align: center;
+      color: $tabs-titles-item-color;
     }
 
     &-smile,
@@ -75,9 +79,9 @@
       width: 0;
       height: 0;
       content: ' ';
-      bottom: $tabs-tab-line-bottom;
       left: 50%;
       transform: translate(-50%, 0);
+      bottom: $tabs-tab-line-bottom;
       border-radius: $tabs-tab-line-border-radius;
       opacity: $tabs-tab-line-opacity;
       overflow: hidden;
@@ -91,13 +95,18 @@
         font-size: 20px;
         width: 100%;
         height: 100%;
-        color: $color-primary;
       }
     }
 
     &-active {
-      color: $tabs-titles-item-active-color;
-      font-weight: $tabs-titles-item-active-font-weight;
+      .nut-icon {
+        color: $tabs-titles-item-active-color;
+      }
+
+      .nut-tabs-titles-item-text {
+        color: $tabs-titles-item-active-color;
+        font-weight: $tabs-titles-item-active-font-weight;
+      }
 
       .nut-tabs-titles-item-line {
         overflow: unset;
@@ -111,32 +120,46 @@
         overflow: unset;
         width: 40px;
         height: 20px;
+
+        .nut-icon {
+          color: $tabs-titles-item-active-color;
+        }
       }
     }
 
     &-disabled {
       color: $color-text-disabled;
+      .nut-icon {
+        color: $color-text-disabled;
+      }
+      .nut-tabs-titles-item-text {
+        color: $color-text-disabled;
+      }
     }
   }
 
   &-simple {
-    .nut-tabs-titles-item-active {
-      color: $color-title;
-      font-size: $tabs-titles-item-active-font-size;
+    .nut-tabs-titles-item {
+      &-active {
+        .nut-tabs-titles-item-text,
+        .nut-icon {
+          color: $color-title;
+          font-size: $tabs-titles-item-active-font-size;
+        }
+      }
     }
   }
 
   &-card {
     padding: 0;
-    background-color: $color-default-light;
+    // background-color: $color-default-light;
 
     .nut-tabs-titles-item {
       padding: 0;
-
       &-active {
         font-weight: $font-weight-bold;
         background-color: $white;
-        border-radius: $radius-s $radius-s 0 0;
+        border-radius: $radius-base $radius-base 0 0;
       }
     }
   }
@@ -156,11 +179,10 @@
     .nut-tabs-titles-item-active {
       .nut-tabs-titles-item-text {
         background: $color-default-light;
-        color: $color-text;
+        color: $tabs-titles-item-active-color;
         border-radius: $tabs-tab-button-border-radius;
         font-weight: $font-weight-bold;
         background-color: $tabs-tab-button-active-background-color;
-        color: $color-text-link;
         border: $tabs-tab-button-active-border;
       }
     }
@@ -194,35 +216,7 @@
   }
 }
 
-[dir='rtl'] .nut-tabs-titles,
-.nut-rtl .nut-tabs-titles {
-  &-item {
-    &-smile,
-    &-line {
-      left: auto;
-      right: 50%;
-      transform: translate(50%, 0);
-    }
-  }
-  &-divider {
-    .nut-tabs-titles-item {
-      &::after {
-        right: auto;
-        left: 0;
-      }
-    }
-  }
-}
-
-.nut-tabs-horizontal {
-  flex-direction: column;
-  position: relative;
-}
-
 .nut-tabs-vertical {
-  flex-direction: row;
-  width: 100%;
-
   .nut-tabs-ellipsis {
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -230,47 +224,26 @@
   }
 
   .nut-tabs-titles {
-    box-sizing: border-box;
     flex-direction: column;
     height: 100%;
-    padding: 0;
     width: $tabs-vertical-titles-width;
     flex-shrink: 0;
 
     .nut-tabs-list {
-      width: 100%;
-      display: flex;
       flex-direction: column;
-      flex-shrink: 0;
-    }
-
-    &-line {
-      .nut-tabs-titles-item {
-        padding-left: 14px;
-      }
     }
   }
 
-  .nut-tabs-titles-scrollable {
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-
   .nut-tabs-titles-item {
     height: $tabs-vertical-titles-item-height;
-    margin: 0;
     flex: none;
 
     &-smile {
-      width: 0;
-      height: 0;
       overflow: hidden;
       transition: width 0.3s ease;
     }
 
     &-line {
-      width: 0;
-      height: 0;
       transform: translate(0, -50%);
       transition: height 0.3s ease;
 
@@ -292,8 +265,6 @@
         right: -12px;
         bottom: -2%;
         left: auto;
-        width: 40px;
-        height: 20px;
         transform: rotate(320deg);
       }
     }
@@ -302,15 +273,13 @@
   .nut-tabs-horizontal {
     .nut-tabs-titles {
       flex-direction: row;
-      overflow-x: auto;
-      overflow-y: hidden;
       height: $tabs-titles-height;
+      width: 100%;
+      padding: 0 !important;
 
       .nut-tabs-list {
-        width: 100%;
-        display: flex;
         flex-direction: row;
-        flex-shrink: 0;
+        height: auto;
       }
     }
 
@@ -324,6 +293,9 @@
       .nut-tabs-titles-item-line {
         left: 50%;
         transform: translate(-50%, 0);
+        width: $tabs-tab-line-width;
+        height: $tabs-tab-line-height;
+        background: $tabs-tab-line-color;
       }
 
       .nut-tabs-titles-item-smile {
@@ -347,32 +319,32 @@
       height: 100%;
     }
   }
+}
 
-  .nut-tabs-horizontal {
-    .nut-tabs-titles {
-      display: flex;
-      flex-direction: row;
-      padding: 0 !important;
-      width: 100%;
-
-      .nut-tabs-titles-item {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        flex: 1 0 auto;
+.nut-tabs-content {
+  display: flex;
+  box-sizing: border-box;
 
-        &-active {
-          color: $color-primary;
-          font-weight: $tabs-titles-item-active-font-weight;
-          font-size: $tabs-titles-item-active-font-size;
+  &-wrap {
+    overflow: hidden;
+  }
+}
 
-          .nut-tabs-titles-item-line {
-            content: ' ';
-            width: $tabs-tab-line-width;
-            height: $tabs-tab-line-height;
-            background: $tabs-tab-line-color;
-          }
-        }
+[dir='rtl'] .nut-tabs-titles,
+.nut-rtl .nut-tabs-titles {
+  &-item {
+    &-smile,
+    &-line {
+      left: auto;
+      right: 50%;
+      transform: translate(50%, 0);
+    }
+  }
+  &-divider {
+    .nut-tabs-titles-item {
+      &::after {
+        right: auto;
+        left: 0;
       }
     }
   }
@@ -420,12 +392,3 @@
     }
   }
 }
-
-.nut-tabs-content {
-  &-wrap {
-    overflow: hidden;
-  }
-
-  display: flex;
-  box-sizing: border-box;
-}

package/dist/cjs/packages/tabs/tabs.js

@@ -63,7 +63,6 @@ var Tabs = function Tabs(props) {
         onChange: onChange
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
     var titleItemsRef = (0, _react.useRef)([]);
-    var navRef = (0, _react.useRef)(null);
     var getTitles = function getTitles() {
         var titles = [];
         _react.default.Children.forEach(children, function(child, idx) {
@@ -100,7 +99,7 @@ var Tabs = function Tabs(props) {
     ]);
     var classes = (0, _classnames.default)(classPrefix, "".concat(classPrefix, "-").concat(direction), className);
     var _obj;
-    var classesTitle = (0, _classnames.default)("".concat(classPrefix, "-titles"), (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-titles-").concat(activeType), activeType), (0, _define_property._)(_obj, "".concat(classPrefix, "-titles-scrollable"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-titles-").concat(align), align), _obj));
+    var classesTitle = (0, _classnames.default)("".concat(classPrefix, "-titles"), (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-titles-").concat(activeType), activeType), (0, _define_property._)(_obj, "".concat(classPrefix, "-titles-").concat(align), align), _obj));
     var tabsActiveStyle = {
         color: activeType === 'smile' ? activeColor : '',
         background: activeType === 'line' ? activeColor : ''
@@ -164,6 +163,8 @@ var Tabs = function Tabs(props) {
                         return prev + curr.width;
                     }, 0);
                     to = left - (navRectRef.current.width - titleRect.width) / 2;
+                    // to < 0 说明不需要进行滚动，页面元素已全部显示出来
+                    if (to < 0) return;
                     to = rtl ? -to : to;
                 }
                 (0, _taro.nextTick)(function() {
@@ -213,8 +214,7 @@ var Tabs = function Tabs(props) {
         className: classesTitle,
         style: (0, _object_spread._)({}, tabStyle)
     }, /*#__PURE__*/ _react.default.createElement(_components.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.default.createElement(_components.View, {

package/dist/cjs/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/cjs/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/cjs/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/cjs/packages/tag/tag.js

@@ -16,6 +16,7 @@ var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _components = require("@tarojs/components");
+var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _typings = require("../../utils/typings");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
@@ -76,20 +77,13 @@ var Tag = function Tag(props) {
             setVisible(false);
             onClose && onClose(e);
         }
-    }, closeIcon) : // <Close
-    //   size={8}
-    //   onClick={(e) => {
-    //     setVisible(false)
-    //     onClose && onClose(e)
-    //   }}
-    // />
-    /*#__PURE__*/ _react.default.createElement(_components.Text, {
+    }, closeIcon) : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, {
+        size: 8,
         onClick: function onClick(e) {
             setVisible(false);
             onClose && onClose(e);
-        },
-        className: "".concat(classPrefix, "-custom-icon")
-    }, "X")) : /*#__PURE__*/ _react.default.createElement(_components.View, {
+        }
+    })) : /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: classes,
         style: (0, _object_spread._)({}, style, getStyle()),
         onClick: function onClick(e) {

package/dist/cjs/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;