From 4a5029ea29ac75243dfec68153051292fc70f5cf Mon Sep 17 00:00:00 2001
From: alpadev <2838324+alpadev@users.noreply.github.com>
Date: Thu, 3 Jun 2021 13:44:16 +0200
Subject: Fix handling of transitionend events dispatched by nested
 elements(#33845)

Fix handling of transitionend events dispatched by nested elements
Properly handle events from nested elements

Change `emulateTransitionEnd` to `executeAfterTransition` &&
---
 js/src/base-component.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'js/src/base-component.js')

diff --git a/js/src/base-component.js b/js/src/base-component.js
index a5f1b36a0..368cc99c8 100644
--- a/js/src/base-component.js
+++ b/js/src/base-component.js
@@ -7,10 +7,8 @@
 
 import Data from './dom/data'
 import {
-  emulateTransitionEnd,
-  execute,
-  getElement,
-  getTransitionDurationFromElement
+  executeAfterTransition,
+  getElement
 } from './util/index'
 import EventHandler from './dom/event-handler'
 
@@ -44,15 +42,7 @@ class BaseComponent {
   }
 
   _queueCallback(callback, element, isAnimated = true) {
-    if (!isAnimated) {
-      execute(callback)
-      return
-    }
-
-    const transitionDuration = getTransitionDurationFromElement(element)
-    EventHandler.one(element, 'transitionend', () => execute(callback))
-
-    emulateTransitionEnd(element, transitionDuration)
+    executeAfterTransition(callback, element, isAnimated)
   }
 
   /** Static */
-- 
cgit v1.2.3