fix: use animationend event (#2770)

sweetalert2 · Oct 7, 2024 · c510323 · c510323
1 parent c699d6c
commit c510323
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 35 deletions.
diff --git a/src/instanceMethods/close.js b/src/instanceMethods/close.js
@@ -157,7 +157,7 @@ const prepareResolveValue = (resolveValue) => {
 const handlePopupAnimation = (instance, popup, innerParams) => {
   const container = dom.getContainer()
   // If animation is supported, animate
-  const animationIsSupported = dom.animationEndEvent && dom.hasCssAnimation(popup)
+  const animationIsSupported = dom.hasCssAnimation(popup)
 
   if (typeof innerParams.willClose === 'function') {
     innerParams.willClose(popup)
@@ -180,17 +180,14 @@ const handlePopupAnimation = (instance, popup, innerParams) => {
  * @param {Function} didClose
  */
 const animatePopup = (instance, popup, container, returnFocus, didClose) => {
-  if (!dom.animationEndEvent) {
-    return
-  }
   globalState.swalCloseEventFinishedCallback = removePopupAndResetState.bind(
     null,
     instance,
     container,
     returnFocus,
     didClose
   )
-  popup.addEventListener(dom.animationEndEvent, function (e) {
+  popup.addEventListener('animationend', function (e) {
     if (e.target === popup) {
       globalState.swalCloseEventFinishedCallback()
       delete globalState.swalCloseEventFinishedCallback

diff --git a/src/utils/dom/animationEndEvent.js b/src/utils/dom/animationEndEvent.js
diff --git a/src/utils/dom/index.js b/src/utils/dom/index.js
@@ -2,5 +2,4 @@ export * from './domUtils.js'
 export * from './init.js'
 export * from './getters.js'
 export * from './parseHtmlToContainer.js'
-export * from './animationEndEvent.js'
 export * from './renderers/render.js'
diff --git a/src/utils/openPopup.js b/src/utils/openPopup.js
@@ -52,11 +52,11 @@ export const openPopup = (params) => {
  */
 const swalOpenAnimationFinished = (event) => {
   const popup = dom.getPopup()
-  if (event.target !== popup || !dom.animationEndEvent) {
+  if (event.target !== popup) {
     return
   }
   const container = dom.getContainer()
-  popup.removeEventListener(dom.animationEndEvent, swalOpenAnimationFinished)
+  popup.removeEventListener('animationend', swalOpenAnimationFinished)
   container.style.overflowY = 'auto'
 }
 
@@ -65,9 +65,9 @@ const swalOpenAnimationFinished = (event) => {
  * @param {HTMLElement} popup
  */
 const setScrollingVisibility = (container, popup) => {
-  if (dom.animationEndEvent && dom.hasCssAnimation(popup)) {
+  if (dom.hasCssAnimation(popup)) {
     container.style.overflowY = 'hidden'
-    popup.addEventListener(dom.animationEndEvent, swalOpenAnimationFinished)
+    popup.addEventListener('animationend', swalOpenAnimationFinished)
   } else {
     container.style.overflowY = 'auto'
   }