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

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

@@ -9,12 +9,7 @@
 }
 
 .nut-toast {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   left: 0;
   top: 0;
   display: flex;
@@ -28,17 +23,14 @@
 
   &-overlay-default {
     --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
-    --nutui-overlay-zIndex: 1300;
   }
 
   &-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 */
   }
 
@@ -87,12 +79,7 @@
   }
 
   &-center {
-    /* #ifdef rn */
-    top: var(--nutui-toast-inner-top, 38%);
-    /* #endif */
-    /* #ifndef rn */
     top: var(--nutui-toast-inner-top, 48%);
-    /* #endif */
   }
 
   &-bottom {

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

@@ -1,26 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import { BasicComponent } from "../../utils/typings";
-export type ToastPosition = 'top' | 'bottom' | 'center';
-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;
-    content: React.ReactNode;
-    contentClassName?: string;
-    contentStyle?: React.CSSProperties;
-    type: string;
-    visible: boolean;
-    wordBreak?: ToastWordBreak;
-    onClose: () => void;
-}
+import { ToastProps } from "./index";
 export declare const Toast: FunctionComponent<Partial<ToastProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'content'>> & {
     show: typeof show;
     hide: typeof hide;

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

@@ -7,13 +7,13 @@ import classNames from "classnames";
 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 { defaultOverlayProps } from "../overlay/overlay";
 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), {
+var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     id: '',
     duration: 2,
     position: 'center',
@@ -21,18 +21,18 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     size: 'base',
     icon: null,
     content: '',
-    type: 'text',
+    contentClassName: '',
+    contentStyle: {},
     closeOnOverlayClick: false,
     lockScroll: false,
-    contentClassName: '',
     visible: false,
     wordBreak: 'break-all',
+    zIndex: 1300,
     onClose: function() {}
 });
-var classPrefix = 'nut-toast';
-// export default class Notification extends React.PureComponent<NotificationProps> {
 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, 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 _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, 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, wordBreak = _useParams_params.wordBreak, zIndex = _useParams_params.zIndex, onClose = _useParams_params.onClose, setParams = _useParams.setParams;
+    var classPrefix = 'nut-toast';
     var timer = useRef(-1);
     var rtl = useRtl();
     var _usePropsValue = _sliced_to_array(usePropsValue({
@@ -93,19 +93,21 @@ export var Toast = function(props) {
             _$hide();
         }
     };
-    var hasIcon = function() {
-        return type !== 'text' || !!icon;
-    };
-    var iconName = function() {
-        if (icon) {
-            return icon;
+    var renderIcon = function() {
+        var iconNode = icon;
+        if (typeof icon === 'string') {
+            iconNode = ({
+                success: /*#__PURE__*/ React.createElement(Success, null),
+                fail: /*#__PURE__*/ React.createElement(Failure, null),
+                warn: /*#__PURE__*/ React.createElement(Tips, null),
+                loading: /*#__PURE__*/ React.createElement(Loading, {
+                    className: "nut-icon-loading"
+                })
+            })[icon];
         }
-        return ({
-            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];
+        return iconNode && /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-icon-wrapper")
+        }, iconNode);
     };
     var classes = classNames({
         'nut-toast-has-icon': icon,
@@ -115,9 +117,10 @@ export var Toast = function(props) {
         left: '50%',
         transform: 'translate(-50%, -50%)'
     } : null;
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, innerVisible ? /*#__PURE__*/ React.createElement(Overlay, {
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, innerVisible && /*#__PURE__*/ React.createElement(Overlay, {
         visible: innerVisible,
         style: style,
+        zIndex: zIndex,
         className: "".concat(classPrefix, "-overlay-default-taro ").concat(className),
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
@@ -130,13 +133,11 @@ export var Toast = function(props) {
     }, /*#__PURE__*/ React.createElement(View, {
         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(Text, {
+    }, renderIcon(), title && /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-title")
-    }, title) : null, content ? /*#__PURE__*/ React.createElement(Text, {
+    }, title), content && /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-text")
-    }, content) : null))) : null);
+    }, content)))));
 };
 export function show(selector, options) {
     // eslint-disable-next-line react-hooks/rules-of-hooks

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

@@ -0,0 +1,17 @@
+import { OverlayProps } from "../overlay/types";
+export type ToastPosition = 'top' | 'bottom' | 'center';
+export type ToastIcon = 'success' | 'fail' | 'loading' | 'warn' | React.ReactNode;
+export type ToastWordBreak = 'normal' | 'break-all' | 'break-word';
+export type ToastSize = 'small' | 'base' | 'large';
+export interface ToastProps extends Omit<OverlayProps, 'onClick'> {
+    id: string;
+    position: ToastPosition;
+    title: string;
+    size: ToastSize;
+    icon: ToastIcon;
+    content: React.ReactNode;
+    contentClassName: string;
+    contentStyle: React.CSSProperties;
+    wordBreak: ToastWordBreak;
+    onClose: () => void;
+}

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

@@ -0,0 +1 @@
+export { };

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

@@ -4,19 +4,14 @@
 /* #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));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -67,7 +62,7 @@
   position: fixed;
   min-height: 46%;
   max-height: 100%;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,13 +82,13 @@
   align-items: center;
 }
 .nut-popup-title-title {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   font-weight: var(--nutui-font-weight-bold, 600);
   font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
   line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
@@ -112,7 +107,7 @@
   z-index: 1;
   width: var(--nutui-popup-icon-size, 20px);
   height: var(--nutui-popup-icon-size, 20px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
 .nut-popup-title-right:active {
@@ -437,7 +432,7 @@
   background: var(--nutui-popover-content-background-color, #ffffff);
   border-radius: var(--nutui-popover-border-radius, var(--nutui-radius-xs, 4px));
   font-size: var(--nutui-popover-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-popover-text-color, var(--nutui-black-10));
+  color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   line-height: 28px;
   max-height: initial;
   overflow-y: initial;
@@ -447,7 +442,7 @@
   align-items: center;
   justify-content: center;
   padding: 0 var(--nutui-popover-menu-item-padding, 8px);
-  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-black-3));
+  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   max-width: var(--nutui-popover-menu-item-width, 160px);
   word-wrap: break-word;
 }
@@ -481,7 +476,7 @@
   width: 12px;
   height: 12px;
   font-size: 12px;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon .nut-icon {
   width: 12px;
@@ -489,7 +484,7 @@
   font-size: 12px;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-disabled {
-  color: var(--nutui-popover-disable-color, var(--nutui-gray-4));
+  color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
   cursor: not-allowed;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-taroitem {
@@ -548,14 +543,14 @@
 }
 
 .nut-popover-dark {
-  background: var(--nutui-popover-text-color, var(--nutui-black-10));
+  background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   color: var(--nutui-popover-content-background-color, #ffffff);
 }
 .nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
-  color: var(--nutui-popover-text-color, var(--nutui-black-10));
+  color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
 }
 .nut-popover-dark .nut-popover-content {
-  background: var(--nutui-popover-text-color, var(--nutui-black-10)) !important;
+  background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7))) !important;
   color: var(--nutui-popover-content-background-color, #ffffff) !important;
 }
 .nut-popover-dark .nut-popover-content .nut-popover-menu-item-action-icon {
@@ -666,7 +661,7 @@
 
 .nut-tour-mask {
   position: fixed;
-  box-shadow: 0px 0px 0px 150vh var(--nutui-black-10);
+  box-shadow: 0px 0px 0px 150vh var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border-radius: var(--nutui-tour-mask-border-radius, 10px);
   z-index: 999;
 }
@@ -706,18 +701,18 @@
 }
 .nut-tour-content-bottom-operate-btn {
   display: inline-block;
-  border: 1px solid var(--nutui-gray-4);
+  border: 1px solid var(--nutui-color-text-disabled, #c2c4cc);
   margin-left: var(--nutui-tour-content-bottom-btn-margin-left, 4px);
   padding: var(--nutui-tour-content-bottom-btn-padding, 2px 4px);
   font-size: var(--nutui-tour-content-bottom-btn-font-size, 12px);
   border-radius: var(--nutui-tour-content-bottom-btn-border-radius, 4px);
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   cursor: pointer;
 }
 .nut-tour-content-bottom-operate-btn.active {
   color: #fff;
   border: 0;
-  background: var(--nutui-brand-6);
+  background: var(--nutui-color-primary, #ff0f23);
 }
 .nut-tour-content-tile .nut-tour-content-inner {
   margin: 0;

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

@@ -0,0 +1,82 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-tour-mask {
+  position: fixed;
+  box-shadow: 0px 0px 0px 150vh rgba(0, 0, 0, 0.7);
+  border-radius: 10px;
+  z-index: 999;
+}
+.nut-tour-mask-none {
+  box-shadow: none;
+}
+.nut-tour-mask-hidden {
+  opacity: 0;
+}
+.nut-tour-content {
+  display: block;
+  padding: 10px 12px;
+  min-width: 200px;
+  box-sizing: content-box;
+}
+.nut-tour-content-top {
+  display: block;
+  text-align: end;
+}
+.nut-tour-content-inner {
+  margin: 10px 0px;
+  font-size: 14px;
+  white-space: nowrap;
+}
+.nut-tour-content-bottom {
+  margin-top: 10px;
+  display: flex;
+  justify-content: space-between;
+}
+.nut-tour-content-bottom-operate {
+  display: flex;
+  justify-content: flex-end;
+}
+.nut-tour-content-bottom-operate-btn {
+  display: inline-block;
+  border: 1px solid #c2c4cc;
+  margin-left: 4px;
+  padding: 2px 4px;
+  font-size: 12px;
+  border-radius: 4px;
+  color: #505259;
+  cursor: pointer;
+}
+.nut-tour-content-bottom-operate-btn.active {
+  color: #fff;
+  border: 0;
+  background: #ff0f23;
+}
+.nut-tour-content-tile .nut-tour-content-inner {
+  margin: 0;
+}
+.nut-tour-masked {
+  position: fixed;
+  width: 100vh;
+  height: 100vh;
+  z-index: 1000;
+  top: 0;
+  left: 0;
+  background: transparent;
+}
+
+[dir=rtl] .nut-tour-content-bottom-operate-btn {
+  margin-left: 0;
+  margin-right: 4px;
+}
+
+.nut-rtl .nut-tour-content-bottom-operate-btn {
+  margin-left: 0;
+  margin-right: 4px;
+}
+[dir=rtl] .nut-tour-masked,
+.nut-rtl .nut-tour-masked {
+  left: auto;
+  right: 0;
+}

package/dist/es/packages/tour/tour.js

@@ -8,7 +8,7 @@ import { View } from "@tarojs/components";
 import Popover from "../popover/index";
 import { getTaroRectById } from "../../utils/use-taro-rect";
 import { ComponentDefaults } from "../../utils/typings";
-import { useConfig } from "../configprovider";
+import { useConfig } from "../configprovider/index";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     visible: false,
     type: 'step',

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

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

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

@@ -0,0 +1,42 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-trendarrow {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  color: #1a1a1a;
+  font-size: 14px;
+}
+.nut-trendarrow-icon-before {
+  margin-right: 4px;
+}
+.nut-trendarrow-icon-after {
+  margin-left: 4px;
+}
+.nut-trendarrow-rate {
+  vertical-align: middle;
+  display: inline;
+}
+.nut-trendarrow .nut-icon {
+  vertical-align: middle;
+}
+
+[dir=rtl] .nut-trendarrow-icon-before {
+  margin-right: 0;
+  margin-left: 4px;
+}
+
+.nut-rtl .nut-trendarrow-icon-before {
+  margin-right: 0;
+  margin-left: 4px;
+}
+[dir=rtl] .nut-trendarrow-icon-after {
+  margin-left: 0;
+  margin-right: 4px;
+}
+.nut-rtl .nut-trendarrow-icon-after {
+  margin-left: 0;
+  margin-right: 4px;
+}

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

@@ -12,7 +12,7 @@
   flex: auto;
   border-radius: var(--nutui-progress-border-radius, 12px);
   height: var(--nutui-progress-height, 10px);
-  background: var(--nutui-progress-background, var(--nutui-gray-3));
+  background: var(--nutui-progress-background, var(--nutui-color-background, #f2f3f5));
 }
 .nut-progress-outer .nut-progress-active:before {
   content: "";
@@ -89,7 +89,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-uploader-background, var(--nutui-gray-3));
+  background: var(--nutui-uploader-background, var(--nutui-color-background, #f2f3f5));
   width: var(--nutui-uploader-image-width, 100px);
   height: var(--nutui-uploader-image-height, 100px);
   border: var(--nutui-uploader-image-border, 0px);
@@ -100,11 +100,11 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  color: var(--nutui-uploader-image-color, var(--nutui-gray-5));
+  color: var(--nutui-uploader-image-color, var(--nutui-color-text-help, #888b94));
 }
 .nut-uploader-icon i,
 .nut-uploader-icon .nut-icon {
-  color: var(--nutui-uploader-image-color, var(--nutui-gray-5));
+  color: var(--nutui-uploader-image-color, var(--nutui-color-text-help, #888b94));
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-icon-tip {
@@ -124,12 +124,12 @@
   cursor: not-allowed;
 }
 .nut-uploader-upload-disabled {
-  background: var(--nutui-uploader-background-disabled, var(--nutui-gray-3));
-  color: var(--nutui-uploader-image-disabled, var(--nutui-gray-4));
+  background: var(--nutui-uploader-background-disabled, var(--nutui-color-background, #f2f3f5));
+  color: var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-uploader-upload-disabled .nut-uploader-icon i,
 .nut-uploader-upload-disabled .nut-uploader-icon .nut-icon {
-  color: var(--nutui-uploader-image-disabled, var(--nutui-gray-4));
+  color: var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #c2c4cc));
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-preview {
@@ -149,14 +149,14 @@
   justify-content: center;
   width: 100%;
   height: 100%;
-  background: var(--nutui-uploader-preview-progress-background, var(--nutui-black-10));
+  background: var(--nutui-uploader-preview-progress-background, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   border-radius: var(--nutui-uploader-image-border-radius, 4px);
 }
 .nut-uploader-preview-progress i {
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-preview-progress-msg {
-  color: var(--nutui-gray-5);
+  color: var(--nutui-color-text-help, #888b94);
   font-size: 12px;
 }
 .nut-uploader-preview.list {
@@ -174,7 +174,7 @@
   align-items: center;
   justify-content: space-between;
   padding: 0 10px;
-  background-color: var(--nutui-color-background-sunken, var(--nutui-gray-2));
+  background-color: var(--nutui-color-background-sunken, #f7f8fc);
 }
 .nut-uploader-preview-list .nut-uploader-preview-img-file-name {
   display: flex;
@@ -210,7 +210,7 @@
   overflow: hidden;
 }
 .nut-uploader-preview-img i {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-uploader-preview-img .tips {
   position: absolute;
@@ -252,7 +252,7 @@
   display: flex;
   width: 90%;
   font-size: 12px;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;