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

package/dist/cjs/packages/dialog/content.js

@@ -2,38 +2,54 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "Content", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    Content: function() {
         return Content;
+    },
+    defaultContentProps: function() {
+        return defaultContentProps;
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 var _define_property = require("@swc/helpers/_/_define_property");
+var _object_spread = require("@swc/helpers/_/_object_spread");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var defaultContentProps = {
+    visible: false,
+    title: '',
+    header: '',
+    footer: '',
+    close: '',
+    footerDirection: 'horizontal',
+    onClick: function onClick() {}
+};
 var Content = function Content(props) {
-    var visible = props.visible, title = props.title, header = props.header, footer = props.footer, close = props.close, footerDirection = props.footerDirection, onClick = props.onClick, children = props.children;
+    var _$_object_spread = (0, _object_spread._)({}, defaultContentProps, props), visible = _$_object_spread.visible, title = _$_object_spread.title, header = _$_object_spread.header, footer = _$_object_spread.footer, close = _$_object_spread.close, footerDirection = _$_object_spread.footerDirection, children = _$_object_spread.children, style = _$_object_spread.style, className = _$_object_spread.className, onClick = _$_object_spread.onClick;
     var classPrefix = 'nut-dialog';
     var renderHeader = function renderHeader() {
-        return title ? /*#__PURE__*/ _react.default.createElement("div", {
+        return title && /*#__PURE__*/ _react.default.createElement("div", {
             className: "".concat(classPrefix, "-header")
-        }, title) : null;
+        }, title);
     };
     var renderFooter = function renderFooter() {
-        return footer ? /*#__PURE__*/ _react.default.createElement("div", {
+        return footer && /*#__PURE__*/ _react.default.createElement("div", {
             className: (0, _classnames.default)("".concat(classPrefix, "-footer"), (0, _define_property._)({}, footerDirection, footerDirection))
-        }, footer) : null;
+        }, footer);
     };
     var handleClick = function handleClick(e) {
         onClick && onClick(e);
     };
     return /*#__PURE__*/ _react.default.createElement("div", {
-        className: (0, _classnames.default)("".concat(classPrefix, "-outer"), props.className),
-        style: props.style,
-        onClick: function onClick(e) {
-            return handleClick(e);
-        }
+        className: (0, _classnames.default)("".concat(classPrefix, "-outer"), className),
+        style: style,
+        onClick: handleClick
     }, close, header, /*#__PURE__*/ _react.default.createElement("div", {
         className: classPrefix,
         style: {
@@ -41,6 +57,6 @@ var Content = function Content(props) {
         }
     }, renderHeader(), /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-content")
-    }, /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, children)), renderFooter()));
+    }, children), renderFooter()));
 };
 Content.displayName = 'NutContent';

package/dist/cjs/packages/dialog/dialog.d.ts

@@ -1,3 +1,2 @@
-import { DialogBasicProps, DialogComponent } from './config';
-export type DialogProps = DialogBasicProps;
+import { DialogComponent } from './types';
 export declare const Dialog: DialogComponent;

package/dist/cjs/packages/dialog/dialog.js

@@ -24,9 +24,7 @@ var _button = /*#__PURE__*/ _interop_require_default._(require("../button"));
 var _confirm = /*#__PURE__*/ _interop_require_default._(require("./confirm"));
 var _dialogwrap = require("./dialogwrap");
 var _configprovider = require("../configprovider");
-var _typings = require("../../utils/typings");
-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._)({}, _dialogwrap.defaultDialogWrapProps), {
     confirmText: '',
     cancelText: '',
     overlay: true,
@@ -38,6 +36,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     lockScroll: true,
     closeIconPosition: 'bottom',
     closeIcon: false,
+    zIndex: 1200,
     beforeCancel: function beforeCancel() {
         return true;
     },
@@ -47,7 +46,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var BaseDialog = function BaseDialog(props, ref) {
     var locale = (0, _configprovider.useConfig)().locale;
-    var _mergeProps = (0, _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 = (0, _object_without_properties._)(_mergeProps, [
+    var _ref = (0, _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 = (0, _object_without_properties._)(_ref, [
         "visible",
         "footer",
         "hideConfirmButton",
@@ -59,6 +58,7 @@ var BaseDialog = function BaseDialog(props, ref) {
         "cancelText",
         "closeIconPosition",
         "closeIcon",
+        "footerDirection",
         "onClose",
         "onCancel",
         "onConfirm",
@@ -122,15 +122,26 @@ var BaseDialog = function BaseDialog(props, ref) {
                 return _ref.apply(this, arguments);
             };
         }();
-        return footer || /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !hideCancelButton && /*#__PURE__*/ _react.default.createElement(_button.default, {
+        var btnClass = hideCancelButton || hideConfirmButton ? "".concat(classPrefix, "-footer-block") : '';
+        return footer || /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !hideCancelButton && (footerDirection === 'vertical' ? /*#__PURE__*/ _react.default.createElement("div", {
+            style: {
+                order: 2
+            },
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
+            onClick: function onClick(e) {
+                return handleCancel(e);
+            }
+        }, cancelText || locale.cancel) : /*#__PURE__*/ _react.default.createElement(_button.default, {
             type: "default",
-            className: "".concat(classPrefix, "-footer-cancel"),
+            size: "large",
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
             onClick: function onClick(e) {
                 return handleCancel(e);
             }
-        }, cancelText || locale.cancel), !hideConfirmButton && /*#__PURE__*/ _react.default.createElement(_button.default, {
+        }, cancelText || locale.cancel)), !hideConfirmButton && /*#__PURE__*/ _react.default.createElement(_button.default, {
             type: "primary",
-            className: (0, _classnames.default)("".concat(classPrefix, "-footer-ok"), {
+            size: "large",
+            className: (0, _classnames.default)("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
                 disabled: disableConfirmButton
             }),
             disabled: disableConfirmButton,
@@ -150,19 +161,21 @@ var BaseDialog = function BaseDialog(props, ref) {
         };
         var _obj;
         var closeClasses = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-close"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
+        var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null) : /*#__PURE__*/ _react.default.createElement(_iconsreact.Failure, null);
         return /*#__PURE__*/ _react.default.createElement("div", {
             className: closeClasses,
             onClick: handleCancel
-        }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null));
+        }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     return /*#__PURE__*/ _react.default.createElement("div", {
         style: {
             display: visible ? 'block' : 'none'
         }
-    }, /*#__PURE__*/ _react.default.createElement(_dialogwrap.DialogWrap, (0, _object_spread_props._)((0, _object_spread._)({}, props), {
+    }, /*#__PURE__*/ _react.default.createElement(_dialogwrap.DialogWrap, (0, _object_spread_props._)((0, _object_spread._)({}, restProps), {
         visible: visible,
         lockScroll: lockScroll,
         footer: renderFooter(),
+        footerDirection: footerDirection,
         close: renderCloseIcon(),
         onClose: onClose,
         onCancel: onCancel

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

@@ -2,35 +2,52 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "DialogWrap", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    DialogWrap: function() {
         return DialogWrap;
+    },
+    defaultDialogWrapProps: function() {
+        return defaultDialogWrapProps;
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
+var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _reacttransitiongroup = require("react-transition-group");
-var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _content = require("./content");
 var _overlay = require("../overlay/overlay");
-var _typings = require("../../utils/typings");
 var _overlay1 = /*#__PURE__*/ _interop_require_default._(require("../overlay"));
-var _mergeprops = require("../../utils/merge-props");
-var defaultDialogProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+var defaultDialogWrapProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps, _content.defaultContentProps), {
     overlay: true,
     overlayStyle: {},
-    overlayClassName: '',
+    overlayClassName: 'nut-dialog-overlay',
     onCancel: function onCancel() {},
     onClose: function onClose() {},
-    onOverlayClick: function onOverlayClick(e) {
+    onOverlayClick: function onOverlayClick() {
         return true;
     }
-}), _overlay.defaultOverlayProps);
+});
 var DialogWrap = function DialogWrap(props) {
-    var _mergeProps = (0, _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 = (0, _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 = (0, _object_without_properties._)(_ref, [
+        "visible",
+        "overlay",
+        "overlayStyle",
+        "overlayClassName",
+        "closeOnOverlayClick",
+        "lockScroll",
+        "zIndex",
+        "onClose",
+        "onCancel",
+        "onOverlayClick"
+    ]);
     var onHandleClickOverlay = function onHandleClickOverlay(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
             var closed = onOverlayClick && onOverlayClick(e);
@@ -38,20 +55,24 @@ var DialogWrap = function DialogWrap(props) {
             closed && (onCancel === null || onCancel === void 0 ? void 0 : onCancel());
         }
     };
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay ? /*#__PURE__*/ _react.default.createElement(_overlay1.default, {
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay && /*#__PURE__*/ _react.default.createElement(_overlay1.default, {
+        zIndex: zIndex,
         style: overlayStyle,
-        className: (0, _classnames.default)('nut-dialog-overlay', overlayClassName),
+        className: overlayClassName,
         visible: visible,
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
         onClick: onHandleClickOverlay
-    }) : null, /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
+    }), /*#__PURE__*/ _react.default.createElement(_reacttransitiongroup.CSSTransition, {
         in: visible,
         timeout: 300,
         classNames: "fadeDialog",
         unmountOnExit: true,
         appear: true
-    }, /*#__PURE__*/ _react.default.createElement(_content.Content, (0, _object_spread_props._)((0, _object_spread._)({}, props), {
+    }, /*#__PURE__*/ _react.default.createElement(_content.Content, (0, _object_spread_props._)((0, _object_spread._)({}, restProps), {
+        style: {
+            zIndex: zIndex
+        },
         visible: visible
     }))));
 };

package/dist/cjs/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/cjs/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%;
+      }
     }
   }
 }