rc-dialog - npm Package Compare versions

Comparing version 8.9.0 to 9.0.0

es/Dialog/Content/Panel.d.ts

 import React from 'react';
-import type { IDialogChildProps } from '..';
-export interface PanelProps extends Omit<IDialogChildProps, 'getOpenCount'> {
+import type { IDialogPropTypes } from '../../IDialogPropTypes';
+export interface PanelProps extends Omit<IDialogPropTypes, 'getOpenCount'> {
     prefixCls: string;
@@ -5,0 +5,0 @@ ariaId?: string;

es/Dialog/index.d.ts

 /// <reference types="react" />
-import type ScollLocker from 'rc-util/lib/Dom/scrollLocker';
 import type { IDialogPropTypes } from '../IDialogPropTypes';
-export declare type IDialogChildProps = {
-    getOpenCount: () => number;
-    scrollLocker?: ScollLocker;
-} & IDialogPropTypes;
-export default function Dialog(props: IDialogChildProps): JSX.Element;
+export default function Dialog(props: IDialogPropTypes): JSX.Element;

es/Dialog/index.js

@@ -24,3 +24,2 @@ import _extends from "@babel/runtime/helpers/esm/extends";
       focusTriggerAfterClose = _props$focusTriggerAf === void 0 ? true : _props$focusTriggerAf,
-      scrollLocker = props.scrollLocker,
       wrapStyle = props.wrapStyle,
@@ -148,12 +147,11 @@ wrapClassName = props.wrapClassName,
     };
-  }, []);
-  useEffect(function () {
-    if (animatedVisible) {
-      scrollLocker === null || scrollLocker === void 0 ? void 0 : scrollLocker.lock();
-      return scrollLocker === null || scrollLocker === void 0 ? void 0 : scrollLocker.unLock;
-    }
+  }, []); // useEffect(() => {
+  //   if (animatedVisible) {
+  //     scrollLocker?.lock();
+  //     return scrollLocker?.unLock;
+  //   }
+  //   return () => {};
+  // }, [animatedVisible, scrollLocker]);
+  // ========================= Render =========================
 
-    return function () {};
-  }, [animatedVisible, scrollLocker]); // ========================= Render =========================
-
   return /*#__PURE__*/React.createElement("div", _extends({
@@ -160,0 +158,0 @@ className: classNames("".concat(prefixCls, "-root"), rootClassName)

es/DialogWrap.js

 import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import * as React from 'react';
-import Portal from "rc-util/es/PortalWrapper";
+import Portal from '@rc-component/portal';
 import Dialog from './Dialog'; // fix issue #10656
@@ -32,14 +32,13 @@
     }
-  }, [visible]); // 渲染在当前 dom 里；
+  }, [visible]); // // 渲染在当前 dom 里；
+  // if (getContainer === false) {
+  //   return (
+  //     <Dialog
+  //       {...props}
+  //       getOpenCount={() => 2} // 不对 body 做任何操作。。
+  //     />
+  //   );
+  // }
+  // Destroy on close will remove wrapped div
 
-  if (getContainer === false) {
-    return /*#__PURE__*/React.createElement(Dialog, _extends({}, props, {
-      getOpenCount: function getOpenCount() {
-        return 2;
-      } // 不对 body 做任何操作。。
-
-    }));
-  } // Destroy on close will remove wrapped div
-
-
   if (!forceRender && destroyOnClose && !animatedVisible) {
@@ -50,14 +49,13 @@ return null;
   return /*#__PURE__*/React.createElement(Portal, {
-    visible: visible,
-    forceRender: forceRender,
-    getContainer: getContainer
-  }, function (childProps) {
-    return /*#__PURE__*/React.createElement(Dialog, _extends({}, props, {
-      destroyOnClose: destroyOnClose,
-      afterClose: function afterClose() {
-        _afterClose === null || _afterClose === void 0 ? void 0 : _afterClose();
-        setAnimatedVisible(false);
-      }
-    }, childProps));
-  });
+    open: visible || forceRender || animatedVisible,
+    autoDestroy: false,
+    getContainer: getContainer,
+    autoLock: visible || animatedVisible
+  }, /*#__PURE__*/React.createElement(Dialog, _extends({}, props, {
+    destroyOnClose: destroyOnClose,
+    afterClose: function afterClose() {
+      _afterClose === null || _afterClose === void 0 ? void 0 : _afterClose();
+      setAnimatedVisible(false);
+    }
+  })));
 };
@@ -64,0 +62,0 @@

lib/Dialog/Content/Panel.d.ts

 import React from 'react';
-import type { IDialogChildProps } from '..';
-export interface PanelProps extends Omit<IDialogChildProps, 'getOpenCount'> {
+import type { IDialogPropTypes } from '../../IDialogPropTypes';
+export interface PanelProps extends Omit<IDialogPropTypes, 'getOpenCount'> {
     prefixCls: string;
@@ -5,0 +5,0 @@ ariaId?: string;

lib/Dialog/index.d.ts

 /// <reference types="react" />
-import type ScollLocker from 'rc-util/lib/Dom/scrollLocker';
 import type { IDialogPropTypes } from '../IDialogPropTypes';
-export declare type IDialogChildProps = {
-    getOpenCount: () => number;
-    scrollLocker?: ScollLocker;
-} & IDialogPropTypes;
-export default function Dialog(props: IDialogChildProps): JSX.Element;
+export default function Dialog(props: IDialogPropTypes): JSX.Element;

lib/Dialog/index.js

@@ -50,3 +50,2 @@ "use strict";
       focusTriggerAfterClose = _props$focusTriggerAf === void 0 ? true : _props$focusTriggerAf,
-      scrollLocker = props.scrollLocker,
       wrapStyle = props.wrapStyle,
@@ -174,12 +173,11 @@ wrapClassName = props.wrapClassName,
     };
-  }, []);
-  (0, React.useEffect)(function () {
-    if (animatedVisible) {
-      scrollLocker === null || scrollLocker === void 0 ? void 0 : scrollLocker.lock();
-      return scrollLocker === null || scrollLocker === void 0 ? void 0 : scrollLocker.unLock;
-    }
+  }, []); // useEffect(() => {
+  //   if (animatedVisible) {
+  //     scrollLocker?.lock();
+  //     return scrollLocker?.unLock;
+  //   }
+  //   return () => {};
+  // }, [animatedVisible, scrollLocker]);
+  // ========================= Render =========================
 
-    return function () {};
-  }, [animatedVisible, scrollLocker]); // ========================= Render =========================
-
   return /*#__PURE__*/React.createElement("div", (0, _extends2.default)({
@@ -186,0 +184,0 @@ className: (0, _classnames.default)("".concat(prefixCls, "-root"), rootClassName)

lib/DialogWrap.js

@@ -18,3 +18,3 @@ "use strict";
 
-var _PortalWrapper = _interopRequireDefault(require("rc-util/lib/PortalWrapper"));
+var _portal = _interopRequireDefault(require("@rc-component/portal"));
 
@@ -53,14 +53,13 @@ var _Dialog = _interopRequireDefault(require("./Dialog"));
     }
-  }, [visible]); // 渲染在当前 dom 里；
+  }, [visible]); // // 渲染在当前 dom 里；
+  // if (getContainer === false) {
+  //   return (
+  //     <Dialog
+  //       {...props}
+  //       getOpenCount={() => 2} // 不对 body 做任何操作。。
+  //     />
+  //   );
+  // }
+  // Destroy on close will remove wrapped div
 
-  if (getContainer === false) {
-    return /*#__PURE__*/React.createElement(_Dialog.default, (0, _extends2.default)({}, props, {
-      getOpenCount: function getOpenCount() {
-        return 2;
-      } // 不对 body 做任何操作。。
-
-    }));
-  } // Destroy on close will remove wrapped div
-
-
   if (!forceRender && destroyOnClose && !animatedVisible) {
@@ -70,15 +69,14 @@ return null;
 
-  return /*#__PURE__*/React.createElement(_PortalWrapper.default, {
-    visible: visible,
-    forceRender: forceRender,
-    getContainer: getContainer
-  }, function (childProps) {
-    return /*#__PURE__*/React.createElement(_Dialog.default, (0, _extends2.default)({}, props, {
-      destroyOnClose: destroyOnClose,
-      afterClose: function afterClose() {
-        _afterClose === null || _afterClose === void 0 ? void 0 : _afterClose();
-        setAnimatedVisible(false);
-      }
-    }, childProps));
-  });
+  return /*#__PURE__*/React.createElement(_portal.default, {
+    open: visible || forceRender || animatedVisible,
+    autoDestroy: false,
+    getContainer: getContainer,
+    autoLock: visible || animatedVisible
+  }, /*#__PURE__*/React.createElement(_Dialog.default, (0, _extends2.default)({}, props, {
+    destroyOnClose: destroyOnClose,
+    afterClose: function afterClose() {
+      _afterClose === null || _afterClose === void 0 ? void 0 : _afterClose();
+      setAnimatedVisible(false);
+    }
+  })));
 };
@@ -85,0 +83,0 @@

package.json

 {
   "name": "rc-dialog",
-  "version": "8.9.0",
+  "version": "9.0.0",
   "description": "dialog ui component for react",
@@ -50,2 +50,3 @@ "keywords": [
     "@babel/runtime": "^7.10.1",
+    "@rc-component/portal": "^1.0.0-8",
     "classnames": "^2.2.6",
@@ -56,2 +57,4 @@ "rc-motion": "^2.3.0",
   "devDependencies": {
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^12.0.0",
     "@types/enzyme": "^3.10.7",
@@ -58,0 +61,0 @@ "@types/jest": "^26.0.14",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

70442

decreased by-6.47%

Dependency count

7

increased by16.67%

Dev dependency count

31

increased by6.9%

Number of package files

41

decreased by-2.38%

Lines of code

1567

decreased by-0.63%

Dependency changes

• + Added@rc-component/portal@^1.0.0-8

• + Added@rc-component/portal@1.1.2(transitive)