@lexriver/dome 1.4.2 → 1.5.2

package/out/DomeRouter.d.ts

@@ -1,6 +1,6 @@
 export declare type RouteAction = (params: {
     [key: string]: string;
-}, url: string) => void | Promise<void>;
+}, url: string, scrollToPreviousPositionFunctionAsync: () => Promise<void>) => void | Promise<void>;
 interface HistoryUrl {
     url: string;
     scroll: number;

package/out/DomeRouter.js

@@ -7,26 +7,36 @@ export var DomeRouter;
     const allRoutes = [];
     let onNotFoundAction = undefined;
     window.addEventListener('popstate', async (e) => {
+        // on go back
         //console.log(filename, 'window.popstate event', e, 'historyUrl=', historyUrls)
-        await executeAsync();
-        await DomeManipulator.scrollToAsync({
-            pxFromTop: getScrollPositionForUrl(window.location.pathname)
-        });
+        const url = window.location.pathname;
+        await executeAsync(url, getScrollPositionForUrl(url));
+        // await DomeManipulator.scrollToAsync({
+        //     pxFromTop: getScrollPositionForUrl(window.location.pathname)
+        // })
     });
     function getScrollPositionForUrl(url) {
         // well, let's find the last url? or which index? 
-        let result = 0;
-        for (let item of historyUrls) {
+        //let result = 0
+        for (let i = historyUrls.length - 1; i >= 0; i--) {
+            const item = historyUrls[i];
             if (item.url === url) {
-                result = item.scroll;
+                //result = item.scroll
+                return item.scroll;
             }
         }
-        return result;
+        return 0;
+        // for(let item of historyUrls){
+        //     if(item.url === url){
+        //         result = item.scroll        
+        //     }
+        // }
+        // return result
     }
     function navigate(url) {
         window.history.pushState(null, '', url);
         addUrlToHistory(url);
-        executeAsync();
+        executeAsync(url, 0);
         DomeManipulator.scrollToTop();
     }
     DomeRouter.navigate = navigate;
@@ -54,6 +64,8 @@ export var DomeRouter;
         if (historyUrls.length > 1) {
             historyUrls[historyUrls.length - 2].scroll = DomeManipulator.getCurrentScrollPosition();
         }
+        console.log('adding url to history', url);
+        console.log('historyUrls=', historyUrls);
     }
     function getCurrentUrl() {
         return historyUrls.length > 0 ? historyUrls[historyUrls.length - 1] : window.location.pathname;
@@ -72,15 +84,16 @@ export var DomeRouter;
     }
     DomeRouter.getPreviousPageUrl = getPreviousPageUrl;
     function reloadCurrentPage(addToHistory = false) {
+        const url = window.location.pathname;
         if (addToHistory)
-            addUrlToHistory(window.location.pathname);
-        executeAsync();
+            addUrlToHistory(url);
+        executeAsync(url, getScrollPositionForUrl(url)); // TODO: check
     }
     DomeRouter.reloadCurrentPage = reloadCurrentPage;
     function resolveUrl(url = window.location.pathname, addToHistory = true) {
         if (addToHistory)
             addUrlToHistory(window.location.pathname);
-        executeAsync(url);
+        executeAsync(url, getScrollPositionForUrl(url)); // TODO: check
     }
     DomeRouter.resolveUrl = resolveUrl;
     function onRoute(route, exactMatch, action) {
@@ -177,7 +190,7 @@ export var DomeRouter;
             return [name.substring(1), value];
         }
     }
-    async function executeAsync(url = window.location.pathname) {
+    async function executeAsync(url = window.location.pathname, scrollToPosition) {
         //const url = window.location.pathname
         const urlSlices = getRouteSlices(url);
         // urlSlices = show, category, 345
@@ -216,7 +229,11 @@ export var DomeRouter;
             if (matched) {
                 countOfFoundRoutes++;
                 //console.log('DomeRouter', 'executeAsync', url, route, extractedParameters)
-                await route.action(extractedParameters, url);
+                await route.action(extractedParameters, url, async () => {
+                    await DomeManipulator.scrollToAsync({
+                        pxFromTop: scrollToPosition
+                    });
+                });
             }
         }
         if (countOfFoundRoutes == 0 && onNotFoundAction) {

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "sideEffects": false,
     "name": "@lexriver/dome",
-    "version": "1.4.2",
+    "version": "1.5.2",
     "description": "",
     "main": "out/index.js",
     "types": "out/index.d.ts",

package/src/DomeRouter.ts

@@ -2,7 +2,11 @@ import { DomeManipulator } from "./DomeManipulator"
 
 const filename = '[DomeRouter]'
 
-export type RouteAction = (params:{[key:string]:string}, url:string) => void|Promise<void>
+export type RouteAction = (
+    params:{[key:string]:string}, 
+    url:string,
+    scrollToPreviousPositionFunctionAsync:()=>Promise<void>
+    ) => void|Promise<void>
 
 interface Route{
     routeSlices:string[]
@@ -22,28 +26,39 @@ export module DomeRouter {
     let onNotFoundAction:(()=>void)|undefined = undefined
 
     window.addEventListener('popstate', async (e) => {
+        // on go back
         //console.log(filename, 'window.popstate event', e, 'historyUrl=', historyUrls)
-        await executeAsync()
-        await DomeManipulator.scrollToAsync({
-            pxFromTop: getScrollPositionForUrl(window.location.pathname)
-        })
+        const url = window.location.pathname
+        await executeAsync(url, getScrollPositionForUrl(url) )
+        // await DomeManipulator.scrollToAsync({
+        //     pxFromTop: getScrollPositionForUrl(window.location.pathname)
+        // })
     })
 
     function getScrollPositionForUrl(url:string){
         // well, let's find the last url? or which index? 
-        let result = 0
-        for(let item of historyUrls){
+        //let result = 0
+        for(let i=historyUrls.length-1;i>=0;i--){
+            const item = historyUrls[i]
             if(item.url === url){
-                result = item.scroll        
+                //result = item.scroll
+                return item.scroll
+
             }
         }
-        return result
+        return 0
+        // for(let item of historyUrls){
+        //     if(item.url === url){
+        //         result = item.scroll        
+        //     }
+        // }
+        // return result
     }
 
     export function navigate(url:string){
         window.history.pushState(null, '', url)
         addUrlToHistory(url)
-        executeAsync()
+        executeAsync(url, 0)
         DomeManipulator.scrollToTop()
     }
 
@@ -72,6 +87,9 @@ export module DomeRouter {
         if(historyUrls.length>1){
             historyUrls[historyUrls.length-2].scroll = DomeManipulator.getCurrentScrollPosition()
         }
+
+        console.log('adding url to history', url)
+        console.log('historyUrls=', historyUrls)
     }
 
       
@@ -91,13 +109,14 @@ export module DomeRouter {
     }
 
     export function reloadCurrentPage(addToHistory:boolean = false){
-        if(addToHistory) addUrlToHistory(window.location.pathname)
-        executeAsync()
+        const url = window.location.pathname
+        if(addToHistory) addUrlToHistory(url)
+        executeAsync(url, getScrollPositionForUrl(url)) // TODO: check
     }
 
     export function resolveUrl(url:string = window.location.pathname, addToHistory:boolean = true){
         if(addToHistory) addUrlToHistory(window.location.pathname)
-        executeAsync(url)
+        executeAsync(url, getScrollPositionForUrl(url)) // TODO: check
     }
 
     export function onRoute(route:string, exactMatch:boolean, action:RouteAction){
@@ -198,7 +217,7 @@ export module DomeRouter {
 
     }
 
-    async function executeAsync(url:string = window.location.pathname){
+    async function executeAsync(url:string = window.location.pathname, scrollToPosition:number){
         //const url = window.location.pathname
         const urlSlices = getRouteSlices(url)
         // urlSlices = show, category, 345
@@ -238,7 +257,11 @@ export module DomeRouter {
             if(matched){
                 countOfFoundRoutes++
                 //console.log('DomeRouter', 'executeAsync', url, route, extractedParameters)
-                await route.action(extractedParameters, url)
+                await route.action(extractedParameters, url, async () => {
+                    await DomeManipulator.scrollToAsync({
+                        pxFromTop: scrollToPosition
+                    })
+                })
             }
         }
         if(countOfFoundRoutes==0 && onNotFoundAction){