@lightningtv/solid 3.0.0-1 → 3.0.0-10

package/dist/src/primitives/useHold.d.ts

@@ -0,0 +1,27 @@
+export type UseHoldProps = {
+    onHold: () => void;
+    onEnter: () => void;
+    onRelease?: () => void;
+    holdThreshold?: number;
+    performOnEnterImmediately?: boolean;
+};
+/**
+ * @example
+ * const [holdRight, releaseRight] = useHold({
+ *   onHold: handleHoldRight,
+ *   onEnter: handleOnRight,
+ *   onRelease: handleReleaseHold,
+ *   holdThreshold: 200,
+ *   performOnEnterImmediately: true
+ * });
+ *
+ * <View
+ *   onRight={holdRight}
+ *   onRightRelease={releaseRight}
+ * />
+ *
+ * @param {UseHoldProps} props - The properties for configuring the hold behavior.
+ * @returns {[() => boolean, () => boolean]} A tuple containing `startHold` and `releaseHold` functions.
+ */
+export declare function useHold(props: UseHoldProps): ((() => boolean) | (() => true | undefined))[];
+export default useHold;

package/dist/src/primitives/useHold.js

@@ -0,0 +1,54 @@
+import { createMemo } from 'solid-js';
+/**
+ * @example
+ * const [holdRight, releaseRight] = useHold({
+ *   onHold: handleHoldRight,
+ *   onEnter: handleOnRight,
+ *   onRelease: handleReleaseHold,
+ *   holdThreshold: 200,
+ *   performOnEnterImmediately: true
+ * });
+ *
+ * <View
+ *   onRight={holdRight}
+ *   onRightRelease={releaseRight}
+ * />
+ *
+ * @param {UseHoldProps} props - The properties for configuring the hold behavior.
+ * @returns {[() => boolean, () => boolean]} A tuple containing `startHold` and `releaseHold` functions.
+ */
+export function useHold(props) {
+    const holdThreshold = createMemo(() => props.holdThreshold ?? 500);
+    const performOnEnterImmediately = createMemo(() => props.performOnEnterImmediately ?? false);
+    let holdTimeout = -1;
+    let wasHeld = false;
+    const startHold = () => {
+        if (holdTimeout === -1) {
+            if (performOnEnterImmediately()) {
+                props.onEnter();
+            }
+            holdTimeout = setTimeout(() => {
+                wasHeld = true;
+                props.onHold();
+            }, holdThreshold());
+        }
+        return true;
+    };
+    const releaseHold = () => {
+        if (holdTimeout !== -1) {
+            clearTimeout(holdTimeout);
+            holdTimeout = -1;
+            if (!wasHeld) {
+                if (!performOnEnterImmediately())
+                    props.onEnter();
+                return;
+            }
+            props.onRelease?.();
+            wasHeld = false;
+        }
+        return true;
+    };
+    return [startHold, releaseHold];
+}
+export default useHold;
+//# sourceMappingURL=useHold.js.map

package/dist/src/primitives/useHold.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useHold.js","sourceRoot":"","sources":["../../../src/primitives/useHold.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAUtC;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,UAAU,OAAO,CAAC,KAAmB;IACzC,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,IAAI,GAAG,CAAC,CAAC;IACnE,MAAM,yBAAyB,GAAG,UAAU,CAC1C,GAAG,EAAE,CAAC,KAAK,CAAC,yBAAyB,IAAI,KAAK,CAC/C,CAAC;IAEF,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;IACrB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE,CAAC;YACvB,IAAI,yBAAyB,EAAE,EAAE,CAAC;gBAChC,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,CAAC;YACD,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,OAAO,GAAG,IAAI,CAAC;gBACf,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,CAAC,EAAE,aAAa,EAAE,CAAsB,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE,CAAC;YACvB,YAAY,CAAC,WAAW,CAAC,CAAC;YAC1B,WAAW,GAAG,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,IAAI,CAAC,yBAAyB,EAAE;oBAAE,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClD,OAAO;YACT,CAAC;YACD,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;YACpB,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAClC,CAAC;AAED,eAAe,OAAO,CAAC"}

package/dist/src/primitives/utils/chainFunctions.d.ts

@@ -1,4 +1,30 @@
-type ChainableFunction = (...args: unknown[]) => unknown;
-export declare function chainFunctions(...args: ChainableFunction[]): ChainableFunction;
-export declare function chainFunctions<T>(...args: (ChainableFunction | T)[]): T;
-export {};
+import * as s from 'solid-js';
+export type AnyFunction = (this: any, ...args: any[]) => any;
+/**
+ * take an array of functions and if you return `true` from a function, it will stop the chain
+ * @param fns list of functions to chain together, can be `undefined`, `null`, or `false` to skip them
+ * @returns a function that will call each function in the list until one returns `true` or all functions are called.
+ * If no functions are provided, it will return `undefined`.
+ *
+ * @example
+ * ```tsx
+ * function Button (props: NodeProps) {
+ *   function onEnter (el: ElementNode) {...}
+ *   return <view onEnter={chainFunctions(props.onEnter, onEnter)} />
+ * }
+ * ```
+ */
+export declare function chainFunctions<T extends AnyFunction>(...fns: T[]): T;
+export declare function chainFunctions<T extends AnyFunction>(...fns: (T | undefined | null | false)[]): T | undefined;
+/**
+ * Utility for chaining multiple `ref` assignments with `props.ref` forwarding.
+ * @param refs list of ref setters. Can be a `props.ref` prop for ref forwarding or a setter to a local variable (`el => ref = el`).
+ * @example
+ * ```tsx
+ * function Button (props: NodeProps) {
+ *    let localRef: ElementNode | undefined
+ *    return <view ref={chainRefs(props.ref, el => localRef = el)} />
+ * }
+ * ```
+ */
+export declare const chainRefs: <T>(...refs: (s.Ref<T> | undefined)[]) => (el: T) => void;

package/dist/src/primitives/utils/chainFunctions.js

@@ -1,6 +1,5 @@
-// take an array of functions and if you return true from a function, it will stop the chain
-export function chainFunctions(...args) {
-    const onlyFunctions = args.filter((func) => typeof func === 'function');
+export function chainFunctions(...fns) {
+    const onlyFunctions = fns.filter((func) => typeof func === 'function');
     if (onlyFunctions.length === 0) {
         return undefined;
     }
@@ -18,4 +17,16 @@ export function chainFunctions(...args) {
         return result;
     };
 }
+/**
+ * Utility for chaining multiple `ref` assignments with `props.ref` forwarding.
+ * @param refs list of ref setters. Can be a `props.ref` prop for ref forwarding or a setter to a local variable (`el => ref = el`).
+ * @example
+ * ```tsx
+ * function Button (props: NodeProps) {
+ *    let localRef: ElementNode | undefined
+ *    return <view ref={chainRefs(props.ref, el => localRef = el)} />
+ * }
+ * ```
+ */
+export const chainRefs = chainFunctions;
 //# sourceMappingURL=chainFunctions.js.map

package/dist/src/primitives/utils/chainFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"chainFunctions.js","sourceRoot":"","sources":["../../../../src/primitives/utils/chainFunctions.ts"],"names":[],"mappings":"AAKA,4FAA4F;AAC5F,MAAM,UAAU,cAAc,CAC5B,GAAG,IAA+B;IAElC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC;IACxE,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,UAA6B,GAAG,SAAoB;QACzD,IAAI,MAAM,CAAC;QACX,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACrC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"chainFunctions.js","sourceRoot":"","sources":["../../../../src/primitives/utils/chainFunctions.ts"],"names":[],"mappings":"AAsBA,MAAM,UAAU,cAAc,CAC5B,GAAG,GAA+C;IAElD,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC;IACvE,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,UAAU,GAAG,SAAS;QAC3B,IAAI,MAAM,CAAC;QACX,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACrC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,cAEL,CAAC"}

package/dist/src/primitives/utils/createSpriteMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSpriteMap.js","sourceRoot":"","sources":["../../../../src/primitives/utils/createSpriteMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAmB,MAAM,mBAAmB,CAAC;AAU9D,MAAM,UAAU,eAAe,CAC7B,GAAW,EACX,WAAwB;IAExB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,cAAc,EAAE;QAC9D,GAAG;KACJ,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,MAAM,CAEvB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QACX,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,YAAY,EAAE;YACjD,OAAO,EAAE,gBAAgB;YACzB,CAAC;YACD,CAAC;YACD,KAAK;YACL,MAAM;SACP,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"createSpriteMap.js","sourceRoot":"","sources":["../../../../src/primitives/utils/createSpriteMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAU9D,MAAM,UAAU,eAAe,CAC7B,GAAW,EACX,WAAwB;IAExB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,cAAc,EAAE;QAC9D,GAAG;KACJ,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,MAAM,CAEvB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QACX,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,YAAY,EAAE;YACjD,OAAO,EAAE,gBAAgB;YACzB,CAAC;YACD,CAAC;YACD,KAAK;YACL,MAAM;SACP,CAA2C,CAAC;QAC7C,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

package/dist/src/primitives/utils/handleNavigation.js

@@ -3,6 +3,14 @@ export function onGridFocus(onSelectedChanged) {
     return function () {
         if (!this || this.children.length === 0)
             return false;
+        // if a child already has focus, assume that should be selected
+        this.children.find((child, index) => {
+            if (child.states.has(Config.focusStateKey)) {
+                this.selected = index;
+                return true;
+            }
+            return false;
+        });
         this.selected = this.selected || 0;
         let child = this.selected
             ? this.children[this.selected]
@@ -60,8 +68,9 @@ export function handleNavigation(direction) {
                 return false;
             }
         }
-        const active = this.children[this.selected || 0];
-        assertTruthy(active instanceof ElementNode);
+        const active = this.children[this.selected || 0] || this.children[0];
+        if (!(active instanceof ElementNode))
+            return false;
         const navigableThis = this;
         navigableThis.onSelectedChanged &&
             navigableThis.onSelectedChanged.call(navigableThis, navigableThis.selected, navigableThis, active, lastSelected);

package/dist/src/primitives/utils/handleNavigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleNavigation.js","sourceRoot":"","sources":["../../../../src/primitives/utils/handleNavigation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAItE,MAAM,UAAU,WAAW,CAAC,iBAAgD;IAC1E,OAAO;QACL,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAEtD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;QACnC,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ;YACvB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC9B,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;QAEtB,OAAO,KAAK,EAAE,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,CAAC,CAAC,KAAK,YAAY,WAAW,CAAC;YAAE,OAAO,KAAK,CAAC;QAClD,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEjB,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,IAAwB,CAAC;YACtC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,SAA2C;IAE3C,OAAO;QACL,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;QAExC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,SAAS,KAAK,OAAO,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAClD,GAAG,CAAC;gBACF,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;gBACzD,IAAI,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;oBACjC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACV,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;wBACnB,MAAM;oBACR,CAAC;oBACD,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACpB,CAAC;YACH,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE;QACpD,CAAC;aAAM,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACtD,GAAG,CAAC;gBACF,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;gBACzD,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;oBACtB,IAAI,CAAC,IAAI,EAAE,CAAC;wBACV,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;wBACnB,MAAM;oBACR,CAAC;oBACD,IAAI,CAAC,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC;YAC7B,IACE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAO,CAAC,GAAG,CACvC,MAAM,CAAC,aAAa,IAAI,QAAQ,CACjC,EACD,CAAC;gBACD,8DAA8D;gBAC9D,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;QACjD,YAAY,CAAC,MAAM,YAAY,WAAW,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG,IAAwB,CAAC;QAE/C,aAAa,CAAC,iBAAiB;YAC7B,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAClC,aAAa,EACb,aAAa,CAAC,QAAQ,EACtB,aAAa,EACb,MAAM,EACN,YAAY,CACb,CAAC;QAEJ,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,oDAAoD;YACpD,gCAAgC;YAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACtD,YAAY,CAAC,iBAAiB,YAAY,WAAW,CAAC,CAAC;YACvD,MAAM,GAAG,GAAG,iBAAiB,CAAC,QAAQ,IAAI,CAAC,CAAC;YAC5C,MAAM,CAAC,QAAQ;gBACb,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"handleNavigation.js","sourceRoot":"","sources":["../../../../src/primitives/utils/handleNavigation.ts"],"names":[],"mappings":"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"}

package/dist/src/primitives/utils/withScrolling.d.ts

@@ -1,10 +1,13 @@
 import type { ElementNode, ElementText } from '@lightningtv/core';
 export interface ScrollableElement extends ElementNode {
     scrollIndex?: number;
+    scroll?: 'always' | 'none' | 'edge' | 'auto' | 'center';
     selected: number;
     offset?: number;
     endOffset?: number;
+    onScrolled?: (elm: ScrollableElement, offset: number, isInitial: boolean) => void;
     _targetPosition?: number;
     _screenOffset?: number;
+    _initialPosition?: number;
 }
 export declare function withScrolling(isRow: boolean): (selected: number | ElementNode, component?: ElementNode, selectedElement?: ElementNode | ElementText, lastSelected?: number) => void;

package/dist/src/primitives/utils/withScrolling.js

@@ -21,6 +21,9 @@ export function withScrolling(isRow) {
             componentRef.scroll === 'none' ||
             !componentRef.children.length)
             return;
+        if (componentRef._initialPosition === undefined) {
+            componentRef._initialPosition = componentRef[axis];
+        }
         const lng = componentRef.lng;
         const screenSize = isRow ? lng.stage.root.width : lng.stage.root.height;
         // Determine if movement is incremental or decremental
@@ -37,7 +40,13 @@ export function withScrolling(isRow) {
         }
         const screenOffset = componentRef._screenOffset;
         const gap = componentRef.gap || 0;
-        const scroll = componentRef.scroll || 'auto';
+        // when creating we set scroll to always so we setup the right location for selected and scrollIndex
+        const scroll = componentRef.scroll ||
+            (lastSelected === undefined
+                ? componentRef.scrollIndex
+                    ? 'center'
+                    : 'always'
+                : 'auto');
         // Allows manual position control
         const targetPosition = componentRef._targetPosition ?? componentRef[axis];
         const rootPosition = isIncrementing || scroll === 'auto'
@@ -118,6 +127,10 @@ export function withScrolling(isRow) {
                 : Math.min(nextPosition, offset);
         // Update position if it has changed
         if (componentRef[axis] !== nextPosition) {
+            if (componentRef.onScrolled) {
+                const isInitial = nextPosition === componentRef._initialPosition;
+                componentRef.onScrolled(componentRef, nextPosition, isInitial);
+            }
             componentRef[axis] = nextPosition;
             // Store the new position to keep track during animations
             componentRef._targetPosition = nextPosition;

package/dist/src/primitives/utils/withScrolling.js.map

@@ -1 +1 @@
-{"version":3,"file":"withScrolling.js","sourceRoot":"","sources":["../../../../src/primitives/utils/withScrolling.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"withScrolling.js","sourceRoot":"","sources":["../../../../src/primitives/utils/withScrolling.ts"],"names":[],"mappings":"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"}

package/dist/src/render.d.ts

@@ -1,9 +1,9 @@
-import { type NodeProps, type TextProps, type RendererMain, type RendererMainSettings } from '@lightningtv/core';
-import { type JSXElement, type ValidComponent } from 'solid-js';
+import { type NodeProps, type TextProps, type RendererMainSettings } from '@lightningtv/core';
+import { type JSXElement, type Component } from 'solid-js';
 import type { SolidNode } from './types.js';
 export declare const rootNode: import("@lightningtv/core").ElementNode;
 export declare function createRenderer(rendererOptions?: RendererMainSettings, node?: HTMLElement | string): {
-    renderer: RendererMain;
+    renderer: import("@lightningtv/core").IRendererMain;
     rootNode: import("@lightningtv/core").ElementNode;
     render: (code: () => JSXElement) => () => void;
 };
@@ -19,8 +19,8 @@ export declare function scheduleTask(callback: Task, priority?: 'high' | 'low'):
  * ```
  * @description https://www.solidjs.com/docs/latest/api#dynamic
  */
-export declare function Dynamic<T>(props: T & {
-    component?: ValidComponent;
+export declare function Dynamic<T extends Record<string, any>>(props: T & {
+    component?: Component<T> | undefined | null;
 }): JSXElement;
 export declare const View: (props: NodeProps) => JSXElement;
 export declare const Text: (props: TextProps) => JSXElement;

package/dist/src/render.js

@@ -1,7 +1,7 @@
 import { createRenderer as solidCreateRenderer } from 'solid-js/universal';
 import { Config, startLightningRenderer, } from '@lightningtv/core';
 import nodeOpts from './solidOpts.js';
-import { splitProps, createMemo, createRenderEffect, untrack, } from 'solid-js';
+import { splitProps, createMemo, createRenderEffect, untrack, createRoot, } from 'solid-js';
 import { activeElement, setActiveElement } from './activeElement.js';
 const solidRenderer = solidCreateRenderer(nodeOpts);
 let renderer;
@@ -30,11 +30,13 @@ export function createRenderer(rendererOptions, node) {
 export const { effect, memo, createComponent, createElement, createTextNode, insertNode, insert, spread, setProp, mergeProps, use, } = solidRenderer;
 const taskQueue = [];
 let tasksEnabled = false;
-createRenderEffect(() => {
-    // should change whenever a keypress occurs, so we disable the task queue
-    // until the renderer is idle again.
-    activeElement();
-    tasksEnabled = false;
+createRoot(() => {
+    createRenderEffect(() => {
+        // should change whenever a keypress occurs, so we disable the task queue
+        // until the renderer is idle again.
+        activeElement();
+        tasksEnabled = false;
+    });
 });
 export function setTasksEnabled(enabled) {
     tasksEnabled = enabled;

package/dist/src/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/render.ts"],"names":[],"mappings":"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"}

package/dist/src/solidOpts.d.ts

@@ -1,5 +1,12 @@
 import { ElementNode, type ElementText, type TextNode } from '@lightningtv/core';
 import type { SolidNode } from './types.js';
+declare module '@lightningtv/core' {
+    interface ElementNode {
+        /** @internal for managing series of insertions and deletions */
+        _queueDelete?: number;
+        preserve?: boolean;
+    }
+}
 declare const _default: {
     createElement(name: string): ElementNode;
     createTextNode(text: string): TextNode;

package/dist/src/solidOpts.js

@@ -1,4 +1,33 @@
 import { assertTruthy, isElementText, ElementNode, NodeType, log, } from '@lightningtv/core';
+Object.defineProperty(ElementNode.prototype, 'preserve', {
+    get() {
+        return this._queueDelete === 0;
+    },
+    set(v) {
+        this._queueDelete = v ? 0 : undefined;
+    },
+});
+let elementDeleteQueue = [];
+function flushDeleteQueue() {
+    for (let el of elementDeleteQueue) {
+        if (Number(el._queueDelete) < 0) {
+            el.destroy();
+        }
+        el._queueDelete = undefined;
+    }
+    elementDeleteQueue.length = 0;
+}
+function pushDeleteQueue(node, n) {
+    if (node._queueDelete === undefined) {
+        node._queueDelete = n;
+        if (elementDeleteQueue.push(node) === 1) {
+            queueMicrotask(flushDeleteQueue);
+        }
+    }
+    else {
+        node._queueDelete += n;
+    }
+}
 export default {
     createElement(name) {
         return new ElementNode(name);
@@ -19,10 +48,13 @@ export default {
     },
     insertNode(parent, node, anchor) {
         log('INSERT: ', parent, node, anchor);
+        let prevParent = node.parent;
         parent.insertChild(node, anchor);
-        node._queueDelete = false;
         if (node instanceof ElementNode) {
-            parent.rendered && node.render(true);
+            node.parent.rendered && node.render(true);
+            if (prevParent !== undefined) {
+                pushDeleteQueue(node, 1);
+            }
         }
         else if (isElementText(parent)) {
             // TextNodes can be placed outside of <text> nodes when <Show> is used as placeholder
@@ -35,12 +67,12 @@ export default {
     removeNode(parent, node) {
         log('REMOVE: ', parent, node);
         parent.removeChild(node);
-        node._queueDelete = true;
         if (node instanceof ElementNode) {
-            // Solid replacesNodes to move them (via insert and remove),
-            // so we need to wait for the next microtask to destroy the node
-            // in the event it gets a new parent.
-            queueMicrotask(() => node.destroy());
+            pushDeleteQueue(node, -1);
+        }
+        else if (isElementText(parent)) {
+            // TextNodes can be placed outside of <text> nodes when <Show> is used as placeholder
+            parent.text = parent.getText();
         }
     },
     getParentNode(node) {

package/dist/src/solidOpts.js.map

@@ -1 +1 @@
-{"version":3,"file":"solidOpts.js","sourceRoot":"","sources":["../../src/solidOpts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,WAAW,EACX,QAAQ,EACR,GAAG,GAGJ,MAAM,mBAAmB,CAAC;AAG3B,eAAe;IACb,aAAa,CAAC,IAAY;QACxB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IACD,cAAc,CAAC,IAAY;QACzB,qDAAqD;QACrD,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IACxC,CAAC;IACD,WAAW,CAAC,IAAc,EAAE,KAAa;QACvC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,YAAY,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IACD,WAAW,CAAC,IAAiB,EAAE,IAAY,EAAE,QAAa,IAAI;QAC5D,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IACrB,CAAC;IACD,UAAU,CAAC,MAAmB,EAAE,IAAe,EAAE,MAAiB;QAChE,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAEtC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAE1B,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;YAChC,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;aAAM,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,qFAAqF;YACrF,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IACD,UAAU,CAAC,IAAe;QACxB,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IACD,UAAU,CAAC,MAAmB,EAAE,IAAe;QAC7C,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9B,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;YAChC,4DAA4D;YAC5D,gEAAgE;YAChE,qCAAqC;YACrC,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,aAAa,CAAC,IAAe;QAC3B,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACD,aAAa,CAAC,IAAiB;QAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAc,CAAC;IACvC,CAAC;IACD,cAAc,CAAC,IAAe;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAW,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,KAAK,CAAc,CAAC;QACtC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CAC6B,CAAC"}
+{"version":3,"file":"solidOpts.js","sourceRoot":"","sources":["../../src/solidOpts.ts"],"names":[],"mappings":"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"}