sweetalert2 11.4.6 → 11.4.7

package/src/SweetAlert.js

@@ -228,6 +228,6 @@ Object.keys(instanceMethods).forEach((key) => {
 
 SweetAlert.DismissReason = DismissReason
 
-SweetAlert.version = '11.4.6'
+SweetAlert.version = '11.4.7'
 
 export default SweetAlert

package/src/instanceMethods/close.js

@@ -6,6 +6,7 @@ import { swalClasses } from '../utils/classes.js'
 import globalState, { restoreActiveElement } from '../globalState.js'
 import privateProps from '../privateProps.js'
 import privateMethods from '../privateMethods.js'
+import { removeKeydownHandler } from '../keydown-handler.js'
 
 /*
  * Instance method to close sweetAlert
@@ -16,10 +17,7 @@ function removePopupAndResetState(instance, container, returnFocus, didClose) {
     triggerDidCloseAndDispose(instance, didClose)
   } else {
     restoreActiveElement(returnFocus).then(() => triggerDidCloseAndDispose(instance, didClose))
-    globalState.keydownTarget.removeEventListener('keydown', globalState.keydownHandler, {
-      capture: globalState.keydownListenerCapture,
-    })
-    globalState.keydownHandlerAdded = false
+    removeKeydownHandler(globalState)
   }
 
   const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)

package/src/keydown-handler.js

@@ -4,14 +4,17 @@ import { callIfFunction } from './utils/utils.js'
 import { clickConfirm } from './staticMethods/dom.js'
 import privateProps from './privateProps.js'
 
-export const addKeydownHandler = (instance, globalState, innerParams, dismissWith) => {
+export const removeKeydownHandler = (globalState) => {
   if (globalState.keydownTarget && globalState.keydownHandlerAdded) {
     globalState.keydownTarget.removeEventListener('keydown', globalState.keydownHandler, {
       capture: globalState.keydownListenerCapture,
     })
     globalState.keydownHandlerAdded = false
   }
+}
 
+export const addKeydownHandler = (instance, globalState, innerParams, dismissWith) => {
+  removeKeydownHandler(globalState)
   if (!innerParams.toast) {
     globalState.keydownHandler = (e) => keydownHandler(instance, e, dismissWith)
     globalState.keydownTarget = innerParams.keydownListenerCapture ? window : dom.getPopup()