@nutui/nutui-react-taro 3.0.0-beta.3 → 3.0.0-beta.5

package/dist/es/packages/resultpage/resultpage.js

@@ -1,10 +1,10 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import React, { useState } from "react";
+import React from "react";
 import classNames from "classnames";
-import { View, Text, Image } from "@tarojs/components";
+import { Tips, Warning, Failure, Ask, Success } from "@nutui/icons-react-taro";
+import { View, Text } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
 import { Button } from "../button/button";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
@@ -19,20 +19,28 @@ export var ResultPage = function(props) {
     var classPrefix = "nut-resultpage";
     var cls = classNames(classPrefix, className);
     var defaultStatus = {
-        success: 'https://img11.360buyimg.com/imagetools/jfs/t1/233690/33/17768/1251/66543101F2589003b/f5dcaea8e29c23aa.png',
-        error: 'https://img14.360buyimg.com/imagetools/jfs/t1/224715/38/17932/1426/66543101F1dbc50e8/eaffdb926b00584b.png',
-        warning: 'https://img13.360buyimg.com/imagetools/jfs/t1/200545/24/43507/1219/66543101Fe58cfbe4/c29054555f3bcb4b.png',
-        info: 'https://img13.360buyimg.com/imagetools/jfs/t1/199421/5/44230/1320/66543100F23a9466e/0e9eadd5cebf07fb.png',
-        waiting: 'https://img11.360buyimg.com/imagetools/jfs/t1/226266/21/17859/1428/66543101F2dc4c3f3/44e2ae2b51c6e0ed.png'
+        success: /*#__PURE__*/ React.createElement(Success, {
+            color: "#00D900"
+        }),
+        error: /*#__PURE__*/ React.createElement(Failure, {
+            color: "#FF0F23"
+        }),
+        warning: /*#__PURE__*/ React.createElement(Warning, {
+            color: "#FFBF00"
+        }),
+        info: /*#__PURE__*/ React.createElement(Tips, {
+            color: "#0073FF"
+        }),
+        waiting: /*#__PURE__*/ React.createElement(Ask, {
+            color: "#0073FF"
+        })
     };
-    var _useState = _sliced_to_array(useState("".concat(typeof icon === 'string' && icon ? icon : defaultStatus[status])), 1), iconSrc = _useState[0];
     return /*#__PURE__*/ React.createElement(View, {
         className: cls,
         style: style
-    }, typeof icon === 'string' ? /*#__PURE__*/ React.createElement(Image, {
-        src: iconSrc,
+    }, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-icon")
-    }) : null, typeof title === 'string' && title ? /*#__PURE__*/ React.createElement(View, {
+    }, icon || defaultStatus[status]), typeof title === 'string' && title ? /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-title")
     }, title) : title, typeof description === 'string' && description ? /*#__PURE__*/ React.createElement(Text, {
         numberOfLines: 2,
@@ -47,7 +55,7 @@ export var ResultPage = function(props) {
             className: "".concat(classPrefix, "-action"),
             key: index
         }, /*#__PURE__*/ React.createElement(Button, _object_spread_props(_object_spread({}, rest), {
-            size: "small"
+            size: "large"
         }), action === null || action === void 0 ? void 0 : action.text));
     })) : null, children);
 };

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

@@ -5,10 +5,12 @@
   align-items: center;
   margin: 0 auto;
   &-icon {
-    height: $resultpage-icon-size;
-    width: $resultpage-icon-size;
+    display: inline-flex;
     margin-bottom: $resultpage-icon-margin-bottom;
-    background-size: 100%;
+    .nut-icon {
+      height: $resultpage-icon-size;
+      width: $resultpage-icon-size;
+    }
   }
   &-title {
     width: $resultpage-width;

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

@@ -6,21 +6,23 @@
   margin: 0 auto;
 }
 .nut-resultpage-icon {
-  height: var(--nutui-resultpage-icon-size, 48px);
-  width: var(--nutui-resultpage-icon-size, 48px);
-  margin-bottom: var(--nutui-resultpage-icon-margin-bottom, 16px);
-  background-size: 100%;
+  display: inline-flex;
+  margin-bottom: var(--nutui-resultpage-icon-margin-bottom, 12px);
+}
+.nut-resultpage-icon .nut-icon {
+  height: var(--nutui-resultpage-icon-size, 36px);
+  width: var(--nutui-resultpage-icon-size, 36px);
 }
 .nut-resultpage-title {
-  width: var(--nutui-resultpage-width, 247px);
-  margin-bottom: var(--nutui-resultpage-title-margin-bottom, 9px);
+  width: var(--nutui-resultpage-width, 240px);
+  margin-bottom: var(--nutui-resultpage-title-margin-bottom, 12px);
   font-size: var(--nutui-resultpage-title-font-size, var(--nutui-font-size-xl, 18px));
   color: var(--nutui-resultpage-title-color, var(--nutui-color-title, #1a1a1a));
   font-weight: var(--nutui-font-weight-bold, 600);
   text-align: center;
 }
 .nut-resultpage-description {
-  width: var(--nutui-resultpage-width, 247px);
+  width: var(--nutui-resultpage-width, 240px);
   line-height: var(--nutui-resultpage-description-line-height, 20px);
   font-size: var(--nutui-resultpage-description-font-size, var(--nutui-font-size-base, 14px));
   color: var(--nutui-resultpage-description-color, var(--nutui-color-text, #505259));
@@ -33,7 +35,7 @@
 .nut-resultpage-actions {
   display: flex;
   flex-direction: row;
-  margin-top: var(--nutui-resultpage-actions-margin-top, 21px);
+  margin-top: var(--nutui-resultpage-actions-margin-top, 16px);
 }
 .nut-resultpage-action {
   margin-left: 6px;

package/dist/es/packages/resultpage/types.d.ts

@@ -1,4 +1,4 @@
 export type ResultPageStatusOptions = {
-    [key: string]: string;
+    [key: string]: React.ReactNode;
 };
 export type ResultPageStatus = 'success' | 'error' | 'warning' | 'info' | 'waiting';

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

@@ -110,10 +110,20 @@
   color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-tabbar-item-active .nut-tabbar-item-icon-box {
+  /* #ifdef harmony*/
+  color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
+  /* #endif*/
+  /* #ifndef harmony*/
   color: inherit;
+  /* #endif*/
 }
 .nut-tabbar-item-active .nut-tabbar-item-icon-box .nut-icon {
+  /* #ifdef harmony*/
+  color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
+  /* #endif*/
+  /* #ifndef harmony*/
   color: inherit;
+  /* #endif*/
 }
 
 .nut-tabbar {

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

@@ -2,41 +2,13 @@ import { FunctionComponent } from 'react';
 import { BasicComponent } from "../../utils/typings";
 import TabbarItem from "../tabbaritem/index";
 export interface TabbarProps extends BasicComponent {
-    /**
-    * 默认选中的标签的索引值
-    * @default 0
-    */
-    defaultValue: number
-    /**
-    * 选中的标签的索引值
-    * @default -
-    */
-    value?: number
-    /**
-    * 是否固定在页面底部，为 true 时默认开启 safeArea
-    * @default false
-    */
-    fixed: boolean
-    /**
-    * icon未激活的颜色
-    * @default #7d7e80
-    */
-    inactiveColor: string
-    /**
-    * icon激活的颜色
-    * @default #0073ff
-    */
-    activeColor: string
-    /**
-    * 是否开启iphone系列全面屏底部安全区适配
-    * @default false
-    */
-    safeArea: boolean
-    /**
-    * 切换页签时触发事件
-    * @default -
-    */
-    onSwitch: (value: number) => void
+    defaultValue: number;
+    value?: number;
+    fixed: boolean;
+    inactiveColor: string;
+    activeColor: string;
+    safeArea: boolean;
+    onSwitch: (value: number) => void;
 }
 export declare const Tabbar: FunctionComponent<Partial<TabbarProps>> & {
     Item: typeof TabbarItem;

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

@@ -110,8 +110,18 @@
   color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-tabbar-item-active .nut-tabbar-item-icon-box {
+  /* #ifdef harmony*/
+  color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
+  /* #endif*/
+  /* #ifndef harmony*/
   color: inherit;
+  /* #endif*/
 }
 .nut-tabbar-item-active .nut-tabbar-item-icon-box .nut-icon {
+  /* #ifdef harmony*/
+  color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
+  /* #endif*/
+  /* #ifndef harmony*/
   color: inherit;
+  /* #endif*/
 }

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

@@ -40,10 +40,20 @@
     color: $tabbar-active-color;
 
     .nut-tabbar-item-icon-box {
+      /* #ifdef harmony*/
+      color: $tabbar-active-color;
+      /* #endif*/
+      /* #ifndef harmony*/
       color: inherit;
+      /* #endif*/
 
       .nut-icon {
+        /* #ifdef harmony*/
+        color: $tabbar-active-color;
+        /* #endif*/
+        /* #ifndef harmony*/
         color: inherit;
+        /* #endif*/
       }
     }
   }

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

@@ -1,40 +1,12 @@
 import { FunctionComponent, ReactNode } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export interface TabbarItemProps extends BasicComponent {
-    /**
-    * 标签页的标题
-    * @default -
-    */
-    title: ReactNode
-    /**
-    * 自定义图标
-    * @default -
-    */
-    icon: ReactNode
-    /**
-    * 徽标中显示的内容，支持数字、字符和自定义内容
-    * @default -
-    */
-    value: ReactNode
-    /**
-    * 徽标是否为小点
-    * @default false
-    */
-    dot: boolean
-    /**
-    * value 为数值时，最大值
-    * @default 99
-    */
-    max: number
-    /**
-    * 徽标的上下偏移量，支持单位设置，可设置为：5 等
-    * @default 0
-    */
-    top: string
-    /**
-    * 徽标的左右偏移量，支持单位设置，可设置为：5 等
-    * @default 0
-    */
-    right: string
+    title: ReactNode;
+    icon: ReactNode;
+    value: ReactNode;
+    dot: boolean;
+    max: number;
+    top: string;
+    right: string;
 }
 export declare const TabbarItem: FunctionComponent<Partial<TabbarItemProps>>;

package/dist/es/packages/tabbaritem/tabbaritem.js

@@ -8,6 +8,7 @@ import { View } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
 import Badge from "../badge/index";
 import TabbarContext from "../tabbar/context";
+import addColorForHarmony from "../../utils/add-color-for-harmony";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     title: '',
     icon: null,
@@ -55,9 +56,15 @@ export var TabbarItem = function(props) {
         }
     }, rest), icon ? /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(Badge, badgeProps, /*#__PURE__*/ React.createElement(View, {
         className: boxPrefix
-    }, icon)), /*#__PURE__*/ React.createElement(View, {
-        className: titleClass
+    }, addColorForHarmony(icon, active ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor))), /*#__PURE__*/ React.createElement(View, {
+        className: titleClass,
+        style: {
+            color: active ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor
+        }
     }, title)) : /*#__PURE__*/ React.createElement(Badge, badgeProps, /*#__PURE__*/ React.createElement(View, {
-        className: titleClass
+        className: titleClass,
+        style: {
+            color: active ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor
+        }
     }, title)));
 };

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

@@ -13,6 +13,7 @@
 .nut-tag .nut-icon {
   vertical-align: middle;
   margin-left: 4px;
+  color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text {
   font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));

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

@@ -13,6 +13,7 @@
   .nut-icon {
     vertical-align: middle;
     margin-left: 4px;
+    color: $tag-color;
   }
 
   &-text {

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

@@ -1 +1,2 @@
+import '../../overlay/style';
 import './toast.scss';

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

@@ -1,3 +1,63 @@
+.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-color-mask, rgba(0, 0, 0, 0.7)));
+  z-index: var(--nutui-overlay-zIndex, 1000);
+}
+
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
+.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);
+}
+
 @keyframes rotation {
   0% {
     -webkit-transform: rotate(0deg);

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

@@ -27,7 +27,7 @@
   justify-content: center;
   transition: all 0.4s;
   border-radius: var(--nutui-progress-border-radius, 12px);
-  background-color: var(--nutui-progress-color, #ff0f23);
+  background: var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
 }
 .nut-progress-text {
   display: flex;
@@ -36,6 +36,7 @@
   top: var(--nutui-progress-text-position-top, -4px);
   bottom: var(--nutui-progress-text-position-bottom, -4px);
   transition: all 0.4s;
+  transform: translate(-50%);
 }
 .nut-progress-text-inner {
   display: flex;
@@ -49,7 +50,7 @@
   border-radius: var(--nutui-progress-text-border-radius, 5px);
   font-size: var(--nutui-progress-text-font-size, 9px);
   line-height: 1;
-  background: var(--nutui-progress-text-background, #ff0f23);
+  background: var(--nutui-progress-text-background, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
 }
 @keyframes progressActive {
   0% {

package/dist/es/utils/add-color-for-harmony.d.ts

@@ -0,0 +1,9 @@
+import React, { ReactNode } from 'react';
+/**
+ * 为支持 Harmony 的 React 元素添加颜色属性
+ * @param maybeElement - 要处理的 React 节点
+ * @param color - 要添加的颜色值（如：'#ff0000'）
+ * @returns 处理后的 React 节点
+ */
+declare function addColorForHarmony(maybeElement: ReactNode, color?: string): string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined;
+export default addColorForHarmony;

package/dist/es/utils/add-color-for-harmony.js

@@ -0,0 +1,16 @@
+import React from "react";
+import { harmony } from "./platform-taro";
+/**
+ * 为支持 Harmony 的 React 元素添加颜色属性
+ * @param maybeElement - 要处理的 React 节点
+ * @param color - 要添加的颜色值（如：'#ff0000'）
+ * @returns 处理后的 React 节点
+ */ function addColorForHarmony(maybeElement, color) {
+    if (React.isValidElement(maybeElement) && harmony()) {
+        return React.cloneElement(maybeElement, {
+            color: color
+        });
+    }
+    return maybeElement;
+}
+export default addColorForHarmony;