@nutui/nutui-react-taro 3.0.0-beta.5 → 3.0.0-beta.7

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

@@ -4,12 +4,17 @@
   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;
 
@@ -21,7 +26,6 @@
 
   .nut-tabs-list {
     width: 100%;
-    height: auto;
     display: flex;
     flex-shrink: 0;
   }
@@ -40,11 +44,6 @@
     }
   }
 
-  &-scrollable {
-    overflow-x: auto;
-    overflow-y: hidden;
-  }
-
   &-item {
     position: relative;
     display: flex;
@@ -60,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,
@@ -76,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;
@@ -92,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;
@@ -112,18 +120,33 @@
         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;
+        }
+      }
     }
   }
 
@@ -133,7 +156,6 @@
 
     .nut-tabs-titles-item {
       padding: 0;
-
       &-active {
         font-weight: $font-weight-bold;
         background-color: $white;
@@ -157,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-primary;
         border: $tabs-tab-button-active-border;
       }
     }
@@ -195,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;
@@ -231,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;
 
@@ -293,8 +265,6 @@
         right: -12px;
         bottom: -2%;
         left: auto;
-        width: 40px;
-        height: 20px;
         transform: rotate(320deg);
       }
     }
@@ -303,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;
       }
     }
 
@@ -325,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 {
@@ -348,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;
       }
     }
   }
@@ -421,12 +392,3 @@
     }
   }
 }
-
-.nut-tabs-content {
-  display: flex;
-  box-sizing: border-box;
-
-  &-wrap {
-    overflow: hidden;
-  }
-}

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 : ''
@@ -215,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,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-tag {
   padding: var(--nutui-tag-padding, 0px 2px);
   display: flex;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-textarea {
   position: relative;
   width: 100%;

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

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

package/dist/cjs/packages/timeselect/style/style.css

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -146,9 +150,6 @@
   bottom: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 300px;
-  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
@@ -412,6 +413,8 @@
 .nut-timedetail {
   display: flex;
   align-content: flex-start;
+  flex: 1;
+  min-width: 0;
   flex-wrap: wrap;
   padding: 0 0 50px 12px;
 }

package/dist/cjs/packages/toast/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -106,16 +110,20 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-width: 30%;
-  max-width: 95.7%;
+  min-width: 96px;
+  max-width: 60%;
+  box-sizing: border-box;
   font-size: var(--nutui-toast-text-font-size, 14px);
   text-align: var(--nutui-toast-inner-text-align, center);
-  padding: var(--nutui-toast-inner-padding, 16px 24px);
+  padding: var(--nutui-toast-inner-padding, 13px 16px);
   word-break: break-all;
   background: var(--nutui-toast-inner-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
-  border-radius: var(--nutui-toast-inner-border-radius, 16px);
+  border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xl, 12px));
   color: var(--nutui-toast-font-color, #ffffff);
 }
+.nut-toast-inner-descrption {
+  max-width: 68.2%;
+}
 .nut-toast-inner-normal {
   word-break: normal;
   word-wrap: normal;
@@ -147,17 +155,16 @@
 .nut-toast-text {
   color: #ffffff;
   text-align: var(--nutui-toast-inner-text-align, center);
-}
-.nut-toast-text-empty {
-  margin-bottom: -8px;
+  line-height: 20px;
 }
 .nut-toast-title {
   color: #ffffff;
   font-size: var(--nutui-toast-title-font-size, 16px);
-  font-weight: 500;
+  font-weight: 600;
   text-align: var(--nutui-toast-inner-text-align, center);
+  line-height: 22px;
 }
-.nut-toast-icon {
+.nut-toast .nut-icon {
   width: 24px;
   height: 24px;
   color: #ffffff;
@@ -167,7 +174,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-bottom: 8px;
+  margin: 3px 0 5px;
   color: #ffffff;
 }
 .nut-toast-icon-wrapper-icon {

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

@@ -50,8 +50,10 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    min-width: 30%;
-    max-width: 95.7%;
+    min-width: 96px;
+    max-width: 60%;
+    // max-width: 224px;
+    box-sizing: border-box;
     font-size: $toast-text-font-size;
     text-align: $toast-inner-text-align;
     padding: $toast-inner-padding;
@@ -60,6 +62,11 @@
     border-radius: $toast-inner-border-radius;
     color: $toast-font-color;
 
+    &-descrption {
+      max-width: 68.2%;
+      // max-width: 256px;
+    }
+
     &-normal {
       word-break: normal;
       word-wrap: normal;
@@ -99,19 +106,18 @@
   &-text {
     color: #ffffff;
     text-align: $toast-inner-text-align;
-    &-empty {
-      margin-bottom: -8px;
-    }
+    line-height: 20px;
   }
 
   &-title {
     color: #ffffff;
     font-size: $toast-title-font-size;
-    font-weight: 500;
+    font-weight: 600;
     text-align: $toast-inner-text-align;
+    line-height: 22px;
   }
 
-  &-icon {
+  .nut-icon {
     width: 24px;
     height: 24px;
     color: #ffffff;
@@ -122,7 +128,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-bottom: 8px;
+    margin: 3px 0 5px;
     color: #ffffff;
 
     &-icon {

package/dist/cjs/packages/toast/toast.d.ts

@@ -12,7 +12,6 @@ export interface ToastProps extends BasicComponent {
     lockScroll: boolean;
     size: ToastSize;
     icon: React.ReactNode;
-    iconSize: string;
     maskClassName?: string;
     content: React.ReactNode;
     contentClassName?: string;
@@ -21,10 +20,6 @@ export interface ToastProps extends BasicComponent {
     visible: boolean;
     wordBreak?: ToastWordBreak;
     onClose: () => void;
-    /**
-     * @deprecated Please use `content` prop instead.
-     */
-    msg: React.ReactNode;
 }
 export declare const Toast: FunctionComponent<Partial<ToastProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'content'>> & {
     show: typeof show;

package/dist/cjs/packages/toast/toast.js

@@ -21,6 +21,7 @@ _export(exports, {
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+var _define_property = require("@swc/helpers/_/_define_property");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
@@ -42,9 +43,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     title: '',
     size: 'base',
     icon: null,
-    iconSize: '20',
     content: '',
-    msg: '',
     type: 'text',
     closeOnOverlayClick: false,
     lockScroll: false,
@@ -55,7 +54,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var classPrefix = 'nut-toast';
 var Toast = function Toast(props) {
-    var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.mergeProps)(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, position = _useParams_params.position, contentStyle = _useParams_params.contentStyle, icon = _useParams_params.icon, iconSize = _useParams_params.iconSize, content = _useParams_params.content, msg = _useParams_params.msg, duration = _useParams_params.duration, type = _useParams_params.type, title = _useParams_params.title, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, lockScroll = _useParams_params.lockScroll, contentClassName = _useParams_params.contentClassName, visible = _useParams_params.visible, size = _useParams_params.size, className = _useParams_params.className, style = _useParams_params.style, onClose = _useParams_params.onClose, wordBreak = _useParams_params.wordBreak, setParams = _useParams.setParams;
+    var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.mergeProps)(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, position = _useParams_params.position, contentStyle = _useParams_params.contentStyle, icon = _useParams_params.icon, content = _useParams_params.content, duration = _useParams_params.duration, type = _useParams_params.type, title = _useParams_params.title, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, lockScroll = _useParams_params.lockScroll, contentClassName = _useParams_params.contentClassName, visible = _useParams_params.visible, size = _useParams_params.size, className = _useParams_params.className, style = _useParams_params.style, onClose = _useParams_params.onClose, wordBreak = _useParams_params.wordBreak, setParams = _useParams.setParams;
     var timer = (0, _react.useRef)(-1);
     var rtl = (0, _index1.useRtl)();
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
@@ -124,23 +123,10 @@ var Toast = function Toast(props) {
             return icon;
         }
         return ({
-            success: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Success, {
-                className: "nut-toast-icon",
-                color: "#ffffff",
-                size: iconSize
-            }),
-            fail: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, {
-                color: "#ffffff",
-                size: iconSize
-            }),
-            warn: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Tips, {
-                color: "#ffffff",
-                size: iconSize
-            }),
-            loading: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, {
-                color: "#ffffff",
-                size: iconSize
-            })
+            success: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Success, null),
+            fail: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, null),
+            warn: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Tips, null),
+            loading: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, null)
         })[type];
     };
     var classes = (0, _classnames.default)({
@@ -164,15 +150,15 @@ var Toast = function Toast(props) {
         className: "".concat(classPrefix, " ").concat(classes),
         id: id
     }, /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "".concat(classPrefix, "-inner ").concat(classPrefix, "-").concat(position, " ").concat(contentClassName, " ").concat(classPrefix, "-inner-").concat(size, " ").concat(classPrefix, "-inner-").concat(wordBreak),
+        className: (0, _classnames.default)("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), (0, _define_property._)({}, "".concat(classPrefix, "-inner-descrption"), content)),
         style: (0, _object_spread._)({}, styles, contentStyle)
     }, hasIcon() ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-icon-wrapper")
     }, iconName()) : null, title ? /*#__PURE__*/ _react.default.createElement(_components.Text, {
         className: "".concat(classPrefix, "-title")
-    }, title) : null, /*#__PURE__*/ _react.default.createElement(_components.Text, {
-        className: "".concat(classPrefix, "-text  ").concat(content ? '' : "".concat(classPrefix, "-text-empty"))
-    }, content || msg)))) : null);
+    }, title) : null, content ? /*#__PURE__*/ _react.default.createElement(_components.Text, {
+        className: "".concat(classPrefix, "-text")
+    }, content) : null))) : null);
 };
 function show(selector, options) {
     // eslint-disable-next-line react-hooks/rules-of-hooks