swup 3.0.1 → 3.0.2

package/src/modules/loadPage.ts

@@ -7,15 +7,30 @@ export type TransitionOptions = {
 	customTransition?: string;
 };
 
-export const loadPage = function (
-	this: Swup,
-	data: TransitionOptions,
-	popstate: PopStateEvent | null
-) {
-	const { url, customTransition } = data;
-	const skipTransition = !!(popstate && !this.options.animateHistoryBrowsing);
+export type PageLoadOptions = {
+	url: string;
+	event?: Event;
+	customTransition?: string;
+};
 
-	this.triggerEvent('transitionStart', popstate || undefined);
+export function loadPage(this: Swup, data: TransitionOptions) {
+	const { url } = data;
+
+	// Check if the visit should be ignored
+	if (this.shouldIgnoreVisit(url)) {
+		window.location.href = url;
+	} else {
+		this.performPageLoad(data);
+	}
+}
+
+export function performPageLoad(this: Swup, data: PageLoadOptions) {
+	const { url, event, customTransition } = data ?? {};
+
+	const isHistoryVisit = event instanceof PopStateEvent;
+	const skipTransition = this.shouldSkipTransition({ url, event });
+
+	this.triggerEvent('transitionStart', event);
 
 	// set transition object
 	this.updateTransition(getCurrentUrl(), url, customTransition);
@@ -24,10 +39,10 @@ export const loadPage = function (
 	}
 
 	// start/skip animation
-	const animationPromises = this.leavePage(data, { popstate, skipTransition });
+	const animationPromises = this.leavePage({ event, skipTransition });
 
 	// create history record if this is not a popstate call (with or without anchor)
-	if (!popstate) {
+	if (!isHistoryVisit) {
 		createHistoryRecord(url + (this.scrollToElement || ''));
 	}
 
@@ -39,7 +54,7 @@ export const loadPage = function (
 	// when everything is ready, render the page
 	Promise.all<PageRecord | void>([fetchPromise, ...animationPromises])
 		.then(([pageData]) => {
-			this.renderPage(pageData as PageRecord, { popstate, skipTransition });
+			this.renderPage(pageData as PageRecord, { event, skipTransition });
 		})
 		.catch((errorUrl) => {
 			// Return early if errorUrl is not defined (probably aborted preload request)
@@ -54,4 +69,4 @@ export const loadPage = function (
 			// Go back to the actual page we're still at
 			history.go(-1);
 		});
-};
+}

package/src/modules/renderPage.ts

@@ -2,12 +2,15 @@ import { Location, updateHistoryRecord, getCurrentUrl } from '../helpers';
 import Swup from '../Swup';
 import { PageRecord } from './Cache';
 
+export type PageRenderOptions = {
+	event?: Event;
+	skipTransition?: boolean;
+};
+
 export const renderPage = function (
 	this: Swup,
 	page: PageRecord,
-	{ popstate, skipTransition }: { popstate: PopStateEvent | null; skipTransition?: boolean } = {
-		popstate: null
-	}
+	{ event, skipTransition }: PageRenderOptions = {}
 ) {
 	document.documentElement.classList.remove('is-leaving');
 
@@ -30,11 +33,11 @@ export const renderPage = function (
 		document.documentElement.classList.add('is-rendering');
 	}
 
-	this.triggerEvent('willReplaceContent', popstate || undefined);
+	this.triggerEvent('willReplaceContent', event);
 
 	this.replaceContent(page).then(() => {
-		this.triggerEvent('contentReplaced', popstate || undefined);
-		this.triggerEvent('pageView', popstate || undefined);
+		this.triggerEvent('contentReplaced', event);
+		this.triggerEvent('pageView', event);
 
 		// empty cache if it's disabled (in case preload plugin filled it)
 		if (!this.options.cache) {
@@ -42,7 +45,7 @@ export const renderPage = function (
 		}
 
 		// Perform in transition
-		this.enterPage({ popstate: popstate || undefined, skipTransition });
+		this.enterPage({ event, skipTransition });
 
 		// reset scroll-to element
 		this.scrollToElement = null;

package/src/modules/transitions.ts

@@ -0,0 +1,10 @@
+import Swup from '../Swup';
+
+export function updateTransition(this: Swup, from: string, to: string, custom?: string): void {
+	this.transition = { from, to, custom };
+}
+
+export function shouldSkipTransition(this: Swup, { event }: { url?: string; event?: Event }) {
+	const isHistoryVisit = event instanceof PopStateEvent;
+	return !!(isHistoryVisit && !this.options.animateHistoryBrowsing);
+}

package/dist/types/modules/updateTransition.d.ts

@@ -1,2 +0,0 @@
-import Swup from '../Swup';
-export declare const updateTransition: (this: Swup, from: string, to: string, custom?: string) => void;

package/src/modules/updateTransition.ts

@@ -1,10 +0,0 @@
-import Swup from '../Swup';
-
-export const updateTransition = function (
-	this: Swup,
-	from: string,
-	to: string,
-	custom?: string
-): void {
-	this.transition = { from, to, custom };
-};