@lightningtv/solid 3.0.0-2 → 3.0.0-21

package/dist/src/primitives/announcer/speech.js

@@ -1,3 +1,5 @@
+const ARIA_PARENT_ID = 'aria-parent';
+let ariaLabelPhrases = [];
 /* global SpeechSynthesisErrorEvent */
 function flattenStrings(series = []) {
     const flattenedSeries = [];
@@ -22,6 +24,72 @@ function delay(pause) {
         setTimeout(resolve, pause);
     });
 }
+/**
+ * @description This function is called at the end of the speak series
+ * @param Phrase is an object containing the text and the language
+ */
+function addChildrenToAriaDiv(phrase) {
+    if (phrase?.text?.trim().length === 0)
+        return;
+    ariaLabelPhrases.push(phrase);
+}
+/**
+ * @description This function is triggered finally when the speak series is finished and we are to speak the aria labels
+ */
+function focusElementForAria() {
+    const element = createAriaElement();
+    if (!element) {
+        console.error(`ARIA div not found: ${ARIA_PARENT_ID}`);
+        return;
+    }
+    for (const object of ariaLabelPhrases) {
+        const span = document.createElement('span');
+        // TODO: Not sure LG or Samsung support lang attribute on span or switching language
+        span.setAttribute('lang', object.lang);
+        span.setAttribute('aria-label', object.text);
+        element.appendChild(span);
+    }
+    // Cleanup
+    setTimeout(() => {
+        ariaLabelPhrases = [];
+        cleanAriaLabelParent();
+        focusCanvas();
+    }, 100);
+}
+/**
+ * @description Clean the aria label parent after speaking
+ */
+function cleanAriaLabelParent() {
+    const parentTag = document.getElementById(ARIA_PARENT_ID);
+    if (parentTag) {
+        while (parentTag.firstChild) {
+            parentTag.removeChild(parentTag.firstChild);
+        }
+    }
+}
+/**
+ * @description Focus the canvas element
+ */
+function focusCanvas() {
+    const canvas = document.getElementById('app')?.firstChild;
+    canvas?.focus();
+}
+/**
+ * @description Create the aria element in the DOM if it doesn't exist
+ * @private For xbox, we may need to create a different element each time we wanna use aria
+ */
+function createAriaElement() {
+    const aria_container = document.getElementById(ARIA_PARENT_ID);
+    if (!aria_container) {
+        const element = document.createElement('div');
+        element.setAttribute('id', ARIA_PARENT_ID);
+        element.setAttribute('aria-live', 'assertive');
+        element.setAttribute('tabindex', '0');
+        document.body.appendChild(element);
+        return element;
+    }
+    return aria_container;
+}
 /**
  * Speak a string
  *
@@ -30,11 +98,20 @@ function delay(pause) {
  * @param lang Language to speak in
  * @return {Promise<void>} Promise resolved when the utterance has finished speaking, and rejected if there's an error
  */
-function speak(phrase, utterances, lang = 'en-US') {
+function speak(phrase, utterances, lang = 'en-US', voiceName) {
     const synth = window.speechSynthesis;
     return new Promise((resolve, reject) => {
+        let selectedVoice;
+        if (voiceName) {
+            const availableVoices = synth.getVoices();
+            selectedVoice =
+                availableVoices.find((v) => v.name === voiceName) || availableVoices[0];
+        }
         const utterance = new SpeechSynthesisUtterance(phrase);
         utterance.lang = lang;
+        if (selectedVoice) {
+            utterance.voice = selectedVoice;
+        }
         utterance.onend = () => {
             resolve();
         };
@@ -45,15 +122,10 @@ function speak(phrase, utterances, lang = 'en-US') {
         synth.speak(utterance);
     });
 }
-function speakSeries(series, lang, root = true) {
+function speakSeries(series, aria, lang, voice, root = true) {
     const synth = window.speechSynthesis;
     const remainingPhrases = flattenStrings(Array.isArray(series) ? series : [series]);
     const nestedSeriesResults = [];
-    /*
-      We hold this array of SpeechSynthesisUtterances in order to prevent them from being
-      garbage collected prematurely on STB hardware which can cause the 'onend' events of
-      utterances to not fire consistently.
-    */
     const utterances = [];
     let active = true;
     const seriesChain = (async () => {
@@ -61,26 +133,68 @@ function speakSeries(series, lang, root = true) {
             while (active && remainingPhrases.length) {
                 const phrase = await Promise.resolve(remainingPhrases.shift());
                 if (!active) {
-                    // Exit
-                    // Need to check this after the await in case it was cancelled in between
-                    break;
+                    break; // Exit if canceled
+                }
+                if (typeof phrase === 'string' && phrase.includes('PAUSE-')) {
+                    // Handle pauses
+                    const pause = Number(phrase.split('PAUSE-')[1]) * 1000;
+                    if (!isNaN(pause)) {
+                        await delay(pause);
+                    }
                 }
-                else if (typeof phrase === 'string' && phrase.includes('PAUSE-')) {
-                    // Pause it
-                    let pause = Number(phrase.split('PAUSE-')[1]) * 1000;
-                    if (isNaN(pause)) {
-                        pause = 0;
+                else if (typeof phrase === 'string') {
+                    if (!phrase) {
+                        continue; // Skip empty strings
+                    }
+                    // Handle regular strings with retry logic
+                    const totalRetries = 3;
+                    let retriesLeft = totalRetries;
+                    while (active && retriesLeft > 0) {
+                        try {
+                            if (aria)
+                                addChildrenToAriaDiv({ text: phrase, lang });
+                            else
+                                await speak(phrase, utterances, lang, voice);
+                            retriesLeft = 0; // Exit retry loop on success
+                        }
+                        catch (e) {
+                            if (e instanceof SpeechSynthesisErrorEvent) {
+                                if (e.error === 'network') {
+                                    retriesLeft--;
+                                    console.warn(`Speech synthesis network error. Retries left: ${retriesLeft}`);
+                                    await delay(500 * (totalRetries - retriesLeft));
+                                }
+                                else if (e.error === 'canceled' ||
+                                    e.error === 'interrupted') {
+                                    // Cancel or interrupt error (ignore)
+                                    retriesLeft = 0;
+                                }
+                                else {
+                                    throw new Error(`SpeechSynthesisErrorEvent: ${e.error}`);
+                                }
+                            }
+                            else {
+                                throw e;
+                            }
+                        }
                     }
-                    await delay(pause);
                 }
-                else if (typeof phrase === 'string' && phrase.length) {
-                    // Speak it
+                else if (phrase instanceof SpeechSynthesisUtterance) {
+                    // Handle SpeechSynthesisUtterance objects with retry logic
                     const totalRetries = 3;
                     let retriesLeft = totalRetries;
+                    const text = phrase.text;
+                    const objectLang = phrase?.lang;
+                    const objectVoice = phrase?.voice;
                     while (active && retriesLeft > 0) {
                         try {
-                            await speak(phrase, utterances, lang);
-                            retriesLeft = 0;
+                            if (text) {
+                                if (aria)
+                                    addChildrenToAriaDiv({ text, lang: objectLang });
+                                else
+                                    await speak(text, utterances, objectLang, objectVoice?.name);
+                                retriesLeft = 0; // Exit retry loop on success
+                            }
                         }
                         catch (e) {
                             if (e instanceof SpeechSynthesisErrorEvent) {
@@ -105,13 +219,14 @@ function speakSeries(series, lang, root = true) {
                     }
                 }
                 else if (typeof phrase === 'function') {
-                    const seriesResult = speakSeries(phrase(), lang, false);
+                    // Handle functions
+                    const seriesResult = speakSeries(phrase(), aria, lang, voice, false);
                     nestedSeriesResults.push(seriesResult);
                     await seriesResult.series;
                 }
                 else if (Array.isArray(phrase)) {
-                    // Speak it (recursively)
-                    const seriesResult = speakSeries(phrase, lang, false);
+                    // Handle nested arrays
+                    const seriesResult = speakSeries(phrase, aria, lang, voice, false);
                     nestedSeriesResults.push(seriesResult);
                     await seriesResult.series;
                 }
@@ -119,6 +234,10 @@ function speakSeries(series, lang, root = true) {
         }
         finally {
             active = false;
+            // Call completion logic only for the original (root) series
+            if (root && aria) {
+                focusElementForAria();
+            }
         }
     })();
     return {
@@ -134,19 +253,29 @@ function speakSeries(series, lang, root = true) {
                 return;
             }
             if (root) {
-                synth.cancel();
+                if (aria) {
+                    const element = createAriaElement();
+                    if (element) {
+                        ariaLabelPhrases = [];
+                        cleanAriaLabelParent();
+                        element.focus();
+                        focusCanvas();
+                    }
+                    return;
+                }
+                synth.cancel(); // Cancel all ongoing speech
             }
-            nestedSeriesResults.forEach((nestedSeriesResults) => {
-                nestedSeriesResults.cancel();
+            nestedSeriesResults.forEach((nestedSeriesResult) => {
+                nestedSeriesResult.cancel();
             });
             active = false;
         },
     };
 }
 let currentSeries;
-export default function (toSpeak, lang = 'en-US') {
+export default function (toSpeak, aria, lang = 'en-US', voice) {
     currentSeries && currentSeries.cancel();
-    currentSeries = speakSeries(toSpeak, lang);
+    currentSeries = speakSeries(toSpeak, aria, lang, voice);
     return currentSeries;
 }
 //# sourceMappingURL=speech.js.map

package/dist/src/primitives/announcer/speech.js.map

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

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

@@ -17,7 +17,7 @@
  * - `restoreFocus()`: Restores focus to the last stored element and removes it from the stack. Returns `true` if successful, `false` otherwise.
  * - `clearFocusStack()`: Empties the focus stack.
  */
-import { JSX } from 'solid-js';
+import * as s from 'solid-js';
 import { type ElementNode } from '@lightningtv/solid';
 interface FocusStackContextType {
     storeFocus: (element: ElementNode, prevElement?: ElementNode) => void;
@@ -25,7 +25,7 @@ interface FocusStackContextType {
     clearFocusStack: () => void;
 }
 export declare function FocusStackProvider(props: {
-    children: JSX.Element;
-}): JSX.Element;
-export declare function useFocusStack(): FocusStackContextType;
+    children: s.JSX.Element;
+}): s.JSX.Element;
+export declare function useFocusStack(autoClear?: boolean): FocusStackContextType;
 export {};

package/dist/src/primitives/createFocusStack.jsx

@@ -17,12 +17,15 @@
  * - `restoreFocus()`: Restores focus to the last stored element and removes it from the stack. Returns `true` if successful, `false` otherwise.
  * - `clearFocusStack()`: Empties the focus stack.
  */
-import { createSignal, createContext, useContext } from 'solid-js';
-const FocusStackContext = createContext(undefined);
+import * as s from 'solid-js';
+const FocusStackContext = s.createContext(undefined);
 export function FocusStackProvider(props) {
-    const [_focusStack, setFocusStack] = createSignal([]);
+    const [_focusStack, setFocusStack] = s.createSignal([]);
     function storeFocus(element, prevElement) {
-        setFocusStack((stack) => [...stack, prevElement || element]);
+        const elm = prevElement || element;
+        if (elm) {
+            setFocusStack(stack => [...stack, elm]);
+        }
     }
     function restoreFocus() {
         let wasFocused = false;
@@ -43,11 +46,17 @@ export function FocusStackProvider(props) {
       {props.children}
     </FocusStackContext.Provider>);
 }
-export function useFocusStack() {
-    const context = useContext(FocusStackContext);
+export function useFocusStack(autoClear = true) {
+    const context = s.useContext(FocusStackContext);
     if (!context) {
         throw new Error("useFocusStack must be used within a FocusStackProvider");
     }
+    if (autoClear) {
+        s.onCleanup(() => {
+            // delay clearing the focus stack so restoreFocus can happen first.
+            setTimeout(() => context.clearFocusStack(), 5);
+        });
+    }
     return context;
 }
 //# sourceMappingURL=createFocusStack.jsx.map

package/dist/src/primitives/createFocusStack.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"createFocusStack.jsx","sourceRoot":"","sources":["../../../src/primitives/createFocusStack.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAO,MAAM,UAAU,CAAC;AASxE,MAAM,iBAAiB,GAAG,aAAa,CAAoC,SAAS,CAAC,CAAC;AAEtF,MAAM,UAAU,kBAAkB,CAAC,KAA+B;IAChE,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,GAAG,YAAY,CAAgB,EAAE,CAAC,CAAC;IAErE,SAAS,UAAU,CAAC,OAAoB,EAAE,WAAyB;QACjE,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,EAAE,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,SAAS,YAAY;QACnB,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;YAChC,IAAI,WAAW,IAAI,OAAO,WAAW,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC9D,WAAW,CAAC,QAAQ,EAAE,CAAC;gBACvB,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;YACD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,SAAS,eAAe;QACtB,aAAa,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,CACL,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,CAC/E;MAAA,CAAC,KAAK,CAAC,QAAQ,CACjB;IAAA,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,MAAM,OAAO,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"createFocusStack.jsx","sourceRoot":"","sources":["../../../src/primitives/createFocusStack.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAS9B,MAAM,iBAAiB,GAAG,CAAC,CAAC,aAAa,CAAoC,SAAS,CAAC,CAAC;AAExF,MAAM,UAAU,kBAAkB,CAAC,KAAiC;IAClE,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,CAAgB,EAAE,CAAC,CAAC;IAEvE,SAAS,UAAU,CAAC,OAAoB,EAAE,WAAyB;QACjE,MAAM,GAAG,GAAG,WAAW,IAAI,OAAO,CAAC;QACnC,IAAI,GAAG,EAAE,CAAC;YACR,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,SAAS,YAAY;QACnB,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;YAChC,IAAI,WAAW,IAAI,OAAO,WAAW,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC9D,WAAW,CAAC,QAAQ,EAAE,CAAC;gBACvB,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;YACD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,SAAS,eAAe;QACtB,aAAa,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,CACL,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,CAC/E;MAAA,CAAC,KAAK,CAAC,QAAQ,CACjB;IAAA,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,SAAS,GAAG,IAAI;IAC5C,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;YACf,mEAAmE;YACnE,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

@@ -0,0 +1,8 @@
+import * as s from 'solid-js';
+import * as lng from '@lightningtv/solid';
+interface Destroyable {
+    (props: lng.NodeProps): s.JSX.Element;
+    destroy: () => void;
+}
+export declare function createTag(children: s.JSX.Element): Destroyable;
+export {};

package/dist/src/primitives/createTag.jsx

@@ -0,0 +1,20 @@
+import * as s from 'solid-js';
+import * as lng from '@lightningtv/solid';
+export function createTag(children) {
+    const [texture, setTexture] = s.createSignal(null);
+    const Tag = <view display='flex' onLayout={(n) => {
+            if (n.preFlexwidth && n.width !== n.preFlexwidth) {
+                n.rtt = true;
+                setTimeout(() => setTexture(n.texture), 1);
+            }
+        }} parent={lng.rootNode} children={children} textureOptions={{
+            preventCleanup: true
+        }}/>;
+    Tag.render(false);
+    const TagComponent = (props) => {
+        return <view color={0xffffffff} autosize {...props} texture={texture()}/>;
+    };
+    TagComponent.destroy = () => Tag.destroy();
+    return TagComponent;
+}
+//# sourceMappingURL=createTag.jsx.map

package/dist/src/primitives/createTag.jsx.map

@@ -0,0 +1 @@
+{"version":3,"file":"createTag.jsx","sourceRoot":"","sources":["../../../src/primitives/createTag.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAA;AAC7B,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAOzC,MAAM,UAAU,SAAS,CAAC,QAAuB;IAC/C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,YAAY,CAAiC,IAAI,CAAC,CAAC;IACnF,MAAM,GAAG,GAAG,CAAC,IAAI,CACf,OAAO,CAAC,MAAM,CACd,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC;gBACjD,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC;gBACb,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CAAC,CACF,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACzC,cAAc,CAAC,CAAC;YAChB,cAAc,EAAE,IAAI;SACrB,CAAC,EAA6B,CAAA;IAC/B,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAElB,MAAM,YAAY,GAAG,CAAC,KAAoB,EAAE,EAAE;QAC5C,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAG,CAAC;IAC7E,CAAC,CAAC;IACF,YAAY,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAE3C,OAAO,YAAY,CAAC;AACtB,CAAC"}

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

@@ -4,6 +4,7 @@ export * from './createInfiniteItems.js';
 export * from './useMouse.js';
 export * from './portal.jsx';
 export * from './Lazy.jsx';
+export * from './Image.jsx';
 export * from './Visible.jsx';
 export * from './router.js';
 export * from './Column.jsx';
@@ -11,10 +12,19 @@ export * from './Row.jsx';
 export * from './Grid.jsx';
 export * from './FPSCounter.jsx';
 export * from './FadeInOut.jsx';
+export * from './Preserve.jsx';
+export * from './Suspense.jsx';
+export * from './Marquee.jsx';
 export * from './createFocusStack.jsx';
-export { withScrolling } from './utils/withScrolling.js';
-export { chainFunctions } from './utils/chainFunctions.js';
-export { handleNavigation, onGridFocus } from './utils/handleNavigation.js';
+export * from './useHold.js';
+export * from './KeepAlive.jsx';
+export * from './VirtualGrid.jsx';
+export * from './Virtual.jsx';
+export * from './utils/withScrolling.js';
+export * from './createTag.jsx';
+export { type AnyFunction, chainFunctions, chainRefs, } from './utils/chainFunctions.js';
+export * from './utils/handleNavigation.js';
 export { createSpriteMap, type SpriteDef } from './utils/createSpriteMap.js';
+export { createBlurredImage } from './utils/createBlurredImage.js';
 export type * from './types.js';
-export type { KeyHandler } from '@lightningtv/core/focusManager';
+export type { KeyHandler } from '../core/focusManager.js';

package/dist/src/primitives/index.js

@@ -4,6 +4,7 @@ export * from './createInfiniteItems.js';
 export * from './useMouse.js';
 export * from './portal.jsx';
 export * from './Lazy.jsx';
+export * from './Image.jsx';
 export * from './Visible.jsx';
 export * from './router.js';
 export * from './Column.jsx';
@@ -11,9 +12,18 @@ export * from './Row.jsx';
 export * from './Grid.jsx';
 export * from './FPSCounter.jsx';
 export * from './FadeInOut.jsx';
+export * from './Preserve.jsx';
+export * from './Suspense.jsx';
+export * from './Marquee.jsx';
 export * from './createFocusStack.jsx';
-export { withScrolling } from './utils/withScrolling.js';
-export { chainFunctions } from './utils/chainFunctions.js';
-export { handleNavigation, onGridFocus } from './utils/handleNavigation.js';
+export * from './useHold.js';
+export * from './KeepAlive.jsx';
+export * from './VirtualGrid.jsx';
+export * from './Virtual.jsx';
+export * from './utils/withScrolling.js';
+export * from './createTag.jsx';
+export { chainFunctions, chainRefs, } from './utils/chainFunctions.js';
+export * from './utils/handleNavigation.js';
 export { createSpriteMap } from './utils/createSpriteMap.js';
+export { createBlurredImage } from './utils/createBlurredImage.js';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/primitives/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAkB,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/primitives/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAEL,cAAc,EACd,SAAS,GACV,MAAM,2BAA2B,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAkB,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC"}

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

@@ -1,5 +1,5 @@
-import type { ElementNode, NodeProps, NodeStyles } from '@lightningtv/solid';
-import type { KeyHandler } from '@lightningtv/core/focusManager';
+import type { ElementNode, NodeProps, NodeStyles } from '../index.js';
+import type { KeyHandler } from '../core/focusManager.js';
 export type OnSelectedChanged = (this: NavigableElement, selectedIndex: number, elm: NavigableElement, active: ElementNode, lastSelectedIndex?: number) => void;
 export interface NavigableProps extends NodeProps {
     /** function to be called when the selected of the component changes */
@@ -28,9 +28,12 @@ export interface NavigableProps extends NodeProps {
      * Wrap the row so active goes back to the beginning of the row
      */
     wrap?: boolean;
+    /** function to be called when scrolled */
+    onScrolled?: (elm: NavigableElement, offset: number, isInitial: boolean) => void;
 }
 export interface NavigableElement extends ElementNode, NavigableProps {
     selected: number;
+    scrollToIndex: (this: NavigableElement, index: number) => void;
 }
 export interface NavigableStyleProperties {
     /**

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

@@ -1,5 +1,5 @@
-import type { ElementNode } from '@lightningtv/core';
-import { type KeyMap, type KeyHoldOptions } from '@lightningtv/core/focusManager';
+import type { ElementNode } from '../core/index.js';
+import { type KeyMap, type KeyHoldOptions } from '../core/focusManager.js';
 declare const focusPath: import("solid-js").Accessor<ElementNode[]>;
 export { focusPath };
 export declare const useFocusManager: (userKeyMap?: Partial<KeyMap>, keyHoldOptions?: KeyHoldOptions) => void;

package/dist/src/primitives/useFocusManager.js

@@ -1,6 +1,6 @@
 import { createEffect, on, createSignal, onCleanup, getOwner, runWithOwner, } from 'solid-js';
-import { Config } from '@lightningtv/core';
-import { useFocusManager as useFocusManagerCore, } from '@lightningtv/core/focusManager';
+import { Config } from '../core/index.js';
+import { useFocusManager as useFocusManagerCore, } from '../core/focusManager.js';
 import { activeElement, setActiveElement } from '../activeElement.js';
 const [focusPath, setFocusPath] = createSignal([]);
 export { focusPath };

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

@@ -1 +1 @@
-{"version":3,"file":"useFocusManager.js","sourceRoot":"","sources":["../../../src/primitives/useFocusManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,EAAE,EACF,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,YAAY,GACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EACL,eAAe,IAAI,mBAAmB,GAGvC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEtE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,YAAY,CAAgB,EAAE,CAAC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,CAAC;AAErB,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,UAA4B,EAC5B,cAA+B,EAC/B,EAAE;IACF,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,gBAAgB,GAAG,CAAC,SAAS,EAAE,EAAE,CACtC,YAAY,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAElD,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,mBAAmB,CAAC;QAChE,UAAU;QACV,cAAc;QACd,YAAY;KACb,CAAC,CAAC;IAEH,YAAY,CACV,EAAE,CACA,aAAa,EACb,GAAG,EAAE;QACH,YAAY,CAAC,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC;IACrC,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CACF,CAAC;IAEF,SAAS,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC,CAAC"}
+{"version":3,"file":"useFocusManager.js","sourceRoot":"","sources":["../../../src/primitives/useFocusManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,EAAE,EACF,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,YAAY,GACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EACL,eAAe,IAAI,mBAAmB,GAGvC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEtE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,YAAY,CAAgB,EAAE,CAAC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,CAAC;AAErB,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,UAA4B,EAC5B,cAA+B,EAC/B,EAAE;IACF,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,gBAAgB,GAAG,CAAC,SAAS,EAAE,EAAE,CACtC,YAAY,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAElD,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,mBAAmB,CAAC;QAChE,UAAU;QACV,cAAc;QACd,YAAY;KACb,CAAC,CAAC;IAEH,YAAY,CACV,EAAE,CACA,aAAa,EACb,GAAG,EAAE;QACH,YAAY,CAAC,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC;IACrC,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CACF,CAAC;IAEF,SAAS,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC,CAAC"}

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/useMouse.d.ts

@@ -1,2 +1,18 @@
-import { ElementNode } from '@lightningtv/solid';
-export declare function useMouse(myApp?: ElementNode, throttleBy?: number): void;
+import type { ElementText, TextNode } from '../core/index.js';
+import { ElementNode } from '../index.js';
+type CustomState = `$${string}`;
+type RenderableNode = ElementNode | ElementText | TextNode;
+interface MouseStateOptions {
+    hoverState: CustomState;
+    pressedState: CustomState;
+}
+type UseMouseOptions = {
+    customStates: MouseStateOptions;
+} | {
+    customStates: undefined;
+};
+export declare function addCustomStateToElement(element: RenderableNode, state: CustomState): void;
+export declare function removeCustomStateFromElement(element: RenderableNode, state: CustomState): void;
+export declare function hasCustomState(element: RenderableNode, state: CustomState): boolean;
+export declare function useMouse<TApp extends ElementNode = ElementNode>(myApp?: TApp, throttleBy?: number, options?: UseMouseOptions): void;
+export {};