swup 4.3.0 → 4.3.2

package/src/Swup.ts

@@ -167,6 +167,11 @@ export default class Swup {
 
 		window.addEventListener('popstate', this.handlePopState);
 
+		// Set scroll restoration to manual if animating history visits
+		if (this.options.animateHistoryBrowsing) {
+			window.history.scrollRestoration = 'manual';
+		}
+
 		// Initial save to cache
 		if (this.options.cache) {
 			// Disabled to avoid caching modified dom state: logic moved to preload plugin
@@ -279,6 +284,7 @@ export default class Swup {
 								return this.performNavigation();
 							case 'scroll':
 							default:
+								updateHistoryRecord(url);
 								return this.scrollToContent();
 						}
 					});
@@ -310,18 +316,10 @@ export default class Swup {
 		}
 
 		const { url, hash } = Location.fromUrl(href);
-		const animate = this.options.animateHistoryBrowsing;
-		const resetScroll = this.options.animateHistoryBrowsing;
-
-		this.visit = this.createVisit({
-			to: url,
-			hash,
-			event,
-			animate,
-			resetScroll
-		});
 
-		// Mark as popstate visit
+		this.visit = this.createVisit({ to: url, hash, event });
+
+		// Mark as history visit
 		this.visit.history.popstate = true;
 
 		// Determine direction of history visit
@@ -331,6 +329,17 @@ export default class Swup {
 			this.visit.history.direction = direction;
 		}
 
+		// Disable animation & scrolling for history visits
+		this.visit.animation.animate = false;
+		this.visit.scroll.reset = false;
+		this.visit.scroll.target = false;
+
+		// Animated history visit: re-enable animation & scroll reset
+		if (this.options.animateHistoryBrowsing) {
+			this.visit.animation.animate = true;
+			this.visit.scroll.reset = true;
+		}
+
 		// Does this even do anything?
 		// if (!hash) {
 		// 	event.preventDefault();

package/src/modules/Visit.ts

@@ -52,7 +52,7 @@ export interface VisitScroll {
 	/** Whether to reset the scroll position after the visit. Default: `true` */
 	reset: boolean;
 	/** Anchor element to scroll to on the next page. */
-	target?: string;
+	target?: string | false;
 }
 
 export interface VisitTrigger {
@@ -82,38 +82,23 @@ export interface VisitInitOptions {
 	to: string;
 	from?: string;
 	hash?: string;
-	animate?: boolean;
-	animation?: string;
-	targets?: string[];
 	el?: Element;
 	event?: Event;
-	action?: HistoryAction;
-	resetScroll?: boolean;
 }
 
 /** Create a new visit object. */
 export function createVisit(
 	this: Swup,
-	{
-		to,
-		from = this.currentPageUrl,
-		hash,
-		animate = true,
-		animation: name,
-		el,
-		event,
-		action = 'push',
-		resetScroll: reset = true
-	}: VisitInitOptions
+	{ to, from = this.currentPageUrl, hash, el, event }: VisitInitOptions
 ): Visit {
 	return {
 		from: { url: from },
 		to: { url: to, hash },
 		containers: this.options.containers,
 		animation: {
-			animate,
+			animate: true,
 			wait: false,
-			name,
+			name: undefined,
 			scope: this.options.animationScope,
 			selector: this.options.animationSelector
 		},
@@ -126,12 +111,12 @@ export function createVisit(
 			write: this.options.cache
 		},
 		history: {
-			action,
+			action: 'push',
 			popstate: false,
 			direction: undefined
 		},
 		scroll: {
-			reset,
+			reset: true,
 			target: undefined
 		}
 	};

package/src/modules/scrollToContent.ts

@@ -7,7 +7,7 @@ import Swup from '../Swup.js';
 export const scrollToContent = function (this: Swup): boolean {
 	const options: ScrollIntoViewOptions = { behavior: 'auto' };
 	const { target, reset } = this.visit.scroll;
-	const scrollTarget = target || this.visit.to.hash;
+	const scrollTarget = target ?? this.visit.to.hash;
 
 	let scrolled = false;