@lightningtv/solid 3.0.0-2 → 3.0.0-20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/README.md +6 -0
- package/dist/src/jsx-runtime.d.ts +1 -3
- package/dist/src/primitives/Column.jsx +9 -10
- package/dist/src/primitives/Column.jsx.map +1 -1
- package/dist/src/primitives/Grid.d.ts +15 -6
- package/dist/src/primitives/Grid.jsx +35 -22
- package/dist/src/primitives/Grid.jsx.map +1 -1
- package/dist/src/primitives/Image.d.ts +8 -0
- package/dist/src/primitives/Image.jsx +24 -0
- package/dist/src/primitives/Image.jsx.map +1 -0
- package/dist/src/primitives/KeepAlive.d.ts +30 -0
- package/dist/src/primitives/KeepAlive.jsx +77 -0
- package/dist/src/primitives/KeepAlive.jsx.map +1 -0
- package/dist/src/primitives/Lazy.d.ts +8 -7
- package/dist/src/primitives/Lazy.jsx +49 -23
- package/dist/src/primitives/Lazy.jsx.map +1 -1
- package/dist/src/primitives/Marquee.d.ts +64 -0
- package/dist/src/primitives/Marquee.jsx +86 -0
- package/dist/src/primitives/Marquee.jsx.map +1 -0
- package/dist/src/primitives/Preserve.d.ts +4 -0
- package/dist/src/primitives/Preserve.jsx +11 -0
- package/dist/src/primitives/Preserve.jsx.map +1 -0
- package/dist/src/primitives/Row.jsx +9 -10
- package/dist/src/primitives/Row.jsx.map +1 -1
- package/dist/src/primitives/Suspense.d.ts +22 -0
- package/dist/src/primitives/Suspense.jsx +33 -0
- package/dist/src/primitives/Suspense.jsx.map +1 -0
- package/dist/src/primitives/Virtual.d.ts +18 -0
- package/dist/src/primitives/Virtual.jsx +434 -0
- package/dist/src/primitives/Virtual.jsx.map +1 -0
- package/dist/src/primitives/VirtualGrid.d.ts +13 -0
- package/dist/src/primitives/VirtualGrid.jsx +139 -0
- package/dist/src/primitives/VirtualGrid.jsx.map +1 -0
- package/dist/src/primitives/VirtualList.d.ts +11 -0
- package/dist/src/primitives/VirtualList.jsx +96 -0
- package/dist/src/primitives/VirtualList.jsx.map +1 -0
- package/dist/src/primitives/VirtualRow.d.ts +13 -0
- package/dist/src/primitives/VirtualRow.jsx +97 -0
- package/dist/src/primitives/VirtualRow.jsx.map +1 -0
- package/dist/src/primitives/Visible.d.ts +0 -1
- package/dist/src/primitives/Visible.jsx +1 -1
- package/dist/src/primitives/Visible.jsx.map +1 -1
- package/dist/src/primitives/announcer/announcer.d.ts +2 -0
- package/dist/src/primitives/announcer/announcer.js +7 -5
- package/dist/src/primitives/announcer/announcer.js.map +1 -1
- package/dist/src/primitives/announcer/index.d.ts +5 -1
- package/dist/src/primitives/announcer/index.js +8 -2
- package/dist/src/primitives/announcer/index.js.map +1 -1
- package/dist/src/primitives/announcer/speech.d.ts +2 -2
- package/dist/src/primitives/announcer/speech.js +157 -28
- package/dist/src/primitives/announcer/speech.js.map +1 -1
- package/dist/src/primitives/createFocusStack.d.ts +4 -4
- package/dist/src/primitives/createFocusStack.jsx +15 -6
- package/dist/src/primitives/createFocusStack.jsx.map +1 -1
- package/dist/src/primitives/createTag.d.ts +8 -0
- package/dist/src/primitives/createTag.jsx +20 -0
- package/dist/src/primitives/createTag.jsx.map +1 -0
- package/dist/src/primitives/index.d.ts +13 -3
- package/dist/src/primitives/index.js +13 -3
- package/dist/src/primitives/index.js.map +1 -1
- package/dist/src/primitives/types.d.ts +3 -0
- package/dist/src/primitives/useHold.d.ts +27 -0
- package/dist/src/primitives/useHold.js +54 -0
- package/dist/src/primitives/useHold.js.map +1 -0
- package/dist/src/primitives/useMouse.d.ts +24 -1
- package/dist/src/primitives/useMouse.js +153 -47
- package/dist/src/primitives/useMouse.js.map +1 -1
- package/dist/src/primitives/utils/chainFunctions.d.ts +30 -4
- package/dist/src/primitives/utils/chainFunctions.js +14 -3
- package/dist/src/primitives/utils/chainFunctions.js.map +1 -1
- package/dist/src/primitives/utils/createBlurredImage.d.ts +56 -0
- package/dist/src/primitives/utils/createBlurredImage.js +223 -0
- package/dist/src/primitives/utils/createBlurredImage.js.map +1 -0
- package/dist/src/primitives/utils/createSpriteMap.d.ts +2 -2
- package/dist/src/primitives/utils/createSpriteMap.js.map +1 -1
- package/dist/src/primitives/utils/handleNavigation.d.ts +85 -5
- package/dist/src/primitives/utils/handleNavigation.js +242 -69
- package/dist/src/primitives/utils/handleNavigation.js.map +1 -1
- package/dist/src/primitives/utils/withScrolling.d.ts +8 -1
- package/dist/src/primitives/utils/withScrolling.js +25 -6
- package/dist/src/primitives/utils/withScrolling.js.map +1 -1
- package/dist/src/render.d.ts +6 -5
- package/dist/src/render.js +4 -0
- package/dist/src/render.js.map +1 -1
- package/dist/src/solidOpts.d.ts +3 -2
- package/dist/src/solidOpts.js +31 -15
- package/dist/src/solidOpts.js.map +1 -1
- package/dist/src/universal.d.ts +25 -0
- package/dist/src/universal.js +232 -0
- package/dist/src/universal.js.map +1 -0
- package/dist/src/utils.d.ts +2 -0
- package/dist/src/utils.js +8 -0
- package/dist/src/utils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/jsx-runtime.d.ts +2 -4
- package/package.json +19 -10
- package/src/primitives/Column.tsx +10 -12
- package/src/primitives/Grid.tsx +57 -33
- package/src/primitives/Image.tsx +36 -0
- package/src/primitives/KeepAlive.tsx +124 -0
- package/src/primitives/Lazy.tsx +60 -37
- package/src/primitives/Marquee.tsx +149 -0
- package/src/primitives/Preserve.tsx +18 -0
- package/src/primitives/Row.tsx +11 -12
- package/src/primitives/Suspense.tsx +39 -0
- package/src/primitives/Virtual.tsx +478 -0
- package/src/primitives/VirtualGrid.tsx +199 -0
- package/src/primitives/Visible.tsx +1 -2
- package/src/primitives/announcer/announcer.ts +16 -10
- package/src/primitives/announcer/index.ts +12 -2
- package/src/primitives/announcer/speech.ts +188 -27
- package/src/primitives/createFocusStack.tsx +18 -7
- package/src/primitives/createTag.tsx +31 -0
- package/src/primitives/index.ts +17 -3
- package/src/primitives/types.ts +10 -0
- package/src/primitives/useHold.ts +69 -0
- package/src/primitives/useMouse.ts +283 -66
- package/src/primitives/utils/chainFunctions.ts +40 -9
- package/src/primitives/utils/createBlurredImage.ts +366 -0
- package/src/primitives/utils/createSpriteMap.ts +6 -4
- package/src/primitives/utils/handleNavigation.ts +307 -84
- package/src/primitives/utils/withScrolling.ts +47 -16
- package/src/render.ts +9 -7
- package/src/solidOpts.ts +34 -19
- package/src/utils.ts +10 -0
package/LICENSE
CHANGED
|
@@ -187,7 +187,7 @@
|
|
|
187
187
|
same "printed page" as the copyright notice for easier
|
|
188
188
|
identification within third-party archives.
|
|
189
189
|
|
|
190
|
-
Copyright
|
|
190
|
+
Copyright 2024 Chris Lorenzo
|
|
191
191
|
|
|
192
192
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
193
193
|
you may not use this file except in compliance with the License.
|
package/README.md
CHANGED
|
@@ -6,6 +6,12 @@
|
|
|
6
6
|
|
|
7
7
|
Is a UI framework for [LightningJS 3 Renderer](https://lightningjs.io/) built with [SolidJS](https://www.solidjs.com/) Universal Renderer. It allows you to declaratively construct lightning nodes with reactive primitives, with incredible performance.
|
|
8
8
|
|
|
9
|
+
## Used by companies worldwide
|
|
10
|
+
|
|
11
|
+
<div style="display: flex; align-items: center; gap: 20px;">
|
|
12
|
+
<img src="docs/companylogos/Angel.png" alt="Angel Studios" width="200" /> <img src="docs/companylogos/bell-fibe-tv.png" alt="Bell Fibe TV" width="80" />
|
|
13
|
+
</div>
|
|
14
|
+
|
|
9
15
|
## Need Support?
|
|
10
16
|
|
|
11
17
|
[ConnectedTV Dev](https://lightningtv.dev/)
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { NodeProps, TextProps } from '@lightningtv/core';
|
|
2
2
|
declare module 'solid-js' {
|
|
3
3
|
namespace JSX {
|
|
4
4
|
interface IntrinsicElements {
|
|
@@ -6,7 +6,5 @@ declare module 'solid-js' {
|
|
|
6
6
|
view: NodeProps;
|
|
7
7
|
text: TextProps;
|
|
8
8
|
}
|
|
9
|
-
interface IntrinsicAttributes extends NewOmit<NodeProps, 'children' | 'style'> {
|
|
10
|
-
}
|
|
11
9
|
}
|
|
12
10
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { combineStyles } from '@lightningtv/solid';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { navigableForwardFocus, handleNavigation } from './utils/handleNavigation.js';
|
|
3
|
+
import { scrollColumn } from './utils/withScrolling.js';
|
|
4
4
|
import { chainFunctions } from './utils/chainFunctions.js';
|
|
5
5
|
const ColumnStyles = {
|
|
6
6
|
display: 'flex',
|
|
@@ -13,18 +13,17 @@ const ColumnStyles = {
|
|
|
13
13
|
},
|
|
14
14
|
},
|
|
15
15
|
};
|
|
16
|
-
const onUp = handleNavigation('up');
|
|
17
|
-
const onDown = handleNavigation('down');
|
|
18
|
-
const scroll = withScrolling(false);
|
|
19
16
|
function scrollToIndex(index) {
|
|
20
17
|
this.selected = index;
|
|
21
|
-
|
|
22
|
-
this.setFocus();
|
|
18
|
+
scrollColumn(index, this);
|
|
19
|
+
this.children[index]?.setFocus();
|
|
23
20
|
}
|
|
21
|
+
const onUp = handleNavigation('up');
|
|
22
|
+
const onDown = handleNavigation('down');
|
|
24
23
|
export const Column = (props) => {
|
|
25
|
-
return (<view {...props} onUp={/* @once */chainFunctions(props.onUp, onUp)} onDown={/* @once */chainFunctions(props.onDown, onDown)} selected={props.selected || 0} scrollToIndex={scrollToIndex} forwardFocus={
|
|
24
|
+
return (<view {...props} onUp={/* @once */chainFunctions(props.onUp, onUp)} onDown={/* @once */chainFunctions(props.onDown, onDown)} selected={props.selected || 0} scrollToIndex={scrollToIndex} forwardFocus={navigableForwardFocus} onLayout={
|
|
26
25
|
/* @once */
|
|
27
|
-
props.selected ? chainFunctions(props.onLayout,
|
|
28
|
-
/* @once */ chainFunctions(props.onSelectedChanged, props.scroll !== 'none' ?
|
|
26
|
+
props.selected ? chainFunctions(props.onLayout, scrollColumn) : props.onLayout} onSelectedChanged={
|
|
27
|
+
/* @once */ chainFunctions(props.onSelectedChanged, props.scroll !== 'none' ? scrollColumn : undefined)} style={/* @once */combineStyles(props.style, ColumnStyles)}/>);
|
|
29
28
|
};
|
|
30
29
|
//# sourceMappingURL=Column.jsx.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Column.jsx","sourceRoot":"","sources":["../../../src/primitives/Column.tsx"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAmB,MAAM,oBAAoB,CAAC;AACjF,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"Column.jsx","sourceRoot":"","sources":["../../../src/primitives/Column.tsx"],"names":[],"mappings":"AACA,OAAO,EAAe,aAAa,EAAmB,MAAM,oBAAoB,CAAC;AACjF,OAAO,EACL,qBAAqB,EAAE,gBAAgB,EACxC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3D,MAAM,YAAY,GAAe;IAC/B,OAAO,EAAE,MAAM;IACf,aAAa,EAAE,QAAQ;IACvB,GAAG,EAAE,EAAE;IACP,UAAU,EAAE;QACV,CAAC,EAAE;YACD,QAAQ,EAAE,GAAG;YACb,MAAM,EAAE,aAAa;SACtB;KACF;CACF,CAAC;AAEF,SAAS,aAAa,CAAoB,KAAa;IACrD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACtB,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC1B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;AACpC,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAExC,MAAM,CAAC,MAAM,MAAM,GAA2B,CAAC,KAAK,EAAE,EAAE;IACtD,OAAO,CACL,CAAC,IAAI,CACH,IAAI,KAAK,CAAC,CACV,IAAI,CAAC,CAAC,WAAY,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CACnD,MAAM,CAAC,CAAC,WAAY,cAAc,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CACzD,QAAQ,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,CAC9B,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,YAAY,CAAC,CAAC,qBAAqB,CAAC,CACpC,QAAQ,CAAC,CAAC;QACR,WAAW;QACX,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QACxE,CAAC,CACD,iBAAiB,CAAC,CAAC;QACjB,WAAW,CAAC,cAAc,CACxB,KAAK,CAAC,iBAAiB,EACvB,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAEtD,CAAC,CACD,KAAK,CAAC,CAAC,WAAY,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,EAC5D,CACH,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,13 +1,22 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { type NodeProps,
|
|
3
|
-
export
|
|
4
|
-
item:
|
|
1
|
+
import { JSX } from "solid-js";
|
|
2
|
+
import { type NodeProps, ElementNode, NewOmit } from "@lightningtv/solid";
|
|
3
|
+
export interface GridItemProps<T> {
|
|
4
|
+
item: T;
|
|
5
|
+
index: number;
|
|
6
|
+
width: number;
|
|
7
|
+
height: number;
|
|
8
|
+
x: number;
|
|
9
|
+
y: number;
|
|
10
|
+
}
|
|
11
|
+
export interface GridProps<T> extends NewOmit<NodeProps, 'children'> {
|
|
12
|
+
items: readonly T[];
|
|
13
|
+
children: (props: GridItemProps<T>) => JSX.Element;
|
|
5
14
|
itemHeight?: number;
|
|
6
15
|
itemWidth?: number;
|
|
7
16
|
itemOffset?: number;
|
|
8
|
-
items: T[];
|
|
9
17
|
columns?: number;
|
|
10
18
|
looping?: boolean;
|
|
11
19
|
scroll?: "auto" | "none";
|
|
12
20
|
onSelectedChanged?: (index: number, grid: ElementNode, elm?: ElementNode) => void;
|
|
13
|
-
}
|
|
21
|
+
}
|
|
22
|
+
export declare function Grid<T>(props: GridProps<T>): JSX.Element;
|
|
@@ -1,12 +1,24 @@
|
|
|
1
|
-
import { For, createSignal, createMemo } from "solid-js";
|
|
2
|
-
import {
|
|
3
|
-
|
|
1
|
+
import { For, createSignal, createMemo, createEffect } from "solid-js";
|
|
2
|
+
import { ElementNode } from "@lightningtv/solid";
|
|
3
|
+
import { chainRefs } from "./utils/chainFunctions.js";
|
|
4
|
+
export function Grid(props) {
|
|
4
5
|
const [focusedIndex, setFocusedIndex] = createSignal(0);
|
|
5
6
|
const baseColumns = 4;
|
|
7
|
+
const itemWidth = () => props.itemWidth ?? 300;
|
|
8
|
+
const itemHeight = () => props.itemHeight ?? 300;
|
|
6
9
|
const columns = createMemo(() => props.columns || baseColumns);
|
|
7
|
-
const totalWidth = createMemo(() => (
|
|
8
|
-
const totalHeight = createMemo(() => (
|
|
9
|
-
|
|
10
|
+
const totalWidth = createMemo(() => itemWidth() + (props.itemOffset ?? 0));
|
|
11
|
+
const totalHeight = createMemo(() => itemHeight() + (props.itemOffset ?? 0));
|
|
12
|
+
function focus() {
|
|
13
|
+
const focusedElm = gridRef.children[focusedIndex()];
|
|
14
|
+
if (focusedElm instanceof ElementNode && !focusedElm.states.has('$focus')) {
|
|
15
|
+
focusedElm.setFocus();
|
|
16
|
+
props.onSelectedChanged?.call(gridRef, focusedIndex(), gridRef, focusedElm);
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
function moveFocus(delta) {
|
|
10
22
|
if (!props.items || props.items.length === 0)
|
|
11
23
|
return false;
|
|
12
24
|
const newIndex = focusedIndex() + delta;
|
|
@@ -27,12 +39,10 @@ export const Grid = (props) => {
|
|
|
27
39
|
else {
|
|
28
40
|
return false;
|
|
29
41
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
};
|
|
35
|
-
const handleHorizontalFocus = (delta, elm) => {
|
|
42
|
+
return focus();
|
|
43
|
+
}
|
|
44
|
+
;
|
|
45
|
+
function handleHorizontalFocus(delta) {
|
|
36
46
|
if (!props.items || props.items.length === 0)
|
|
37
47
|
return false;
|
|
38
48
|
const newIndex = focusedIndex() + delta;
|
|
@@ -48,19 +58,22 @@ export const Grid = (props) => {
|
|
|
48
58
|
else {
|
|
49
59
|
return false;
|
|
50
60
|
}
|
|
51
|
-
|
|
52
|
-
focusedElm.setFocus();
|
|
53
|
-
isFunction(props.onSelectedChanged) && props.onSelectedChanged.call(elm, focusedIndex(), elm, focusedElm);
|
|
54
|
-
return true;
|
|
55
|
-
};
|
|
56
|
-
function onFocus() {
|
|
57
|
-
handleHorizontalFocus(0, this);
|
|
61
|
+
return focus();
|
|
58
62
|
}
|
|
63
|
+
;
|
|
64
|
+
// Handle focus when items change - important for autofocus
|
|
65
|
+
createEffect(() => {
|
|
66
|
+
if (props.items && props.items.length > 0 && gridRef && gridRef.states.has('$focus')) {
|
|
67
|
+
queueMicrotask(focus);
|
|
68
|
+
}
|
|
69
|
+
});
|
|
59
70
|
const scrollY = createMemo(() => props.scroll === "none" ? props.y ?? 0 : -Math.floor(focusedIndex() / columns()) * totalHeight() + (props.y || 0));
|
|
60
|
-
|
|
71
|
+
let gridRef;
|
|
72
|
+
return (<view {...props} ref={chainRefs(el => gridRef = el, props.ref)} transition={{ y: true }} onUp={() => moveFocus(-columns())} onDown={() => moveFocus(columns())} onLeft={() => handleHorizontalFocus(-1)} onRight={() => handleHorizontalFocus(1)} onFocus={() => handleHorizontalFocus(0)} strictBounds={false} y={scrollY()}>
|
|
61
73
|
<For each={props.items}>
|
|
62
|
-
{(item, index) => (<
|
|
74
|
+
{(item, index) => (<props.children item={item} index={index()} width={itemWidth()} height={itemHeight()} x={(index() % columns()) * totalWidth()} y={Math.floor(index() / columns()) * totalHeight()}/>)}
|
|
63
75
|
</For>
|
|
64
76
|
</view>);
|
|
65
|
-
}
|
|
77
|
+
}
|
|
78
|
+
;
|
|
66
79
|
//# sourceMappingURL=Grid.jsx.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Grid.jsx","sourceRoot":"","sources":["../../../src/primitives/Grid.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Grid.jsx","sourceRoot":"","sources":["../../../src/primitives/Grid.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { createRenderEffect, createSignal } from 'solid-js';
|
|
2
|
+
import { renderer } from '@lightningtv/solid';
|
|
3
|
+
export const Image = (props) => {
|
|
4
|
+
const [texture, setTexture] = createSignal(null);
|
|
5
|
+
const [src, setSrc] = createSignal(props.placeholder || null);
|
|
6
|
+
createRenderEffect(() => {
|
|
7
|
+
const srcTexture = renderer.createTexture('ImageTexture', props);
|
|
8
|
+
if (props.fallback) {
|
|
9
|
+
srcTexture.once('failed', () => {
|
|
10
|
+
if (props.fallback === props.placeholder) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
setSrc(props.fallback);
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
srcTexture.getTextureData().then(resp => {
|
|
17
|
+
// if texture fails to load, this is still called after the failed handler
|
|
18
|
+
if (resp.data)
|
|
19
|
+
setTexture(srcTexture);
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
return (<view {...props} src={src()} color={props.color || 0xffffffff} texture={texture()}/>);
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=Image.jsx.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Image.jsx","sourceRoot":"","sources":["../../../src/primitives/Image.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAkB,kBAAkB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAoC,MAAM,oBAAoB,CAAC;AAQhF,MAAM,CAAC,MAAM,KAAK,GAA0B,CAAC,KAAK,EAAE,EAAE;IACpD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,YAAY,CAAM,IAAI,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,YAAY,CAAgB,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC;IAE7E,kBAAkB,CAAC,GAAG,EAAE;QACtB,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,CAAiB,CAAC;QAEjF,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;gBAC7B,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC;oBACzC,OAAO;gBACT,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,QAAS,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;QACL,CAAC;QAED,UAAU,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACtC,0EAA0E;YAC1E,IAAI,IAAI,CAAC,IAAI;gBACX,UAAU,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,CACL,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAG,CACtF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { RouteProps } from "@solidjs/router";
|
|
2
|
+
import * as s from 'solid-js';
|
|
3
|
+
import { ElementNode } from "@lightningtv/solid";
|
|
4
|
+
export interface KeepAliveElement {
|
|
5
|
+
id: string;
|
|
6
|
+
owner: s.Owner | null;
|
|
7
|
+
children: s.JSX.Element;
|
|
8
|
+
routeSignal?: s.Signal<unknown>;
|
|
9
|
+
dispose: () => void;
|
|
10
|
+
}
|
|
11
|
+
export declare const storeKeepAlive: (element: KeepAliveElement) => KeepAliveElement | undefined;
|
|
12
|
+
export declare const removeKeepAlive: (id: string) => void;
|
|
13
|
+
interface KeepAliveProps {
|
|
14
|
+
id: string;
|
|
15
|
+
shouldDispose?: (key: string) => boolean;
|
|
16
|
+
onRemove?: ElementNode['onRemove'];
|
|
17
|
+
onRender?: ElementNode['onRender'];
|
|
18
|
+
transition?: ElementNode['transition'];
|
|
19
|
+
}
|
|
20
|
+
export declare const KeepAlive: (props: s.ParentProps<KeepAliveProps>) => s.JSX.Element;
|
|
21
|
+
export declare const KeepAliveRoute: <S extends string>(props: RouteProps<S> & {
|
|
22
|
+
id?: string;
|
|
23
|
+
path: string;
|
|
24
|
+
component: s.Component<RouteProps<S>>;
|
|
25
|
+
shouldDispose?: (key: string) => boolean;
|
|
26
|
+
onRemove?: ElementNode["onRemove"];
|
|
27
|
+
onRender?: ElementNode["onRender"];
|
|
28
|
+
transition?: ElementNode["transition"];
|
|
29
|
+
}) => s.JSX.Element;
|
|
30
|
+
export {};
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { Route } from "@solidjs/router";
|
|
2
|
+
import * as s from 'solid-js';
|
|
3
|
+
const keepAliveElements = new Map();
|
|
4
|
+
export const storeKeepAlive = (element) => {
|
|
5
|
+
if (keepAliveElements.has(element.id)) {
|
|
6
|
+
console.warn(`[KeepAlive] Element with id "${element.id}" already in cache. Recreating.`);
|
|
7
|
+
return element;
|
|
8
|
+
}
|
|
9
|
+
keepAliveElements.set(element.id, element);
|
|
10
|
+
return element;
|
|
11
|
+
};
|
|
12
|
+
export const removeKeepAlive = (id) => {
|
|
13
|
+
const element = keepAliveElements.get(id);
|
|
14
|
+
if (element) {
|
|
15
|
+
element.dispose();
|
|
16
|
+
keepAliveElements.delete(id);
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
function wrapChildren(props) {
|
|
20
|
+
const onRemove = props.onRemove || ((elm) => { elm.alpha = 0; });
|
|
21
|
+
const onRender = props.onRender || ((elm) => { elm.alpha = 1; });
|
|
22
|
+
const transition = props.transition || { alpha: true };
|
|
23
|
+
return (<view preserve onRemove={onRemove} onRender={onRender} forwardFocus={0} transition={transition} {...props}/>);
|
|
24
|
+
}
|
|
25
|
+
export const KeepAlive = (props) => {
|
|
26
|
+
let existing = keepAliveElements.get(props.id);
|
|
27
|
+
if (existing && props.shouldDispose?.(props.id)) {
|
|
28
|
+
existing.dispose();
|
|
29
|
+
keepAliveElements.delete(props.id);
|
|
30
|
+
existing = undefined;
|
|
31
|
+
}
|
|
32
|
+
if (!existing) {
|
|
33
|
+
return s.createRoot((dispose) => {
|
|
34
|
+
const children = wrapChildren(props);
|
|
35
|
+
storeKeepAlive({
|
|
36
|
+
id: props.id,
|
|
37
|
+
owner: s.getOwner(),
|
|
38
|
+
children,
|
|
39
|
+
dispose,
|
|
40
|
+
});
|
|
41
|
+
return children;
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
else if (existing && !existing.children) {
|
|
45
|
+
existing.children = s.runWithOwner(existing.owner, () => wrapChildren(props));
|
|
46
|
+
}
|
|
47
|
+
return existing.children;
|
|
48
|
+
};
|
|
49
|
+
export const KeepAliveRoute = (props) => {
|
|
50
|
+
const key = props.id || props.path;
|
|
51
|
+
const preload = props.preload ? (preloadProps) => {
|
|
52
|
+
let existing = keepAliveElements.get(key);
|
|
53
|
+
if (existing && props.shouldDispose?.(key)) {
|
|
54
|
+
existing.dispose();
|
|
55
|
+
keepAliveElements.delete(key);
|
|
56
|
+
existing = undefined;
|
|
57
|
+
}
|
|
58
|
+
if (!existing) {
|
|
59
|
+
return s.createRoot((dispose) => {
|
|
60
|
+
storeKeepAlive({
|
|
61
|
+
id: key,
|
|
62
|
+
owner: s.getOwner(),
|
|
63
|
+
dispose,
|
|
64
|
+
children: null,
|
|
65
|
+
});
|
|
66
|
+
return props.preload(preloadProps);
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
else if (existing.children) {
|
|
70
|
+
existing.children?.setFocus();
|
|
71
|
+
}
|
|
72
|
+
} : undefined;
|
|
73
|
+
return (<Route {...props} preload={preload} component={(childProps) => <KeepAlive id={key} onRemove={props.onRemove} onRender={props.onRender} transition={props.transition}>
|
|
74
|
+
{props.component(childProps)}
|
|
75
|
+
</KeepAlive>}/>);
|
|
76
|
+
};
|
|
77
|
+
//# sourceMappingURL=KeepAlive.jsx.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"KeepAlive.jsx","sourceRoot":"","sources":["../../../src/primitives/KeepAlive.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
type LazyProps<T extends readonly any[]> = NewOmit<NodeProps, 'children'> & {
|
|
1
|
+
import * as s from 'solid-js';
|
|
2
|
+
import * as lng from '@lightningtv/solid';
|
|
3
|
+
type LazyProps<T extends readonly any[]> = lng.NewOmit<lng.NodeProps, 'children'> & {
|
|
4
4
|
each: T | undefined | null | false;
|
|
5
|
-
fallback?: JSX.Element;
|
|
6
5
|
upCount: number;
|
|
6
|
+
buffer?: number;
|
|
7
7
|
delay?: number;
|
|
8
8
|
sync?: boolean;
|
|
9
9
|
eagerLoad?: boolean;
|
|
10
|
-
|
|
10
|
+
noRefocus?: boolean;
|
|
11
|
+
children: (item: s.Accessor<T[number]>, index: number) => s.JSX.Element;
|
|
11
12
|
};
|
|
12
|
-
export declare function LazyRow<T extends readonly any[]>(props: LazyProps<T>): JSX.Element;
|
|
13
|
-
export declare function LazyColumn<T extends readonly any[]>(props: LazyProps<T>): JSX.Element;
|
|
13
|
+
export declare function LazyRow<T extends readonly any[]>(props: LazyProps<T>): lng.JSX.Element;
|
|
14
|
+
export declare function LazyColumn<T extends readonly any[]>(props: LazyProps<T>): lng.JSX.Element;
|
|
14
15
|
export {};
|
|
@@ -1,19 +1,29 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
1
|
+
import * as s from 'solid-js';
|
|
2
|
+
import * as lng from '@lightningtv/solid';
|
|
3
|
+
import * as lngp from '@lightningtv/solid/primitives';
|
|
4
4
|
function createLazy(component, props, keyHandler) {
|
|
5
5
|
// Need at least one item so it can be focused
|
|
6
|
-
const [offset, setOffset] = createSignal(
|
|
6
|
+
const [offset, setOffset] = s.createSignal(props.sync ? props.upCount : 0);
|
|
7
7
|
let timeoutId = null;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
8
|
+
let viewRef;
|
|
9
|
+
let itemLength = 0;
|
|
10
|
+
const buffer = s.createMemo(() => {
|
|
11
|
+
if (typeof props.buffer === 'number') {
|
|
12
|
+
return props.buffer;
|
|
13
|
+
}
|
|
14
|
+
const scroll = props.scroll || props.style?.scroll;
|
|
15
|
+
if (!scroll || scroll === 'auto' || scroll === 'always')
|
|
16
|
+
return props.upCount + 1;
|
|
17
|
+
if (scroll === 'center')
|
|
18
|
+
return Math.ceil(props.upCount / 2) + 1;
|
|
19
|
+
return 2;
|
|
20
|
+
});
|
|
21
|
+
s.createRenderEffect(() => setOffset(offset => Math.max(offset, (props.selected || 0) + buffer())));
|
|
22
|
+
if (!props.sync || props.eagerLoad) {
|
|
23
|
+
s.createEffect(() => {
|
|
14
24
|
if (props.each) {
|
|
15
25
|
const loadItems = () => {
|
|
16
|
-
let count = untrack(offset);
|
|
26
|
+
let count = s.untrack(offset);
|
|
17
27
|
if (count < props.upCount) {
|
|
18
28
|
setOffset(count + 1);
|
|
19
29
|
timeoutId = setTimeout(loadItems, 16); // ~60fps
|
|
@@ -21,20 +31,38 @@ function createLazy(component, props, keyHandler) {
|
|
|
21
31
|
}
|
|
22
32
|
else if (props.eagerLoad) {
|
|
23
33
|
const maxOffset = props.each ? props.each.length : 0;
|
|
24
|
-
if (
|
|
34
|
+
if (count >= maxOffset)
|
|
25
35
|
return;
|
|
26
36
|
setOffset((prev) => Math.min(prev + 1, maxOffset));
|
|
27
|
-
scheduleTask(loadItems);
|
|
37
|
+
lng.scheduleTask(loadItems);
|
|
28
38
|
}
|
|
29
39
|
};
|
|
30
40
|
loadItems();
|
|
31
41
|
}
|
|
32
42
|
});
|
|
33
43
|
}
|
|
34
|
-
const items = createMemo(() =>
|
|
35
|
-
|
|
44
|
+
const items = s.createMemo(() => {
|
|
45
|
+
if (Array.isArray(props.each)) {
|
|
46
|
+
if (itemLength != props.each.length) {
|
|
47
|
+
itemLength = props.each.length;
|
|
48
|
+
if (viewRef && !viewRef.noRefocus && lng.hasFocus(viewRef)) {
|
|
49
|
+
queueMicrotask(viewRef.setFocus);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return props.each.slice(0, offset());
|
|
53
|
+
}
|
|
54
|
+
itemLength = 0;
|
|
55
|
+
return [];
|
|
56
|
+
});
|
|
57
|
+
function lazyScrollToIndex(index) {
|
|
58
|
+
setOffset(Math.max(index, 0) + buffer());
|
|
59
|
+
queueMicrotask(() => viewRef.scrollToIndex(index));
|
|
60
|
+
}
|
|
61
|
+
const updateOffset = (_event, container) => {
|
|
36
62
|
const maxOffset = props.each ? props.each.length : 0;
|
|
37
|
-
|
|
63
|
+
const selected = container.selected || 0;
|
|
64
|
+
const numChildren = container.children.length;
|
|
65
|
+
if (offset() >= maxOffset || selected < numChildren - buffer())
|
|
38
66
|
return;
|
|
39
67
|
if (!props.delay) {
|
|
40
68
|
setOffset((prev) => Math.min(prev + 1, maxOffset));
|
|
@@ -51,16 +79,14 @@ function createLazy(component, props, keyHandler) {
|
|
|
51
79
|
}, props.delay ?? 0);
|
|
52
80
|
};
|
|
53
81
|
const handler = keyHandler(updateOffset);
|
|
54
|
-
return (<
|
|
55
|
-
<
|
|
56
|
-
|
|
57
|
-
</Dynamic>
|
|
58
|
-
</Show>);
|
|
82
|
+
return (<lng.Dynamic {...props} component={component} {...handler} lazyScrollToIndex={lazyScrollToIndex} ref={lngp.chainRefs(el => { viewRef = el; }, props.ref)}>
|
|
83
|
+
<s.Index each={items()} children={props.children}/>
|
|
84
|
+
</lng.Dynamic>);
|
|
59
85
|
}
|
|
60
86
|
export function LazyRow(props) {
|
|
61
|
-
return createLazy(Row, props, (updateOffset) => ({ onRight: updateOffset }));
|
|
87
|
+
return createLazy(lngp.Row, props, (updateOffset) => ({ onRight: updateOffset }));
|
|
62
88
|
}
|
|
63
89
|
export function LazyColumn(props) {
|
|
64
|
-
return createLazy(Column, props, (updateOffset) => ({ onDown: updateOffset }));
|
|
90
|
+
return createLazy(lngp.Column, props, (updateOffset) => ({ onDown: updateOffset }));
|
|
65
91
|
}
|
|
66
92
|
//# sourceMappingURL=Lazy.jsx.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Lazy.jsx","sourceRoot":"","sources":["../../../src/primitives/Lazy.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Lazy.jsx","sourceRoot":"","sources":["../../../src/primitives/Lazy.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import * as lng from '@lightningtv/solid';
|
|
2
|
+
export interface MarqueeAnimationProps {
|
|
3
|
+
/** delay in ms between animations, @default 1000 */
|
|
4
|
+
delay?: number;
|
|
5
|
+
/** pixels per second, @default 200 */
|
|
6
|
+
speed?: number;
|
|
7
|
+
/**
|
|
8
|
+
* distance between the end of the text and the start of the next animation
|
|
9
|
+
* @default `0.5 * clipWidth`
|
|
10
|
+
*/
|
|
11
|
+
scrollGap?: number;
|
|
12
|
+
/** easing function, @default 'linear' */
|
|
13
|
+
easing?: string;
|
|
14
|
+
}
|
|
15
|
+
export interface MarqueeControlProps {
|
|
16
|
+
/** whether to scroll the text or show it contained */
|
|
17
|
+
marquee: boolean;
|
|
18
|
+
}
|
|
19
|
+
export interface MarqueeTextProps extends lng.TextProps, MarqueeControlProps, MarqueeAnimationProps {
|
|
20
|
+
/** width of the container */
|
|
21
|
+
clipWidth: number;
|
|
22
|
+
}
|
|
23
|
+
export interface MarqueeProps extends lng.NewOmit<lng.NodeProps, 'children'>, MarqueeControlProps, MarqueeAnimationProps {
|
|
24
|
+
textProps?: lng.TextProps;
|
|
25
|
+
children: lng.TextProps['children'];
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* MarqueeText is a component that scrolls text when it overflows the container.
|
|
29
|
+
*
|
|
30
|
+
* @example
|
|
31
|
+
* ```tsx
|
|
32
|
+
* <view width={400} height={28} clipping>
|
|
33
|
+
* <MarqueeText
|
|
34
|
+
* clipWidth={400}
|
|
35
|
+
* marquee={inFocus()}
|
|
36
|
+
* speed={200}
|
|
37
|
+
* delay={1000}
|
|
38
|
+
* scrollGap={24}
|
|
39
|
+
* easing='ease-in-out'
|
|
40
|
+
* >
|
|
41
|
+
* This is a long text that will scroll when it overflows the container.
|
|
42
|
+
* </MarqueeText>
|
|
43
|
+
* </view>
|
|
44
|
+
*/
|
|
45
|
+
export declare function MarqueeText(props: MarqueeTextProps): lng.JSX.Element;
|
|
46
|
+
/**
|
|
47
|
+
* Marquee is a component that scrolls text when it overflows the container.
|
|
48
|
+
* It uses the {@link MarqueeText} component to do the actual scrolling.
|
|
49
|
+
*
|
|
50
|
+
* @example
|
|
51
|
+
* ```tsx
|
|
52
|
+
* <Marquee
|
|
53
|
+
* width={400}
|
|
54
|
+
* marquee={inFocus()}
|
|
55
|
+
* easing='ease-in-out'
|
|
56
|
+
* textProps={{
|
|
57
|
+
* fontSize: 28,
|
|
58
|
+
* }}
|
|
59
|
+
* >
|
|
60
|
+
* This is a long text that will scroll when it overflows the container.
|
|
61
|
+
* </Marquee>
|
|
62
|
+
* ```
|
|
63
|
+
*/
|
|
64
|
+
export declare function Marquee(props: MarqueeProps): lng.JSX.Element;
|