@nutui/nutui-react 3.0.0-beta.5 → 3.0.0-beta.6

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

@@ -1,12 +1,13 @@
 .nut-switch {
   cursor: pointer;
+  position: relative;
   display: flex;
   flex-direction: row;
   align-items: center;
-  width: $switch-width;
+  min-width: $switch-width;
   height: $switch-height;
   line-height: $switch-line-height;
-  background-color: $switch-open-background-color;
+  background-color: $switch-active-background-color;
   border-radius: $switch-border-radius;
   background-size: 100% 100%;
   background-repeat: no-repeat;
@@ -14,64 +15,79 @@
   flex: 0 0 auto; // 防止被压缩
 
   &-button {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: center;
-    height: $switch-inside-height;
-    width: $switch-inside-width;
-    transform: $switch-inside-close-transform;
+    height: calc($switch-height - $switch-border-width * 2);
+    width: calc($switch-height - $switch-border-width * 2);
     border-radius: $switch-inside-border-radius;
     background: $color-primary-text;
-    transition: transform 0.3s;
-    box-shadow: $switch-button-box-shadow;
+    transition: left 0.3s linear;
+    box-shadow: $switch-inside-box-shadow;
     &-open {
-      transform: $switch-inside-open-transform;
+      left: calc(100% - $switch-height + $switch-border-width);
       &-rtl {
-        transform: var(--nutui-switch-inside-open-transform, translateX(-18px));
+        left: $switch-border-width;
       }
     }
     &-close {
-      transform: $switch-inside-close-transform;
+      left: $switch-border-width;
       &-rtl {
-        transform: var(--nutui-switch-inside-close-transform, translateX(-2px));
+        left: calc(100% - $switch-height + $switch-border-width);
       }
     }
   }
 
   &-close {
-    background-color: $switch-close-background-color;
+    background-color: $switch-inactive-background-color;
     &-line {
-      width: 12px;
+      width: calc(($switch-height - $switch-border-width * 2) / 2);
       height: 2px;
-      background: $switch-close-line-background-color;
+      background: $switch-inactive-line-background-color;
       border-radius: 2px;
     }
   }
 
-  &-disabled {
-    background-color: $switch-open-disabled-background-color;
-    &-close {
-      background-color: $switch-close-disabled-background-color;
-    }
-  }
-
   &-label {
-    color: $color-primary-text;
-    font-size: $font-size-s;
-
+    display: inline-flex;
+    align-items: center;
+    height: 100%;
+    white-space: nowrap;
+    color: $switch-label-text-color;
+    font-size: $switch-label-font-size;
+    .nut-icon {
+      color: $switch-label-text-color;
+    }
     &-open {
-      transform: translateX(-18px);
+      margin: 0 calc($switch-height - $switch-border-width + 3px) 0 7px;
       &-rtl {
-        transform: translateX(18px);
+        margin: 0 7px 0 calc($switch-height - $switch-border-width + 3px);
       }
     }
 
     &-close {
-      transform: translateX(18px);
+      margin: 0 7px 0 calc($switch-height - $switch-border-width + 3px);
       &-rtl {
-        transform: translateX(-18px);
+        margin: 0 calc($switch-height - $switch-border-width + 3px) 0 7px;
       }
     }
+
+    &-close-disabled {
+      color: $switch-inactive-disabled-label-text-color;
+      .nut-icon {
+        color: $switch-inactive-disabled-label-text-color;
+      }
+    }
+  }
+
+  &-disabled {
+    background-color: $switch-active-disabled-background-color;
+    &-close {
+      background-color: $switch-inactive-disabled-background-color;
+    }
   }
 }

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

@@ -4,8 +4,8 @@ export interface SwitchProps extends BasicComponent {
     checked: boolean;
     defaultChecked: boolean;
     disabled: boolean;
-    activeText: string;
-    inactiveText: string;
+    activeText: React.ReactNode;
+    inactiveText: React.ReactNode;
     onChange: (val: boolean, event: React.MouseEvent) => void;
 }
 export declare const Switch: FunctionComponent<Partial<SwitchProps>>;

package/dist/es/packages/switch/switch.js

@@ -62,16 +62,8 @@ export var Switch = function(props) {
         ])
     }, !value && !activeText && /*#__PURE__*/ React.createElement("div", {
         className: "".concat(classPrefix, "-close-line")
-    }), activeText && /*#__PURE__*/ React.createElement("div", {
-        className: classNames([
-            [
-                "".concat(classPrefix, "-label")
-            ],
-            [
-                value ? "".concat(classPrefix, "-label-open") : "".concat(classPrefix, "-label-close")
-            ],
-            (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix, "-label-open-rtl"), rtl && value), _define_property(_obj1, "".concat(classPrefix, "-button-close-rtl"), rtl && !value), _obj1)
-        ])
-    }, value ? activeText : inactiveText)));
+    })), activeText && /*#__PURE__*/ React.createElement("div", {
+        className: classNames("".concat(classPrefix, "-label"), (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix, "-label-open"), value), _define_property(_obj1, "".concat(classPrefix, "-label-close"), !value), _define_property(_obj1, "".concat(classPrefix, "-label-open-rtl"), rtl && value), _define_property(_obj1, "".concat(classPrefix, "-label-close-rtl"), rtl && !value), _define_property(_obj1, "".concat(classPrefix, "-label-close-disabled"), disabled && !value), _obj1))
+    }, value ? activeText : inactiveText));
 };
 Switch.displayName = 'NutSwitch';

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-badge {
   position: relative;
   display: inline-flex;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-badge {
   position: relative;
   display: inline-flex;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-table {
   overflow: hidden;
   position: relative;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-tabpane {
   width: 100%;
   flex-shrink: 0;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-tabpane {
   width: 100%;
   flex-shrink: 0;

package/dist/es/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/es/packages/textarea/style/style.css

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

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;
 }

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;
 

package/dist/es/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/es/packages/timeselect/timeselect.d.ts

@@ -17,50 +17,14 @@ export interface OptionKeyType {
     childrenKey: string;
 }
 export interface TimeSelectProps extends BasicComponent {
-    /**
-    * 是否显示弹层
-    * @default false
-    */
-    visible: boolean
-    /**
-    * 是否支持多选
-    * @default false
-    */
-    multiple?: boolean
-    /**
-    * 弹层标题
-    * @default 取件时间
-    */
-    title?: ReactNode
-    /**
-    * 默认选中的值，非受控
-    * @default -
-    */
-    defaultValue: DateType[]
-    /**
-    * 数据
-    * @default -
-    */
-    options: DateType[]
-    /**
-    * 配置数据中的关键字, valueKey, textKey, childrenKey
-    * @default -
-    */
-    optionKey: OptionKeyType
-    /**
-    * 关闭遮罩之后的回调
-    * @default -
-    */
-    onSelect?: (value: DateType[]) => void
-    /**
-    * 点击左栏时的回调
-    * @default -
-    */
-    onDateChange?: (date: DateType, value: DateType[]) => void
-    /**
-    * 点击右侧选项时的回调
-    * @default -
-    */
-    onTimeChange?: (time: TimeType, value: DateType[]) => void
+    visible: boolean;
+    multiple?: boolean;
+    title?: ReactNode;
+    defaultValue: DateType[];
+    options: DateType[];
+    optionKey: OptionKeyType;
+    onSelect?: (value: DateType[]) => void;
+    onDateChange?: (date: DateType, value: DateType[]) => void;
+    onTimeChange?: (time: TimeType, value: DateType[]) => void;
 }
 export declare const TimeSelect: FunctionComponent<Partial<TimeSelectProps>>;

package/dist/es/packages/toast/Notification.js

@@ -129,13 +129,13 @@ var Notification = /*#__PURE__*/ function(_superClass) {
                     className: "".concat(classPrefix, " ").concat(classes),
                     id: "toast-".concat(id)
                 }, /*#__PURE__*/ React.createElement("div", {
-                    className: "".concat(classPrefix, "-inner ").concat(classPrefix, "-").concat(position, " ").concat(contentClassName, " ").concat(classPrefix, "-inner-").concat(size, " ").concat(classPrefix, "-inner-").concat(wordBreak),
+                    className: classNames("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), _define_property({}, "".concat(classPrefix, "-inner-descrption"), content)),
                     style: _object_spread({}, contentStyle)
                 }, this.renderIcon(), title ? /*#__PURE__*/ React.createElement("div", {
                     className: "".concat(classPrefix, "-title")
-                }, title) : null, /*#__PURE__*/ React.createElement("span", {
-                    className: "".concat(classPrefix, "-text ").concat(content ? '' : "".concat(classPrefix, "-text-empty"))
-                }, content)))));
+                }, title) : null, content ? /*#__PURE__*/ React.createElement("span", {
+                    className: "".concat(classPrefix, "-text")
+                }, content) : null))));
             }
         }
     ]);

package/dist/es/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/es/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/es/packages/tour/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;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-trendarrow {
   display: flex;
   flex-direction: row;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-progress {
   display: flex;
   align-items: center;

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

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

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-horizontal-items {
   float: left;
 }

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-watermark {
   position: absolute;
   z-index: var(--nutui-watermark-z-index, 1200);