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

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-small;
-    }
-  }
-
-  &-large {
-    .nut-toast-inner {
-      font-size: $font-size-large;
-    }
+  &-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,82 +5,21 @@ export type ToastSize = 'small' | 'base' | 'large';
 export type ToastWordBreak = 'normal' | 'break-all' | 'break-word';
 export interface ToastProps extends BasicComponent {
     id?: string;
+    duration: number;
+    position?: ToastPosition;
+    title: string;
+    closeOnOverlayClick: boolean;
+    lockScroll: boolean;
+    size: ToastSize;
+    icon: React.ReactNode;
     maskClassName?: string;
-    /**
-    * 自定义内容区类名
-    * @default -
-    */
-    contentClassName?: string
-    /**
-    * 自定义内容区样式
-    * @default -
-    */
-    contentStyle?: React.CSSProperties
-    /**
-    * 自定义图标，对应icon组件，支持图片链接
-    * @default -
-    */
-    icon: React.ReactNode
-    iconSize: string;
-    /**
-    * 消息文本内容
-    * @default -
-    */
-    content: React.ReactNode
-    /**
-    * 展示时长（秒），值为 0 时，toast 不会自动消失（loading类型默认为0）
-    * @default 2
-    */
-    duration: number
-    /**
-    * toast展示位置
-    * @default center
-    */
-    position?: ToastPosition
-    /**
-    * 弹框类型 可选值（text、success、fail、warn、loading）
-    * @default -
-    */
-    type: string
-    /**
-    * 标题
-    * @default -
-    */
-    title: string
-    /**
-    * 是否在点击遮罩层后关闭提示
-    * @default false
-    */
-    closeOnOverlayClick: boolean
-    /**
-    * 背景是否锁定
-    * @default false
-    */
-    lockScroll: boolean
-    /**
-    * 文案尺寸，三选一
-    * @default base
-    */
-    size: ToastSize
-    /**
-    * 弹窗是否显示开关
-    * @default false
-    */
-    visible: boolean
-    /**
-    * 换行截断方式
-    * @default break-all
-    */
-    wordBreak?: ToastWordBreak
-    /**
-    * 关闭时触发的事件
-    * @default null
-    */
-    onClose: () => void
-    /**
-     * @deprecated Please use `content` prop instead.
-     */
-    msg: React.ReactNode;
+    content: React.ReactNode;
+    contentClassName?: string;
+    contentStyle?: React.CSSProperties;
+    type: string;
+    visible: boolean;
+    wordBreak?: ToastWordBreak;
+    onClose: () => void;
 }
 export declare const Toast: FunctionComponent<Partial<ToastProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'content'>> & {
     show: typeof show;

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

@@ -4,26 +4,27 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useEffect, useRef } from "react";
 import classNames from "classnames";
-import { View } from "@tarojs/components";
+import { Text, View } from "@tarojs/components";
 import { Failure, Loading, Success, Tips } from "@nutui/icons-react-taro";
 import Overlay from "../overlay/index";
 import { ComponentDefaults } from "../../utils/typings";
 import { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "../../utils/use-custom-event";
 import { usePropsValue } from "../../utils/use-props-value";
+import { useRtl } from "../configprovider/index";
+import { harmony } from "../../utils/platform-taro";
+import { mergeProps } from "../../utils/merge-props";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     id: '',
-    icon: null,
-    iconSize: '20',
-    content: '',
-    msg: '',
     duration: 2,
     position: 'center',
-    type: 'text',
     title: '',
+    size: 'base',
+    icon: null,
+    content: '',
+    type: 'text',
     closeOnOverlayClick: false,
     lockScroll: false,
     contentClassName: '',
-    size: 'base',
     visible: false,
     wordBreak: 'break-all',
     onClose: function() {}
@@ -31,8 +32,9 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 var classPrefix = 'nut-toast';
 // export default class Notification extends React.PureComponent<NotificationProps> {
 export var Toast = function(props) {
-    var _useParams = useParams(_object_spread({}, 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 = useParams(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 = useRef(-1);
+    var rtl = useRtl();
     var _usePropsValue = _sliced_to_array(usePropsValue({
         value: visible,
         defaultValue: undefined,
@@ -92,41 +94,31 @@ export var Toast = function(props) {
         }
     };
     var hasIcon = function() {
-        if (type !== 'text') {
-            return true;
-        }
-        return !!icon;
+        return type !== 'text' || !!icon;
     };
     var iconName = function() {
         if (icon) {
             return icon;
         }
         return ({
-            success: /*#__PURE__*/ React.createElement(Success, {
-                color: "#ffffff",
-                size: iconSize
-            }),
-            fail: /*#__PURE__*/ React.createElement(Failure, {
-                color: "#ffffff",
-                size: iconSize
-            }),
-            warn: /*#__PURE__*/ React.createElement(Tips, {
-                color: "#ffffff",
-                size: iconSize
-            }),
-            loading: /*#__PURE__*/ React.createElement(Loading, {
-                color: "#ffffff",
-                size: iconSize
-            })
+            success: /*#__PURE__*/ React.createElement(Success, null),
+            fail: /*#__PURE__*/ React.createElement(Failure, null),
+            warn: /*#__PURE__*/ React.createElement(Tips, null),
+            loading: /*#__PURE__*/ React.createElement(Loading, null)
         })[type];
     };
-    var classes = classNames(_define_property({
-        'nut-toast-has-icon': icon
-    }, "nut-toast-".concat(size), true));
+    var classes = classNames({
+        'nut-toast-has-icon': icon,
+        'nut-toast-rtl': rtl
+    });
+    var styles = harmony() ? {
+        left: '50%',
+        transform: 'translate(-50%, -50%)'
+    } : null;
     return /*#__PURE__*/ React.createElement(React.Fragment, null, innerVisible ? /*#__PURE__*/ React.createElement(Overlay, {
         visible: innerVisible,
         style: style,
-        className: "".concat(classPrefix, "-overlay-default ").concat(className),
+        className: "".concat(classPrefix, "-overlay-default-taro ").concat(className),
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
         onClick: function() {
@@ -136,15 +128,15 @@ export var Toast = function(props) {
         className: "".concat(classPrefix, " ").concat(classes),
         id: id
     }, /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classPrefix, "-inner ").concat(classPrefix, "-").concat(position, " ").concat(contentClassName, " ").concat(wordBreak),
-        style: contentStyle
-    }, hasIcon() ? /*#__PURE__*/ React.createElement("p", {
+        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({}, styles, contentStyle)
+    }, hasIcon() ? /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-icon-wrapper")
-    }, iconName()) : null, title ? /*#__PURE__*/ React.createElement(View, {
+    }, iconName()) : null, title ? /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-title")
-    }, title) : null, /*#__PURE__*/ React.createElement("span", {
+    }, title) : null, content ? /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-text")
-    }, content || msg)))) : null);
+    }, content) : null))) : null);
 };
 export function show(selector, options) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -161,7 +153,6 @@ export function hide(selector) {
         status: false
     });
 }
-Toast.defaultProps = defaultProps;
 Toast.displayName = 'NutToast';
 Toast.show = show;
 Toast.hide = hide;