@qsxy/element-plus-react 1.0.2 → 2.0.0

package/dist/Dialog/Dialog.js

@@ -1,110 +1,125 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _templateObject;
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
 import { addClass, removeClass } from 'dom-lib';
-import React, { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
+import omit from 'lodash/omit';
+import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import Transition from "../Transition/Transition";
-import { PopupManager, addUnit } from "../Util";
-import { useClassNames, useControlled } from "../hooks";
+import { PopupManager, addUnit, mergeDefaultProps } from "../Util";
+import { useClassNames } from "../hooks";
+import { useLockscreen } from "../hooks/useLockscreen";
 import DialogBody from "./DialogBody";
 import { DialogContext } from "./DialogContext";
 import DialogFooter from "./DialogFooter";
 import DialogHeader from "./DialogHeader";
 import { useDraggable } from "./useDraggable";
-function InternalElDialog(props, ref) {
-  var _props$modal = props.modal,
-    modal = _props$modal === void 0 ? true : _props$modal,
-    _props$closeOnClickMo = props.closeOnClickModal,
-    closeOnClickModal = _props$closeOnClickMo === void 0 ? true : _props$closeOnClickMo,
-    _props$width = props.width,
-    width = _props$width === void 0 ? '50%' : _props$width,
-    _props$overflow = props.overflow,
-    overflow = _props$overflow === void 0 ? false : _props$overflow,
-    title = props.title,
-    showClose = props.showClose,
-    border = props.border,
-    children = props.children,
-    center = props.center,
-    alignCenter = props.alignCenter,
-    draggable = props.draggable,
-    fullscreen = props.fullscreen,
-    headerClass = props.headerClass,
-    top = props.top,
-    close = props.close,
-    beforeClose = props.beforeClose,
-    _props$lockScroll = props.lockScroll,
-    lockScroll = _props$lockScroll === void 0 ? true : _props$lockScroll,
-    zIndex = props.zIndex,
-    _props$classPrefix = props.classPrefix,
-    classPrefix = _props$classPrefix === void 0 ? 'dialog' : _props$classPrefix;
+var Dialog = /*#__PURE__*/React.memo( /*#__PURE__*/forwardRef(function (props, ref) {
+  props = mergeDefaultProps({
+    visible: false,
+    modal: true,
+    closeOnClickModal: true,
+    width: '50%',
+    overflow: false,
+    lockScroll: true,
+    showClose: true,
+    classPrefix: 'dialog',
+    transitionConfig: 'dialog-fade',
+    openDelay: 0,
+    closeDelay: 0,
+    destroyOnClose: false
+  }, props);
+  var _props = props,
+    visible = _props.visible,
+    modal = _props.modal,
+    modalPenetrable = _props.modalPenetrable,
+    closeOnClickModal = _props.closeOnClickModal,
+    width = _props.width,
+    overflow = _props.overflow,
+    title = _props.title,
+    footer = _props.footer,
+    showClose = _props.showClose,
+    openDelay = _props.openDelay,
+    closeDelay = _props.closeDelay,
+    border = _props.border,
+    children = _props.children,
+    center = _props.center,
+    alignCenter = _props.alignCenter,
+    draggable = _props.draggable,
+    fullscreen = _props.fullscreen,
+    headerClass = _props.headerClass,
+    bodyClass = _props.bodyClass,
+    footerClass = _props.footerClass,
+    top = _props.top,
+    onCloseDialog = _props.onCloseDialog,
+    beforeClose = _props.beforeClose,
+    lockScroll = _props.lockScroll,
+    zIndex = _props.zIndex,
+    classPrefix = _props.classPrefix,
+    modalClass = _props.modalClass,
+    transitionConfig = _props.transitionConfig,
+    destroyOnClose = _props.destroyOnClose;
   var _useClassNames = useClassNames(classPrefix),
     b = _useClassNames.b,
     m = _useClassNames.m,
     is = _useClassNames.is;
-  var _useControlled = useControlled(props.visible, props.defaultVisible),
-    _useControlled2 = _slicedToArray(_useControlled, 3),
-    visible = _useControlled2[0],
-    setVisible = _useControlled2[1],
-    isControlled = _useControlled2[2];
-
-  /** 是否有标题 */
-  var haveTitle = useRef(false);
+  useLockscreen(visible, {
+    shouldLock: lockScroll
+  });
 
-  /** 是否有按钮组 */
-  var haveFooter = useRef(false);
   // 模态框容器div
   var wrapperRef = useRef(null);
   // 模态框主题div
   var dialogRef = useRef(null);
-  // 遮罩div
-  // const backdropRef = useRef<HTMLDivElement>(null);
   var overlayRef = useRef(null);
   var headerRef = useRef(null);
-  useDraggable(dialogRef, headerRef, draggable, overflow);
-
-  /** 获取子组件 */
-  var getInstancesFromChildren = useCallback(function (_children) {
-    var componentChildren = _children instanceof Array ? _children : [_children];
-    componentChildren.forEach(function (node) {
-      var _nodeType;
-      var nodeType = node === null || node === void 0 ? void 0 : node.type;
-      nodeType = ((_nodeType = nodeType) === null || _nodeType === void 0 ? void 0 : _nodeType.displayName) || nodeType;
-      if (nodeType === 'ElDialogHeader') {
-        haveTitle.current = true;
-      } else if (nodeType === 'ElDialogFooter') {
-        haveFooter.current = true;
-      } else if (nodeType === 'Fragment') {
-        getInstancesFromChildren(node);
-      }
-    });
-  }, []);
+  var mousedownRef = useRef(null);
+  var contentRef = useRef(null);
+  var nextZIndex = useMemo(function () {
+    return zIndex || PopupManager.nextZIndex();
+  }, [zIndex]);
+  var onMousedown = function onMousedown(e) {
+    e.stopPropagation();
+    mousedownRef.current = e;
+  };
+  var onMouseup = function onMouseup(mouseup) {
+    var _mousedownRef$current, _dialogRef$current, _dialogRef$current2;
+    var mouseUpTarget = mouseup === null || mouseup === void 0 ? void 0 : mouseup.target;
+    var mouseDownTarget = mousedownRef === null || mousedownRef === void 0 || (_mousedownRef$current = mousedownRef.current) === null || _mousedownRef$current === void 0 ? void 0 : _mousedownRef$current.target;
+    var isTargetExists = !mouseUpTarget || !mouseDownTarget;
+    var isContainedByPopper = (dialogRef === null || dialogRef === void 0 || (_dialogRef$current = dialogRef.current) === null || _dialogRef$current === void 0 ? void 0 : _dialogRef$current.contains(mouseUpTarget)) || (dialogRef === null || dialogRef === void 0 || (_dialogRef$current2 = dialogRef.current) === null || _dialogRef$current2 === void 0 ? void 0 : _dialogRef$current2.contains(mouseDownTarget));
+    if (isTargetExists || isContainedByPopper) {
+      return;
+    }
+    if (closeOnClickModal) {
+      doClose();
+    } else {
+      addClass(dialogRef.current, b('dialog-shake', false));
+      setTimeout(function () {
+        removeClass(dialogRef.current, b('dialog-shake', false));
+      }, 300);
+    }
+  };
+  useDraggable(dialogRef, headerRef, props);
   var doClose = useCallback(function () {
     if (beforeClose) {
-      beforeClose === null || beforeClose === void 0 || beforeClose(function (value) {
-        if (value) {
+      beforeClose === null || beforeClose === void 0 || beforeClose(function (cancle) {
+        if (cancle) {
           return;
         }
-        setVisible(false);
-        close === null || close === void 0 || close();
+        onCloseDialog === null || onCloseDialog === void 0 || onCloseDialog();
       });
     } else {
-      setVisible(false);
-      close === null || close === void 0 || close();
+      onCloseDialog === null || onCloseDialog === void 0 || onCloseDialog();
     }
-  }, [beforeClose, close, setVisible]);
+  }, [beforeClose, onCloseDialog]);
 
   // const keydown = useCallback(
   //     ({ code }: KeyboardEvent) => {
@@ -118,115 +133,80 @@ function InternalElDialog(props, ref) {
   //     [doClose, visible],
   // );
 
-  /**关闭对话框 */
-  useEffect(function () {
-    if (visible) {
-      var mousedown;
-      var shadowRef = wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current;
-      shadowRef === null || shadowRef === void 0 || shadowRef.addEventListener('mousedown', function (e) {
-        return mousedown = e;
-      });
-      shadowRef === null || shadowRef === void 0 || shadowRef.addEventListener('mouseup', function (mouseup) {
-        var _mousedown, _dialogRef$current, _dialogRef$current2;
-        var mouseUpTarget = mouseup === null || mouseup === void 0 ? void 0 : mouseup.target;
-        var mouseDownTarget = (_mousedown = mousedown) === null || _mousedown === void 0 ? void 0 : _mousedown.target;
-        var isTargetExists = !mouseUpTarget || !mouseDownTarget;
-        var isContainedByPopper = (dialogRef === null || dialogRef === void 0 || (_dialogRef$current = dialogRef.current) === null || _dialogRef$current === void 0 ? void 0 : _dialogRef$current.contains(mouseUpTarget)) || (dialogRef === null || dialogRef === void 0 || (_dialogRef$current2 = dialogRef.current) === null || _dialogRef$current2 === void 0 ? void 0 : _dialogRef$current2.contains(mouseDownTarget));
-        if (isTargetExists || isContainedByPopper) {
-          return;
-        }
-        if (closeOnClickModal) {
-          doClose();
-        } else {
-          addClass(dialogRef.current, b('dialog-shake', false));
-          setTimeout(function () {
-            removeClass(dialogRef.current, b('dialog-shake', false));
-          }, 300);
-        }
-      });
-    }
-  }, [b, modal, beforeClose, doClose, ref, setVisible, visible, closeOnClickModal]);
-
-  // useEffect(() => {
-  //     document.addEventListener('keydown', keydown, false);
-  //     console.log(PopupManager.zIndex);
-  //     return () => {
-  //         console.log(PopupManager.zIndex);
-  //         document.removeEventListener('keydown', keydown, false);
-  //     };
-  // }, [keydown]);
-
-  useEffect(function () {
-    getInstancesFromChildren(children);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   useImperativeHandle(ref, function () {
     return wrapperRef.current;
   });
+  var transitionName = typeof transitionConfig === 'string' ? transitionConfig : transitionConfig.name;
   return /*#__PURE__*/React.createElement(DialogContext.Provider, {
     value: {
       modal: modal,
-      setVisible: setVisible,
-      isControlled: isControlled,
       doClose: doClose,
       center: center,
-      overflow: overflow,
-      haveTitle: haveTitle.current,
-      haveFooter: haveFooter.current
+      overflow: overflow
     }
-  }, /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(Transition, {
+  }, /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(Transition, _extends({
     nodeRef: wrapperRef,
     visible: visible,
     transitionAppear: true,
-    unmountOnExit: props.unmountOnExit || !draggable,
+    unmountOnExit: destroyOnClose,
     beforeEnter: function beforeEnter() {
-      var _props$beforeEnter;
-      (_props$beforeEnter = props.beforeEnter) === null || _props$beforeEnter === void 0 || _props$beforeEnter.call(props);
-      addClass(overlayRef.current, b('anim-bounce-in', false));
+      var _props$beforeEnter, _props2;
+      (_props$beforeEnter = (_props2 = props).beforeEnter) === null || _props$beforeEnter === void 0 || _props$beforeEnter.call(_props2);
+      addClass(wrapperRef.current, transitionName + '-enter-from');
+      addClass(wrapperRef.current, transitionName + '-enter-active');
     },
     onEnter: function onEnter() {
-      var _props$onOpen, _props$onEnter;
-      (_props$onOpen = props.onOpen) === null || _props$onOpen === void 0 || _props$onOpen.call(props);
-      (_props$onEnter = props.onEnter) === null || _props$onEnter === void 0 || _props$onEnter.call(props);
+      var _props$onOpen, _props3, _props$onEnter, _props4;
+      (_props$onOpen = (_props3 = props).onOpen) === null || _props$onOpen === void 0 || _props$onOpen.call(_props3);
+      (_props$onEnter = (_props4 = props).onEnter) === null || _props$onEnter === void 0 || _props$onEnter.call(_props4);
       if (draggable && dialogRef.current) {
         // addStyle(modalRef.current, 'transform', `translate(${positionRef.current.left}px, ${positionRef.current.top}px)`);
       }
-      if (lockScroll) {
-        addClass(document.body, b('popup-parent--hidden', false));
-      }
     },
     afterEnter: function afterEnter() {
-      var _props$afterEnter, _props$onOpened;
-      (_props$afterEnter = props.afterEnter) === null || _props$afterEnter === void 0 || _props$afterEnter.call(props);
-      (_props$onOpened = props.onOpened) === null || _props$onOpened === void 0 || _props$onOpened.call(props);
-      // addStyle(dialogRef.current, 'display', 'block');
-      removeClass(overlayRef.current, b('anim-bounce-in', false));
+      var _props$afterEnter, _props5, _props$onOpened, _props6;
+      (_props$afterEnter = (_props5 = props).afterEnter) === null || _props$afterEnter === void 0 || _props$afterEnter.call(_props5);
+      (_props$onOpened = (_props6 = props).onOpened) === null || _props$onOpened === void 0 || _props$onOpened.call(_props6);
+      removeClass(wrapperRef.current, transitionName + '-enter-from');
+      // removeClass(wrapperRef.current, transitionName + '-enter-active');
     },
     beforeLeave: function beforeLeave() {
-      var _props$beforeLeave;
-      addClass(overlayRef.current, b('anim-bounce-out', false));
-      (_props$beforeLeave = props.beforeLeave) === null || _props$beforeLeave === void 0 || _props$beforeLeave.call(props);
+      var _props$beforeLeave, _props7;
+      addClass(wrapperRef.current, transitionName + '-leave-to');
+      addClass(wrapperRef.current, transitionName + '-leave-active');
+      (_props$beforeLeave = (_props7 = props).beforeLeave) === null || _props$beforeLeave === void 0 || _props$beforeLeave.call(_props7);
     },
     onLeave: function onLeave() {
-      var _props$onClose, _props$onLeave;
-      (_props$onClose = props.onClose) === null || _props$onClose === void 0 || _props$onClose.call(props);
-      (_props$onLeave = props.onLeave) === null || _props$onLeave === void 0 || _props$onLeave.call(props);
+      var _props$onClose, _props8, _props$onLeave, _props9;
+      (_props$onClose = (_props8 = props).onClose) === null || _props$onClose === void 0 || _props$onClose.call(_props8);
+      (_props$onLeave = (_props9 = props).onLeave) === null || _props$onLeave === void 0 || _props$onLeave.call(_props9);
+      // removeClass(wrapperRef.current, transitionName + '-leave-to');
     },
     afterLeave: function afterLeave() {
-      var _props$afterLeave, _props$onClosed;
-      (_props$afterLeave = props.afterLeave) === null || _props$afterLeave === void 0 || _props$afterLeave.call(props);
-      (_props$onClosed = props.onClosed) === null || _props$onClosed === void 0 || _props$onClosed.call(props);
-      if (lockScroll) {
-        removeClass(document.body, b('popup-parent--hidden', false));
-      }
-      removeClass(overlayRef.current, b('anim-bounce-out', false));
+      var _props$afterLeave, _props10, _props$onClosed, _props11;
+      (_props$afterLeave = (_props10 = props).afterLeave) === null || _props$afterLeave === void 0 || _props$afterLeave.call(_props10);
+      (_props$onClosed = (_props11 = props).onClosed) === null || _props$onClosed === void 0 || _props$onClosed.call(_props11);
+      removeClass(wrapperRef.current, transitionName + '-leave-active');
+      removeClass(wrapperRef.current, transitionName + '-leave-to');
     },
-    duration: 300
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classNames(b('overlay', false), props.className),
-    style: {
-      zIndex: zIndex || PopupManager.nextZIndex()
+    duration: 200 + closeDelay,
+    showDuration: openDelay
+  }, typeof transitionConfig === 'string' ? {} : omit(transitionConfig, 'name')), /*#__PURE__*/React.createElement("div", {
+    className: classNames(modal ? b('overlay', false) : '', modalClass || b('modal-dialog', false), is({
+      penetrable: modalPenetrable
+    })),
+    style: modal ? {
+      zIndex: nextZIndex
+    } : {
+      zIndex: nextZIndex,
+      position: 'fixed',
+      top: '0px',
+      right: '0px',
+      bottom: '0px',
+      left: '0px'
     },
+    onMouseDown: onMousedown,
+    onMouseUp: onMouseup,
     ref: wrapperRef
   }, /*#__PURE__*/React.createElement("div", {
     ref: overlayRef,
@@ -235,7 +215,7 @@ function InternalElDialog(props, ref) {
       display: alignCenter ? 'flex' : 'block'
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: classNames(b(), is({
+    className: classNames(b(), props.className, is({
       draggable: draggable,
       'align-center': alignCenter,
       fullscreen: fullscreen
@@ -248,11 +228,14 @@ function InternalElDialog(props, ref) {
     showClose: showClose,
     border: border,
     headerClass: headerClass
-  }, title), children)))), document.body));
-}
-var Comp = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(InternalElDialog));
-var Dialog = Comp;
-Dialog.body = DialogBody;
-Dialog.footer = DialogFooter;
+  }, title), /*#__PURE__*/React.createElement(DialogBody, {
+    ref: contentRef,
+    classPrefix: classPrefix,
+    className: bodyClass
+  }, children), /*#__PURE__*/React.createElement(DialogFooter, {
+    classPrefix: classPrefix,
+    className: footerClass
+  }, footer))))), document.body));
+}));
 Dialog.displayName = 'ElDialog';
 export default Dialog;

package/dist/Dialog/DialogBody.js

@@ -1,52 +1,17 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _templateObject;
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 import classNames from 'classnames';
-import React, { forwardRef, memo, useImperativeHandle, useRef } from 'react';
+import React, { forwardRef, memo } from 'react';
 import { useClassNames } from "../hooks";
 var DialogBody = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, ref) {
   var _props$classPrefix = props.classPrefix,
     classPrefix = _props$classPrefix === void 0 ? 'dialog' : _props$classPrefix;
   var _useClassNames = useClassNames(classPrefix),
     e = _useClassNames.e;
-  // const { overflow, mounted, haveFooter } = useContext(DialogContext);
-
-  var contentRef = useRef(null);
-  // const scrollbarInstance = useRef<ScrollbarRef>(null);
-
-  // const resizeFn = useCallback(() => {
-  //     if (contentRef.current) {
-  //         const { top } = contentRef.current.getBoundingClientRect();
-  //         const { height = 0 } = haveFooter && contentRef.current.nextElementSibling ? contentRef.current.nextElementSibling.getBoundingClientRect() : {};
-  //         addStyle(contentRef.current, { [overflow ? 'height' : 'maxHeight']: `${document.body.clientHeight - top - height - 20 - 60}px` });
-  //         scrollbarInstance.current?.update();
-  //     }
-  // }, [haveFooter, overflow]);
-
-  // useEffect(() => {
-  //     if (mounted) {
-  //         resizeFn();
-  //         window.addEventListener('resize', resizeFn);
-  //     }
-
-  //     return () => {
-  //         window.removeEventListener('resize', resizeFn);
-  //     };
-  //     // eslint-disable-next-line react-hooks/exhaustive-deps
-  // }, [mounted]);
-
-  useImperativeHandle(ref, function () {
-    return contentRef.current;
-  });
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(e(_templateObject || (_templateObject = _taggedTemplateLiteral(["body"]))), props.className),
-    ref: contentRef,
-    style: _objectSpread({}, props.style)
+    ref: ref,
+    style: props.style
   }, props.children);
 }));
 DialogBody.displayName = 'ElDialogBody';

package/dist/Dialog/DialogContext.d.ts

@@ -2,21 +2,14 @@
 interface DialogContentProps {
     /** 当设置为 true，Dialog 打开时会显示背景，点击背景会关闭 Dialog，如果不想关闭 Dialog，可以设置为 'static' */
     modal: boolean;
-    setVisible: (visible: boolean) => void;
     /** 隐藏时的回调函数 */
     doClose: () => void;
-    /** 是否可控 */
-    isControlled: boolean;
     /** 是否让 Dialog 的 header 和 footer 部分居中排列 */
     center: boolean;
     /** body 内容过长时自动设置高度 */
     overflow: boolean;
     /** 是否加载成功 */
     mounted?: boolean;
-    /** 是否有标题 */
-    haveTitle: boolean;
-    /** 是否有按钮组 */
-    haveFooter: boolean;
 }
 export declare const DialogContext: import("react").Context<DialogContentProps>;
 export {};

package/dist/Dialog/DialogContext.js

@@ -2,12 +2,8 @@ import noop from 'lodash/noop';
 import { createContext } from 'react';
 export var DialogContext = /*#__PURE__*/createContext({
   modal: true,
-  setVisible: noop,
   doClose: noop,
-  isControlled: false,
   center: false,
   overflow: false,
-  mounted: false,
-  haveTitle: false,
-  haveFooter: false
+  mounted: false
 });

package/dist/Dialog/DialogHeader.js

@@ -20,14 +20,14 @@ var DialogHeader = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, r
   var isString = useMemo(function () {
     return typeof props.children === 'string';
   }, [props.children]);
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("header", {
     ref: ref,
     className: classNames(e(_templateObject || (_templateObject = _taggedTemplateLiteral(["header"]))), is({
       border: border
     }), {
       'show-close': showClose
     }, props.headerClass)
-  }, isString ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }, isString ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: e(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["title"]))),
     style: center ? {
       textAlign: 'center'

package/dist/Dialog/typings.d.ts

@@ -4,43 +4,61 @@ import { AnimationEventProps, BaseProps, NativeProps } from '../types/common';
 export interface DialogProps extends AnimationEventProps, BaseProps, NativeProps<'--el-dialog-width' | '--el-dialog-margin-top' | '--el-dialog-bg-color' | '--el-dialog-box-shadow' | '--el-dialog-title-font-size' | '--el-dialog-content-font-size' | '--el-dialog-font-line-height' | '--el-dialog-padding-primary' | '--el-dialog-border-radius'>, TransitionProps {
     /** 是否显示模态框（可控） */
     visible: boolean;
-    /** 默认是否显示模态框 */
-    defaultVisible?: boolean;
+    /** Dialog 对话框 Dialog 的标题， 也可通过ElDialog.header传入 */
+    title?: string | React.ReactElement;
+    /** 对话框的宽度，默认值为 50% */
+    width?: string | number;
+    /** 是否为全屏 Dialog */
+    fullscreen?: boolean;
+    /** dialog CSS 中的 margin-top 值，默认为 15vh */
+    top?: string;
     /** 是否需要遮罩层 */
     modal?: boolean;
+    /** 是否允许穿透遮罩层。 modal 属性必须为 false */
+    modalPenetrable?: boolean;
     /** 遮罩的自定义类名 */
-    className?: string;
-    /** 是否可以通过点击 modal 关闭 Dialog */
-    closeOnClickModal?: boolean;
-    /** 应用于 backdrop DOM 节点的 css class */
-    backdropClassName?: string;
-    /** 对话框的宽度，默认值为 50% */
-    width?: string | number;
+    modalClass?: string;
     /** header 部分的自定义 class 名 */
     headerClass?: string;
-    /** Dialog 对话框 Dialog 的标题， 也可通过ElDialog.header传入 */
-    title?: string | React.ReactElement;
+    /** body 部分的自定义 class 名 */
+    bodyClass?: string;
+    /** footer 部分的自定义 class 名 */
+    footerClass?: string;
+    /** 是否在 Dialog 出现时将 body 滚动锁定 */
+    lockScroll?: boolean;
+    /** dialog 打开的延时时间，单位毫秒 */
+    openDelay?: number;
+    /** dialog 关闭的延时时间，单位毫秒 */
+    closeDelay?: number;
+    /** 是否可以通过点击 modal 关闭 Dialog */
+    closeOnClickModal?: boolean;
+    /** 是否可以通过按下 ESC 关闭 Dialog */
     /** 当设置为 true, 显示关闭按钮 */
     showClose?: boolean;
-    /** 标题是否有边框 */
-    border?: boolean;
-    /** dialog CSS 中的 margin-top 值，默认为 15vh */
-    top?: string;
-    /** 是否让 Dialog 的 header 和 footer 部分居中排列 */
-    center?: boolean;
-    /** 是否水平垂直对齐对话框 */
-    alignCenter?: boolean;
+    /** 关闭前的回调，会暂停 Dialog 的关闭. 回调函数内执行 done 参数方法的时候才是真正关闭对话框的时候. */
+    beforeClose?: DialogBeforeCloseFn;
+    /** 关闭Dialog函数，与 `visible` 属性配合使用，关闭后将 `visible` 设置为 `false`。 */
+    onCloseDialog?: () => void;
+    /** 控制是否在关闭 Dialog 之后将子元素全部销毁 */
+    destroyOnClose?: boolean;
     /** 为 Dialog 启用可拖拽功能 */
     draggable?: boolean;
     /** 拖动范围可以超出可视区 */
     overflow?: boolean;
-    /** 是否为全屏 Dialog */
-    fullscreen?: boolean;
-    /** 是否在 Dialog 出现时将 body 滚动锁定 */
-    lockScroll?: boolean;
-    /** 是否可以通过按下 ESC 关闭 Dialog */
+    /** 是否让 Dialog 的 header 和 footer 部分居中排列 */
+    center?: boolean;
+    /** 是否水平垂直对齐对话框 */
+    alignCenter?: boolean;
     /** 和原生的 CSS 的 z-index 相同，改变 z 轴的顺序 */
     zIndex?: number;
+    /** 遮罩的自定义类名 */
+    className?: string;
+    /** Dialog 对话框 Dialog 的底部内容， 也可通过ElDialog.footer传入 */
+    footer?: React.ReactNode;
+    /** 标题是否有边框 */
+    border?: boolean;
+    /** Dialog 过渡动画配置 */
+    transitionConfig?: DialogTransition;
     /** Dialog 打开的回调 */
     onOpen?: () => void;
     /** Dialog 打开动画结束时的回调 */
@@ -49,13 +67,10 @@ export interface DialogProps extends AnimationEventProps, BaseProps, NativeProps
     onClose?: () => void;
     /** Dialog 关闭动画结束时的回调 */
     onClosed?: () => void;
-    /** 关闭弹窗函数 */
-    close: () => void;
-    /** 关闭前的回调，会暂停 Dialog 的关闭. 回调函数内执行 done 参数方法的时候才是真正关闭对话框的时候. */
-    beforeClose?: DialogBeforeCloseFn;
 }
 type DoneFn = (cancel?: boolean) => void;
 export type DialogBeforeCloseFn = (done: DoneFn) => void;
+export type DialogTransition = string | TransitionProps;
 export interface DialogHeaderProps extends BaseProps {
     /** header 部分的自定义 class 名 */
     headerClass?: string;

package/dist/Dialog/useDraggable.d.ts

@@ -1,2 +1,3 @@
 import { RefObject } from 'react';
-export declare const useDraggable: (targetRef: RefObject<HTMLElement | undefined>, dragRef: RefObject<HTMLElement | undefined>, draggable: boolean, overflow?: boolean) => void;
+import { DialogProps } from './typings';
+export declare const useDraggable: (targetRef: RefObject<HTMLElement | undefined>, dragRef: RefObject<HTMLElement | undefined>, props: DialogProps) => void;