@nutui/nutui-react-taro 3.0.0-beta.9 → 3.0.0

package/dist/es/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/es/packages/timeselect/style/style.harmony.css

@@ -0,0 +1,35 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-timeselect {
+  background-color: #ffffff;
+  display: flex;
+  flex-direction: column;
+  height: calc(100% - 50px);
+}
+.nut-timeselect-content {
+  display: flex;
+  flex: 1;
+}
+.nut-timeselect-content-left {
+  width: 140px;
+  min-width: 140px;
+  height: 100%;
+  overflow: auto;
+  background: #f7f8fc;
+}
+
+.nut-timepannel {
+  padding: 0 16px;
+  height: 40px;
+  line-height: 40px;
+  text-align: start;
+  color: #505259;
+  font-size: 14px;
+}
+.nut-timepannel.active {
+  background: #ffffff;
+  color: #1a1a1a;
+  font-weight: 600;
+}

package/dist/es/packages/timeselect/timeselect.js

@@ -10,7 +10,7 @@ import { View } from "@tarojs/components";
 import Popup from "../popup/index";
 import TimeDetail from "../timedetail/index";
 import { ComponentDefaults } from "../../utils/typings";
-import { useConfig } from "../configprovider/configprovider";
+import { useConfig } from "../configprovider/index";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     visible: false,
     multiple: false,

package/dist/es/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/es/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/es/packages/toast/style/style.harmony.css

@@ -0,0 +1,138 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+@keyframes rotation {
+  0% {
+    -webkit-transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+  }
+}
+.nut-toast {
+  position: fixed;
+  left: 0;
+  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-overlay-default-taro {
+  /* #ifdef harmony */
+  background-color: rgba(0, 0, 0, 0);
+  /* #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;
+  min-width: 96px;
+  max-width: 60%;
+  box-sizing: border-box;
+  font-size: 14px;
+  text-align: center;
+  padding: 13px 16px;
+  word-break: break-all;
+  background: rgba(0, 0, 0, 0.7);
+  border-radius: 12px;
+  color: #ffffff;
+}
+.nut-toast-inner-descrption {
+  max-width: 68.2%;
+}
+.nut-toast-inner-normal {
+  word-break: normal;
+  word-wrap: normal;
+}
+.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: 48%;
+}
+.nut-toast-bottom {
+  top: 80%;
+}
+.nut-toast-top {
+  top: 20%;
+}
+.nut-toast-text {
+  color: #ffffff;
+  text-align: center;
+  line-height: 20px;
+}
+.nut-toast-title {
+  color: #ffffff;
+  font-size: 16px;
+  font-weight: 600;
+  text-align: center;
+  line-height: 22px;
+}
+.nut-toast .nut-icon {
+  width: 24px;
+  height: 24px;
+  color: #ffffff;
+}
+.nut-toast-icon-wrapper {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 3px 0 5px;
+  color: #ffffff;
+}
+.nut-toast-icon-wrapper-icon {
+  width: 24px;
+  height: 24px;
+}
+.nut-toast-rtl {
+  left: auto;
+  right: 0;
+}
+.nut-toast-rtl-inner {
+  left: auto;
+  right: 50%;
+}
+
+[dir=rtl] .nut-toast,
+.nut-rtl .nut-toast {
+  left: auto;
+  right: 0;
+}
+[dir=rtl] .nut-toast-inner,
+.nut-rtl .nut-toast-inner {
+  left: auto;
+  right: 50%;
+}
+
+.toast-fade-enter-active {
+  transition: opacity 0.3s;
+}
+
+.toast-fade-leave-active {
+  transition: opacity 0.3s;
+}
+
+.toast-fade-enter-from,
+.toast-fade-leave-to {
+  opacity: 0;
+}

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 { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "../../utils/use-custom-event";
-import { usePropsValue } from "../../utils/use-props-value";
+import { defaultOverlayProps } from "../overlay/overlay";
+import { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "../../hooks/use-custom-event";
+import { usePropsValue } from "../../hooks/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 { };