@lightningjs/blits 0.6.8 → 0.6.9

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+# v0.6.9
+
+_31 jan 2024_
+
+- Fixed single quote escaping for all browsers (removing sometimes unsupported negative lookahead)
+- Fixed issue with focus when navigating back to a page that is kept in history
+
 # v0.6.8
 
 _29 jan 2024_

package/boilerplate/package.json

@@ -31,6 +31,6 @@
     "vite": "^4.0.4"
   },
   "dependencies": {
-    "@lightningjs/blits": "^0.6.8"
+    "@lightningjs/blits": "^0.6.9"
   }
 }

package/package.json

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

package/src/lib/codegenerator/generator.js

@@ -326,8 +326,12 @@ const cast = (val = '', key = false, component = 'component.') => {
     if (val.startsWith('$')) {
       castedValue = `${component}${val.replace('$', '')}`
     } else {
-      // unescaped single quotes must be escaped
-      castedValue = `'${parseInlineContent(val.replace(/(?<!\\)'/g, "\\'"), component)}'`
+      // unescaped single quotes must be escaped while preserving escaped backslashes
+      const escapedVal = val
+        .replace(/\\\\/g, '__DOUBLE_BACKSLASH__')
+        .replace(/(^|[^\\])'/g, "$1\\'")
+        .replace(/__DOUBLE_BACKSLASH__/g, '\\\\')
+      castedValue = `'${parseInlineContent(escapedVal, component)}'`
     }
   }
   // numeric

package/src/router/router.js

@@ -30,6 +30,7 @@ const cacheMap = new WeakMap()
 const history = []
 let overrideOptions = {}
 let navigatingBack = false
+let previousFocus
 
 export const getHash = () => {
   return (document.location.hash || '/').replace(/^#/, '')
@@ -97,6 +98,12 @@ export const navigate = async function () {
 
       this[symbols.children].push(view)
 
+      // keep reference to the previous focus for storing in cache
+      previousFocus = Focus.get()
+
+      // set focus to the view that we're routing to
+      focus ? Focus.set(focus) : Focus.set(view)
+
       // apply before settings to holder element
       if (route.transition.before) {
         if (Array.isArray(route.transition.before)) {
@@ -143,8 +150,6 @@ export const navigate = async function () {
         Announcer.speak(route.announce.message, route.announce.politeness)
       }
 
-      // focus the new view
-      focus ? Focus.set(focus) : view.focus()
       this.activeView = this[symbols.children][this[symbols.children].length - 1]
     } else {
       Log.error(`Route ${hash} not found`)
@@ -172,7 +177,7 @@ const removeView = async (route, view, transition) => {
 
   // cache the page when it's as 'keepAlive' instead of destroying
   if (route.options && route.options.keepAlive === true) {
-    cacheMap.set(route, { view: view, focus: Focus.get() })
+    cacheMap.set(route, { view: view, focus: previousFocus })
   } else {
     // remove and cleanup
     for (let i = 0; i < view[symbols.children].length - 1; i++) {