fix(Modal): fix wrong types on ModalProps (#5894)

* fix(Modal): Fix wrong types on ModalProps

* remove seemingly unnecessary passing of args

* re-added ...args in handleEnter

* re-added args to handleEntering

* replaced args spread operator with isAppearing

* update package lock

package.json

@@ -70,7 +70,7 @@
     "invariant": "^2.2.4",
     "prop-types": "^15.7.2",
     "prop-types-extra": "^1.1.0",
-    "react-overlays": "^5.0.1",
+    "react-overlays": "^5.1.1",
     "react-transition-group": "^4.4.1",
     "uncontrollable": "^7.2.1",
     "warning": "^4.0.3"

src/Modal.tsx

@@ -12,7 +12,7 @@ import transitionEnd from 'dom-helpers/transitionEnd';
 import PropTypes from 'prop-types';
 import * as React from 'react';
 import { useCallback, useMemo, useRef, useState } from 'react';
-import BaseModal, { ModalProps as BaseModalProps } from 'react-overlays/Modal';
+import BaseModal, { BaseModalProps } from 'react-overlays/Modal';
 import BootstrapModalManager from './BootstrapModalManager';
 import Fade from './Fade';
 import ModalBody from './ModalBody';
@@ -49,6 +49,7 @@ export interface ModalProps
   contentClassName?: string;
   dialogAs?: React.ElementType;
   scrollable?: boolean;
+  [other: string]: any;
 }
 
 let manager;
@@ -383,7 +384,7 @@ const Modal: BsPrefixRefForwardingComponent<'div', ModalProps> =
           return;
         }
 
-        onHide();
+        onHide?.();
       };
 
       const handleEscapeKeyDown = (e) => {
@@ -397,30 +398,30 @@ const Modal: BsPrefixRefForwardingComponent<'div', ModalProps> =
         }
       };
 
-      const handleEnter = (node, ...args) => {
+      const handleEnter = (node, isAppearing) => {
         if (node) {
           node.style.display = 'block';
           updateDialogStyle(node);
         }
 
-        onEnter?.(node, ...args);
+        onEnter?.(node, isAppearing);
       };
 
-      const handleExit = (node, ...args) => {
+      const handleExit = (node) => {
         removeStaticModalAnimationRef.current?.();
-        onExit?.(node, ...args);
+        onExit?.(node);
       };
 
-      const handleEntering = (node, ...args) => {
-        onEntering?.(node, ...args);
+      const handleEntering = (node, isAppearing) => {
+        onEntering?.(node, isAppearing);
 
         // FIXME: This should work even when animation is disabled.
         addEventListener(window as any, 'resize', handleWindowResize);
       };
 
-      const handleExited = (node, ...args) => {
+      const handleExited = (node) => {
         if (node) node.style.display = ''; // RHL removes it sometimes
-        onExited?.(...args);
+        onExited?.(node);
 
         // FIXME: This should work even when animation is disabled.
         removeEventListener(window as any, 'resize', handleWindowResize);

yarn.lock

@@ -7018,10 +7018,10 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-overlays@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-5.0.1.tgz#7e2c3cd3c0538048b0b7451d203b1289c561b7f2"
-  integrity sha512-plwUJieTBbLSrgvQ4OkkbTD/deXgxiJdNuKzo6n1RWE3OVnQIU5hffCGS/nvIuu6LpXFs2majbzaXY8rcUVdWA==
+react-overlays@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-5.1.1.tgz#2e7cf49744b56537c7828ccb94cfc63dd778ae4f"
+  integrity sha512-eCN2s2/+GVZzpnId4XVWtvDPYYBD2EtOGP74hE+8yDskPzFy9+pV1H3ZZihxuRdEbQzzacySaaDkR7xE0ydl4Q==
   dependencies:
     "@babel/runtime" "^7.13.8"
     "@popperjs/core" "^2.8.6"