@lightningjs/blits 0.6.13 → 0.7.1

package/src/lib/hooks.js

@@ -19,8 +19,8 @@ import symbols from './symbols.js'
 
 const cbs = {}
 
-export const emit = (hook, name, scope) => {
-  cbs[name] && cbs[name][hook] && cbs[name][hook].apply(scope)
+export const emit = (hook, name, scope, data = []) => {
+  cbs[name] && cbs[name][hook] && cbs[name][hook].apply(scope, data)
 }
 
 export const privateEmit = (hook, name, scope) => {

package/src/lib/lifecycle.js

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024 Comcast Cable Communications Management, LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Log } from './log.js'
+import { emit, privateEmit } from './hooks.js'
+
+const states = ['init', 'ready', 'focus', 'unfocus', 'destroy']
+
+export default {
+  previous: null,
+  current: null,
+  get state() {
+    return this.current
+  },
+  set state(v) {
+    if (states.indexOf(v) > -1 && v !== this.current) {
+      Log.debug(
+        `Setting lifecycle state from ${this.current} to ${v} for ${this.component.componentId}`
+      )
+      this.previous = this.current
+      this.current = v
+      // emit 'private' hook
+      privateEmit(v, this.component.name, this.component)
+      // emit 'public' hook
+      emit(v, this.component.name, this.component)
+    }
+  },
+}

package/src/lib/reactivity/reactive.js

@@ -57,9 +57,14 @@ const reactiveProxy = (target) => {
     set(target, key, value, receiver) {
       const oldValue = target[key]
 
-      const result = Reflect.set(target, key, value, receiver)
+      let result
+      if (typeof value === 'object' && Array.isArray(value) && proxyMap.get(target[key])) {
+        result = target[key].splice(0, target[key].length, ...value)
+      } else {
+        result = Reflect.set(target, key, value, receiver)
+      }
 
-      if (typeof result === 'object') {
+      if (typeof value === 'object') {
         reactiveProxy(target[key])
       }
 
@@ -104,6 +109,7 @@ const reactiveDefineProperty = (target) => {
         return internalValue
       },
       set(newValue) {
+        // todo: support assigning array (as we do with proxies)
         let oldValue = internalValue
         if (oldValue !== newValue) {
           internalValue = newValue

package/src/lib/setup/base.js

@@ -35,8 +35,14 @@ const shaderAlias = {
   rounded: 'radius',
 }
 
-export default (component) => {
+export default (component, name) => {
   Object.defineProperties(component.prototype, {
+    name: {
+      value: name,
+      writable: false,
+      enumerable: true,
+      configurable: false,
+    },
     focus: {
       value: function (e) {
         Focus.set(this, e)
@@ -242,11 +248,8 @@ const deleteChildren = function (children) {
     if (!children[i]) return
     if (Array.isArray(children[i])) {
       deleteChildren(children[i])
-    } else if (children[i].delete) {
-      children[i].delete()
     } else if (children[i].destroy) {
       children[i].destroy()
-      children[i] = null
     }
     children[i] = null
   }

package/src/router/router.js

@@ -28,7 +28,9 @@ export let navigating = false
 
 const cacheMap = new WeakMap()
 const history = []
+
 let overrideOptions = {}
+let navigationData = {}
 let navigatingBack = false
 let previousFocus
 
@@ -133,7 +135,8 @@ export const navigate = async function () {
         holder.set('w', '100%')
         holder.set('h', '100%')
         // merge props with potential route params to be injected into the component instance
-        const props = { ...this[symbols.props], ...route.params }
+        const props = { ...this[symbols.props], ...route.params, ...navigationData }
+
         view = await route.component({ props }, holder, this)
         if (view[Symbol.toStringTag] === 'Module') {
           if (view.default && typeof view.default === 'function') {
@@ -233,7 +236,7 @@ const removeView = async (route, view, transition) => {
     cacheMap.set(route, { view: view, focus: previousFocus })
   } else {
     // remove and cleanup
-    for (let i = 0; i < view[symbols.children].length - 1; i++) {
+    for (let i = 0; i < view[symbols.children].length; i++) {
       if (view[symbols.children][i] && view[symbols.children][i].destroy) {
         view[symbols.children][i].destroy()
         view[symbols.children][i] = null
@@ -250,7 +253,8 @@ const setOrAnimate = (node, transition, shouldAnimate = true) => {
     : node.set(transition.prop, transition.value)
 }
 
-export const to = (location, options = {}) => {
+export const to = (location, data = {}, options = {}) => {
+  navigationData = data
   overrideOptions = options
   window.location.hash = `#${location}`
 }