@rc-component/dialog 1.0.0 → 1.0.1

package/lib/Dialog/index.js

@@ -1,77 +1,71 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _contains = _interopRequireDefault(require("rc-util/lib/Dom/contains"));
-var _useId = _interopRequireDefault(require("rc-util/lib/hooks/useId"));
-var _KeyCode = _interopRequireDefault(require("rc-util/lib/KeyCode"));
-var _pickAttrs = _interopRequireDefault(require("rc-util/lib/pickAttrs"));
+var _contains = _interopRequireDefault(require("@rc-component/util/lib/Dom/contains"));
+var _useId = _interopRequireDefault(require("@rc-component/util/lib/hooks/useId"));
+var _KeyCode = _interopRequireDefault(require("@rc-component/util/lib/KeyCode"));
+var _pickAttrs = _interopRequireDefault(require("@rc-component/util/lib/pickAttrs"));
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _util = require("../util");
 var _Content = _interopRequireDefault(require("./Content"));
 var _Mask = _interopRequireDefault(require("./Mask"));
-var _warning = require("rc-util/lib/warning");
-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 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;
+var _warning = require("@rc-component/util/lib/warning");
+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; }
+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.`)
-      (0, _warning.warning)(!(prop in props), "".concat(prop, " is deprecated, please use styles instead."));
+      (0, _warning.warning)(!(prop in props), `${prop} is deprecated, please use styles instead.`);
     });
     if ('wrapClassName' in props) {
-      (0, _warning.warning)(false, "wrapClassName is deprecated, please use classNames instead.");
+      (0, _warning.warning)(false, `wrapClassName is deprecated, please use classNames instead.`);
     }
   }
-  var lastOutSideActiveElementRef = (0, _react.useRef)();
-  var wrapperRef = (0, _react.useRef)();
-  var contentRef = (0, _react.useRef)();
-  var _React$useState = React.useState(visible),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    animatedVisible = _React$useState2[0],
-    setAnimatedVisible = _React$useState2[1];
+  const lastOutSideActiveElementRef = (0, _react.useRef)();
+  const wrapperRef = (0, _react.useRef)();
+  const contentRef = (0, _react.useRef)();
+  const [animatedVisible, setAnimatedVisible] = React.useState(visible);
 
   // ========================== Init ==========================
-  var ariaId = (0, _useId.default)();
+  const ariaId = (0, _useId.default)();
   function saveLastOutSideActiveElementRef() {
     if (!(0, _contains.default)(wrapperRef.current, document.activeElement)) {
       lastOutSideActiveElementRef.current = document.activeElement;
@@ -79,8 +73,7 @@ var Dialog = function Dialog(props) {
   }
   function focusDialogContent() {
     if (!(0, _contains.default)(wrapperRef.current, document.activeElement)) {
-      var _contentRef$current;
-      (_contentRef$current = contentRef.current) === null || _contentRef$current === void 0 || _contentRef$current.focus();
+      contentRef.current?.focus();
     }
   }
 
@@ -105,35 +98,35 @@ var Dialog = function Dialog(props) {
 
       // Trigger afterClose only when change visible from true to false
       if (animatedVisible) {
-        afterClose === null || afterClose === void 0 || afterClose();
+        afterClose?.();
       }
     }
-    afterOpenChange === null || afterOpenChange === void 0 || afterOpenChange(newVisible);
+    afterOpenChange?.(newVisible);
   }
   function onInternalClose(e) {
-    onClose === null || onClose === void 0 || onClose(e);
+    onClose?.(e);
   }
 
   // >>> Content
-  var contentClickRef = (0, _react.useRef)(false);
-  var contentTimeoutRef = (0, _react.useRef)();
+  const contentClickRef = (0, _react.useRef)(false);
+  const contentTimeoutRef = (0, _react.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) {
@@ -155,7 +148,7 @@ var Dialog = function Dialog(props) {
   }
 
   // ========================= Effect =========================
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (visible) {
       setAnimatedVisible(true);
       saveLastOutSideActiveElementRef();
@@ -163,35 +156,37 @@ var Dialog = function Dialog(props) {
   }, [visible]);
 
   // Remove direct should also check the scroll bar update
-  (0, _react.useEffect)(function () {
-    return function () {
-      clearTimeout(contentTimeoutRef.current);
-    };
+  (0, _react.useEffect)(() => () => {
+    clearTimeout(contentTimeoutRef.current);
   }, []);
-  var mergedStyle = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    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", (0, _extends2.default)({
-    className: (0, _classnames.default)("".concat(prefixCls, "-root"), rootClassName)
+    className: (0, _classnames.default)(`${prefixCls}-root`, rootClassName),
+    style: rootStyle
   }, (0, _pickAttrs.default)(props, {
     data: true
   })), /*#__PURE__*/React.createElement(_Mask.default, {
     prefixCls: prefixCls,
     visible: mask && visible,
     motionName: (0, _util.getMotionName)(prefixCls, maskTransitionName, maskAnimation),
-    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      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", (0, _extends2.default)({
     tabIndex: -1,
     onKeyDown: onWrapperKeyDown,
-    className: (0, _classnames.default)("".concat(prefixCls, "-wrap"), wrapClassName, modalClassNames === null || modalClassNames === void 0 ? void 0 : modalClassNames.wrapper),
+    className: (0, _classnames.default)(`${prefixCls}-wrap`, wrapClassName, modalClassNames?.wrapper),
     ref: wrapperRef,
     onClick: onWrapperClick,
     style: mergedStyle

package/lib/DialogWrap.js

@@ -1,19 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _portal = _interopRequireDefault(require("@rc-component/portal"));
 var React = _interopRequireWildcard(require("react"));
 var _context = require("./context");
 var _Dialog = _interopRequireDefault(require("./Dialog"));
-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; }
+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; }
 // fix issue #10656
 /*
  * getContainer remarks
@@ -23,24 +21,20 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * 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 = (0, _slicedToArray2.default)(_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);
     }
@@ -59,8 +53,8 @@ var DialogWrap = function DialogWrap(props) {
     autoLock: visible || animatedVisible
   }, /*#__PURE__*/React.createElement(_Dialog.default, (0, _extends2.default)({}, props, {
     destroyOnClose: destroyOnClose,
-    afterClose: function afterClose() {
-      _afterClose === null || _afterClose === void 0 || _afterClose();
+    afterClose: () => {
+      afterClose?.();
       setAnimatedVisible(false);
     }
   }))));

package/lib/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/lib/context.js

@@ -1,11 +1,10 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RefContext = 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 RefContext = exports.RefContext = /*#__PURE__*/React.createContext({});
+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; }
+const RefContext = exports.RefContext = /*#__PURE__*/React.createContext({});

package/lib/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "Panel", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _Panel.default;
   }
 });

package/lib/util.js

@@ -7,19 +7,19 @@ exports.getMotionName = getMotionName;
 exports.offset = offset;
 // =============================== Motion ===============================
 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];
@@ -28,13 +28,13 @@ function getScroll(w, top) {
   return ret;
 }
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/dialog",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "dialog ui component for react",
   "keywords": [
     "react",
@@ -51,12 +51,12 @@
   "dependencies": {
     "@babel/runtime": "^7.10.1",
     "@rc-component/portal": "^1.0.0-8",
+    "@rc-component/util": "^1.0.1",
     "classnames": "^2.2.6",
-    "rc-motion": "^2.3.0",
-    "rc-util": "^5.21.0"
+    "rc-motion": "^2.3.0"
   },
   "devDependencies": {
-    "@rc-component/father-plugin": "^1.0.1",
+    "@rc-component/father-plugin": "^2.0.1",
     "@testing-library/jest-dom": "^6.1.6",
     "@testing-library/react": "^12.0.0",
     "@types/enzyme": "^3.10.7",