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

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

@@ -7,14 +7,12 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { forwardRef, useState } from "react";
 import classNames from "classnames";
-import { Close } from "@nutui/icons-react";
+import { Failure, Close } from "@nutui/icons-react";
 import Button from "../button";
 import confirm from "./confirm";
-import { DialogWrap } from "./dialogwrap";
+import { DialogWrap, defaultDialogWrapProps } from "./dialogwrap";
 import { useConfig } from "../configprovider";
-import { ComponentDefaults } from "../../utils/typings";
-import { mergeProps } from "../../utils/merge-props";
-var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
+var defaultProps = _object_spread_props(_object_spread({}, defaultDialogWrapProps), {
     confirmText: '',
     cancelText: '',
     overlay: true,
@@ -26,6 +24,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     lockScroll: true,
     closeIconPosition: 'bottom',
     closeIcon: false,
+    zIndex: 1200,
     beforeCancel: function() {
         return true;
     },
@@ -35,7 +34,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 var BaseDialog = function(props, ref) {
     var locale = useConfig().locale;
-    var _mergeProps = mergeProps(defaultProps, props), visible = _mergeProps.visible, footer = _mergeProps.footer, hideConfirmButton = _mergeProps.hideConfirmButton, hideCancelButton = _mergeProps.hideCancelButton, lockScroll = _mergeProps.lockScroll, disableConfirmButton = _mergeProps.disableConfirmButton, closeOnOverlayClick = _mergeProps.closeOnOverlayClick, confirmText = _mergeProps.confirmText, cancelText = _mergeProps.cancelText, closeIconPosition = _mergeProps.closeIconPosition, closeIcon = _mergeProps.closeIcon, onClose = _mergeProps.onClose, onCancel = _mergeProps.onCancel, onConfirm = _mergeProps.onConfirm, beforeCancel = _mergeProps.beforeCancel, beforeClose = _mergeProps.beforeClose, restProps = _object_without_properties(_mergeProps, [
+    var _ref = _object_spread({}, defaultProps, props), visible = _ref.visible, footer = _ref.footer, hideConfirmButton = _ref.hideConfirmButton, hideCancelButton = _ref.hideCancelButton, lockScroll = _ref.lockScroll, disableConfirmButton = _ref.disableConfirmButton, closeOnOverlayClick = _ref.closeOnOverlayClick, confirmText = _ref.confirmText, cancelText = _ref.cancelText, closeIconPosition = _ref.closeIconPosition, closeIcon = _ref.closeIcon, footerDirection = _ref.footerDirection, onClose = _ref.onClose, onCancel = _ref.onCancel, onConfirm = _ref.onConfirm, beforeCancel = _ref.beforeCancel, beforeClose = _ref.beforeClose, restProps = _object_without_properties(_ref, [
         "visible",
         "footer",
         "hideConfirmButton",
@@ -47,6 +46,7 @@ var BaseDialog = function(props, ref) {
         "cancelText",
         "closeIconPosition",
         "closeIcon",
+        "footerDirection",
         "onClose",
         "onCancel",
         "onConfirm",
@@ -110,15 +110,26 @@ var BaseDialog = function(props, ref) {
                 return _ref.apply(this, arguments);
             };
         }();
-        return footer || /*#__PURE__*/ React.createElement(React.Fragment, null, !hideCancelButton && /*#__PURE__*/ React.createElement(Button, {
+        var btnClass = hideCancelButton || hideConfirmButton ? "".concat(classPrefix, "-footer-block") : '';
+        return footer || /*#__PURE__*/ React.createElement(React.Fragment, null, !hideCancelButton && (footerDirection === 'vertical' ? /*#__PURE__*/ React.createElement("div", {
+            style: {
+                order: 2
+            },
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
+            onClick: function(e) {
+                return handleCancel(e);
+            }
+        }, cancelText || locale.cancel) : /*#__PURE__*/ React.createElement(Button, {
             type: "default",
-            className: "".concat(classPrefix, "-footer-cancel"),
+            size: "large",
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
             onClick: function(e) {
                 return handleCancel(e);
             }
-        }, cancelText || locale.cancel), !hideConfirmButton && /*#__PURE__*/ React.createElement(Button, {
+        }, cancelText || locale.cancel)), !hideConfirmButton && /*#__PURE__*/ React.createElement(Button, {
             type: "primary",
-            className: classNames("".concat(classPrefix, "-footer-ok"), {
+            size: "large",
+            className: classNames("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
                 disabled: disableConfirmButton
             }),
             disabled: disableConfirmButton,
@@ -138,19 +149,21 @@ var BaseDialog = function(props, ref) {
         };
         var _obj;
         var closeClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-close"), true), _define_property(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
+        var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ React.createElement(Close, null) : /*#__PURE__*/ React.createElement(Failure, null);
         return /*#__PURE__*/ React.createElement("div", {
             className: closeClasses,
             onClick: handleCancel
-        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null));
+        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     return /*#__PURE__*/ React.createElement("div", {
         style: {
             display: visible ? 'block' : 'none'
         }
-    }, /*#__PURE__*/ React.createElement(DialogWrap, _object_spread_props(_object_spread({}, props), {
+    }, /*#__PURE__*/ React.createElement(DialogWrap, _object_spread_props(_object_spread({}, restProps), {
         visible: visible,
         lockScroll: lockScroll,
         footer: renderFooter(),
+        footerDirection: footerDirection,
         close: renderCloseIcon(),
         onClose: onClose,
         onCancel: onCancel

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

@@ -1,15 +1,4 @@
-import React, { FunctionComponent, HTMLAttributes } from 'react';
-import { OverlayProps } from "../overlay/overlay";
-interface DialogWrapProps extends OverlayProps {
-    visible: boolean;
-    overlay: boolean;
-    overlayStyle: React.CSSProperties;
-    overlayClassName: string;
-    footer: React.ReactNode;
-    close: React.ReactNode;
-    onCancel: () => void;
-    onClose: () => void;
-    onOverlayClick: (e: MouseEvent) => boolean | void;
-}
+import { FunctionComponent, HTMLAttributes } from 'react';
+import { DialogWrapProps } from './types';
+export declare const defaultDialogWrapProps: DialogWrapProps;
 export declare const DialogWrap: FunctionComponent<Partial<DialogWrapProps> & Omit<HTMLAttributes<HTMLDivElement>, 'title' | 'content'>>;
-export {};

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

@@ -1,25 +1,34 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import React from "react";
 import { CSSTransition } from "react-transition-group";
-import classNames from "classnames";
-import { Content } from "./content";
+import { Content, defaultContentProps } from "./content";
 import { defaultOverlayProps } from "../overlay/overlay";
-import { ComponentDefaults } from "../../utils/typings";
 import Overlay from "../overlay";
-import { mergeProps } from "../../utils/merge-props";
-var defaultDialogProps = _object_spread(_object_spread_props(_object_spread({}, ComponentDefaults), {
+export var defaultDialogWrapProps = _object_spread_props(_object_spread({}, defaultOverlayProps, defaultContentProps), {
     overlay: true,
     overlayStyle: {},
-    overlayClassName: '',
+    overlayClassName: 'nut-dialog-overlay',
     onCancel: function() {},
     onClose: function() {},
-    onOverlayClick: function(e) {
+    onOverlayClick: function() {
         return true;
     }
-}), defaultOverlayProps);
+});
 export var DialogWrap = function(props) {
-    var _mergeProps = mergeProps(defaultDialogProps, props), visible = _mergeProps.visible, overlay = _mergeProps.overlay, overlayStyle = _mergeProps.overlayStyle, overlayClassName = _mergeProps.overlayClassName, closeOnOverlayClick = _mergeProps.closeOnOverlayClick, lockScroll = _mergeProps.lockScroll, onClose = _mergeProps.onClose, onCancel = _mergeProps.onCancel, onOverlayClick = _mergeProps.onOverlayClick;
+    var _ref = _object_spread({}, defaultDialogWrapProps, props), visible = _ref.visible, overlay = _ref.overlay, overlayStyle = _ref.overlayStyle, overlayClassName = _ref.overlayClassName, closeOnOverlayClick = _ref.closeOnOverlayClick, lockScroll = _ref.lockScroll, zIndex = _ref.zIndex, onClose = _ref.onClose, onCancel = _ref.onCancel, onOverlayClick = _ref.onOverlayClick, restProps = _object_without_properties(_ref, [
+        "visible",
+        "overlay",
+        "overlayStyle",
+        "overlayClassName",
+        "closeOnOverlayClick",
+        "lockScroll",
+        "zIndex",
+        "onClose",
+        "onCancel",
+        "onOverlayClick"
+    ]);
     var onHandleClickOverlay = function(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
             var closed = onOverlayClick && onOverlayClick(e);
@@ -27,20 +36,24 @@ export var DialogWrap = function(props) {
             closed && (onCancel === null || onCancel === void 0 ? void 0 : onCancel());
         }
     };
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay && /*#__PURE__*/ React.createElement(Overlay, {
+        zIndex: zIndex,
         style: overlayStyle,
-        className: classNames('nut-dialog-overlay', overlayClassName),
+        className: overlayClassName,
         visible: visible,
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
         onClick: onHandleClickOverlay
-    }) : null, /*#__PURE__*/ React.createElement(CSSTransition, {
+    }), /*#__PURE__*/ React.createElement(CSSTransition, {
         in: visible,
         timeout: 300,
         classNames: "fadeDialog",
         unmountOnExit: true,
         appear: true
-    }, /*#__PURE__*/ React.createElement(Content, _object_spread_props(_object_spread({}, props), {
+    }, /*#__PURE__*/ React.createElement(Content, _object_spread_props(_object_spread({}, restProps), {
+        style: {
+            zIndex: zIndex
+        },
         visible: visible
     }))));
 };

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

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

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

@@ -5,15 +5,14 @@
   flex-direction: column;
   align-items: center;
   width: $dialog-width;
-  // max-height: 67%;
+  min-width: $dialog-min-width;
+  /* #ifndef harmony*/
+  max-height: 67%;
+  /* #endif */
   min-height: $dialog-min-height;
   padding: $dialog-padding;
   box-sizing: border-box;
 
-  &-overlay {
-    --nutui-overlay-zIndex: 1200;
-  }
-
   &-outer {
     position: fixed;
     max-height: 100%;
@@ -27,7 +26,6 @@
     -webkit-transform: translate(-50%, -50%);
     transform: translate(-50%, -50%);
     border-radius: $dialog-border-radius;
-    z-index: $dialog-z-index;
     animation-duration: 0.3s;
   }
 
@@ -58,11 +56,17 @@
     }
 
     &-bottom {
-      bottom: -56px;
+      bottom: -64px;
+      width: $dialog-bottom-close-icon-size;
+      height: $dialog-bottom-close-icon-size;
       left: 50%;
-      transform: translateY(-50%);
+      transform: translateX(-50%);
       .nut-icon {
-        color: $dialog-close-color;
+        color: $color-text-disabled;
+        background-color: $color-mask-part;
+        border-radius: 50%;
+        width: $dialog-bottom-close-icon-size;
+        height: $dialog-bottom-close-icon-size;
       }
     }
 
@@ -86,7 +90,7 @@
     max-height: $dialog-content-max-height;
     line-height: $dialog-content-line-height;
     font-size: $font-size-base;
-    color: $color-text;
+    color: $color-title;
     word-wrap: break-word;
     word-break: break-all;
     white-space: pre-wrap;
@@ -105,20 +109,15 @@
 
       .nut-button {
         min-width: 100%;
-        margin: 0;
+      }
 
-        &.nut-dialog-footer-ok {
-          order: 1;
-        }
-
-        &.nut-dialog-footer-cancel {
-          border: 0;
-          color: $color-text;
-          order: 2;
-          display: flex;
-          align-items: flex-end;
-          margin-top: $dialog-vertical-footer-ok-margin-top;
-        }
+      .nut-dialog-footer-cancel {
+        margin: 0;
+        color: $color-text;
+        font-size: $font-size-base;
+        display: flex;
+        justify-content: center;
+        margin-top: $dialog-vertical-footer-ok-margin-top;
       }
     }
 
@@ -132,6 +131,12 @@
 
     &-ok {
       max-width: $dialog-footer-ok-max-width;
+      font-weight: $font-weight-bold;
+    }
+    &-block {
+      &.nut-button {
+        min-width: 100%;
+      }
     }
   }
 }