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

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,24 +31,25 @@
     --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;
+    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/es/packages/toast/toast.d.ts

@@ -5,78 +5,22 @@ export type ToastSize = 'small' | 'base' | 'large';
 export type ToastWordBreak = 'normal' | 'break-all' | 'break-word';
 export interface ToastProps extends BasicComponent {
     id?: string;
-    maskClassName?: string;
-    /**
-    * 自定义内容区类名
-    * @default -
-    */
-    contentClassName?: string
-    /**
-    * 自定义内容区样式
-    * @default -
-    */
-    contentStyle?: React.CSSProperties
-    /**
-    * 自定义图标，对应icon组件，支持图片链接
-    * @default -
-    */
-    icon: React.ReactNode
+    duration: number;
+    position?: ToastPosition;
+    title: string;
+    closeOnOverlayClick: boolean;
+    lockScroll: boolean;
+    size: ToastSize;
+    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
+    maskClassName?: string;
+    content: React.ReactNode;
+    contentClassName?: string;
+    contentStyle?: React.CSSProperties;
+    type: string;
+    visible: boolean;
+    wordBreak?: ToastWordBreak;
+    onClose: () => void;
     /**
      * @deprecated Please use `content` prop instead.
      */

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

@@ -1,30 +1,31 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 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: '',
+    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() {}
@@ -34,6 +35,7 @@ var classPrefix = 'nut-toast';
 export var Toast = function(props) {
     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, 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 = useRef(-1);
+    var rtl = useRtl();
     var _usePropsValue = _sliced_to_array(usePropsValue({
         value: visible,
         defaultValue: undefined,
@@ -93,10 +95,7 @@ export var Toast = function(props) {
         }
     };
     var hasIcon = function() {
-        if (type !== 'text') {
-            return true;
-        }
-        return !!icon;
+        return type !== 'text' || !!icon;
     };
     var iconName = function() {
         if (icon) {
@@ -104,6 +103,7 @@ export var Toast = function(props) {
         }
         return ({
             success: /*#__PURE__*/ React.createElement(Success, {
+                className: "nut-toast-icon",
                 color: "#ffffff",
                 size: iconSize
             }),
@@ -121,13 +121,18 @@ export var Toast = function(props) {
             })
         })[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() {
@@ -137,14 +142,14 @@ 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: "".concat(classPrefix, "-inner ").concat(classPrefix, "-").concat(position, " ").concat(contentClassName, " ").concat(classPrefix, "-inner-").concat(size, " ").concat(classPrefix, "-inner-").concat(wordBreak),
+        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", {
-        className: "".concat(classPrefix, "-text")
+    }, title) : null, /*#__PURE__*/ React.createElement(Text, {
+        className: "".concat(classPrefix, "-text  ").concat(content ? '' : "".concat(classPrefix, "-text-empty"))
     }, content || msg)))) : null);
 };
 export function show(selector, options) {

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

@@ -1,5 +1,6 @@
 .nut-trendarrow {
-  display: inline-flex;
+  display: flex;
+  flex-direction: row;
   align-items: center;
   color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-trendarrow-font-size, 14px);

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

@@ -1,7 +1,8 @@
 .nut-trendarrow {
-  display: inline-flex;
+  display: flex;
+  flex-direction: row;
   align-items: center;
-  color: #1A1A1A;
+  color: #1a1a1a;
   font-size: 14px;
 }
 .nut-trendarrow-icon-before {

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

@@ -1,5 +1,6 @@
 .nut-trendarrow {
-  display: inline-flex;
+  display: flex;
+  flex-direction: row;
   align-items: center;
   color: $color-title;
   font-size: $trendarrow-font-size;

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

@@ -1,60 +1,16 @@
 import React, { FunctionComponent } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export interface TrendArrowProps extends BasicComponent {
-    /**
-    * 数值，大于0时箭头向上，小于0时箭头向下
-    * @default -
-    */
-    value: number
-    /**
-    * 小数位精度
-    * @default 2
-    */
-    digits: number
-    /**
-    * 是否显示加减号
-    * @default false
-    */
-    symbol: boolean
-    /**
-    * 是否显示 0
-    * @default false
-    */
-    zero: boolean
-    /**
-    * 是否在数字左侧显示箭头
-    * @default false
-    */
-    left: boolean
-    /**
-    * 文字颜色是否与箭头同步
-    * @default true
-    */
-    sync: boolean
-    /**
-    * 文字颜色
-    * @default #333333
-    */
-    color: string
-    /**
-    * 向上箭头颜色
-    * @default #FF0F23
-    */
-    riseColor: string
-    /**
-    * 向下箭头颜色
-    * @default #64b578
-    */
-    dropColor: string
-    /**
-    * 自定义向上箭头icon
-    * @default <TriangleUp/>
-    */
-    riseIcon: React.ReactNode
-    /**
-    * 自定义向下箭头icon
-    * @default <TriangleDown/>
-    */
-    dropIcon: React.ReactNode
+    value: number;
+    digits: number;
+    symbol: boolean;
+    zero: boolean;
+    left: boolean;
+    sync: boolean;
+    color: string;
+    riseColor: string;
+    dropColor: string;
+    riseIcon: React.ReactNode;
+    dropIcon: React.ReactNode;
 }
 export declare const TrendArrow: FunctionComponent<Partial<TrendArrowProps> & React.HTMLAttributes<HTMLDivElement>>;

package/dist/es/packages/trendarrow/trendarrow.js

@@ -3,7 +3,9 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import React, { useRef } from "react";
 import { TriangleDown, TriangleUp } from "@nutui/icons-react-taro";
+import { View, Text } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
+import { harmony } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     value: 0,
     digits: 2,
@@ -12,8 +14,8 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     left: false,
     sync: true,
     color: '#333',
-    riseColor: 'var(--nutui-brand-6)',
-    dropColor: 'var(--nutui-secondary-1)',
+    riseColor: harmony() ? '#ff0f23' : 'var(--nutui-brand-6)',
+    dropColor: harmony() ? '#14cc33' : 'var(--nutui-secondary-1)',
     riseIcon: null,
     dropIcon: null
 });
@@ -72,12 +74,12 @@ export var TrendArrow = function(props) {
     }();
     var renderContent = function(left) {
         var classNameSuffix = !left ? 'icon-after' : 'icon-before';
-        return /*#__PURE__*/ React.createElement("span", {
+        return /*#__PURE__*/ React.createElement(Text, {
             className: "".concat(classPrefix, "-").concat(classNameSuffix, " ").concat(classPrefix, "-value"),
             style: calcStyle
         }, calcRate);
     };
-    return /*#__PURE__*/ React.createElement("div", _object_spread({
+    return /*#__PURE__*/ React.createElement(View, _object_spread({
         className: "".concat(classPrefix, " ").concat(className),
         style: style
     }, rest), !left && renderContent(!left), Number(value) !== 0 && /*#__PURE__*/ React.createElement(React.Fragment, null, rateTrend.current ? /*#__PURE__*/ React.createElement(React.Fragment, null, riseIcon || /*#__PURE__*/ React.createElement(TriangleUp, {