swup 3.0.6 → 3.0.8

package/src/modules/getAnimationPromises.ts

@@ -35,31 +35,35 @@ export function getAnimationPromises(
 
 	const animatedElements = queryAll(selector, document.body);
 
-	// Warn if no animated containers found on page, but keep things going
+	// Warn if no elements match the animationSelector, but keep things going
 	if (!animatedElements.length) {
-		console.warn(`[swup] No animated elements found by selector ${selector}`);
+		console.warn(`[swup] No elements found matching animationSelector \`${selector}\``);
 		return [Promise.resolve()];
 	}
 
-	return animatedElements.map((element) => getAnimationPromiseForElement(element, selector));
+	const animationPromises = animatedElements
+		.map((element) => getAnimationPromiseForElement(element))
+		.filter(Boolean) as Promise<void>[];
+
+	if (!animationPromises.length) {
+		console.warn(
+			`[swup] No CSS animation duration defined on elements matching \`${selector}\``
+		);
+		return [Promise.resolve()];
+	}
+
+	return animationPromises;
 }
 
 const isTransitionOrAnimationEvent = (event: any): event is TransitionEvent | AnimationEvent =>
-	!!event.elapsedTime;
+	[transitionEndEvent, animationEndEvent].includes(event.type);
 
-function getAnimationPromiseForElement(
-	element: Element,
-	selector: string,
-	expectedType: 'animation' | 'transition' | null = null
-): Promise<void> {
-	const { type, timeout, propCount } = getTransitionInfo(element, expectedType);
+function getAnimationPromiseForElement(element: Element): Promise<void> | undefined {
+	const { type, timeout, propCount } = getTransitionInfo(element);
 
 	// Resolve immediately if no transition defined
 	if (!type || !timeout) {
-		console.warn(
-			`[swup] No CSS transition duration defined for element of selector ${selector}`
-		);
-		return Promise.resolve();
+		return undefined;
 	}
 
 	return new Promise((resolve) => {