@lightningjs/blits 1.35.4 → 1.35.5

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## v1.35.3
+## v1.35.5
+
+_06 Aug 2025_
+
+-  Fixed timing routerview causing focus to be passed to previous page
+
+
+## v1.35.4
 
 _03 Aug 2025_
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/blits",
-  "version": "1.35.4",
+  "version": "1.35.5",
   "description": "Blits: The Lightning 3 App Development Framework",
   "bin": "bin/index.js",
   "exports": {

package/src/components/RouterView.js

@@ -18,6 +18,7 @@
 import Component from '../component.js'
 import Router from '../router/router.js'
 import symbols from '../lib/symbols.js'
+import Focus from '../focus.js'
 
 let hashchangeHandler = null
 
@@ -93,7 +94,9 @@ export default () =>
         window.removeEventListener('hashchange', hashchangeHandler, false)
       },
       focus() {
-        this.activeView && this.activeView.$focus()
+        if (this.activeView && Focus.get() === this) {
+          this.activeView.$focus()
+        }
       },
     },
     input: {

package/src/router/router.js

@@ -337,6 +337,9 @@ export const navigate = async function () {
       // keep reference to the previous focus for storing in cache
       previousFocus = Focus.get()
 
+      const children = this[symbols.children]
+      this.activeView = children[children.length - 1]
+
       // set focus to the view that we're routing to
       focus ? focus.$focus() : /** @type {BlitsComponent} */ (view).$focus()
 
@@ -380,8 +383,6 @@ export const navigate = async function () {
           await setOrAnimate(holder, route.transition.in, shouldAnimate)
         }
       }
-      const children = this[symbols.children]
-      this.activeView = children[children.length - 1]
     } else {
       Log.error(`Route ${hash} not found`)
       const routerHooks = this.parent[symbols.routerHooks]