@lightningtv/solid 3.0.0-20 → 3.0.0-22

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@lightningtv/solid",
-  "version": "3.0.0-20",
+  "version": "3.0.0-22",
   "description": "Lightning Renderer for Solid Universal",
   "type": "module",
   "exports": {
     ".": {
+      "@lightningtv/source": "./src/index.ts",
       "import": {
-        "@lightningtv/source": "./src/index.ts",
         "types": "./dist/src/index.d.ts",
         "default": "./dist/src/index.js"
       }
     },
     "./primitives": {
+      "@lightningtv/source": "./src/primitives/index.ts",
       "import": {
-        "@lightningtv/source": "./src/primitives/index.ts",
         "types": "./dist/src/primitives/index.d.ts",
         "default": "./dist/src/primitives/index.js"
       }
     },
     "./devtools": {
+      "@lightningtv/source": "./src/devtools/index.ts",
       "import": {
-        "@lightningtv/source": "./src/devtools/index.ts",
         "types": "./dist/src/devtools/index.d.ts",
         "default": "./dist/src/devtools/index.js"
       }
@@ -42,7 +42,7 @@
     "watch": "tsc -w",
     "prepare": "husky",
     "prepack": "npm run build",
-    "release": "release-it --only-version",
+    "release": "release-it",
     "test:browser": "vitest --config=vitest.browser.config.ts"
   },
   "keywords": [
@@ -55,18 +55,16 @@
   "author": "Chris Lorenzo",
   "license": "Apache-2.0",
   "dependencies": {
-    "@lightningjs/renderer": "3.0.0-beta16",
-    "@lightningtv/core": "3.0.0-20",
+    "@lightningjs/renderer": "3.0.0-beta18",
     "@lightningtv/solid": "link:",
     "@solid-primitives/event-listener": "^2.3.3",
-    "@solid-primitives/keyed": "^1.5.2",
     "@solid-primitives/list": "^0.1.2",
     "@solid-primitives/mouse": "^2.0.20",
     "@solid-primitives/scheduled": "^1.4.4"
   },
   "devDependencies": {
     "@eslint/js": "^9.16.0",
-    "@solid-devtools/debugger": "^0.27.0",
+    "@solid-devtools/debugger": "^0.28.1",
     "@solidjs/testing-library": "^0.8.10",
     "@typescript-eslint/eslint-plugin": "^8.17.0",
     "@typescript-eslint/parser": "^8.17.0",
@@ -96,9 +94,7 @@
     "@solidjs/router": "^0.15.1",
     "solid-js": "*"
   },
-  "optionalDependencies": {
-    "@solid-devtools/debugger": "^0.28.0"
-  },
+  "peerDependenciesMeta": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lightning-tv/solid.git"

package/src/activeElement.ts

@@ -1,5 +1,5 @@
 import { createSignal } from 'solid-js';
-import { type ElementNode } from '@lightningtv/core';
+import { type ElementNode } from './core/index.js';
 export const [activeElement, setActiveElement] = createSignal<
   ElementNode | undefined
 >(undefined);

package/src/core/animation.ts

@@ -0,0 +1,185 @@
+import {
+  getTimingFunction,
+  mergeColorProgress,
+} from '@lightningjs/renderer/utils';
+import {
+  type ElementNode,
+  LightningRendererNumberProps,
+} from './elementNode.js';
+import { type IRendererStage } from './lightningInit.js';
+import { TimingFunction } from '@lightningjs/renderer';
+import { isFunc } from './utils.js';
+
+/**
+ * Simplified Animation Settings
+ */
+export interface SimpleAnimationSettings {
+  duration?: number;
+  delay?: number;
+  easing?: string | TimingFunction;
+}
+
+/**
+ * Properties of a Node used by the SimpleAnimation
+ * (Excludes shaderProps)
+ */
+export type SimpleAnimationProps =
+  (typeof LightningRendererNumberProps)[number];
+
+/**
+ * Configuration for a single node within a SimpleAnimation
+ */
+interface SimpleAnimationNodeConfig {
+  node: ElementNode;
+  duration: number;
+  delay: number;
+  easing: string | TimingFunction;
+  progress: number;
+  delayFor: number;
+  timingFunction: (t: number) => number | undefined;
+  propName: SimpleAnimationProps;
+  startValue: number;
+  targetValue: number;
+}
+
+export class SimpleAnimation {
+  private nodeConfigs: SimpleAnimationNodeConfig[] = [];
+  private isRegistered = false;
+  private stage: IRendererStage | undefined;
+
+  register(stage: IRendererStage) {
+    if (this.isRegistered) {
+      return;
+    }
+    this.isRegistered = true;
+    this.stage = stage;
+    stage.animationManager.registerAnimation(this);
+  }
+
+  /**
+   * Adds a node and its animation properties to this animation instance.
+   * The animation's start values for the specified properties are captured
+   * from the node's current state when this method is called.
+   *
+   * @param node - The CoreNode to animate.
+   * @param props - The properties to animate and their target values. Only number properties are supported.
+   * @param settings - Animation settings for this specific node animation.
+   */
+  add(
+    node: ElementNode,
+    key: SimpleAnimationProps,
+    value: number,
+    settings: SimpleAnimationSettings,
+  ): void {
+    const existingConfig = this.nodeConfigs.find(
+      (config) => config.node === node && config.propName === key,
+    );
+
+    const duration = settings.duration ?? 0;
+    const delay = settings.delay ?? 0;
+    const easing = settings.easing || 'linear';
+    const timingFunction = isFunc(easing) ? easing : getTimingFunction(easing);
+    const targetValue = value;
+    const startValue = node[key] as number;
+
+    if (existingConfig) {
+      existingConfig.duration = duration;
+      existingConfig.delay = delay;
+      existingConfig.easing = easing;
+      existingConfig.timingFunction = timingFunction;
+      existingConfig.targetValue = targetValue;
+      existingConfig.startValue = startValue;
+      existingConfig.progress = 0;
+      existingConfig.delayFor = delay;
+    } else {
+      this.nodeConfigs.push({
+        node,
+        duration,
+        delay,
+        easing,
+        progress: 0,
+        delayFor: delay,
+        timingFunction,
+        propName: key,
+        startValue,
+        targetValue,
+      });
+    }
+  }
+
+  update(dt: number) {
+    // Iterate backward to safely remove finished animations
+    for (let i = this.nodeConfigs.length - 1; i >= 0; i--) {
+      const nodeConfig = this.nodeConfigs[i] as SimpleAnimationNodeConfig;
+      const {
+        node,
+        duration,
+        timingFunction,
+        propName,
+        startValue,
+        targetValue,
+      } = nodeConfig;
+      let remainingDt = dt;
+
+      // 1. Handle Delay
+      if (nodeConfig.delayFor > 0) {
+        nodeConfig.delayFor -= remainingDt;
+        if (nodeConfig.delayFor >= 0) {
+          // Still in delay phase for this node, skip applying values this frame
+          continue;
+        } else {
+          // Delay finished this frame, use the remaining time for animation
+          remainingDt = -nodeConfig.delayFor;
+          nodeConfig.delayFor = 0;
+        }
+      }
+
+      // 2. Update Progress (directly on nodeConfig.progress)
+      if (duration > 0) {
+        nodeConfig.progress += remainingDt / duration;
+        // Clamp progress between 0 and 1
+        nodeConfig.progress = Math.max(0, Math.min(1, nodeConfig.progress));
+      } else if (duration === 0 && nodeConfig.delayFor <= 0) {
+        // Duration is 0 and delay is finished or was 0. Animation completes instantly.
+        nodeConfig.progress = 1;
+      }
+
+      // 3. Calculate Eased Progress
+      const easedProgress =
+        timingFunction(nodeConfig.progress) || nodeConfig.progress;
+
+      // 4. Apply Animated Values to the Node
+      let interpolatedValue: number;
+      if (nodeConfig.progress === 1) {
+        interpolatedValue = targetValue;
+      } else {
+        if (propName.includes('color')) {
+          // Handle color interpolation
+          interpolatedValue = mergeColorProgress(
+            startValue,
+            targetValue,
+            easedProgress,
+          );
+        } else {
+          // Handle linear interpolation for other number properties
+          interpolatedValue =
+            startValue + (targetValue - startValue) * easedProgress;
+        }
+      }
+      // @typescript-eslint/no-explicit-any
+      (node.lng as any)[propName] = interpolatedValue; // Cast to any because the properties on CoreNode might have broader types.
+
+      // 5. Remove Node if Progress is 1
+      if (nodeConfig.progress === 1) {
+        this.nodeConfigs.splice(i, 1);
+      }
+      if (this.nodeConfigs.length === 0) {
+        this.stage?.animationManager.unregisterAnimation(this);
+        this.isRegistered = false;
+      }
+    }
+  }
+}
+
+export const simpleAnimation = new SimpleAnimation();
+export default simpleAnimation;

package/src/core/config.ts

@@ -0,0 +1,77 @@
+import type { RendererMainSettings } from '@lightningjs/renderer';
+import type {
+  TextProps,
+  AnimationSettings,
+  DollarString,
+} from './intrinsicTypes.js';
+import { type ElementNode } from './elementNode.js';
+
+/**
+  STATIC LIGHTNING CONFIGURATION \
+  Replace the values below with in your build system, \
+  or set them in the global scope before importing lightning-core.
+*/
+declare global {
+  /** Whether the DOM renderer should be used instead of `@lightningjs/renderer` */
+  var LIGHTNING_DOM_RENDERING: boolean | undefined;
+  /** Whether element shaders should be disabled */
+  var LIGHTNING_DISABLE_SHADERS: boolean | undefined;
+
+  /** Could be set by vite or other bundler */
+  interface ImportMetaEnv {
+    DEV?: unknown;
+  }
+  interface ImportMeta {
+    env?: ImportMetaEnv;
+  }
+}
+
+export const isDev = !!(import.meta.env && import.meta.env.DEV);
+
+/** Whether the DOM renderer is used instead of `@lightningjs/renderer` */
+export const DOM_RENDERING =
+  typeof LIGHTNING_DOM_RENDERING === 'boolean' && LIGHTNING_DOM_RENDERING;
+
+/** Whether element shaders are enabled */
+export const SHADERS_ENABLED = !(
+  typeof LIGHTNING_DISABLE_SHADERS === 'boolean' && LIGHTNING_DISABLE_SHADERS
+);
+
+/**
+  RUNTIME LIGHTNING CONFIGURATION \
+  This configuration can be set at runtime, but it is recommended to set it
+  before running any Lightning modules to ensure consistent behavior across the application.
+*/
+export interface Config {
+  debug: boolean;
+  focusDebug: boolean;
+  keyDebug: boolean;
+  simpleAnimationsEnabled?: boolean;
+  animationSettings?: AnimationSettings;
+  animationsEnabled: boolean;
+  fontSettings: Partial<TextProps>;
+  rendererOptions?: Partial<RendererMainSettings>;
+  setActiveElement: (elm: ElementNode) => void;
+  focusStateKey: DollarString;
+  lockStyles?: boolean;
+  throttleInput?: number;
+  taskDelay?: number;
+}
+
+export const Config: Config = {
+  debug: false,
+  focusDebug: false,
+  keyDebug: false,
+  animationsEnabled: true,
+  animationSettings: {
+    duration: 250,
+    easing: 'ease-in-out',
+  },
+  fontSettings: {
+    fontFamily: 'Ubuntu',
+    fontSize: 100,
+  },
+  setActiveElement: () => {},
+  focusStateKey: '$focus',
+  lockStyles: true,
+};