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

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

@@ -7,12 +7,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 +28,55 @@
   --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-2, 12px);
-}
-.nut-toast-large .nut-toast-inner {
-  font-size: var(--nutui-font-size-4, 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%);
+  transform: translate(0, -50%);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
   min-width: 30%;
   max-width: 95.7%;
   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);
   word-break: break-all;
-  background: var(--nutui-toast-inner-bg-color, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  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);
   color: var(--nutui-toast-font-color, #ffffff);
-  transform: translate(-50%, -50%);
 }
-.nut-toast-inner.normal {
+.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 +84,43 @@
 .nut-toast-top {
   top: var(--nutui-toast-inner-top, 20%);
 }
-.nut-toast-text:empty {
+.nut-toast-text {
+  color: #ffffff;
+  text-align: var(--nutui-toast-inner-text-align, center);
+}
+.nut-toast-text-empty {
   margin-bottom: -8px;
 }
 .nut-toast-title {
   color: #ffffff;
   font-size: var(--nutui-toast-title-font-size, 16px);
   font-weight: 500;
+  text-align: var(--nutui-toast-inner-text-align, center);
 }
-.nut-toast-title:empty {
-  margin-bottom: -8px;
+.nut-toast-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;
+  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 +132,6 @@
 .nut-rtl .nut-toast-inner {
   left: auto;
   right: 50%;
-  transform: translate(50%, -50%);
 }
 
 .toast-fade-enter-active {

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

@@ -6,42 +6,40 @@
     -webkit-transform: rotate(360deg);
   }
 }
-
-.nut-toast-overlay-default {
-  background: rgba(0, 0, 0, 0);
-  z-index: 1300;
-}
-
 .nut-toast {
-  display: flex;
-  flex-direction: column;
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
-  top: 0;
+  /* #endif */
   left: 0;
-  height: 100%;
-  width: 100%;
-  align-items: center;
+  top: 0;
+  display: flex;
+  flex-direction: row;
   justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
   z-index: 1300;
 }
-
-
-.nut-toast-small .nut-toast-inner {
-  font-size: 12px;
-}
-
-.nut-toast-large .nut-toast-inner {
-  font-size: 16px;
+.nut-toast-overlay-default-taro {
+  /* #ifdef harmony */
+  background-color: rgba(0, 0, 0, 0);
+  z-index: 1300;
+  /* #endif */
+  /* #ifndef harmony */
+  /* #endif */
 }
-
 .nut-toast-inner {
+  position: absolute;
+  top: 50%;
+  transform: translate(0, -50%);
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  position: absolute;
-  left: 50%;
-  top: 50%;
   min-width: 30%;
   max-width: 95.7%;
   font-size: 14px;
@@ -51,79 +49,72 @@
   background: rgba(0, 0, 0, 0.7);
   border-radius: 16px;
   color: #ffffff;
-  transform: translate(-50%, -50%);
 }
-
-.nut-toast-inner.normal {
+.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: 12px;
+}
+.nut-toast-inner-large {
+  font-size: 16px;
+}
 .nut-toast-center {
-  top: 50%;
+  /* #ifdef rn */
+  top: 38%;
+  /* #endif */
+  /* #ifndef rn */
+  top: 48%;
+  /* #endif */
 }
-
 .nut-toast-bottom {
   top: 80%;
 }
-
 .nut-toast-top {
   top: 20%;
 }
-
 .nut-toast-text {
-  display: flex;
   color: #ffffff;
   text-align: center;
 }
-
-.nut-toast-text:empty {
+.nut-toast-text-empty {
   margin-bottom: -8px;
 }
-
 .nut-toast-title {
-  display: flex;
   color: #ffffff;
   font-size: 16px;
   font-weight: 500;
+  text-align: center;
 }
-
-.nut-toast-title:empty {
-  margin-bottom: -8px;
+.nut-toast-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;
+  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,
@@ -131,12 +122,10 @@
   left: auto;
   right: 0;
 }
-
 [dir=rtl] .nut-toast-inner,
 .nut-rtl .nut-toast-inner {
   left: auto;
   right: 50%;
-  transform: translate(50%, -50%);
 }
 
 .toast-fade-enter-active {

package/dist/cjs/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,24 +31,25 @@
     --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;
+    transform: translate(-0, -50%);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
     min-width: 30%;
     max-width: 95.7%;
     font-size: $toast-text-font-size;
@@ -50,21 +59,33 @@
     background: $toast-inner-bg-color;
     border-radius: $toast-inner-border-radius;
     color: $toast-font-color;
-    transform: translate(-50%, -50%);
 
-    &.normal {
+    &-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,7 +97,9 @@
   }
 
   &-text {
-    &:empty {
+    color: #ffffff;
+    text-align: $toast-inner-text-align;
+    &-empty {
       margin-bottom: -8px;
     }
   }
@@ -85,42 +108,36 @@
     color: #ffffff;
     font-size: $toast-title-font-size;
     font-weight: 500;
-
-    &:empty {
-      margin-bottom: -8px;
-    }
+    text-align: $toast-inner-text-align;
   }
 
-  &-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;
-      }
-    }
+  &-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-bottom: 8px;
+    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 +150,6 @@
   &-inner {
     left: auto;
     right: 50%;
-    transform: translate(50%, -50%);
   }
 }
 

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

@@ -5,19 +5,19 @@ export type ToastSize = 'small' | 'base' | 'large';
 export type ToastWordBreak = 'normal' | 'break-all' | 'break-word';
 export interface ToastProps extends BasicComponent {
     id?: string;
-    maskClassName?: string;
-    contentClassName?: string;
-    contentStyle?: React.CSSProperties;
-    icon: React.ReactNode;
-    iconSize: string;
-    content: React.ReactNode;
     duration: number;
     position?: ToastPosition;
-    type: string;
     title: string;
     closeOnOverlayClick: boolean;
     lockScroll: boolean;
     size: ToastSize;
+    icon: React.ReactNode;
+    iconSize: string;
+    maskClassName?: string;
+    content: React.ReactNode;
+    contentClassName?: string;
+    contentStyle?: React.CSSProperties;
+    type: string;
     visible: boolean;
     wordBreak?: ToastWordBreak;
     onClose: () => void;

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

@@ -21,7 +21,6 @@ _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");
@@ -33,28 +32,32 @@ var _index = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"
 var _typings = require("../../utils/typings");
 var _usecustomevent = require("../../utils/use-custom-event");
 var _usepropsvalue = require("../../utils/use-props-value");
+var _index1 = require("../configprovider/index");
+var _platformtaro = require("../../utils/platform-taro");
+var _mergeprops = require("../../utils/merge-props");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     id: '',
+    duration: 2,
+    position: 'center',
+    title: '',
+    size: 'base',
     icon: null,
     iconSize: '20',
     content: '',
     msg: '',
-    duration: 2,
-    position: 'center',
     type: 'text',
-    title: '',
     closeOnOverlayClick: false,
     lockScroll: false,
     contentClassName: '',
-    size: 'base',
     visible: false,
     wordBreak: 'break-all',
     onClose: function onClose() {}
 });
 var classPrefix = 'nut-toast';
 var Toast = function Toast(props) {
-    var _useParams = (0, _usecustomevent.useParams)((0, _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 = (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 timer = (0, _react.useRef)(-1);
+    var rtl = (0, _index1.useRtl)();
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
         value: visible,
         defaultValue: undefined,
@@ -114,10 +117,7 @@ var Toast = function Toast(props) {
         }
     };
     var hasIcon = function hasIcon() {
-        if (type !== 'text') {
-            return true;
-        }
-        return !!icon;
+        return type !== 'text' || !!icon;
     };
     var iconName = function iconName() {
         if (icon) {
@@ -125,6 +125,7 @@ var Toast = function Toast(props) {
         }
         return ({
             success: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Success, {
+                className: "nut-toast-icon",
                 color: "#ffffff",
                 size: iconSize
             }),
@@ -142,13 +143,18 @@ var Toast = function Toast(props) {
             })
         })[type];
     };
-    var classes = (0, _classnames.default)((0, _define_property._)({
-        'nut-toast-has-icon': icon
-    }, "nut-toast-".concat(size), true));
+    var classes = (0, _classnames.default)({
+        'nut-toast-has-icon': icon,
+        'nut-toast-rtl': rtl
+    });
+    var styles = (0, _platformtaro.harmony)() ? {
+        left: '50%',
+        transform: 'translate(-50%, -50%)'
+    } : null;
     return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, innerVisible ? /*#__PURE__*/ _react.default.createElement(_index.default, {
         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 onClick() {
@@ -158,14 +164,14 @@ 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(wordBreak),
-        style: contentStyle
-    }, hasIcon() ? /*#__PURE__*/ _react.default.createElement("p", {
+        className: "".concat(classPrefix, "-inner ").concat(classPrefix, "-").concat(position, " ").concat(contentClassName, " ").concat(classPrefix, "-inner-").concat(size, " ").concat(classPrefix, "-inner-").concat(wordBreak),
+        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.View, {
+    }, iconName()) : null, title ? /*#__PURE__*/ _react.default.createElement(_components.Text, {
         className: "".concat(classPrefix, "-title")
-    }, title) : null, /*#__PURE__*/ _react.default.createElement("span", {
-        className: "".concat(classPrefix, "-text")
+    }, title) : null, /*#__PURE__*/ _react.default.createElement(_components.Text, {
+        className: "".concat(classPrefix, "-text  ").concat(content ? '' : "".concat(classPrefix, "-text-empty"))
     }, content || msg)))) : null);
 };
 function show(selector, options) {
@@ -183,7 +189,6 @@ function hide(selector) {
         status: false
     });
 }
-Toast.defaultProps = defaultProps;
 Toast.displayName = 'NutToast';
 Toast.show = show;
 Toast.hide = hide;