@webqit/webflo 1.0.10 → 1.0.12

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/runtime-pi/client/WebfloClient.js

@@ -454,6 +454,7 @@ export class WebfloClient extends WebfloRuntime {
                 scope.httpEvent.client.postMessage(scope.data.status, { messageType: 'status' });
             }
             await this.render(scope.httpEvent, scope.data, !(['GET'].includes(scope.request.method) || scope.response.redirected || scope.detail.navigationType === 'rdr'));
+            await this.applyPostRenderState(scope.httpEvent);
         });
     }
 
@@ -538,6 +539,12 @@ export class WebfloClient extends WebfloRuntime {
             }
         });
     }
+
+	async applyPostRenderState(httpEvent) {
+		if (!httpEvent.url.hash && httpEvent.detail.navigationType !== 'traverse' && httpEvent.request.method === 'GET') {
+			(this.host === document ? window : this.host).scrollTo(0, 0);
+		}
+	}
 	
 	async remoteFetch(request, ...args) {
 		Observer.set(this.#navigator, 'remotely', true);

package/src/runtime-pi/client/WebfloRootClient1.js

@@ -105,13 +105,13 @@ export class WebfloRootClient1 extends WebfloClient {
 		const undoControl = super.controlClassic((newHref) => {
             try {
                 // Save current scroll position
-                this.host.history.replaceState({
+                window.history.replaceState({
                     ...(this.currentEntry()?.getState?.() || {}),
                     scrollPosition: this.host === window.document ? [window.scrollX, window.scrollY] : [this.host.scrollLeft, this.host.scrollTop,],
                 }, '', this.location.href);
             } catch (e) { }
             // Do actual location update
-            try { this.host.history.pushState({}, '', newHref); } catch (e) { }
+            try { window.history.pushState({}, '', newHref); } catch (e) { }
         });
 		// ONPOPSTATE
 		const popstateHandler = (e) => {
@@ -178,6 +178,6 @@ export class WebfloRootClient1 extends WebfloClient {
 		if (destinationState.scrollPosition?.length) {
 			window.scroll(...destinationState.scrollPosition);
 			(document.querySelector('[autofocus]') || document.body).focus();
-		}
+		} else await super.applyPostRenderState(httpEvent);
 	}
 }

package/src/runtime-pi/client/WebfloSubClient.js

@@ -161,9 +161,7 @@ export class WebfloSubClient extends WebfloClient {
 	async applyPostRenderState(httpEvent) {
 		if (httpEvent.url.hash) {
 			this.host.querySelector(httpEvent.url.hash)?.scrollIntoView();
-		} else {
-			this.host.scrollTo(0, 0);
-		}
+		} else await super.applyPostRenderState(httpEvent);
 		(this.host.querySelector('[autofocus]') || this.host).focus();
 	}
 }

package/src/runtime-pi/client/index.js

@@ -3,7 +3,8 @@ import { WebfloRootClient2 } from './WebfloRootClient2.js';
 import { WebfloSubClient } from './WebfloSubClient.js';
 
 export function start() {
-    const WebfloRootClient = window.navigation ? WebfloRootClient2 : WebfloRootClient1;
+    const navigationAPIMeta = document.querySelector('meta[name="webflo-navigationapi"]')?.value;
+    const WebfloRootClient = window.navigation && navigationAPIMeta ? WebfloRootClient2 : WebfloRootClient1;
     const instance = WebfloRootClient.create(document, this || {});
     instance.initialize();
     WebfloSubClient.defineElement();