Merge branch 'master' into fix/ts-export

Semantic-Org · Aug 9, 2021 · cfabbdc · cfabbdc
2 parents b253fdd + e9ce3da
commit cfabbdc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/src/addons/Portal/Portal.js b/src/addons/Portal/Portal.js
@@ -196,8 +196,8 @@ class Portal extends Component {
   close = (e) => {
     debug('close()')
 
-    _.invoke(this.props, 'onClose', e, { ...this.props, open: false })
     this.setState({ open: false })
+    _.invoke(this.props, 'onClose', e, { ...this.props, open: false })
   }
 
   closeWithTimeout = (e, delay) => {

diff --git a/src/modules/Dropdown/Dropdown.d.ts b/src/modules/Dropdown/Dropdown.d.ts
@@ -127,15 +127,15 @@ export interface StrictDropdownProps {
    * @param {SyntheticEvent} event - React's original SyntheticEvent.
    * @param {object} data - All props and the new item's value.
    */
-  onAddItem?: (event: React.KeyboardEvent<HTMLElement>, data: DropdownProps) => void
+  onAddItem?: (event: React.SyntheticEvent<HTMLElement>, data: DropdownProps) => void
 
   /**
    * Called on blur.
    *
    * @param {SyntheticEvent} event - React's original SyntheticEvent.
    * @param {object} data - All props.
    */
-  onBlur?: (event: React.KeyboardEvent<HTMLElement>, data: DropdownProps) => void
+  onBlur?: (event: React.FocusEvent<HTMLElement>, data: DropdownProps) => void
 
   /**
    * Called when the user attempts to change the value.
@@ -151,7 +151,7 @@ export interface StrictDropdownProps {
    * @param {SyntheticEvent} event - React's original SyntheticEvent.
    * @param {object} data - All props.
    */
-  onClick?: (event: React.KeyboardEvent<HTMLElement>, data: DropdownProps) => void
+  onClick?: (event: React.MouseEvent<HTMLElement>, data: DropdownProps) => void
 
   /**
    * Called when a close event happens.
@@ -167,7 +167,7 @@ export interface StrictDropdownProps {
    * @param {SyntheticEvent} event - React's original SyntheticEvent.
    * @param {object} data - All props.
    */
-  onFocus?: (event: React.SyntheticEvent<HTMLElement>, data: DropdownProps) => void
+  onFocus?: (event: React.FocusEvent<HTMLElement>, data: DropdownProps) => void
 
   /**
    * Called when a multi-select label is clicked.

diff --git a/src/modules/Modal/Modal.js b/src/modules/Modal/Modal.js
@@ -59,8 +59,8 @@ class Modal extends Component {
   handleClose = (e) => {
     debug('close()')
 
-    _.invoke(this.props, 'onClose', e, { ...this.props, open: false })
     this.setState({ open: false })
+    _.invoke(this.props, 'onClose', e, { ...this.props, open: false })
   }
 
   handleDocumentMouseDown = (e) => {
@@ -80,8 +80,8 @@ class Modal extends Component {
     )
       return
 
-    _.invoke(this.props, 'onClose', e, { ...this.props, open: false })
     this.setState({ open: false })
+    _.invoke(this.props, 'onClose', e, { ...this.props, open: false })
   }
 
   handleIconOverrides = (predefinedProps) => ({

diff --git a/test/specs/modules/Modal/Modal-test.js b/test/specs/modules/Modal/Modal-test.js
@@ -421,6 +421,25 @@ describe('Modal', () => {
       domEvent.click(document.body)
       onClose.should.not.have.been.called()
     })
+
+    it('handles unmount without errors', () => {
+      function ControlledExample() {
+        const [open, setState] = React.useState(true)
+
+        return (
+          <>
+            {open && <Modal open onClose={() => setState(false)} />}
+            <button id='close-button' />
+          </>
+        )
+      }
+
+      wrapperMount(<ControlledExample />)
+      assertBodyContains('.ui.modal')
+
+      domEvent.keyDown(document, { key: 'Escape' })
+      assertBodyContains('.ui.modal', false)
+    })
   })
 
   describe('closeOnEscape', () => {