@rc-component/dialog 1.0.0 → 1.1.0

package/es/Dialog/index.js

@@ -1,67 +1,62 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+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); }
 import classNames from 'classnames';
-import contains from "rc-util/es/Dom/contains";
-import useId from "rc-util/es/hooks/useId";
-import KeyCode from "rc-util/es/KeyCode";
-import pickAttrs from "rc-util/es/pickAttrs";
+import contains from "@rc-component/util/es/Dom/contains";
+import useId from "@rc-component/util/es/hooks/useId";
+import KeyCode from "@rc-component/util/es/KeyCode";
+import pickAttrs from "@rc-component/util/es/pickAttrs";
 import * as React from 'react';
 import { useEffect, useRef } from 'react';
 import { getMotionName } from "../util";
 import Content from "./Content";
 import Mask from "./Mask";
-import { warning } from "rc-util/es/warning";
-var Dialog = function Dialog(props) {
-  var _props$prefixCls = props.prefixCls,
-    prefixCls = _props$prefixCls === void 0 ? 'rc-dialog' : _props$prefixCls,
-    zIndex = props.zIndex,
-    _props$visible = props.visible,
-    visible = _props$visible === void 0 ? false : _props$visible,
-    _props$keyboard = props.keyboard,
-    keyboard = _props$keyboard === void 0 ? true : _props$keyboard,
-    _props$focusTriggerAf = props.focusTriggerAfterClose,
-    focusTriggerAfterClose = _props$focusTriggerAf === void 0 ? true : _props$focusTriggerAf,
-    wrapStyle = props.wrapStyle,
-    wrapClassName = props.wrapClassName,
-    wrapProps = props.wrapProps,
-    onClose = props.onClose,
-    afterOpenChange = props.afterOpenChange,
-    afterClose = props.afterClose,
-    transitionName = props.transitionName,
-    animation = props.animation,
-    _props$closable = props.closable,
-    closable = _props$closable === void 0 ? true : _props$closable,
-    _props$mask = props.mask,
-    mask = _props$mask === void 0 ? true : _props$mask,
-    maskTransitionName = props.maskTransitionName,
-    maskAnimation = props.maskAnimation,
-    _props$maskClosable = props.maskClosable,
-    maskClosable = _props$maskClosable === void 0 ? true : _props$maskClosable,
-    maskStyle = props.maskStyle,
-    maskProps = props.maskProps,
-    rootClassName = props.rootClassName,
-    modalClassNames = props.classNames,
-    modalStyles = props.styles;
+import { warning } from "@rc-component/util/es/warning";
+const Dialog = props => {
+  const {
+    prefixCls = 'rc-dialog',
+    zIndex,
+    visible = false,
+    keyboard = true,
+    focusTriggerAfterClose = true,
+    // scrollLocker,
+    // Wrapper
+    wrapStyle,
+    wrapClassName,
+    wrapProps,
+    onClose,
+    afterOpenChange,
+    afterClose,
+    // Dialog
+    transitionName,
+    animation,
+    closable = true,
+    // Mask
+    mask = true,
+    maskTransitionName,
+    maskAnimation,
+    maskClosable = true,
+    maskStyle,
+    maskProps,
+    rootClassName,
+    rootStyle,
+    classNames: modalClassNames,
+    styles: modalStyles
+  } = props;
   if (process.env.NODE_ENV !== 'production') {
-    ['wrapStyle', 'bodyStyle', 'maskStyle'].forEach(function (prop) {
+    ['wrapStyle', 'bodyStyle', 'maskStyle'].forEach(prop => {
       // (prop in props) && console.error(`Warning: ${prop} is deprecated, please use styles instead.`)
-      warning(!(prop in props), "".concat(prop, " is deprecated, please use styles instead."));
+      warning(!(prop in props), `${prop} is deprecated, please use styles instead.`);
     });
     if ('wrapClassName' in props) {
-      warning(false, "wrapClassName is deprecated, please use classNames instead.");
+      warning(false, `wrapClassName is deprecated, please use classNames instead.`);
     }
   }
-  var lastOutSideActiveElementRef = useRef();
-  var wrapperRef = useRef();
-  var contentRef = useRef();
-  var _React$useState = React.useState(visible),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    animatedVisible = _React$useState2[0],
-    setAnimatedVisible = _React$useState2[1];
+  const lastOutSideActiveElementRef = useRef();
+  const wrapperRef = useRef();
+  const contentRef = useRef();
+  const [animatedVisible, setAnimatedVisible] = React.useState(visible);
 
   // ========================== Init ==========================
-  var ariaId = useId();
+  const ariaId = useId();
   function saveLastOutSideActiveElementRef() {
     if (!contains(wrapperRef.current, document.activeElement)) {
       lastOutSideActiveElementRef.current = document.activeElement;
@@ -69,61 +64,66 @@ var Dialog = function Dialog(props) {
   }
   function focusDialogContent() {
     if (!contains(wrapperRef.current, document.activeElement)) {
-      var _contentRef$current;
-      (_contentRef$current = contentRef.current) === null || _contentRef$current === void 0 || _contentRef$current.focus();
+      contentRef.current?.focus();
     }
   }
 
   // ========================= Events =========================
+  // Close action will trigger by:
+  //   1. When hide motion end
+  //   2. Controlled `open` to `false` immediately after set to `true` which will not trigger motion
+  function doClose() {
+    // Clean up scroll bar & focus back
+    setAnimatedVisible(false);
+    if (mask && lastOutSideActiveElementRef.current && focusTriggerAfterClose) {
+      try {
+        lastOutSideActiveElementRef.current.focus({
+          preventScroll: true
+        });
+      } catch (e) {
+        // Do nothing
+      }
+      lastOutSideActiveElementRef.current = null;
+    }
+
+    // Trigger afterClose only when change visible from true to false
+    if (animatedVisible) {
+      afterClose?.();
+    }
+  }
   function onDialogVisibleChanged(newVisible) {
     // Try to focus
     if (newVisible) {
       focusDialogContent();
     } else {
-      // Clean up scroll bar & focus back
-      setAnimatedVisible(false);
-      if (mask && lastOutSideActiveElementRef.current && focusTriggerAfterClose) {
-        try {
-          lastOutSideActiveElementRef.current.focus({
-            preventScroll: true
-          });
-        } catch (e) {
-          // Do nothing
-        }
-        lastOutSideActiveElementRef.current = null;
-      }
-
-      // Trigger afterClose only when change visible from true to false
-      if (animatedVisible) {
-        afterClose === null || afterClose === void 0 || afterClose();
-      }
+      doClose();
     }
-    afterOpenChange === null || afterOpenChange === void 0 || afterOpenChange(newVisible);
+    afterOpenChange?.(newVisible);
   }
   function onInternalClose(e) {
-    onClose === null || onClose === void 0 || onClose(e);
+    onClose?.(e);
   }
 
   // >>> Content
-  var contentClickRef = useRef(false);
-  var contentTimeoutRef = useRef();
+  const contentClickRef = useRef(false);
+  const contentTimeoutRef = useRef();
 
   // We need record content click incase content popup out of dialog
-  var onContentMouseDown = function onContentMouseDown() {
+  const onContentMouseDown = () => {
     clearTimeout(contentTimeoutRef.current);
     contentClickRef.current = true;
   };
-  var onContentMouseUp = function onContentMouseUp() {
-    contentTimeoutRef.current = setTimeout(function () {
+  const onContentMouseUp = () => {
+    contentTimeoutRef.current = setTimeout(() => {
       contentClickRef.current = false;
     });
   };
 
   // >>> Wrapper
   // Close only when element not on dialog
-  var onWrapperClick = null;
+  let onWrapperClick = null;
   if (maskClosable) {
-    onWrapperClick = function onWrapperClick(e) {
+    onWrapperClick = e => {
       if (contentClickRef.current) {
         contentClickRef.current = false;
       } else if (wrapperRef.current === e.target) {
@@ -145,43 +145,47 @@ var Dialog = function Dialog(props) {
   }
 
   // ========================= Effect =========================
-  useEffect(function () {
+  useEffect(() => {
     if (visible) {
       setAnimatedVisible(true);
       saveLastOutSideActiveElementRef();
+    } else if (animatedVisible && contentRef.current.enableMotion() && !contentRef.current.inMotion()) {
+      doClose();
     }
   }, [visible]);
 
   // Remove direct should also check the scroll bar update
-  useEffect(function () {
-    return function () {
-      clearTimeout(contentTimeoutRef.current);
-    };
+  useEffect(() => () => {
+    clearTimeout(contentTimeoutRef.current);
   }, []);
-  var mergedStyle = _objectSpread(_objectSpread(_objectSpread({
-    zIndex: zIndex
-  }, wrapStyle), modalStyles === null || modalStyles === void 0 ? void 0 : modalStyles.wrapper), {}, {
+  const mergedStyle = {
+    zIndex,
+    ...wrapStyle,
+    ...modalStyles?.wrapper,
     display: !animatedVisible ? 'none' : null
-  });
+  };
 
   // ========================= Render =========================
   return /*#__PURE__*/React.createElement("div", _extends({
-    className: classNames("".concat(prefixCls, "-root"), rootClassName)
+    className: classNames(`${prefixCls}-root`, rootClassName),
+    style: rootStyle
   }, pickAttrs(props, {
     data: true
   })), /*#__PURE__*/React.createElement(Mask, {
     prefixCls: prefixCls,
     visible: mask && visible,
     motionName: getMotionName(prefixCls, maskTransitionName, maskAnimation),
-    style: _objectSpread(_objectSpread({
-      zIndex: zIndex
-    }, maskStyle), modalStyles === null || modalStyles === void 0 ? void 0 : modalStyles.mask),
+    style: {
+      zIndex,
+      ...maskStyle,
+      ...modalStyles?.mask
+    },
     maskProps: maskProps,
-    className: modalClassNames === null || modalClassNames === void 0 ? void 0 : modalClassNames.mask
+    className: modalClassNames?.mask
   }), /*#__PURE__*/React.createElement("div", _extends({
     tabIndex: -1,
     onKeyDown: onWrapperKeyDown,
-    className: classNames("".concat(prefixCls, "-wrap"), wrapClassName, modalClassNames === null || modalClassNames === void 0 ? void 0 : modalClassNames.wrapper),
+    className: classNames(`${prefixCls}-wrap`, wrapClassName, modalClassNames?.wrapper),
     ref: wrapperRef,
     onClick: onWrapperClick,
     style: mergedStyle

package/es/DialogWrap.js

@@ -1,5 +1,4 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+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); }
 import Portal from '@rc-component/portal';
 import * as React from 'react';
 import { RefContext } from "./context";
@@ -13,24 +12,20 @@ import Dialog from "./Dialog";
  * So here should add a child (div element) to custom container.
  * */
 
-var DialogWrap = function DialogWrap(props) {
-  var visible = props.visible,
-    getContainer = props.getContainer,
-    forceRender = props.forceRender,
-    _props$destroyOnClose = props.destroyOnClose,
-    destroyOnClose = _props$destroyOnClose === void 0 ? false : _props$destroyOnClose,
-    _afterClose = props.afterClose,
-    panelRef = props.panelRef;
-  var _React$useState = React.useState(visible),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    animatedVisible = _React$useState2[0],
-    setAnimatedVisible = _React$useState2[1];
-  var refContext = React.useMemo(function () {
-    return {
-      panel: panelRef
-    };
-  }, [panelRef]);
-  React.useEffect(function () {
+const DialogWrap = props => {
+  const {
+    visible,
+    getContainer,
+    forceRender,
+    destroyOnClose = false,
+    afterClose,
+    panelRef
+  } = props;
+  const [animatedVisible, setAnimatedVisible] = React.useState(visible);
+  const refContext = React.useMemo(() => ({
+    panel: panelRef
+  }), [panelRef]);
+  React.useEffect(() => {
     if (visible) {
       setAnimatedVisible(true);
     }
@@ -49,8 +44,8 @@ var DialogWrap = function DialogWrap(props) {
     autoLock: visible || animatedVisible
   }, /*#__PURE__*/React.createElement(Dialog, _extends({}, props, {
     destroyOnClose: destroyOnClose,
-    afterClose: function afterClose() {
-      _afterClose === null || _afterClose === void 0 || _afterClose();
+    afterClose: () => {
+      afterClose?.();
       setAnimatedVisible(false);
     }
   }))));

package/es/IDialogPropTypes.d.ts

@@ -1,4 +1,4 @@
-import type { GetContainer } from 'rc-util/lib/PortalWrapper';
+import type { GetContainer } from '@rc-component/util/lib/PortalWrapper';
 import type { CSSProperties, ReactNode, SyntheticEvent } from 'react';
 export type SemanticName = 'header' | 'body' | 'footer' | 'section' | 'title' | 'wrapper' | 'mask';
 export type ModalClassNames = Partial<Record<SemanticName, string>>;
@@ -7,6 +7,7 @@ export type IDialogPropTypes = {
     className?: string;
     keyboard?: boolean;
     style?: CSSProperties;
+    rootStyle?: CSSProperties;
     mask?: boolean;
     children?: React.ReactNode;
     afterClose?: () => any;

package/es/context.js

@@ -1,2 +1,2 @@
 import * as React from 'react';
-export var RefContext = /*#__PURE__*/React.createContext({});
+export const RefContext = /*#__PURE__*/React.createContext({});

package/es/util.js

@@ -1,18 +1,18 @@
 // =============================== Motion ===============================
 export function getMotionName(prefixCls, transitionName, animationName) {
-  var motionName = transitionName;
+  let motionName = transitionName;
   if (!motionName && animationName) {
-    motionName = "".concat(prefixCls, "-").concat(animationName);
+    motionName = `${prefixCls}-${animationName}`;
   }
   return motionName;
 }
 
 // =============================== Offset ===============================
 function getScroll(w, top) {
-  var ret = w["page".concat(top ? 'Y' : 'X', "Offset")];
-  var method = "scroll".concat(top ? 'Top' : 'Left');
+  let ret = w[`page${top ? 'Y' : 'X'}Offset`];
+  const method = `scroll${top ? 'Top' : 'Left'}`;
   if (typeof ret !== 'number') {
-    var d = w.document;
+    const d = w.document;
     ret = d.documentElement[method];
     if (typeof ret !== 'number') {
       ret = d.body[method];
@@ -21,13 +21,13 @@ function getScroll(w, top) {
   return ret;
 }
 export function offset(el) {
-  var rect = el.getBoundingClientRect();
-  var pos = {
+  const rect = el.getBoundingClientRect();
+  const pos = {
     left: rect.left,
     top: rect.top
   };
-  var doc = el.ownerDocument;
-  var w = doc.defaultView || doc.parentWindow;
+  const doc = el.ownerDocument;
+  const w = doc.defaultView || doc.parentWindow;
   pos.left += getScroll(w);
   pos.top += getScroll(w, true);
   return pos;

package/lib/Dialog/Content/MemoChildren.js

@@ -1,17 +1,14 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var React = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var _default = exports.default = /*#__PURE__*/React.memo(function (_ref) {
-  var children = _ref.children;
-  return children;
-}, function (_, _ref2) {
-  var shouldUpdate = _ref2.shouldUpdate;
-  return !shouldUpdate;
-});
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _default = exports.default = /*#__PURE__*/React.memo(({
+  children
+}) => children, (_, {
+  shouldUpdate
+}) => !shouldUpdate);

package/lib/Dialog/Content/Panel.d.ts

@@ -7,9 +7,9 @@ export interface PanelProps extends Omit<IDialogPropTypes, 'getOpenCount'> {
     onMouseUp?: React.MouseEventHandler;
     holderRef?: React.Ref<HTMLDivElement>;
 }
-export type ContentRef = {
+export type PanelRef = {
     focus: () => void;
     changeActive: (next: boolean) => void;
 };
-declare const Panel: React.ForwardRefExoticComponent<PanelProps & React.RefAttributes<ContentRef>>;
+declare const Panel: React.ForwardRefExoticComponent<PanelProps & React.RefAttributes<PanelRef>>;
 export default Panel;