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

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

@@ -24,10 +24,10 @@
   color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text-plain {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-tag-default {
-  background: var(--nutui-tag-background-color, var(--nutui-gray-7));
+  background: var(--nutui-tag-background-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-tag-primary {
   background: #fa2c19;
@@ -39,10 +39,10 @@
   background: var(--nutui-tag-success-background-color, #4fc08d);
 }
 .nut-tag-danger {
-  background: var(--nutui-tag-danger-background-color, var(--nutui-red-2));
+  background: var(--nutui-tag-danger-background-color, var(--nutui-color-danger, #ff0f23));
 }
 .nut-tag-warning {
-  background: var(--nutui-tag-warning-background-color, var(--nutui-yellow-2));
+  background: var(--nutui-tag-warning-background-color, var(--nutui-color-warning, #ffbf00));
 }
 .nut-tag-round {
   border-radius: var(--nutui-tag-round-border-radius, 8px);
@@ -63,7 +63,7 @@
 }
 .nut-tag-plain {
   background-color: #fff;
-  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-gray-7);
+  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-color-title, #1a1a1a);
 }
 
 [dir=rtl] .nut-tag .nut-icon,

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

@@ -31,8 +31,6 @@
 
   &-primary {
     background: #fa2c19;
-    // RN 不支持渐变色
-    // background: $tag-primary-background-color;
   }
 
   &-info {

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

@@ -13,22 +13,22 @@
 }
 .nut-textarea-container {
   padding: var(--nutui-textarea-padding, 12px);
-  background-color: var(--nutui-gray-1);
+  background-color: var(--nutui-color-background-overlay, #ffffff);
 }
 .nut-textarea-error {
-  border: 0.5px solid var(--nutui-red-2);
-  background-color: var(--nutui-red-1);
+  border: 0.5px solid var(--nutui-color-danger, #ff0f23);
+  background-color: var(--nutui-color-danger-light, #ffebef);
 }
 .nut-textarea-limit {
   text-align: right;
   font-size: var(--nutui-font-size-base, 14px);
   line-height: var(--nutui-font-size-base, 14px);
   margin-top: var(--nutui-spacing-base, 8px);
-  color: var(--nutui-gray-5);
+  color: var(--nutui-color-text-help, #888b94);
 }
 .nut-textarea-limit-disabled {
   cursor: not-allowed;
-  color: var(--nutui-gray-4);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea-textarea {
   outline: none;
@@ -40,33 +40,33 @@
   margin: 0;
   padding: 0;
   font-size: var(--nutui-font-size-base, 14px);
-  color: var(--nutui-textarea-text-color, var(--nutui-gray-7));
-  caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-brand-6));
+  color: var(--nutui-textarea-text-color, var(--nutui-color-title, #1a1a1a));
+  caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-color-primary, #ff0f23));
   text-align: left;
   background-color: transparent;
   border: 0;
   resize: none;
 }
 .nut-textarea-textarea .taro-textarea {
-  color: var(--nutui-textarea-text-color, var(--nutui-gray-7));
+  color: var(--nutui-textarea-text-color, var(--nutui-color-title, #1a1a1a));
   background-color: transparent;
   resize: none;
 }
 .nut-textarea-textarea::placeholder {
-  color: var(--nutui-gray-5);
+  color: var(--nutui-color-text-help, #888b94);
 }
 .nut-textarea-textarea-disabled {
   cursor: not-allowed;
-  color: var(--nutui-gray-4);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea-textarea-disabled::placeholder {
-  color: var(--nutui-gray-4);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea-textarea-disabled .taro-textarea {
-  color: var(--nutui-gray-4);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea-textarea-disabled .taro-textarea::placeholder {
-  color: var(--nutui-gray-4);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;

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

@@ -16,15 +16,15 @@
   line-height: var(--nutui-timeselect-time-height, 50px);
   text-align: center;
   margin: var(--nutui-timeselect-time-margin, 0 10px 10px 0);
-  background: var(--nutui-timeselect-time-background, var(--nutui-gray-3));
+  background: var(--nutui-timeselect-time-background, var(--nutui-color-background, #f2f3f5));
   border-radius: 5px;
   font-size: var(--nutui-font-size-base, 14px);
   border: 1px solid transparent;
 }
 .nut-timedetail-item.active {
-  background-color: var(--nutui-brand-1);
-  border: 1px solid var(--nutui-brand-6);
-  color: var(--nutui-brand-6);
+  background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
+  border: 1px solid var(--nutui-color-primary, #ff0f23);
+  color: var(--nutui-color-primary, #ff0f23);
   font-weight: var(--nutui-font-weight-bold, 600);
 }
 

package/dist/cjs/packages/timeselect/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 {
@@ -390,15 +385,15 @@
   line-height: var(--nutui-timeselect-time-height, 50px);
   text-align: center;
   margin: var(--nutui-timeselect-time-margin, 0 10px 10px 0);
-  background: var(--nutui-timeselect-time-background, var(--nutui-gray-3));
+  background: var(--nutui-timeselect-time-background, var(--nutui-color-background, #f2f3f5));
   border-radius: 5px;
   font-size: var(--nutui-font-size-base, 14px);
   border: 1px solid transparent;
 }
 .nut-timedetail-item.active {
-  background-color: var(--nutui-brand-1);
-  border: 1px solid var(--nutui-brand-6);
-  color: var(--nutui-brand-6);
+  background-color: var(--nutui-color-primary-light-pressed, #ffebf1);
+  border: 1px solid var(--nutui-color-primary, #ff0f23);
+  color: var(--nutui-color-primary, #ff0f23);
   font-weight: var(--nutui-font-weight-bold, 600);
 }
 
@@ -408,7 +403,7 @@
 }
 
 .nut-timeselect {
-  background-color: var(--nutui-gray-1);
+  background-color: var(--nutui-color-background-overlay, #ffffff);
   display: flex;
   flex-direction: column;
   height: calc(100% - 50px);
@@ -422,7 +417,7 @@
   min-width: var(--nutui-timeselect-date-width, 140px);
   height: 100%;
   overflow: auto;
-  background: var(--nutui-color-background-sunken, var(--nutui-gray-2));
+  background: var(--nutui-color-background-sunken, #f7f8fc);
 }
 
 .nut-timepannel {
@@ -430,11 +425,11 @@
   height: var(--nutui-timeselect-date-height, 40px);
   line-height: var(--nutui-timeselect-date-height, 40px);
   text-align: start;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-timepannel.active {
-  background: var(--nutui-gray-1);
-  color: var(--nutui-timeselect-date-active-color, var(--nutui-gray-7));
+  background: var(--nutui-color-background-overlay, #ffffff);
+  color: var(--nutui-timeselect-date-active-color, var(--nutui-color-title, #1a1a1a));
   font-weight: var(--nutui-font-weight-bold, 600);
 }

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

@@ -1,3 +1,4 @@
 import { Toast } from "./toast";
-export type { ToastProps, ToastPosition, ToastOptions, ToastSize, ToastWordBreak, } from "./toast";
+export type { ToastOptions } from "./toast";
+export type { ToastPosition, ToastSize, ToastWordBreak, ToastProps, } from './types';
 export default Toast;

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

@@ -3,19 +3,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);
 }
 
@@ -71,12 +66,7 @@
   }
 }
 .nut-toast {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   left: 0;
   top: 0;
   display: flex;
@@ -90,16 +80,13 @@
 }
 .nut-toast-overlay-default {
   --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
-  --nutui-overlay-zIndex: 1300;
 }
 .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 {
@@ -117,7 +104,7 @@
   text-align: var(--nutui-toast-inner-text-align, center);
   padding: var(--nutui-toast-inner-padding, 13px 16px);
   word-break: break-all;
-  background: var(--nutui-toast-inner-bg-color, var(--nutui-black-10));
+  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, var(--nutui-radius-xl, 12px));
   color: var(--nutui-toast-font-color, #ffffff);
 }
@@ -139,12 +126,7 @@
   font-size: var(--nutui-font-size-l, 16px);
 }
 .nut-toast-center {
-  /* #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%);

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

@@ -11,12 +11,7 @@
   }
 }
 .nut-toast {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   left: 0;
   top: 0;
   display: flex;
@@ -31,7 +26,6 @@
 .nut-toast-overlay-default-taro {
   /* #ifdef harmony */
   background-color: rgba(0, 0, 0, 0);
-  z-index: 1300;
   /* #endif */
   /* #ifndef harmony */
   /* #endif */
@@ -73,12 +67,7 @@
   font-size: 16px;
 }
 .nut-toast-center {
-  /* #ifdef rn */
-  top: 38%;
-  /* #endif */
-  /* #ifndef rn */
   top: 48%;
-  /* #endif */
 }
 .nut-toast-bottom {
   top: 80%;

package/dist/cjs/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/cjs/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/cjs/packages/toast/toast.js

@@ -30,13 +30,13 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
 var _components = require("@tarojs/components");
 var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"));
-var _typings = require("../../utils/typings");
+var _overlay = require("../overlay/overlay");
 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), {
+var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
     id: '',
     duration: 2,
     position: 'center',
@@ -44,17 +44,18 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     size: 'base',
     icon: null,
     content: '',
-    type: 'text',
+    contentClassName: '',
+    contentStyle: {},
     closeOnOverlayClick: false,
     lockScroll: false,
-    contentClassName: '',
     visible: false,
     wordBreak: 'break-all',
+    zIndex: 1300,
     onClose: function onClose() {}
 });
-var classPrefix = 'nut-toast';
 var Toast = function Toast(props) {
-    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, 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 = (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, 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 = (0, _react.useRef)(-1);
     var rtl = (0, _index1.useRtl)();
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
@@ -115,19 +116,21 @@ var Toast = function Toast(props) {
             _$hide();
         }
     };
-    var hasIcon = function hasIcon() {
-        return type !== 'text' || !!icon;
-    };
-    var iconName = function iconName() {
-        if (icon) {
-            return icon;
+    var renderIcon = function renderIcon() {
+        var iconNode = icon;
+        if (typeof icon === 'string') {
+            iconNode = ({
+                success: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Success, null),
+                fail: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, null),
+                warn: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Tips, null),
+                loading: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, {
+                    className: "nut-icon-loading"
+                })
+            })[icon];
         }
-        return ({
-            success: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Success, null),
-            fail: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, null),
-            warn: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Tips, null),
-            loading: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, null)
-        })[type];
+        return iconNode && /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "".concat(classPrefix, "-icon-wrapper")
+        }, iconNode);
     };
     var classes = (0, _classnames.default)({
         'nut-toast-has-icon': icon,
@@ -137,9 +140,10 @@ var Toast = function Toast(props) {
         left: '50%',
         transform: 'translate(-50%, -50%)'
     } : null;
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, innerVisible ? /*#__PURE__*/ _react.default.createElement(_index.default, {
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, innerVisible && /*#__PURE__*/ _react.default.createElement(_index.default, {
         visible: innerVisible,
         style: style,
+        zIndex: zIndex,
         className: "".concat(classPrefix, "-overlay-default-taro ").concat(className),
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
@@ -152,13 +156,11 @@ var Toast = function Toast(props) {
     }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), (0, _define_property._)({}, "".concat(classPrefix, "-inner-descrption"), content)),
         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.Text, {
+    }, renderIcon(), title && /*#__PURE__*/ _react.default.createElement(_components.Text, {
         className: "".concat(classPrefix, "-title")
-    }, title) : null, content ? /*#__PURE__*/ _react.default.createElement(_components.Text, {
+    }, title), content && /*#__PURE__*/ _react.default.createElement(_components.Text, {
         className: "".concat(classPrefix, "-text")
-    }, content) : null))) : null);
+    }, content)))));
 };
 function show(selector, options) {
     // eslint-disable-next-line react-hooks/rules-of-hooks

package/dist/cjs/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/cjs/packages/toast/types.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});