@nutui/nutui-react 3.0.0-beta.1 → 3.0.0-beta.10

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

@@ -1,3 +1,67 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-overlay {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
+  position: fixed;
+  /* #endif */
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 100%;
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  z-index: var(--nutui-overlay-zIndex, 1000);
+}
+
+.nut-overflow-hidden {
+  overflow: hidden !important;
+}
+
+@keyframes nut-fade-in {
+  0% {
+    opacity: 0;
+  }
+  1% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+@keyframes nut-fade-out {
+  0% {
+    opacity: 1;
+  }
+  1% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+.nut-overlay-slide-enter-active, .nut-overlay-slide-appear-active {
+  animation-fill-mode: both;
+  animation-name: nut-fade-in;
+  animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
+}
+.nut-overlay-slide-exit-active {
+  animation-fill-mode: both;
+  animation-name: nut-fade-out;
+  animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
+}
+
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 @keyframes rotation {
   0% {
     -webkit-transform: rotate(0deg);
@@ -7,12 +71,20 @@
   }
 }
 .nut-toast {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   left: 0;
   top: 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
   width: 100%;
   height: 100%;
-  text-align: center;
   pointer-events: none;
   z-index: 1300;
 }
@@ -20,39 +92,59 @@
   --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
   --nutui-overlay-zIndex: 1300;
 }
-.nut-toast-small .nut-toast-inner {
-  font-size: var(--nutui-font-size-s, 12px);
-}
-.nut-toast-large .nut-toast-inner {
-  font-size: var(--nutui-font-size-l, 16px);
+.nut-toast-overlay-default-taro {
+  /* #ifdef harmony */
+  background-color: rgba(0, 0, 0, 0);
+  z-index: 1300;
+  /* #endif */
+  /* #ifndef harmony */
+  --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
+  --nutui-overlay-zIndex: 1300;
+  /* #endif */
 }
 .nut-toast-inner {
-  display: flex;
-  flex-direction: column;
   position: absolute;
-  left: 50%;
   top: var(--nutui-toast-inner-top, 50%);
-  min-width: 30%;
-  max-width: 95.7%;
+  transform: translate(0, -50%);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  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);
+  background: var(--nutui-toast-inner-bg-color, var(--nutui-black-10));
+  border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xl, 12px));
   color: var(--nutui-toast-font-color, #ffffff);
-  transform: translate(-50%, -50%);
 }
-.nut-toast-inner.normal {
+.nut-toast-inner-descrption {
+  max-width: 68.2%;
+}
+.nut-toast-inner-normal {
   word-break: normal;
   word-wrap: normal;
 }
-.nut-toast-inner.break-word {
+.nut-toast-inner-break-word {
   word-break: normal;
   word-wrap: break-word;
 }
+.nut-toast-inner-small {
+  font-size: var(--nutui-font-size-s, 12px);
+}
+.nut-toast-inner-large {
+  font-size: var(--nutui-font-size-l, 16px);
+}
 .nut-toast-center {
-  top: var(--nutui-toast-inner-top, 50%);
+  /* #ifdef rn */
+  top: var(--nutui-toast-inner-top, 38%);
+  /* #endif */
+  /* #ifndef rn */
+  top: var(--nutui-toast-inner-top, 48%);
+  /* #endif */
 }
 .nut-toast-bottom {
   top: var(--nutui-toast-inner-top, 80%);
@@ -60,40 +152,42 @@
 .nut-toast-top {
   top: var(--nutui-toast-inner-top, 20%);
 }
-.nut-toast-text:empty {
-  margin-bottom: -8px;
+.nut-toast-text {
+  color: #ffffff;
+  text-align: var(--nutui-toast-inner-text-align, center);
+  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-title:empty {
-  margin-bottom: -8px;
+.nut-toast .nut-icon {
+  width: 24px;
+  height: 24px;
+  color: #ffffff;
 }
-.nut-toast-has-icon .nut-toast-icon-wrapper {
+.nut-toast-icon-wrapper {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-bottom: 8px;
+  margin: 3px 0 5px;
+  color: #ffffff;
 }
-.nut-toast-has-icon .nut-toast-icon-wrapper .nut-icon {
+.nut-toast-icon-wrapper-icon {
   width: 24px;
   height: 24px;
 }
-.nut-toast-loading .nut-toast-inner {
-  display: inline-flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-.nut-toast-loading .nut-toast-icon-wrapper {
-  animation: rotation 2s linear infinite;
+.nut-toast-rtl {
+  left: auto;
+  right: 0;
 }
-.nut-toast-loading .nut-toast-icon-wrapper .nut-icon {
-  width: 24px;
-  height: 24px;
+.nut-toast-rtl-inner {
+  left: auto;
+  right: 50%;
 }
 
 [dir=rtl] .nut-toast,
@@ -105,7 +199,6 @@
 .nut-rtl .nut-toast-inner {
   left: auto;
   right: 50%;
-  transform: translate(50%, -50%);
 }
 
 .toast-fade-enter-active {

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

@@ -9,12 +9,20 @@
 }
 
 .nut-toast {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   left: 0;
   top: 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
   width: 100%;
   height: 100%;
-  text-align: center;
   pointer-events: none;
   z-index: 1300;
 
@@ -23,26 +31,29 @@
     --nutui-overlay-zIndex: 1300;
   }
 
-  &-small {
-    .nut-toast-inner {
-      font-size: $font-size-s;
-    }
-  }
-
-  &-large {
-    .nut-toast-inner {
-      font-size: $font-size-l;
-    }
+  &-overlay-default-taro {
+    /* #ifdef harmony */
+    background-color: rgba(0, 0, 0, 0);
+    z-index: 1300;
+    /* #endif */
+    /* #ifndef harmony */
+    --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
+    --nutui-overlay-zIndex: 1300;
+    /* #endif */
   }
 
   &-inner {
-    display: flex;
-    flex-direction: column;
     position: absolute;
-    left: 50%;
     top: $toast-inner-top;
-    min-width: 30%;
-    max-width: 95.7%;
+    transform: translate(-0, -50%);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    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;
@@ -50,21 +61,38 @@
     background: $toast-inner-bg-color;
     border-radius: $toast-inner-border-radius;
     color: $toast-font-color;
-    transform: translate(-50%, -50%);
 
-    &.normal {
+    &-descrption {
+      max-width: 68.2%;
+      // max-width: 256px;
+    }
+
+    &-normal {
       word-break: normal;
       word-wrap: normal;
     }
 
-    &.break-word {
+    &-break-word {
       word-break: normal;
       word-wrap: break-word;
     }
+
+    &-small {
+      font-size: $font-size-s;
+    }
+
+    &-large {
+      font-size: $font-size-l;
+    }
   }
 
   &-center {
-    top: var(--nutui-toast-inner-top, 50%);
+    /* #ifdef rn */
+    top: var(--nutui-toast-inner-top, 38%);
+    /* #endif */
+    /* #ifndef rn */
+    top: var(--nutui-toast-inner-top, 48%);
+    /* #endif */
   }
 
   &-bottom {
@@ -76,51 +104,46 @@
   }
 
   &-text {
-    &:empty {
-      margin-bottom: -8px;
-    }
+    color: #ffffff;
+    text-align: $toast-inner-text-align;
+    line-height: 20px;
   }
 
   &-title {
     color: #ffffff;
     font-size: $toast-title-font-size;
-    font-weight: 500;
-
-    &:empty {
-      margin-bottom: -8px;
-    }
+    font-weight: 600;
+    text-align: $toast-inner-text-align;
+    line-height: 22px;
   }
 
-  &-has-icon {
-    .nut-toast-icon-wrapper {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-bottom: 8px;
-
-      .nut-icon {
-        width: 24px;
-        height: 24px;
-      }
-    }
+  .nut-icon {
+    width: 24px;
+    height: 24px;
+    color: #ffffff;
   }
 
-  &-loading {
-    .nut-toast-inner {
-      display: inline-flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
+  &-icon-wrapper {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 3px 0 5px;
+    color: #ffffff;
+
+    &-icon {
+      width: 24px;
+      height: 24px;
     }
+  }
 
-    .nut-toast-icon-wrapper {
-      animation: rotation 2s linear infinite;
+  &-rtl {
+    left: auto;
+    right: 0;
 
-      .nut-icon {
-        width: 24px;
-        height: 24px;
-      }
+    &-inner {
+      left: auto;
+      right: 50%;
     }
   }
 }
@@ -133,7 +156,6 @@
   &-inner {
     left: auto;
     right: 50%;
-    transform: translate(50%, -50%);
   }
 }
 

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

@@ -5,66 +5,18 @@ export type ToastIcon = 'success' | 'fail' | 'loading' | 'warn' | React.ReactNod
 export type ToastWordBreak = 'normal' | 'break-all' | 'break-word';
 export interface ToastProps extends BasicComponent {
     id?: string;
-    /**
-    * 展示时长（秒），值为 0 时，toast 不会自动消失
-    * @default 2
-    */
-    duration?: number
-    /**
-    * toast展示位置
-    * @default center
-    */
-    position?: ToastPosition
-    /**
-    * 标题
-    * @default -
-    */
-    title?: string
-    /**
-    * 是否在点击遮罩层后关闭提示
-    * @default false
-    */
-    closeOnOverlayClick?: boolean
-    /**
-    * 背景是否锁定
-    * @default false
-    */
-    lockScroll?: boolean
-    /**
-    * 文案尺寸，三选一
-    * @default base
-    */
-    size?: string | number
-    /**
-    * 自定义图标
-    * @default -
-    */
-    icon?: ToastIcon
-    /**
-    * 消息文本内容
-    * @default -
-    */
-    content?: React.ReactNode
-    /**
-    * 关闭时触发的事件
-    * @default () => void
-    */
-    onClose?: () => void
-    /**
-    * 自定义内容区类名
-    * @default -
-    */
-    contentClassName?: string
-    /**
-    * 自定义内容区样式
-    * @default -
-    */
-    contentStyle?: React.CSSProperties
-    /**
-    * 换行截断方式
-    * @default break-all
-    */
-    wordBreak?: ToastWordBreak
+    duration?: number;
+    position?: ToastPosition;
+    title?: string;
+    closeOnOverlayClick?: boolean;
+    lockScroll?: boolean;
+    size?: string | number;
+    icon?: ToastIcon;
+    content?: React.ReactNode;
+    onClose?: () => void;
+    contentClassName?: string;
+    contentStyle?: React.CSSProperties;
+    wordBreak?: ToastWordBreak;
 }
 declare function show(option: ToastProps | string): void;
 declare function config(config: ToastProps): void;

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

@@ -11,11 +11,11 @@ var options = _object_spread_props(_object_spread({}, ComponentDefaults), {
     title: '',
     size: 'base',
     icon: null,
-    onClose: function() {},
     closeOnOverlayClick: false,
     lockScroll: false,
     contentClassName: '',
-    wordBreak: 'break-all'
+    wordBreak: 'break-all',
+    onClose: function() {}
 });
 function getInstance(props, callback) {
     if (messageInstance) {