fix(router): components router fix when view component updated trigge…

…red by something else
framework7io · May 28, 2021 · df64010 · df64010
1 parent 0d2f60f
commit df64010
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/react/shared/components-router.js b/src/react/shared/components-router.js
@@ -34,11 +34,15 @@ export default {
       };
 
       let resolved;
+
+      const childrenBefore = el.children.length;
       function onDidUpdate(componentRouterData) {
         if (componentRouterData !== viewRouter || resolved) return;
+        const childrenAfrer = el.children.length;
+        if (childrenAfrer === childrenBefore) return;
         f7events.off('viewRouterDidUpdate', onDidUpdate);
 
-        const pageEl = el.children[el.children.length - 1];
+        const pageEl = el.children[childrenAfrer - 1];
         pageData.el = pageEl;
 
         resolve(pageEl);

diff --git a/src/svelte/shared/components-router.js b/src/svelte/shared/components-router.js
@@ -34,11 +34,15 @@ export default {
       };
 
       let resolved;
+
+      const childrenBefore = el.children.length;
       function onDidUpdate(componentRouterData) {
         if (componentRouterData !== viewRouter || resolved) return;
+        const childrenAfrer = el.children.length;
+        if (childrenAfrer === childrenBefore) return;
         f7events.off('viewRouterDidUpdate', onDidUpdate);
 
-        const pageEl = el.children[el.children.length - 1];
+        const pageEl = el.children[childrenAfrer - 1];
         pageData.el = pageEl;
 
         resolve(pageEl);

diff --git a/src/vue/shared/components-router.js b/src/vue/shared/components-router.js
@@ -34,11 +34,15 @@ export default {
       };
 
       let resolved;
+
+      const childrenBefore = el.children.length;
       function onDidUpdate(componentRouterData) {
         if (componentRouterData !== viewRouter || resolved) return;
+        const childrenAfrer = el.children.length;
+        if (childrenAfrer === childrenBefore) return;
         f7events.off('viewRouterDidUpdate', onDidUpdate);
 
-        const pageEl = el.children[el.children.length - 1];
+        const pageEl = el.children[childrenAfrer - 1];
         pageData.el = pageEl;
 
         resolve(pageEl);