fix tests

Esri · Jan 15, 2025 · a044e83 · a044e83
1 parent 12da9b7
commit a044e83
Showing 1 changed file with 8 additions and 20 deletions.
diff --git a/packages/calcite-components/src/utils/dom.ts b/packages/calcite-components/src/utils/dom.ts
@@ -618,8 +618,6 @@ export async function whenTransitionDone(
 type TransitionOrAnimation = "transition" | "animation";
 type TransitionOrAnimationInstance = CSSTransition | Animation;
 
-const activeAnimationsFinishPromises = new WeakMap<Animation, Promise<void>>();
-
 async function triggerFallbackStartEnd(start: () => void, end: () => void): Promise<void> {
   // offset callbacks by a frame to simulate event counterparts
   await nextFrame();
@@ -629,11 +627,6 @@ async function triggerFallbackStartEnd(start: () => void, end: () => void): Prom
   end?.();
 }
 
-function triggerEndActionAndClearAnim(animation: Animation, end: () => void): void {
-  activeAnimationsFinishPromises.delete(animation);
-  end?.();
-}
-
 function findAnimation(
   targetEl: HTMLElement,
   type: TransitionOrAnimation,
@@ -673,20 +666,15 @@ export async function whenTransitionOrAnimationDone(
     return triggerFallbackStartEnd(onStart, onEnd);
   }
 
-  if (activeAnimationsFinishPromises.has(anim)) {
-    return activeAnimationsFinishPromises.get(anim);
-  }
-
   onStart?.();
-  activeAnimationsFinishPromises.set(
-    anim,
-    anim.finished
-      .then(() => {})
-      .catch(() => {
-        // swallow error if canceled
-      })
-      .finally(() => triggerEndActionAndClearAnim(anim, onEnd)),
-  );
+
+  try {
+    await anim.finished;
+  } catch {
+    // swallow error if canceled
+  } finally {
+    onEnd?.();
+  }
 }
 
 function nextFrame(): Promise<void> {