portal

Author: Sasha Kondrashov

src/addons/Portal/Portal.d.ts

@@ -50,33 +50,35 @@ export interface StrictPortalProps {
    * Called when a close event happens
    *
    * @param {SyntheticEvent} event - React's original SyntheticEvent.
-   * @param {object} data - All props.
+   * @param {object} props - All props.
+   * @param {boolean} open - Whether or not the portal is displayed.
    */
-  onClose?: (event: React.MouseEvent<HTMLElement>, data: PortalProps) => void
+  onClose?: (event: React.MouseEvent<HTMLElement>, props: PortalProps, open: boolean) => void
 
   /**
    * Called when the portal is mounted on the DOM
    *
    * @param {null}
-   * @param {object} data - All props.
+   * @param {object} props - All props.
    */
-  onMount?: (nothing: null, data: PortalProps) => void
+  onMount?: (nothing: null, props: PortalProps) => void
 
   /**
    * Called when an open event happens
    *
    * @param {SyntheticEvent} event - React's original SyntheticEvent.
-   * @param {object} data - All props.
+   * @param {object} props - All props.
+   * @param {boolean} open - Whether or not the portal is displayed.
    */
-  onOpen?: (event: React.MouseEvent<HTMLElement>, data: PortalProps) => void
+  onOpen?: (event: React.MouseEvent<HTMLElement>, props: PortalProps, open: boolean) => void
 
   /**
    * Called when the portal is unmounted from the DOM
    *
    * @param {null}
-   * @param {object} data - All props.
+   * @param {object} props - All props.
    */
-  onUnmount?: (nothing: null, data: PortalProps) => void
+  onUnmount?: (nothing: null, props: PortalProps) => void
 
   /** Controls whether or not the portal is displayed. */
   open?: boolean

src/addons/Portal/Portal.js

@@ -61,7 +61,7 @@ function Portal(props) {
     debug('open()')
 
     setOpen(true)
-    _.invoke(props, 'onOpen', e, { ...props, open: true })
+    _.invoke(props, 'onOpen', e, props, true)
   }
 
   const openPortalWithTimeout = (e, delay) => {
@@ -77,7 +77,7 @@ function Portal(props) {
     debug('close()')
 
     setOpen(false)
-    _.invoke(props, 'onClose', e, { ...props, open: false })
+    _.invoke(props, 'onClose', e, props, false)
   }
 
   const closePortalWithTimeout = (e, delay) => {

test/specs/addons/Portal/Portal-test.js

@@ -181,7 +181,7 @@ describe('Portal', () => {
 
       wrapper.find('#trigger').simulate('click')
       onOpen.should.have.been.calledOnce()
-      onOpen.should.have.been.calledWithMatch({}, { open: true })
+      onOpen.should.have.been.calledWithMatch({}, {}, true)
     })
   })
 
@@ -196,7 +196,7 @@ describe('Portal', () => {
 
       domEvent.click(document.body)
       onClose.should.have.been.called()
-      onClose.should.have.been.calledWithMatch({}, { open: false })
+      onClose.should.have.been.calledWithMatch({}, {}, false)
     })
   })