@lightningjs/blits 0.6.12 → 0.6.13

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+# v0.6.13
+
+_16 feb 2024_
+
+- Upgraded to 0.7.2 of the renderer
+- Introduced new `maxheight` attribute (besided the existing `maxlines` attribute) for the `<Text />` component
+- Fixed issue with order of lifecycle event emits
+- Fixed logic to not unfoces a parent when it passes focus to a child
+- Removed temporary fix for renderer issue [#123](https://github.com/lightning-js/renderer/issues/123)
+
 # v0.6.12
 
 _9 feb 2024_

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/blits",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "description": "Blits: The Lightning 3 App Development Framework",
   "bin": "bin/index.js",
   "exports": {
@@ -45,7 +45,7 @@
     "tape": "^5.5.0"
   },
   "dependencies": {
-    "@lightningjs/renderer": "^0.7.1",
+    "@lightningjs/renderer": "^0.7.2",
     "@lightningjs/vite-plugin-import-chunk-url": "^0.3.0",
     "execa": "^8.0.1",
     "kolorist": "^1.8.0",

package/src/component.js

@@ -97,15 +97,13 @@ const Component = (name = required('name'), config = required('config')) => {
       },
       set state(v) {
         if (states.indexOf(v) > -1 && v !== this.current) {
-          Log.debug(
-            `Setting lifecycle state from ${this.previous} to ${v} for ${scope.componentId}`
-          )
+          Log.debug(`Setting lifecycle state from ${this.current} to ${v} for ${scope.componentId}`)
           this.previous = this.current
+          this.current = v
           // emit 'private' hook
           privateEmit(v, name, scope)
           // emit 'public' hook
           emit(v, name, scope)
-          this.current = v
         }
       },
     }

package/src/components/FPScounter.js

@@ -19,8 +19,6 @@ import Component from '../component.js'
 import { renderer } from '../launch.js'
 import fps_sprite from '../../public/assets/fps_sprite.base64.js'
 
-console.log(fps_sprite)
-
 export default () =>
   Component('FPScounter', {
     /* eslint-disable no-unused-vars */

package/src/components/FPScounter.orig.js

@@ -19,8 +19,6 @@ import Component from '../component.js'
 import { renderer } from '../launch.js'
 import fps_sprite from '../../public/assets/fps_sprite.base64.js'
 
-console.log(fps_sprite)
-
 export default () =>
   Component('FPScounter', {
     template: `

package/src/components/Text.js

@@ -67,6 +67,9 @@ export default () =>
         function anonymous(component, elms, context) {
           elms[0].set('maxLines', component.maxlines)
         },
+        function anonymous(component, elms, context) {
+          elms[0].set('h', component.maxheight)
+        },
         function anonymous(component, elms, context) {
           elms[0].set('textAlign', component.align)
         },
@@ -95,6 +98,7 @@ export default () =>
       'align',
       'wordwrap',
       'maxlines',
+      'maxheight',
       'lineheight',
       'contain',
       '@loaded',
@@ -105,7 +109,7 @@ export default () =>
       _contain() {
         return (
           this.contain ||
-          (this.wordwrap && this.maxlines ? 'both' : this.wordwrap ? 'width' : 'none')
+          (this.maxheight && this.wordwrap ? 'both' : this.wordwrap ? 'width' : 'none')
         )
       },
       _lineheight() {

package/src/components/Text.orig.js

@@ -35,6 +35,7 @@ export default () =>
         contain="$_contain"
         :wordWrap="$wordwrap"
         :maxLines="$maxlines"
+        :h="$maxheight"
         :textAlign="$align"
         :overflowSuffix="$textoverflow"
         @loaded="$@loaded"
@@ -59,6 +60,7 @@ export default () =>
       'align',
       'wordwrap',
       'maxlines',
+      'maxheight',
       'lineheight',
       'contain',
       '@loaded',
@@ -69,7 +71,7 @@ export default () =>
       _contain() {
         return (
           this.contain ||
-          (this.wordwrap && this.maxlines ? 'both' : this.wordwrap ? 'width' : 'none')
+          (this.maxheight && this.wordwrap ? 'both' : this.wordwrap ? 'width' : 'none')
         )
       },
       _lineheight() {

package/src/element.js

@@ -51,8 +51,6 @@ const unpackTransition = (obj) => {
   return obj
 }
 
-let firstNode = false
-
 const Props = {
   set parent(v) {
     this._props.parent = v === 'root' ? renderer.root : v.node
@@ -201,7 +199,7 @@ const Props = {
     this._props.contain = v
   },
   set maxLines(v) {
-    this.height = v * this.element.node.lineHeight
+    this._props.maxLines = v
   },
   set overflowSuffix(v) {
     this._props.overflowSuffix = v === false ? ' ' : v === true ? undefined : v
@@ -247,13 +245,6 @@ const Element = {
         this.props._set.has('src') || this.props._set.has('texture') ? 0xffffffff : 0
     }
 
-    // temporary workaround for renderer issue https://github.com/lightning-js/renderer/issues/123
-    if (!firstNode) {
-      this.props._props.src =
-        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+ip1sAAAAASUVORK5CYII='
-      firstNode = true
-    }
-
     this.node = props.__textnode
       ? renderer.createTextNode(this.props._props)
       : renderer.createNode(this.props._props)

package/src/focus.js

@@ -35,7 +35,7 @@ export default {
   },
   set(component, event) {
     clearTimeout(setFocusTimeout)
-    focusedComponent && focusedComponent.unfocus()
+    focusedComponent && focusedComponent !== component.parent && focusedComponent.unfocus()
     focusChain.reverse().forEach((cmp) => cmp.unfocus())
     if (component !== focusedComponent) {
       setFocusTimeout = setTimeout(