@nutui/nutui-react 3.0.0-beta.8 → 3.0.0

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

@@ -4,12 +4,7 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
@@ -20,12 +15,6 @@
   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;
 }
@@ -63,18 +52,17 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
-  color: var(--nutui-color-title, #1a1a1a);
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,35 +75,40 @@
   padding: var(--nutui-popup-title-padding, 16px);
   position: relative;
 }
-.nut-popup-title-left {
-  position: absolute;
-  left: var(--nutui-popup-title-padding, 16px);
-}
-.nut-popup-title-title {
+.nut-popup-title-wrapper {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
+}
+.nut-popup-title-title {
+  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-xl, 18px));
+  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-color-text-help, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
+  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);
 }
+.nut-popup-title-description-gap {
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-popup-title-left {
+  position: absolute;
+  top: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 16px);
+}
 .nut-popup-title-right {
   position: absolute;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-color-text-help, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-color-title, #1a1a1a);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -136,15 +129,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
-  /* #ifndef rn */
+  max-width: 295px;
   transform: translate(-50%, -50%);
-  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-bottom, .nut-popup-top {
-  max-height: 83%;
+  max-height: 87%;
 }
 .nut-popup-bottom {
   bottom: 0;
@@ -152,40 +144,33 @@
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
 }
 .nut-popup-right {
   top: 0;
   right: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
 }
 .nut-popup-top {
   top: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 100px;
-  /* #endif */
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -251,22 +236,16 @@
 }
 @keyframes popup-slide-top-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -278,22 +257,16 @@
 }
 @keyframes popup-slide-right-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -305,22 +278,16 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
-  /* #ifndef rn */
   transform: translate(0, 0);
-  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -332,16 +299,12 @@
 }
 @keyframes popup-slide-left-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -395,9 +358,7 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
-  /* #ifndef rn */
   transform: translate(50%, -50%);
-  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -424,7 +385,7 @@
   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-color-background, #f5f6fa));
+  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;

package/dist/cjs/packages/timeselect/timeselect.js

@@ -121,10 +121,7 @@ var TimeSelect = function TimeSelect(props) {
         visible: visible,
         position: "bottom",
         title: title || locale.timeselect.pickupTime,
-        style: (0, _object_spread._)({
-            width: '100%',
-            height: '20%'
-        }, style),
+        style: (0, _object_spread._)({}, style),
         onClose: closeFun
     }, rest), /*#__PURE__*/ _react.default.createElement("div", {
         className: (0, _classnames.default)(classPrefix, className)

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

@@ -1,28 +1,13 @@
 import * as React from 'react';
-import { BasicComponent } from "../../utils/typings";
-import { ToastWordBreak } from './toast';
-export interface NotificationProps extends BasicComponent {
-    id?: string;
-    icon: 'success' | 'fail' | 'loading' | 'warn' | React.ReactNode;
-    content: string | React.ReactNode;
-    duration: number;
-    position?: 'top' | 'center' | 'bottom';
-    title: string;
-    size: string | number;
-    closeOnOverlayClick: boolean;
-    lockScroll: boolean;
-    contentClassName?: string;
-    contentStyle?: React.CSSProperties;
-    wordBreak?: ToastWordBreak;
-    onClose: () => void;
-}
+import { ToastProps } from './index';
 export interface NotificationState {
     show: boolean;
 }
-export default class Notification extends React.PureComponent<NotificationProps, NotificationState> {
-    static newInstance: (properties: NotificationProps, callback: any) => void;
+type ToastNativeProps = Partial<ToastProps>;
+export default class Notification extends React.PureComponent<ToastNativeProps, NotificationState> {
+    static newInstance: (properties: ToastNativeProps, callback: any) => void;
     private closeTimer;
-    constructor(props: NotificationProps);
+    constructor(props: ToastNativeProps);
     close(): void;
     startCloseTimer(): void;
     clearCloseTimer(): void;
@@ -32,3 +17,4 @@ export default class Notification extends React.PureComponent<NotificationProps,
     componentWillUnmount(): void;
     render(): React.JSX.Element;
 }
+export {};

package/dist/cjs/packages/toast/Notification.js

@@ -54,7 +54,7 @@ var Notification = /*#__PURE__*/ function(_superClass) {
                     var element = document.getElementById(this.props.id);
                     element && element.parentNode && element.parentNode.removeChild(element);
                 }
-                this.props.onClose();
+                this.props.onClose && this.props.onClose();
             }
         },
         {
@@ -123,17 +123,18 @@ var Notification = /*#__PURE__*/ function(_superClass) {
             key: "render",
             value: function render() {
                 var _this = this;
-                var _this_props = this.props, id = _this_props.id, icon = _this_props.icon, title = _this_props.title, content = _this_props.content, position = _this_props.position, size = _this_props.size, closeOnOverlayClick = _this_props.closeOnOverlayClick, lockScroll = _this_props.lockScroll, style = _this_props.style, className = _this_props.className, contentClassName = _this_props.contentClassName, contentStyle = _this_props.contentStyle, wordBreak = _this_props.wordBreak;
+                var _this_props = this.props, id = _this_props.id, icon = _this_props.icon, title = _this_props.title, content = _this_props.content, position = _this_props.position, size = _this_props.size, closeOnOverlayClick = _this_props.closeOnOverlayClick, lockScroll = _this_props.lockScroll, style = _this_props.style, className = _this_props.className, contentClassName = _this_props.contentClassName, contentStyle = _this_props.contentStyle, wordBreak = _this_props.wordBreak, zIndex = _this_props.zIndex;
                 var show = this.state.show;
                 var classes = (0, _classnames.default)({
                     'nut-toast-has-icon': icon
                 });
-                return /*#__PURE__*/ _react.createElement(_react.Fragment, null, /*#__PURE__*/ _react.createElement(_index.default, {
+                return /*#__PURE__*/ _react.createElement(_index.default, {
                     visible: show,
                     style: style,
+                    zIndex: zIndex,
                     className: "".concat(classPrefix, "-overlay-default ").concat(className),
                     onClick: function onClick() {
-                        _this.clickCover();
+                        return _this.clickCover();
                     },
                     closeOnOverlayClick: closeOnOverlayClick,
                     lockScroll: lockScroll
@@ -143,11 +144,11 @@ var Notification = /*#__PURE__*/ function(_superClass) {
                 }, /*#__PURE__*/ _react.createElement("div", {
                     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._)({}, contentStyle)
-                }, this.renderIcon(), title ? /*#__PURE__*/ _react.createElement("div", {
+                }, this.renderIcon(), title && /*#__PURE__*/ _react.createElement("div", {
                     className: "".concat(classPrefix, "-title")
-                }, title) : null, content ? /*#__PURE__*/ _react.createElement("span", {
+                }, title), content && /*#__PURE__*/ _react.createElement("span", {
                     className: "".concat(classPrefix, "-text")
-                }, content) : null))));
+                }, content))));
             }
         }
     ]);

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

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

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

@@ -3,12 +3,7 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
@@ -19,12 +14,6 @@
   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;
 }
@@ -62,6 +51,12 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 @keyframes rotation {
   0% {
     -webkit-transform: rotate(0deg);
@@ -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 {
@@ -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/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,25 +1,7 @@
-import * as React from 'react';
-import { BasicComponent } from "../../utils/typings";
-export type ToastPosition = 'top' | 'bottom' | 'center';
-export type ToastIcon = 'success' | 'fail' | 'loading' | 'warn' | React.ReactNode;
-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?: string | number;
-    icon?: ToastIcon;
-    content?: React.ReactNode;
-    onClose?: () => void;
-    contentClassName?: string;
-    contentStyle?: React.CSSProperties;
-    wordBreak?: ToastWordBreak;
-}
-declare function show(option: ToastProps | string): void;
-declare function config(config: ToastProps): void;
+import { ToastProps } from './index';
+type ToastNativeProps = Partial<ToastProps>;
+declare function show(option: ToastNativeProps | string): void;
+declare function config(config: ToastNativeProps): void;
 declare const _default: {
     show: typeof show;
     config: typeof config;

package/dist/cjs/packages/toast/toast.js

@@ -9,24 +9,25 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
-var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _Notification = /*#__PURE__*/ _interop_require_default._(require("./Notification"));
-var _typings = require("../../utils/typings");
+var _overlay = require("../overlay/overlay");
 var messageInstance = null;
-var options = (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',
     title: '',
     size: 'base',
     icon: null,
-    closeOnOverlayClick: false,
-    lockScroll: false,
+    content: '',
     contentClassName: '',
+    contentStyle: {},
     wordBreak: 'break-all',
+    duration: 2,
+    closeOnOverlayClick: false,
+    lockScroll: false,
+    zIndex: 1300,
     onClose: function onClose() {}
 });
 function getInstance(props, callback) {
@@ -46,7 +47,7 @@ function notice(opts) {
             opts.onClose && opts.onClose();
         }
     }
-    var opts2 = (0, _object_spread_props._)((0, _object_spread._)({}, options, opts), {
+    var opts2 = (0, _object_spread_props._)((0, _object_spread._)({}, defaultProps, opts), {
         onClose: close
     });
     getInstance(opts2, function(notification) {
@@ -69,7 +70,7 @@ function show(option) {
     return notice((0, _object_spread._)({}, option));
 }
 function config(config) {
-    options = (0, _object_spread._)({}, options, config);
+    defaultProps = (0, _object_spread._)({}, defaultProps, config);
 }
 var _default = {
     show: show,

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
+});