popup

Author: Sasha Kondrashov

src/modules/Popup/Popup.d.ts

@@ -74,33 +74,35 @@ export interface StrictPopupProps extends 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 the popup is displayed.
    */
-  onClose?: (event: React.MouseEvent<HTMLElement>, data: PopupProps) => void
+  onClose?: (event: React.MouseEvent<HTMLElement>, props: PopupProps, 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: PopupProps) => void
+  onMount?: (nothing: null, props: PopupProps) => 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 the popup is displayed
    */
-  onOpen?: (event: React.MouseEvent<HTMLElement>, data: PopupProps) => void
+  onOpen?: (event: React.MouseEvent<HTMLElement>, props: PopupProps, 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: PopupProps) => void
+  onUnmount?: (nothing: null, props: PopupProps) => void
 
   /** Disables automatic repositioning of the component, it will always be placed according to the position value. */
   pinned?: boolean

src/modules/Popup/Popup.js

@@ -171,12 +171,12 @@ const Popup = React.forwardRef(function (props, ref) {
 
   const handleClose = (e) => {
     debug('handleClose()')
-    _.invoke(props, 'onClose', e, { ...props, open: false })
+    _.invoke(props, 'onClose', e, props, false)
   }
 
   const handleOpen = (e) => {
     debug('handleOpen()')
-    _.invoke(props, 'onOpen', e, { ...props, open: true })
+    _.invoke(props, 'onOpen', e, props, true)
   }
 
   const hideOnScroll = (e) => {

test/specs/modules/Popup/Popup-test.js

@@ -150,7 +150,7 @@ describe('Popup', () => {
       assertInBody('.ui.popup.visible', false)
     })
 
-    it('is called with (e, props) when scroll', () => {
+    it('is called on scroll', () => {
       const onClose = sandbox.spy()
 
       wrapperMount(<Popup content='foo' hideOnScroll onClose={onClose} trigger={trigger} />)
@@ -159,7 +159,7 @@ describe('Popup', () => {
       domEvent.scroll(window)
 
       onClose.should.have.been.calledOnce()
-      onClose.should.have.been.calledWithMatch({}, { content: 'foo', onClose, trigger })
+      onClose.should.have.been.calledWithMatch({}, { content: 'foo', onClose, trigger }, false)
     })
 
     it('not hide on scroll from inside a popup', () => {
@@ -178,6 +178,7 @@ describe('Popup', () => {
 
       domEvent.scroll(window)
       onClose.should.have.been.calledOnce()
+      onClose.should.have.been.calledWithMatch({}, {}, false)
     })
   })
 
@@ -222,6 +223,7 @@ describe('Popup', () => {
 
       domEvent.click('body')
       onClose.should.have.been.calledOnce()
+      onClose.should.have.been.calledWithMatch({}, {}, false)
     })
 
     it('is called when pressing escape', () => {
@@ -230,6 +232,7 @@ describe('Popup', () => {
 
       domEvent.keyDown(document, { key: 'Escape' })
       onClose.should.have.been.calledOnce()
+      onClose.should.have.been.calledWithMatch({}, {}, false)
     })
 
     it('is not called when the open prop changes to false', () => {
@@ -252,7 +255,7 @@ describe('Popup', () => {
 
       wrapper.find('#trigger').simulate('click')
       onOpen.should.have.been.calledOnce()
-      onOpen.should.have.been.calledWithMatch({}, { open: true })
+      onOpen.should.have.been.calledWithMatch({}, {}, true)
     })
   })
 
@@ -267,7 +270,7 @@ describe('Popup', () => {
 
       domEvent.click(document.body)
       onClose.should.have.been.called()
-      onClose.should.have.been.calledWithMatch({}, { open: false })
+      onClose.should.have.been.calledWithMatch({}, {}, false)
     })
   })