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

package/dist/es/packages/dialog/dialog.js

@@ -10,13 +10,14 @@ import { CSSTransition } from "react-transition-group";
 import { View } from "@tarojs/components";
 import { Failure, Close } from "@nutui/icons-react-taro";
 import Button from "../button/index";
-import { Content } from "./content";
+import { Content, defaultContentProps } from "./content";
 import { useConfig } from "../configprovider/configprovider";
 import Overlay from "../overlay/index";
-import { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "../../utils/use-custom-event";
-import { useLockScrollTaro } from "../../utils/use-lock-scoll-taro";
+import { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "../../hooks/use-custom-event";
+import { useLockScrollTaro } from "../../hooks/use-lock-scoll-taro";
 import { mergeProps } from "../../utils/merge-props";
-var defaultProps = {
+import { defaultOverlayProps } from "../overlay/overlay";
+var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps, defaultContentProps), {
     title: '',
     content: '',
     header: '',
@@ -24,40 +25,37 @@ var defaultProps = {
     confirmText: '',
     cancelText: '',
     overlay: true,
-    closeOnOverlayClick: true,
+    overlayStyle: {},
+    overlayClassName: 'nut-dialog-overlay',
     hideConfirmButton: false,
     hideCancelButton: false,
     disableConfirmButton: false,
     footerDirection: 'horizontal',
-    lockScroll: true,
     closeIconPosition: 'bottom',
     closeIcon: false,
+    zIndex: 1200,
     beforeCancel: function() {
         return true;
     },
     beforeClose: function() {
         return true;
     },
+    onCancel: function() {},
+    onClose: function() {},
     onOverlayClick: function() {
         return true;
     }
-};
+});
 export var BaseDialog = function(props) {
     var classPrefix = 'nut-dialog';
     var locale = useConfig().locale;
     var _useState = _sliced_to_array(useState(false), 2), loading = _useState[0], setLoading = _useState[1];
-    var _useParams = useParams(mergeProps(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, className = _useParams_params.className, style = _useParams_params.style, visible = _useParams_params.visible, footer = _useParams_params.footer, title = _useParams_params.title, header = _useParams_params.header, content = _useParams_params.content, children = _useParams_params.children, footerDirection = _useParams_params.footerDirection, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, disableConfirmButton = _useParams_params.disableConfirmButton, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, onOverlayClick = _useParams_params.onOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, overlay = _useParams_params.overlay, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, setParams = _useParams.setParams;
+    var _useParams = useParams(mergeProps(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, className = _useParams_params.className, style = _useParams_params.style, visible = _useParams_params.visible, footer = _useParams_params.footer, title = _useParams_params.title, header = _useParams_params.header, content = _useParams_params.content, children = _useParams_params.children, footerDirection = _useParams_params.footerDirection, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, disableConfirmButton = _useParams_params.disableConfirmButton, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
     useCustomEvent(id, function(param) {
         var status = param.status, options = param.options;
-        if (status) {
-            setParams(_object_spread_props(_object_spread({}, options), {
-                visible: true
-            }));
-        } else {
-            setParams(_object_spread_props(_object_spread({}, options), {
-                visible: false
-            }));
-        }
+        setParams(_object_spread_props(_object_spread({}, options), {
+            visible: status
+        }));
     });
     var refObject = useLockScrollTaro(!!(visible && lockScroll));
     var renderFooter = function() {
@@ -159,9 +157,9 @@ export var BaseDialog = function(props) {
     };
     var onHandleClickOverlay = function(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
-            var closed = onOverlayClick && onOverlayClick();
-            closed && (onClose === null || onClose === void 0 ? void 0 : onClose());
-            closed && (onCancel === null || onCancel === void 0 ? void 0 : onCancel());
+            var closed = onOverlayClick && onOverlayClick(e);
+            closed && onClose && onClose();
+            closed && onCancel && onCancel();
         }
     };
     return /*#__PURE__*/ React.createElement(View, {
@@ -170,13 +168,15 @@ export var BaseDialog = function(props) {
         },
         ref: refObject,
         catchMove: lockScroll
-    }, /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
+    }, /*#__PURE__*/ React.createElement(React.Fragment, null, overlay && /*#__PURE__*/ React.createElement(Overlay, {
+        zIndex: zIndex,
         visible: visible,
+        style: overlayStyle,
+        className: overlayClassName,
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
-        onClick: onHandleClickOverlay,
-        className: classNames('nut-dialog-overlay')
-    }) : null, /*#__PURE__*/ React.createElement(CSSTransition, {
+        onClick: onHandleClickOverlay
+    }), /*#__PURE__*/ React.createElement(CSSTransition, {
         in: visible,
         timeout: 300,
         classNames: "fadeDialog",

package/dist/es/packages/dialog/index.d.ts

@@ -1,3 +1,3 @@
 import { BaseDialog } from "./dialog";
-export type { DialogProps } from "./dialog";
+export type { DialogConfigType, DialogCloseIconPosition, DialogFooterDirection, ContentProps, DialogWrapProps, DialogBasicProps, DialogConfirmProps, DialogReturnProps, } from './types.taro';
 export default BaseDialog;

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

@@ -11,10 +11,6 @@
   padding: $dialog-padding;
   box-sizing: border-box;
 
-  &-overlay {
-    --nutui-overlay-zIndex: 1200;
-  }
-
   &-outer {
     position: fixed;
     max-height: 100%;

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

@@ -6,10 +6,10 @@
   position: relative;
   display: flex;
   display: inline-block;
-  /* #ifdef rn harmony*/
+  /* #ifdef harmony*/
   width: 80px;
   /* #endif */
-  /* #ifndef rn harmony*/
+  /* #ifndef harmony*/
   width: auto;
   /* #endif */
   flex-direction: row;
@@ -29,7 +29,7 @@
   touch-action: manipulation;
   -webkit-appearance: none;
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-  color: var(--nutui-button-default-color, var(--nutui-gray-7));
+  color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
   background: var(--nutui-button-default-background-color, transparent);
   border-width: var(--nutui-button-border-width, 0.5px);
 }
@@ -50,9 +50,9 @@
   left: 50%;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-black-10);
+  background-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border: inherit;
-  border-color: var(--nutui-black-10);
+  border-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border-radius: inherit;
   transform: translate(-50%, -50%);
   opacity: 0;
@@ -71,7 +71,7 @@
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  /* #ifndef rn harmony */
+  /* #ifndef harmony */
   background: initial;
   /* #endif */
 }
@@ -109,20 +109,20 @@
 .nut-button-default {
   padding: var(--nutui-button-default-padding, 0px 12px);
   border-style: solid;
-  border-color: var(--nutui-button-default-border-color, var(--nutui-gray-4));
+  border-color: var(--nutui-button-default-border-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-button-default-disabled, .nut-button-default-solid-disabled {
   color: var(--nutui-button-primary-color, #ffffff);
-  background: var(--nutui-button-default-disabled, var(--nutui-gray-4));
-  border-color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
+  background: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
+  border-color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-button-default-none-disabled {
-  color: var(--nutui-button-default-disabled-color, var(--nutui-gray-5));
+  color: var(--nutui-button-default-disabled-color, var(--nutui-color-text-help, #888b94));
 }
 .nut-button-default-outline-disabled, .nut-button-default-dashed-disabled {
   background: transparent;
-  color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
-  border-color: var(--nutui-button-default-disabled, var(--nutui-gray-4));
+  color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
+  border-color: var(--nutui-button-default-disabled, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-button-normal {
   padding: var(--nutui-button-normal-padding, 0px 12px);
@@ -214,37 +214,37 @@
 }
 .nut-button-primary-disabled, .nut-button-primary-solid-disabled {
   color: var(--nutui-button-primary-color, #ffffff);
-  background: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
-  border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  background: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
+  border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-primary-none {
-  color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
+  color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-button-primary-none-disabled {
-  color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-primary-outline {
-  color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
-  border-color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
+  color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
+  border-color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-button-primary-outline-disabled {
-  color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
-  border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
+  border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-primary-dashed {
-  color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
-  border-color: var(--nutui-button-primary-border-color, var(--nutui-brand-6));
+  color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
+  border-color: var(--nutui-button-primary-border-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-button-primary-dashed-disabled {
-  color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
-  border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
+  border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-primary.nut-button-solid.nut-button-normal {
   font-weight: var(--nutui-font-weight-bold, 600);
 }
 .nut-button-success {
   color: var(--nutui-button-success-color, #ffffff);
-  background: var(--nutui-button-success-background-color, var(--nutui-green-2));
+  background: var(--nutui-button-success-background-color, var(--nutui-color-success, #00d900));
   background-origin: border-box;
   border-color: transparent;
 }
@@ -256,15 +256,15 @@
   border-color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
 }
 .nut-button-success-outline, .nut-button-success-dashed {
-  color: var(--nutui-button-success-border-color, var(--nutui-green-2));
-  border-color: var(--nutui-button-success-border-color, var(--nutui-green-2));
+  color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
+  border-color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
 }
 .nut-button-success-outline-disabled, .nut-button-success-dashed-disabled {
-  color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
-  border-color: var(--nutui-button-primary-disabled, var(--nutui-brand-3));
+  color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
+  border-color: var(--nutui-button-primary-disabled, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-button-success-none {
-  color: var(--nutui-button-success-border-color, var(--nutui-green-2));
+  color: var(--nutui-button-success-border-color, var(--nutui-color-success, #00d900));
 }
 .nut-button-success-none-disabled {
   color: var(--nutui-button-success-disabled, var(--nutui-color-success-disabled, #b2f0ae));
@@ -298,7 +298,7 @@
 }
 .nut-button-danger {
   color: var(--nutui-button-danger-color, #ffffff);
-  background: var(--nutui-button-danger-background-color, var(--nutui-red-2));
+  background: var(--nutui-button-danger-background-color, var(--nutui-color-danger, #ff0f23));
   background-origin: border-box;
   border-color: transparent;
 }
@@ -306,26 +306,26 @@
   color: var(--nutui-button-danger-color, #ffffff);
 }
 .nut-button-danger-solid-disabled {
-  background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
-  border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
+  background: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
+  border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
 }
 .nut-button-danger-outline, .nut-button-danger-dashed {
-  color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
-  border-color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
+  color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
+  border-color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
 }
 .nut-button-danger-outline-disabled, .nut-button-danger-dashed-disabled {
-  color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
-  border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
+  color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
+  border-color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
 }
 .nut-button-danger-none {
-  color: var(--nutui-button-danger-border-color, var(--nutui-red-2));
+  color: var(--nutui-button-danger-border-color, var(--nutui-color-danger, #ff0f23));
 }
 .nut-button-danger-none-disabled {
-  color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-brand-3)));
+  color: var(--nutui-button-danger-disabled, var(--nutui-color-danger-disabled, var(--nutui-color-primary-disabled-special, #ffadbe)));
 }
 .nut-button-warning {
   color: var(--nutui-button-warning-color, #ffffff);
-  background: var(--nutui-button-warning-background-color, var(--nutui-yellow-2));
+  background: var(--nutui-button-warning-background-color, var(--nutui-color-warning, #ffbf00));
   background-origin: border-box;
   border-color: transparent;
 }
@@ -338,15 +338,15 @@
   border-color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
 }
 .nut-button-warning-outline, .nut-button-warning-dashed {
-  color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
-  border-color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
+  color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
+  border-color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
 }
 .nut-button-warning-outline-disabled, .nut-button-warning-dashed-disabled {
   color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
   border-color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
 }
 .nut-button-warning-none {
-  color: var(--nutui-button-warning-border-color, var(--nutui-yellow-2));
+  color: var(--nutui-button-warning-border-color, var(--nutui-color-warning, #ffbf00));
 }
 .nut-button-warning-none-disabled {
   color: var(--nutui-button-warning-disabled, var(--nutui-color-warning-disabled, #fdd3b9));
@@ -392,19 +392,14 @@
 }
 
 .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);
 }
 
@@ -462,9 +457,6 @@
   padding: var(--nutui-dialog-padding, 24px);
   box-sizing: border-box;
 }
-.nut-dialog-overlay {
-  --nutui-overlay-zIndex: 1200;
-}
 .nut-dialog-outer {
   position: fixed;
   max-height: 100%;
@@ -511,8 +503,8 @@
   transform: translateX(-50%);
 }
 .nut-dialog-close-bottom .nut-icon {
-  color: var(--nutui-gray-4);
-  background-color: var(--nutui-black-7);
+  color: var(--nutui-color-text-disabled, #c2c4cc);
+  background-color: var(--nutui-color-mask-part, rgba(0, 0, 0, 0.4));
   border-radius: 50%;
   width: var(--nutui-dialog-bottom-close-icon-size, 24px);
   height: var(--nutui-dialog-bottom-close-icon-size, 24px);
@@ -525,7 +517,7 @@
   text-align: center;
   font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-size-l, 16px));
   font-weight: var(--nutui-dialog-header-font-weight, var(--nutui-font-weight-bold, 600));
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -537,7 +529,7 @@
   max-height: var(--nutui-dialog-content-max-height, 268px);
   line-height: var(--nutui-dialog-content-line-height, 20px);
   font-size: var(--nutui-font-size-base, 14px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   word-wrap: break-word;
   word-break: break-all;
   white-space: pre-wrap;
@@ -561,7 +553,7 @@
 }
 .nut-dialog-footer.vertical .nut-dialog-footer-cancel {
   margin: 0;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-font-size-base, 14px);
   order: 2;
   display: flex;

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

@@ -0,0 +1,57 @@
+import { ReactNode, ForwardRefExoticComponent, PropsWithChildren } from 'react';
+import type { MouseEvent, CSSProperties } from 'react';
+import { OverlayProps } from "../overlay/types";
+import { BasicComponent } from "../../utils/typings";
+export type DialogConfigType = {
+    prefixCls?: string;
+    simple?: boolean;
+};
+export type DialogCloseIconPosition = 'top-right' | 'top-left' | 'bottom';
+export type DialogFooterDirection = 'horizontal' | 'vertical';
+export interface ContentProps extends BasicComponent {
+    visible: boolean;
+    title: ReactNode;
+    header: ReactNode;
+    footer: ReactNode;
+    close: ReactNode;
+    footerDirection: DialogFooterDirection;
+    onClick: (event: MouseEvent) => void;
+}
+export interface DialogWrapProps extends OverlayProps, Omit<ContentProps, 'onClick'> {
+    visible: boolean;
+    overlay: boolean;
+    overlayStyle: CSSProperties;
+    overlayClassName: string;
+    onCancel: () => void;
+    onClose: () => void;
+    onOverlayClick: (e: MouseEvent) => boolean | void;
+}
+export interface DialogBasicProps extends DialogWrapProps {
+    content?: ReactNode;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
+    hideConfirmButton?: boolean;
+    hideCancelButton?: boolean;
+    disableConfirmButton?: boolean;
+    closeIconPosition?: DialogCloseIconPosition;
+    closeIcon?: boolean | ReactNode;
+    beforeClose?: () => boolean;
+    beforeCancel?: () => boolean;
+    onConfirm?: (e?: MouseEvent<HTMLButtonElement>) => PromiseLike<any> | void;
+}
+export interface DialogConfirmProps extends DialogBasicProps {
+    content: ReactNode;
+    isNotice: boolean;
+    noticeType: string;
+}
+export type DialogReturnProps = {
+    update: (newConfig: Partial<DialogConfirmProps>) => void;
+    close: () => void;
+};
+export interface DialogComponent extends ForwardRefExoticComponent<PropsWithChildren<Partial<DialogBasicProps>>> {
+    confirm: (props: Partial<DialogConfirmProps>) => DialogReturnProps;
+    alert: (props: Partial<DialogConfirmProps>) => DialogReturnProps;
+    config: (config: DialogConfigType) => void;
+    destroyAll: () => void;
+}
+export declare const destroyList: Array<() => void>;

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

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

package/dist/es/packages/dialog/types.taro.d.ts

@@ -0,0 +1,10 @@
+import { ITouchEvent } from '@tarojs/components';
+import { ContentProps as ContentWebProps, DialogBasicProps as DialogBasicWebProps } from './types';
+export type { DialogConfigType, DialogCloseIconPosition, DialogFooterDirection, DialogWrapProps, DialogConfirmProps, DialogReturnProps, } from './types';
+export type ContentProps = Omit<ContentWebProps, 'onClick'> & {
+    onClick: (event: ITouchEvent) => void;
+};
+export type DialogBasicProps = Omit<DialogBasicWebProps, 'onOverlayClick' | 'onClick'> & {
+    onClick: (event: ITouchEvent) => void;
+    onOverlayClick: (event: ITouchEvent) => boolean | void;
+};

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

@@ -7,15 +7,15 @@
   align-items: center;
   flex-direction: row;
   font-size: var(--nutui-divider-text-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-divider-text-color, var(--nutui-gray-6));
+  color: var(--nutui-divider-text-color, var(--nutui-color-text, #505259));
   margin: var(--nutui-divider-margin, 16px 0);
   width: 100%;
-  border: 0 solid var(--nutui-divider-border-color, var(--nutui-black-3));
+  border: 0 solid var(--nutui-divider-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-divider-before, .nut-divider-after {
   display: flex;
   border-style: solid;
-  border-color: var(--nutui-divider-border-color, var(--nutui-black-3));
+  border-color: var(--nutui-divider-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   border-width: var(--nutui-divider-line-height, 1px) 0 0;
   height: var(--nutui-divider-line-height, 1px);
   flex: 1;
@@ -38,7 +38,7 @@
   display: inline-flex;
   width: 0px;
   height: var(--nutui-divider-vertical-height, 12px);
-  border-left: 1px solid var(--nutui-divider-border-color, var(--nutui-black-3));
+  border-left: 1px solid var(--nutui-divider-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   margin: var(--nutui-divider-vertical-margin, 0 8px);
   vertical-align: middle;
 }

package/dist/es/packages/drag/drag.js

@@ -5,7 +5,8 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { useState, useEffect, useRef } from "react";
-import { getSystemInfoSync, createSelectorQuery } from "@tarojs/taro";
+import { createSelectorQuery } from "@tarojs/taro";
+import { getWindowInfo } from "../../utils/get-system-info";
 import { ComponentDefaults } from "../../utils/typings";
 import { getRectByTaro } from "../../utils/get-rect-by-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
@@ -50,7 +51,7 @@ export var Drag = function(props) {
     var middleLine = useRef(0);
     var getInfo = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
-            var el, _dragRef_current, top, left, bottom, right, _getSystemInfoSync, screenWidth, windowHeight, _ref, width, height;
+            var el, _dragRef_current, top, left, bottom, right, _getWindowInfo, screenWidth, windowHeight, _ref, width, height;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -60,7 +61,7 @@ export var Drag = function(props) {
                             2
                         ];
                         top = boundary.top, left = boundary.left, bottom = boundary.bottom, right = boundary.right;
-                        _getSystemInfoSync = getSystemInfoSync(), screenWidth = _getSystemInfoSync.screenWidth, windowHeight = _getSystemInfoSync.windowHeight;
+                        _getWindowInfo = getWindowInfo(), screenWidth = _getWindowInfo.screenWidth, windowHeight = _getWindowInfo.windowHeight;
                         return [
                             4,
                             getRectByTaro(dragRef.current)

package/dist/es/packages/elevator/elevator.js

@@ -10,7 +10,7 @@ import { ScrollView, View, Text } from "@tarojs/components";
 import classNames from "classnames";
 import { ComponentDefaults } from "../../utils/typings";
 import { harmony } from "../../utils/platform-taro";
-import useUuid from "../../utils/use-uuid";
+import useUuid from "../../hooks/use-uuid";
 export var elevatorContext = /*#__PURE__*/ createContext({});
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     height: '200px',

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

@@ -14,7 +14,7 @@
   top: 0;
   overflow: hidden;
   font-size: var(--nutui-elevator-list-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-elevator-list-color, var(--nutui-gray-7));
+  color: var(--nutui-elevator-list-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-elevator-list-inner {
   height: 100%;
@@ -32,11 +32,11 @@
   height: var(--nutui-elevator-list-item-code-height, 35px);
   line-height: var(--nutui-elevator-list-item-code-line-height, 35px);
   font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-elevator-list-item-code-color, var(--nutui-gray-7));
+  color: var(--nutui-elevator-list-item-code-color, var(--nutui-color-title, #1a1a1a));
   padding: var(--nutui-elevator-list-item-padding, 0 20px);
   font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
   box-sizing: border-box;
-  border-bottom: var(--nutui-elevator-list-item-code-border-bottom, 1px solid var(--nutui-black-3));
+  border-bottom: var(--nutui-elevator-list-item-code-border-bottom, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   background-color: var(--nutui-elevator-list-item-code-background-color, inherit);
 }
 .nut-elevator-list-item-name {
@@ -47,7 +47,7 @@
   line-height: var(--nutui-elevator-list-item-name-line-height, 30px);
 }
 .nut-elevator-list-item-name-highcolor {
-  color: var(--nutui-brand-6);
+  color: var(--nutui-color-primary, #ff0f23);
 }
 .nut-elevator-list-fixed {
   display: flex;
@@ -65,7 +65,7 @@
 }
 .nut-elevator-list-fixed-title {
   font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-elevator-list-fixed-color, var(--nutui-brand-6));
+  color: var(--nutui-elevator-list-fixed-color, var(--nutui-color-primary, #ff0f23));
   font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-elevator-code-current {
@@ -85,11 +85,11 @@
   position: absolute;
   right: var(--nutui-elevator-bars-right, 10px);
   top: var(--nutui-elevator-bars-top, 50%);
-  color: var(--nutui-gray-5);
+  color: var(--nutui-color-text-help, #888b94);
   font-size: var(--nutui-elevator-bars-font-size, var(--nutui-font-size-s, 12px));
   transform: var(--nutui-elevator-bars-transform, translateY(-50%));
   padding: var(--nutui-elevator-bars-padding, 15px 0);
-  background-color: var(--nutui-elevator-bars-background-color, var(--nutui-gray-3));
+  background-color: var(--nutui-elevator-bars-background-color, var(--nutui-color-background, #f2f3f5));
   border-radius: var(--nutui-elevator-bars-border-radius, 6px);
   text-align: center;
   z-index: var(--nutui-elevator-bars-z-index, 1);
@@ -101,7 +101,7 @@
 }
 .nut-elevator-bars-inner-item-active {
   font-weight: var(--nutui-font-weight-bold, 600);
-  color: var(--nutui-elevator-bars-active-color, var(--nutui-brand-6));
+  color: var(--nutui-elevator-bars-active-color, var(--nutui-color-primary, #ff0f23));
 }
 
 [dir=rtl] .nut-elevator-list-fixed,

package/dist/es/packages/empty/empty.js

@@ -5,7 +5,6 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useEffect, useState } from "react";
 import classNames from "classnames";
 import { View, Image } from "@tarojs/components";
-import Taro from "@tarojs/taro";
 import { ComponentDefaults } from "../../utils/typings";
 import { Button } from "../button/button";
 var defaultStatus = {
@@ -34,12 +33,11 @@ export var Empty = function(props) {
         src: imageUrl
     }) : imageUrl;
     useEffect(function() {
-        var isRN = Taro.getEnv() === Taro.ENV_TYPE.RN;
         setImgStyle(function() {
             if (!imageSize) {
                 return {};
             }
-            if (isRN || typeof imageSize !== 'number') {
+            if (typeof imageSize !== 'number') {
                 return {
                     width: imageSize,
                     height: imageSize

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

@@ -10,7 +10,7 @@
   flex-direction: column;
   justify-content: center;
   padding: var(--nutui-empty-padding, 32px 40px);
-  background-color: var(--nutui-empty-background-color, var(--nutui-gray-1));
+  background-color: var(--nutui-empty-background-color, var(--nutui-color-background-overlay, #ffffff));
 }
 .nut-empty-base {
   width: var(--nutui-empty-image-size, 160px);
@@ -34,12 +34,12 @@
   margin-top: var(--nutui-empty-title-margin-top, 0px);
   font-weight: var(--nutui-font-weight-bold, 600);
   margin-bottom: var(--nutui-empty-title-margin-bottom, 12px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-font-size-l, 16px);
   line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-l, 16px));
 }
 .nut-empty-description {
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-font-size-s, 12px);
   line-height: var(--nutui-empty-description-line-height, 1);
 }