@lightningtv/solid 2.7.18 → 2.8.0-0
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/dist/src/index.d.ts +1 -1
- package/dist/src/index.js +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/primitives/Column.jsx +2 -2
- package/dist/src/primitives/Column.jsx.map +1 -1
- package/dist/src/primitives/FPSCounter.jsx +60 -61
- package/dist/src/primitives/FPSCounter.jsx.map +1 -1
- package/dist/src/primitives/Grid.d.ts +15 -6
- package/dist/src/primitives/Grid.jsx +36 -23
- package/dist/src/primitives/Grid.jsx.map +1 -1
- package/dist/src/primitives/Lazy.jsx +5 -8
- package/dist/src/primitives/Lazy.jsx.map +1 -1
- package/dist/src/primitives/Marquee.d.ts +2 -3
- package/dist/src/primitives/Row.jsx +2 -2
- package/dist/src/primitives/Row.jsx.map +1 -1
- package/dist/src/primitives/index.d.ts +2 -2
- package/dist/src/primitives/index.js +2 -2
- package/dist/src/primitives/index.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/createSpriteMap.js.map +1 -1
- package/dist/src/primitives/utils/withScrolling.js +1 -1
- package/dist/src/primitives/utils/withScrolling.js.map +1 -1
- package/dist/src/render.d.ts +5 -5
- package/dist/src/render.js +8 -6
- package/dist/src/render.js.map +1 -1
- package/dist/src/solidOpts.d.ts +6 -0
- package/dist/src/solidOpts.js +31 -7
- package/dist/src/solidOpts.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/{src/jsx-runtime.ts → jsx-runtime.d.ts} +2 -0
- package/package.json +21 -6
- package/src/devtools/index.ts +77 -0
- package/src/index.ts +1 -1
- package/src/primitives/Column.tsx +2 -2
- package/src/primitives/FPSCounter.tsx +61 -61
- package/src/primitives/FadeInOut.tsx +34 -0
- package/src/primitives/Grid.tsx +59 -35
- package/src/primitives/Lazy.tsx +8 -8
- package/src/primitives/Row.tsx +1 -1
- package/src/primitives/index.ts +6 -2
- package/src/primitives/utils/chainFunctions.ts +40 -9
- package/src/primitives/utils/createSpriteMap.ts +1 -1
- package/src/primitives/utils/withScrolling.ts +4 -3
- package/src/render.ts +13 -12
- package/src/solidOpts.ts +41 -7
- package/src/primitives/LazyUp.tsx +0 -72
- package/src/primitives/jsx-runtime.d.ts +0 -8
package/dist/src/index.d.ts
CHANGED
package/dist/src/index.js
CHANGED
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mBAAmB,CAAC;AAGlC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,OAAO,EACL,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,MAAM,EACN,KAAK,EACL,KAAK,EACL,aAAa,GACd,MAAM,UAAU,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { combineStyles } from '@lightningtv/solid';
|
|
2
2
|
import { handleNavigation, onGridFocus, } from './utils/handleNavigation.js';
|
|
3
3
|
import { withScrolling } from './utils/withScrolling.js';
|
|
4
4
|
import { chainFunctions } from './utils/chainFunctions.js';
|
|
@@ -22,7 +22,7 @@ function scrollToIndex(index) {
|
|
|
22
22
|
this.setFocus();
|
|
23
23
|
}
|
|
24
24
|
export const Column = (props) => {
|
|
25
|
-
return (<
|
|
25
|
+
return (<view {...props} onUp={/* @once */chainFunctions(props.onUp, onUp)} onDown={/* @once */chainFunctions(props.onDown, onDown)} selected={props.selected || 0} scrollToIndex={scrollToIndex} forwardFocus={/* once */onGridFocus(props.onSelectedChanged)} onLayout={
|
|
26
26
|
/* @once */
|
|
27
27
|
props.selected ? chainFunctions(props.onLayout, scroll) : props.onLayout} onSelectedChanged={
|
|
28
28
|
/* @once */ chainFunctions(props.onSelectedChanged, props.scroll !== 'none' ? scroll : undefined)} style={/* @once */combineStyles(props.style, ColumnStyles)}/>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Column.jsx","sourceRoot":"","sources":["../../../src/primitives/Column.tsx"],"names":[],"mappings":"AACA,OAAO,EAAe,
|
|
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,gBAAgB,EAChB,WAAW,GACZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,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,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;AACpC,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;AACxC,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;AAEpC,SAAS,aAAa,CAAoB,KAAa;IACrD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACtB,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;AAClB,CAAC;AAED,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,UAAW,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAC9D,QAAQ,CAAC,CAAC;QACR,WAAW;QACX,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAClE,CAAC,CACD,iBAAiB,CAAC,CAAC;QACjB,WAAW,CAAC,cAAc,CACxB,KAAK,CAAC,iBAAiB,EACvB,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAEhD,CAAC,CACD,KAAK,CAAC,CAAC,WAAY,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,EAC5D,CACH,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { View, Text } from '@lightningtv/solid';
|
|
2
1
|
import { createSignal } from 'solid-js';
|
|
3
2
|
const fpsStyle = {
|
|
4
3
|
color: 0x000000ff,
|
|
@@ -76,90 +75,90 @@ export function setupFPS(root) {
|
|
|
76
75
|
});
|
|
77
76
|
}
|
|
78
77
|
export const FPSCounter = (props) => {
|
|
79
|
-
return (<
|
|
80
|
-
<
|
|
81
|
-
<
|
|
82
|
-
<
|
|
78
|
+
return (<view {...props} style={fpsStyle}>
|
|
79
|
+
<view y={6}>
|
|
80
|
+
<text style={fpsLabel}>FPS:</text>
|
|
81
|
+
<text style={fpsValue} x={90}>
|
|
83
82
|
{fps().toString()}
|
|
84
|
-
</
|
|
85
|
-
</
|
|
83
|
+
</text>
|
|
84
|
+
</view>
|
|
86
85
|
|
|
87
|
-
<
|
|
88
|
-
<
|
|
89
|
-
<
|
|
86
|
+
<view y={6} x={160}>
|
|
87
|
+
<text style={fpsLabel}>AVG:</text>
|
|
88
|
+
<text style={fpsValue} x={100}>
|
|
90
89
|
{avgFps().toString()}
|
|
91
|
-
</
|
|
92
|
-
</
|
|
90
|
+
</text>
|
|
91
|
+
</view>
|
|
93
92
|
|
|
94
|
-
<
|
|
95
|
-
<
|
|
96
|
-
<
|
|
93
|
+
<view x={0} y={26}>
|
|
94
|
+
<text style={fpsLabel}>MIN:</text>
|
|
95
|
+
<text style={fpsValue} x={90}>
|
|
97
96
|
{minFps().toString()}
|
|
98
|
-
</
|
|
99
|
-
</
|
|
97
|
+
</text>
|
|
98
|
+
</view>
|
|
100
99
|
|
|
101
|
-
<
|
|
102
|
-
<
|
|
103
|
-
<
|
|
100
|
+
<view x={160} y={26}>
|
|
101
|
+
<text style={fpsLabel}>MAX:</text>
|
|
102
|
+
<text style={fpsValue} x={100}>
|
|
104
103
|
{maxFps().toString()}
|
|
105
|
-
</
|
|
106
|
-
</
|
|
104
|
+
</text>
|
|
105
|
+
</view>
|
|
107
106
|
|
|
108
|
-
<
|
|
109
|
-
<
|
|
110
|
-
<
|
|
107
|
+
<view display="flex" flexDirection="column" y={58} gap={4}>
|
|
108
|
+
<view height={infoFontSize}>
|
|
109
|
+
<text fontSize={infoFontSize} style={fpsLabel}>
|
|
111
110
|
criticalThreshold:
|
|
112
|
-
</
|
|
113
|
-
<
|
|
111
|
+
</text>
|
|
112
|
+
<text fontSize={infoFontSize} style={fpsLabel} x={230}>
|
|
114
113
|
{criticalThresholdSignal()}
|
|
115
|
-
</
|
|
116
|
-
</
|
|
114
|
+
</text>
|
|
115
|
+
</view>
|
|
117
116
|
|
|
118
|
-
<
|
|
119
|
-
<
|
|
117
|
+
<view height={infoFontSize}>
|
|
118
|
+
<text fontSize={infoFontSize} style={fpsLabel}>
|
|
120
119
|
targetThreshold:
|
|
121
|
-
</
|
|
122
|
-
<
|
|
120
|
+
</text>
|
|
121
|
+
<text fontSize={infoFontSize} style={fpsLabel} x={230}>
|
|
123
122
|
{targetThresholdSignal()}
|
|
124
|
-
</
|
|
125
|
-
</
|
|
123
|
+
</text>
|
|
124
|
+
</view>
|
|
126
125
|
|
|
127
|
-
<
|
|
128
|
-
<
|
|
126
|
+
<view height={infoFontSize}>
|
|
127
|
+
<text fontSize={infoFontSize} style={fpsLabel}>
|
|
129
128
|
renderableMemUsed:
|
|
130
|
-
</
|
|
131
|
-
<
|
|
129
|
+
</text>
|
|
130
|
+
<text fontSize={infoFontSize} style={fpsLabel} x={230}>
|
|
132
131
|
{renderableMemUsedSignal()}
|
|
133
|
-
</
|
|
134
|
-
</
|
|
132
|
+
</text>
|
|
133
|
+
</view>
|
|
135
134
|
|
|
136
|
-
<
|
|
137
|
-
<
|
|
135
|
+
<view height={infoFontSize}>
|
|
136
|
+
<text fontSize={infoFontSize} style={fpsLabel}>
|
|
138
137
|
memUsed:
|
|
139
|
-
</
|
|
140
|
-
<
|
|
138
|
+
</text>
|
|
139
|
+
<text fontSize={infoFontSize} style={fpsLabel} x={230}>
|
|
141
140
|
{memUsedSignal()}
|
|
142
|
-
</
|
|
143
|
-
</
|
|
141
|
+
</text>
|
|
142
|
+
</view>
|
|
144
143
|
|
|
145
|
-
<
|
|
146
|
-
<
|
|
144
|
+
<view height={infoFontSize}>
|
|
145
|
+
<text fontSize={infoFontSize} style={fpsLabel}>
|
|
147
146
|
renderableTexturesLoaded:
|
|
148
|
-
</
|
|
149
|
-
<
|
|
147
|
+
</text>
|
|
148
|
+
<text fontSize={infoFontSize} style={fpsLabel} x={230}>
|
|
150
149
|
{renderableTexturesLoadedSignal().toString()}
|
|
151
|
-
</
|
|
152
|
-
</
|
|
150
|
+
</text>
|
|
151
|
+
</view>
|
|
153
152
|
|
|
154
|
-
<
|
|
155
|
-
<
|
|
153
|
+
<view height={infoFontSize}>
|
|
154
|
+
<text fontSize={infoFontSize} style={fpsLabel}>
|
|
156
155
|
loadedTextures:
|
|
157
|
-
</
|
|
158
|
-
<
|
|
156
|
+
</text>
|
|
157
|
+
<text fontSize={infoFontSize} style={fpsLabel} x={230}>
|
|
159
158
|
{loadedTexturesSignal().toString()}
|
|
160
|
-
</
|
|
161
|
-
</
|
|
162
|
-
</
|
|
163
|
-
</
|
|
159
|
+
</text>
|
|
160
|
+
</view>
|
|
161
|
+
</view>
|
|
162
|
+
</view>);
|
|
164
163
|
};
|
|
165
164
|
//# sourceMappingURL=FPSCounter.jsx.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FPSCounter.jsx","sourceRoot":"","sources":["../../../src/primitives/FPSCounter.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FPSCounter.jsx","sourceRoot":"","sources":["../../../src/primitives/FPSCounter.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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
|
-
</
|
|
65
|
-
}
|
|
76
|
+
</view>);
|
|
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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"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
import { Index, createEffect, createMemo, createSignal, Show, untrack, } from 'solid-js';
|
|
2
|
-
import {
|
|
1
|
+
import { Index, createEffect, createMemo, createSignal, Show, untrack, } from 'solid-js'; // Dynamic removed
|
|
2
|
+
import { scheduleTask, Dynamic } from '@lightningtv/solid'; // Dynamic removed from imports
|
|
3
3
|
import { Row, Column } 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(1);
|
|
6
|
+
const [offset, setOffset] = createSignal(props.sync ? props.upCount : 1);
|
|
7
7
|
let timeoutId = null;
|
|
8
|
-
createEffect(() => setOffset((props.selected || 0) + 1));
|
|
9
|
-
if (props.sync) {
|
|
10
|
-
setOffset(props.upCount);
|
|
11
|
-
}
|
|
12
|
-
else {
|
|
8
|
+
createEffect(() => setOffset(offset => Math.max(offset, (props.selected || 0) + 1)));
|
|
9
|
+
if (!props.sync || props.eaglerLoad) {
|
|
13
10
|
createEffect(() => {
|
|
14
11
|
if (props.each) {
|
|
15
12
|
const loadItems = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Lazy.jsx","sourceRoot":"","sources":["../../../src/primitives/Lazy.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,IAAI,EAGJ,OAAO,GAER,MAAM,UAAU,CAAC
|
|
1
|
+
{"version":3,"file":"Lazy.jsx","sourceRoot":"","sources":["../../../src/primitives/Lazy.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as s from 'solid-js';
|
|
2
1
|
import * as lng from '@lightningtv/solid';
|
|
3
2
|
export interface MarqueeAnimationProps {
|
|
4
3
|
/** delay in ms between animations, @default 1000 */
|
|
@@ -43,7 +42,7 @@ export interface MarqueeProps extends lng.NewOmit<lng.NodeProps, 'children'>, Ma
|
|
|
43
42
|
* </MarqueeText>
|
|
44
43
|
* </view>
|
|
45
44
|
*/
|
|
46
|
-
export declare function MarqueeText(props: MarqueeTextProps):
|
|
45
|
+
export declare function MarqueeText(props: MarqueeTextProps): lng.JSX.Element;
|
|
47
46
|
/**
|
|
48
47
|
* Marquee is a component that scrolls text when it overflows the container.
|
|
49
48
|
* It uses the {@link MarqueeText} component to do the actual scrolling.
|
|
@@ -62,4 +61,4 @@ export declare function MarqueeText(props: MarqueeTextProps): s.JSX.Element;
|
|
|
62
61
|
* </Marquee>
|
|
63
62
|
* ```
|
|
64
63
|
*/
|
|
65
|
-
export declare function Marquee(props: MarqueeProps):
|
|
64
|
+
export declare function Marquee(props: MarqueeProps): lng.JSX.Element;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { combineStyles
|
|
1
|
+
import { combineStyles } from '@lightningtv/solid';
|
|
2
2
|
import { chainFunctions } from './utils/chainFunctions.js';
|
|
3
3
|
import { handleNavigation, onGridFocus, } from './utils/handleNavigation.js';
|
|
4
4
|
import { withScrolling } from './utils/withScrolling.js';
|
|
@@ -21,7 +21,7 @@ function scrollToIndex(index) {
|
|
|
21
21
|
this.setFocus();
|
|
22
22
|
}
|
|
23
23
|
export const Row = (props) => {
|
|
24
|
-
return (<
|
|
24
|
+
return (<view {...props} selected={props.selected || 0} onLeft={/* @once */chainFunctions(props.onLeft, onLeft)} onRight={/* @once */chainFunctions(props.onRight, onRight)} forwardFocus={/* once */onGridFocus(props.onSelectedChanged)} scrollToIndex={scrollToIndex} onLayout={
|
|
25
25
|
/* @once */
|
|
26
26
|
props.selected ? chainFunctions(props.onLayout, scroll) : props.onLayout} onSelectedChanged={
|
|
27
27
|
/* @once */ chainFunctions(props.onSelectedChanged, props.scroll !== 'none' ? scroll : undefined)} style={/* @once */combineStyles(props.style, RowStyles)}/>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Row.jsx","sourceRoot":"","sources":["../../../src/primitives/Row.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"Row.jsx","sourceRoot":"","sources":["../../../src/primitives/Row.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAA2C,MAAM,oBAAoB,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EACL,gBAAgB,EAChB,WAAW,GACZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,MAAM,SAAS,GAAe;IAC5B,OAAO,EAAE,MAAM;IACf,GAAG,EAAE,EAAE;IACP,UAAU,EAAE;QACV,CAAC,EAAE;YACD,QAAQ,EAAE,GAAG;YACb,MAAM,EAAE,aAAa;SACtB;KACF;CACF,CAAC;AAEF,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;AACxC,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAC1C,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;AAEnC,SAAS,aAAa,CAAoB,KAAa;IACrD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACtB,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,MAAM,GAAG,GAAwB,CAAC,KAAK,EAAE,EAAE;IAChD,OAAO,CACL,CAAC,IAAI,CACH,IAAI,KAAK,CAAC,CACV,QAAQ,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,CAC9B,MAAM,CAAC,CAAC,WAAY,cAAc,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CACzD,OAAO,CAAC,CAAC,WAAY,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAC5D,YAAY,CAAC,CAAC,UAAW,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAC9D,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,QAAQ,CAAC,CAAC;QACR,WAAW;QACX,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAClE,CAAC,CACD,iBAAiB,CAAC,CAAC;QACjB,WAAW,CAAC,cAAc,CACxB,KAAK,CAAC,iBAAiB,EACvB,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAEhD,CAAC,CACD,KAAK,CAAC,CAAC,WAAY,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,EACzD,CACH,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -3,7 +3,6 @@ export * from './announcer/index.js';
|
|
|
3
3
|
export * from './createInfiniteItems.js';
|
|
4
4
|
export * from './useMouse.js';
|
|
5
5
|
export * from './portal.jsx';
|
|
6
|
-
export * from './LazyUp.jsx';
|
|
7
6
|
export * from './Lazy.jsx';
|
|
8
7
|
export * from './Visible.jsx';
|
|
9
8
|
export * from './router.js';
|
|
@@ -11,11 +10,12 @@ export * from './Column.jsx';
|
|
|
11
10
|
export * from './Row.jsx';
|
|
12
11
|
export * from './Grid.jsx';
|
|
13
12
|
export * from './FPSCounter.jsx';
|
|
13
|
+
export * from './FadeInOut.jsx';
|
|
14
14
|
export * from './createFocusStack.jsx';
|
|
15
15
|
export * from './marquee.jsx';
|
|
16
16
|
export * from './useHold.js';
|
|
17
17
|
export { withScrolling } from './utils/withScrolling.js';
|
|
18
|
-
export { chainFunctions } from './utils/chainFunctions.js';
|
|
18
|
+
export { type AnyFunction, chainFunctions, chainRefs, } from './utils/chainFunctions.js';
|
|
19
19
|
export { handleNavigation, onGridFocus } from './utils/handleNavigation.js';
|
|
20
20
|
export { createSpriteMap, type SpriteDef } from './utils/createSpriteMap.js';
|
|
21
21
|
export type * from './types.js';
|
|
@@ -3,7 +3,6 @@ export * from './announcer/index.js';
|
|
|
3
3
|
export * from './createInfiniteItems.js';
|
|
4
4
|
export * from './useMouse.js';
|
|
5
5
|
export * from './portal.jsx';
|
|
6
|
-
export * from './LazyUp.jsx';
|
|
7
6
|
export * from './Lazy.jsx';
|
|
8
7
|
export * from './Visible.jsx';
|
|
9
8
|
export * from './router.js';
|
|
@@ -11,11 +10,12 @@ export * from './Column.jsx';
|
|
|
11
10
|
export * from './Row.jsx';
|
|
12
11
|
export * from './Grid.jsx';
|
|
13
12
|
export * from './FPSCounter.jsx';
|
|
13
|
+
export * from './FadeInOut.jsx';
|
|
14
14
|
export * from './createFocusStack.jsx';
|
|
15
15
|
export * from './marquee.jsx';
|
|
16
16
|
export * from './useHold.js';
|
|
17
17
|
export { withScrolling } from './utils/withScrolling.js';
|
|
18
|
-
export { chainFunctions } from './utils/chainFunctions.js';
|
|
18
|
+
export { chainFunctions, chainRefs, } from './utils/chainFunctions.js';
|
|
19
19
|
export { handleNavigation, onGridFocus } from './utils/handleNavigation.js';
|
|
20
20
|
export { createSpriteMap } from './utils/createSpriteMap.js';
|
|
21
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +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,
|
|
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,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAEL,cAAc,EACd,SAAS,GACV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAkB,MAAM,4BAA4B,CAAC"}
|
|
@@ -1,4 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import * as s from 'solid-js';
|
|
2
|
+
export type AnyFunction = (this: any, ...args: any[]) => any;
|
|
3
|
+
/**
|
|
4
|
+
* take an array of functions and if you return `true` from a function, it will stop the chain
|
|
5
|
+
* @param fns list of functions to chain together, can be `undefined`, `null`, or `false` to skip them
|
|
6
|
+
* @returns a function that will call each function in the list until one returns `true` or all functions are called.
|
|
7
|
+
* If no functions are provided, it will return `undefined`.
|
|
8
|
+
*
|
|
9
|
+
* @example
|
|
10
|
+
* ```tsx
|
|
11
|
+
* function Button (props: NodeProps) {
|
|
12
|
+
* function onEnter (el: ElementNode) {...}
|
|
13
|
+
* return <view onEnter={chainFunctions(props.onEnter, onEnter)} />
|
|
14
|
+
* }
|
|
15
|
+
* ```
|
|
16
|
+
*/
|
|
17
|
+
export declare function chainFunctions<T extends AnyFunction>(...fns: T[]): T;
|
|
18
|
+
export declare function chainFunctions<T extends AnyFunction>(...fns: (T | undefined | null | false)[]): T | undefined;
|
|
19
|
+
/**
|
|
20
|
+
* Utility for chaining multiple `ref` assignments with `props.ref` forwarding.
|
|
21
|
+
* @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`).
|
|
22
|
+
* @example
|
|
23
|
+
* ```tsx
|
|
24
|
+
* function Button (props: NodeProps) {
|
|
25
|
+
* let localRef: ElementNode | undefined
|
|
26
|
+
* return <view ref={chainRefs(props.ref, el => localRef = el)} />
|
|
27
|
+
* }
|
|
28
|
+
* ```
|
|
29
|
+
*/
|
|
30
|
+
export declare const chainRefs: <T>(...refs: (s.Ref<T> | undefined)[]) => (el: T) => void;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const onlyFunctions = args.filter((func) => typeof func === 'function');
|
|
1
|
+
export function chainFunctions(...fns) {
|
|
2
|
+
const onlyFunctions = fns.filter((func) => typeof func === 'function');
|
|
4
3
|
if (onlyFunctions.length === 0) {
|
|
5
4
|
return undefined;
|
|
6
5
|
}
|
|
@@ -18,4 +17,16 @@ export function chainFunctions(...args) {
|
|
|
18
17
|
return result;
|
|
19
18
|
};
|
|
20
19
|
}
|
|
20
|
+
/**
|
|
21
|
+
* Utility for chaining multiple `ref` assignments with `props.ref` forwarding.
|
|
22
|
+
* @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`).
|
|
23
|
+
* @example
|
|
24
|
+
* ```tsx
|
|
25
|
+
* function Button (props: NodeProps) {
|
|
26
|
+
* let localRef: ElementNode | undefined
|
|
27
|
+
* return <view ref={chainRefs(props.ref, el => localRef = el)} />
|
|
28
|
+
* }
|
|
29
|
+
* ```
|
|
30
|
+
*/
|
|
31
|
+
export const chainRefs = chainFunctions;
|
|
21
32
|
//# sourceMappingURL=chainFunctions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chainFunctions.js","sourceRoot":"","sources":["../../../../src/primitives/utils/chainFunctions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSpriteMap.js","sourceRoot":"","sources":["../../../../src/primitives/utils/createSpriteMap.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"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,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
|
|
@@ -43,7 +43,7 @@ export function withScrolling(isRow) {
|
|
|
43
43
|
const scroll = componentRef.scroll || 'auto';
|
|
44
44
|
// Allows manual position control
|
|
45
45
|
const targetPosition = componentRef._targetPosition ?? componentRef[axis];
|
|
46
|
-
const rootPosition = isIncrementing
|
|
46
|
+
const rootPosition = isIncrementing || scroll === 'auto'
|
|
47
47
|
? Math.min(targetPosition, componentRef[axis])
|
|
48
48
|
: Math.max(targetPosition, componentRef[axis]);
|
|
49
49
|
componentRef.offset = componentRef.offset ?? rootPosition;
|