@vokril/ui-solid 0.19.1 → 0.20.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/CHANGELOG.md +8 -0
- package/README.md +38 -2
- package/dist/createResizableSidebar-A0F4JmSU.js +472 -0
- package/dist/createResizableSidebar-DwCuRuho.cjs +1 -0
- package/dist/createVirtualWindow-9T5ZJCQR.cjs +1 -0
- package/dist/createVirtualWindow-Dqm5jxZa.js +117 -0
- package/dist/index.cjs +1 -1
- package/dist/index.js +108 -104
- package/dist/layout/createVirtualScroller.d.cts +8 -31
- package/dist/layout/createVirtualScroller.d.ts +8 -31
- package/dist/layout/createVirtualWindow.d.cts +64 -0
- package/dist/layout/createVirtualWindow.d.ts +64 -0
- package/dist/layout/index.cjs +1 -1
- package/dist/layout/index.d.cts +2 -0
- package/dist/layout/index.d.ts +2 -0
- package/dist/layout/index.js +7 -6
- package/dist/layout/virtualScrollerUtils.d.cts +58 -22
- package/dist/layout/virtualScrollerUtils.d.ts +58 -22
- package/dist/rowSource-BnUQ-LKT.cjs +1 -0
- package/dist/rowSource-CLEYuC95.js +1236 -0
- package/dist/server/createResizableSidebar-CZ0IGNm8.js +310 -0
- package/dist/server/createResizableSidebar-DDniLGSD.cjs +1 -0
- package/dist/server/createVirtualWindow-9T5ZJCQR.cjs +1 -0
- package/dist/server/createVirtualWindow-Dqm5jxZa.js +117 -0
- package/dist/server/index.cjs +1 -1
- package/dist/server/index.js +110 -106
- package/dist/server/layout/index.cjs +1 -1
- package/dist/server/layout/index.js +7 -6
- package/dist/server/rowSource-CdvoDIN7.cjs +1 -0
- package/dist/server/rowSource-D7lSI6LT.js +1122 -0
- package/dist/server/tree/index.cjs +1 -1
- package/dist/server/tree/index.js +11 -8
- package/dist/solid/layout/createVirtualScroller.js +17 -100
- package/dist/solid/layout/createVirtualWindow.js +129 -0
- package/dist/solid/layout/index.js +1 -0
- package/dist/solid/layout/virtualScrollerUtils.js +31 -32
- package/dist/solid/tree/TreeSurface.jsx +20 -13
- package/dist/solid/tree/createTreeController.js +110 -62
- package/dist/solid/tree/createTreeSurface.js +29 -12
- package/dist/solid/tree/index.js +1 -0
- package/dist/solid/tree/rowSource.js +93 -0
- package/dist/solid/tree/selectAllInScope.js +31 -25
- package/dist/solid/tree/stickyScroll.js +12 -10
- package/dist/solid/tree/treeAria.js +11 -30
- package/dist/solid/tree/treeKeymap.js +2 -24
- package/dist/solid/tree/viewportAnchor.js +23 -0
- package/dist/style.css +1 -1
- package/dist/tree/TreeStickyHeader.d.cts +1 -1
- package/dist/tree/TreeStickyHeader.d.ts +1 -1
- package/dist/tree/TreeSurface.d.cts +1 -1
- package/dist/tree/TreeSurface.d.ts +1 -1
- package/dist/tree/createTreeController.d.cts +19 -8
- package/dist/tree/createTreeController.d.ts +19 -8
- package/dist/tree/createTreeSurface.d.cts +8 -3
- package/dist/tree/createTreeSurface.d.ts +8 -3
- package/dist/tree/descriptor.d.cts +8 -9
- package/dist/tree/descriptor.d.ts +8 -9
- package/dist/tree/index.cjs +1 -1
- package/dist/tree/index.d.cts +1 -0
- package/dist/tree/index.d.ts +1 -0
- package/dist/tree/index.js +11 -8
- package/dist/tree/rowSource.d.cts +41 -0
- package/dist/tree/rowSource.d.ts +41 -0
- package/dist/tree/selectAllInScope.d.cts +20 -2
- package/dist/tree/selectAllInScope.d.ts +20 -2
- package/dist/tree/stickyScroll.d.cts +32 -5
- package/dist/tree/stickyScroll.d.ts +32 -5
- package/dist/tree/treeAria.d.cts +26 -10
- package/dist/tree/treeAria.d.ts +26 -10
- package/dist/tree/treeKeymap.d.cts +2 -16
- package/dist/tree/treeKeymap.d.ts +2 -16
- package/dist/tree/viewportAnchor.d.cts +21 -0
- package/dist/tree/viewportAnchor.d.ts +21 -0
- package/dist/ui.css +1 -1
- package/package.json +1 -1
- package/dist/createResizableSidebar-Dau7TIuH.cjs +0 -1
- package/dist/createResizableSidebar-gvf9me4K.js +0 -449
- package/dist/createVirtualScroller-CL49JE2P.cjs +0 -1
- package/dist/createVirtualScroller-vu-l4rVv.js +0 -93
- package/dist/descriptor-CaHgh9N_.cjs +0 -1
- package/dist/descriptor-eGtcBtpI.js +0 -1106
- package/dist/server/createResizableSidebar-BQG5elmd.js +0 -287
- package/dist/server/createResizableSidebar-tU8FO2MK.cjs +0 -1
- package/dist/server/createVirtualScroller-CL49JE2P.cjs +0 -1
- package/dist/server/createVirtualScroller-vu-l4rVv.js +0 -93
- package/dist/server/descriptor-CEGvvJZh.cjs +0 -1
- package/dist/server/descriptor-GLoKPx6x.js +0 -992
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("../
|
|
1
|
+
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("../rowSource-CdvoDIN7.cjs");exports.DEFAULT_TREE_CAPABILITIES=e.DEFAULT_TREE_CAPABILITIES;exports.TREE_INDENT_STEP_REM=e.TREE_INDENT_STEP_REM;exports.TreeHighlight=e.TreeHighlight;exports.TreeRow=e.TreeRow;exports.TreeSurface=e.TreeSurface;exports.assertRowIndex=e.assertRowIndex;exports.buildTreeContainerAria=e.buildTreeContainerAria;exports.buildTreeRowAria=e.buildTreeRowAria;exports.buildTreeRowStructureAria=e.buildTreeRowStructureAria;exports.createTreeController=e.createTreeController;exports.createTreeSurface=e.createTreeSurface;exports.selectAllInScope=e.selectAllInScope;exports.treeRowDomId=e.treeRowDomId;exports.treeRowsFrom=e.treeRowsFrom;
|
|
@@ -1,14 +1,17 @@
|
|
|
1
|
-
import { D as
|
|
1
|
+
import { D as a, T as s, a as T, b as o, c as t, d as i, e as l, f as E, g as R, h as c, i as u, s as A, t as I, j as d } from "../rowSource-D7lSI6LT.js";
|
|
2
2
|
export {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
a as DEFAULT_TREE_CAPABILITIES,
|
|
4
|
+
s as TREE_INDENT_STEP_REM,
|
|
5
|
+
T as TreeHighlight,
|
|
6
6
|
o as TreeRow,
|
|
7
7
|
t as TreeSurface,
|
|
8
|
-
|
|
9
|
-
l as
|
|
8
|
+
i as assertRowIndex,
|
|
9
|
+
l as buildTreeContainerAria,
|
|
10
|
+
E as buildTreeRowAria,
|
|
11
|
+
R as buildTreeRowStructureAria,
|
|
10
12
|
c as createTreeController,
|
|
11
|
-
|
|
13
|
+
u as createTreeSurface,
|
|
12
14
|
A as selectAllInScope,
|
|
13
|
-
I as treeRowDomId
|
|
15
|
+
I as treeRowDomId,
|
|
16
|
+
d as treeRowsFrom
|
|
14
17
|
};
|
|
@@ -1,109 +1,26 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { getWindow } from '../_internal/app/windows/window/windowRegistry';
|
|
1
|
+
import { createMemo } from 'solid-js';
|
|
2
|
+
import { createVirtualWindow } from './createVirtualWindow';
|
|
4
3
|
export function createVirtualScroller(options) {
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
const [containerHeight, setContainerHeight] = createSignal(0);
|
|
8
|
-
let containerEl = null;
|
|
9
|
-
let resizeObserver = null;
|
|
10
|
-
const totalHeight = createMemo(() => options.items().length * options.itemHeight);
|
|
11
|
-
const virtualWindow = createMemo(() => getVirtualWindow({
|
|
12
|
-
scrollTop: scrollTop(),
|
|
13
|
-
containerHeight: containerHeight(),
|
|
4
|
+
const virtualWindow = createVirtualWindow({
|
|
5
|
+
count: () => options.items().length,
|
|
14
6
|
itemHeight: options.itemHeight,
|
|
15
|
-
overscan,
|
|
16
|
-
|
|
17
|
-
}));
|
|
18
|
-
const startIndex = createMemo(() => virtualWindow().startIndex);
|
|
19
|
-
const endIndex = createMemo(() => virtualWindow().endIndex);
|
|
20
|
-
const offsetY = createMemo(() => startIndex() * options.itemHeight);
|
|
7
|
+
overscan: options.overscan ?? 5,
|
|
8
|
+
});
|
|
21
9
|
const visibleItems = createMemo(() => {
|
|
22
10
|
const all = options.items();
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
let scrollRafId = 0;
|
|
29
|
-
let pendingScrollTop = 0;
|
|
30
|
-
let lastAppliedScrollTop = 0;
|
|
31
|
-
let scrollWindow = null;
|
|
32
|
-
const onScroll = (event) => {
|
|
33
|
-
const target = event.currentTarget;
|
|
34
|
-
pendingScrollTop = target.scrollTop;
|
|
35
|
-
if (scrollRafId !== 0) {
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
lastAppliedScrollTop = pendingScrollTop;
|
|
39
|
-
setScrollTop(pendingScrollTop);
|
|
40
|
-
scrollWindow = getWindow(target);
|
|
41
|
-
scrollRafId = scrollWindow.requestAnimationFrame(() => {
|
|
42
|
-
scrollRafId = 0;
|
|
43
|
-
if (pendingScrollTop !== lastAppliedScrollTop) {
|
|
44
|
-
lastAppliedScrollTop = pendingScrollTop;
|
|
45
|
-
setScrollTop(pendingScrollTop);
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
|
-
};
|
|
49
|
-
const containerRef = (el) => {
|
|
50
|
-
if (containerEl) {
|
|
51
|
-
containerEl.removeEventListener('scroll', onScroll);
|
|
52
|
-
resizeObserver?.disconnect();
|
|
53
|
-
}
|
|
54
|
-
if (scrollRafId !== 0 && scrollWindow) {
|
|
55
|
-
scrollWindow.cancelAnimationFrame(scrollRafId);
|
|
56
|
-
scrollRafId = 0;
|
|
57
|
-
}
|
|
58
|
-
containerEl = el;
|
|
59
|
-
if (!el)
|
|
60
|
-
return;
|
|
61
|
-
setContainerHeight(el.clientHeight);
|
|
62
|
-
el.addEventListener('scroll', onScroll, { passive: true });
|
|
63
|
-
resizeObserver = new ResizeObserver((entries) => {
|
|
64
|
-
for (const entry of entries) {
|
|
65
|
-
setContainerHeight(entry.contentRect.height);
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
resizeObserver.observe(el);
|
|
69
|
-
};
|
|
70
|
-
const scrollToIndex = (index, align = 'auto', topInset = 0) => {
|
|
71
|
-
if (!containerEl)
|
|
72
|
-
return;
|
|
73
|
-
const top = index * options.itemHeight;
|
|
74
|
-
if (align === 'center') {
|
|
75
|
-
const maxScroll = Math.max(0, containerEl.scrollHeight - containerEl.clientHeight);
|
|
76
|
-
const centered = top - Math.max(0, (containerEl.clientHeight - options.itemHeight) / 2);
|
|
77
|
-
containerEl.scrollTop = Math.max(0, Math.min(maxScroll, centered));
|
|
78
|
-
return;
|
|
79
|
-
}
|
|
80
|
-
const bottom = top + options.itemHeight;
|
|
81
|
-
const viewTop = containerEl.scrollTop + topInset;
|
|
82
|
-
const viewBottom = containerEl.scrollTop + containerEl.clientHeight;
|
|
83
|
-
if (top < viewTop) {
|
|
84
|
-
containerEl.scrollTop = Math.max(0, top - topInset);
|
|
85
|
-
}
|
|
86
|
-
else if (bottom > viewBottom) {
|
|
87
|
-
containerEl.scrollTop = bottom - containerEl.clientHeight;
|
|
88
|
-
}
|
|
89
|
-
};
|
|
90
|
-
onCleanup(() => {
|
|
91
|
-
if (scrollRafId !== 0 && scrollWindow) {
|
|
92
|
-
scrollWindow.cancelAnimationFrame(scrollRafId);
|
|
93
|
-
scrollRafId = 0;
|
|
94
|
-
}
|
|
95
|
-
if (containerEl) {
|
|
96
|
-
containerEl.removeEventListener('scroll', onScroll);
|
|
97
|
-
}
|
|
98
|
-
resizeObserver?.disconnect();
|
|
11
|
+
const { start, end } = virtualWindow.range();
|
|
12
|
+
const visible = [];
|
|
13
|
+
for (let index = start; index < end; index++)
|
|
14
|
+
visible.push({ item: all[index], index });
|
|
15
|
+
return visible;
|
|
99
16
|
});
|
|
100
17
|
return {
|
|
101
18
|
visibleItems,
|
|
102
|
-
totalHeight,
|
|
103
|
-
offsetY,
|
|
104
|
-
scrollTop,
|
|
105
|
-
viewportHeight:
|
|
106
|
-
containerRef,
|
|
107
|
-
scrollToIndex,
|
|
19
|
+
totalHeight: virtualWindow.totalHeight,
|
|
20
|
+
offsetY: virtualWindow.offsetY,
|
|
21
|
+
scrollTop: virtualWindow.scrollTop,
|
|
22
|
+
viewportHeight: virtualWindow.viewportHeight,
|
|
23
|
+
containerRef: virtualWindow.containerRef,
|
|
24
|
+
scrollToIndex: virtualWindow.scrollToIndex,
|
|
108
25
|
};
|
|
109
26
|
}
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import { createEffect, createMemo, createSignal, on, onCleanup, } from 'solid-js';
|
|
2
|
+
import { getWindow } from '../_internal/app/windows/window/windowRegistry';
|
|
3
|
+
import { SCROLL_TOLERANCE_PX, contentScrollTop, domScrollTop, scrollExtentOf, sliceOffset, visibleRange, } from './virtualScrollerUtils';
|
|
4
|
+
function maxContentTop(extent) {
|
|
5
|
+
return Math.max(0, extent.content - extent.viewport);
|
|
6
|
+
}
|
|
7
|
+
export function createVirtualWindow(options) {
|
|
8
|
+
const overscan = options.overscan ?? 5;
|
|
9
|
+
const [viewportHeight, setViewportHeight] = createSignal(0);
|
|
10
|
+
const [contentTop, setContentTop] = createSignal(0);
|
|
11
|
+
let liveContentTop = 0;
|
|
12
|
+
let containerEl = null;
|
|
13
|
+
let resizeObserver = null;
|
|
14
|
+
const extent = createMemo(() => scrollExtentOf({
|
|
15
|
+
count: options.count(),
|
|
16
|
+
itemHeight: options.itemHeight,
|
|
17
|
+
viewport: viewportHeight(),
|
|
18
|
+
}));
|
|
19
|
+
const range = createMemo(() => visibleRange({
|
|
20
|
+
contentTop: contentTop(),
|
|
21
|
+
viewport: viewportHeight(),
|
|
22
|
+
itemHeight: options.itemHeight,
|
|
23
|
+
overscan,
|
|
24
|
+
count: options.count(),
|
|
25
|
+
}), { start: 0, end: 0 }, { equals: (a, b) => a.start === b.start && a.end === b.end });
|
|
26
|
+
const offsetY = createMemo(() => sliceOffset({
|
|
27
|
+
start: range().start,
|
|
28
|
+
itemHeight: options.itemHeight,
|
|
29
|
+
domTop: domScrollTop(contentTop(), extent()),
|
|
30
|
+
contentTop: contentTop(),
|
|
31
|
+
}));
|
|
32
|
+
const totalHeight = createMemo(() => extent().dom);
|
|
33
|
+
const syncElement = (ext) => {
|
|
34
|
+
if (!containerEl)
|
|
35
|
+
return;
|
|
36
|
+
const dom = domScrollTop(liveContentTop, ext);
|
|
37
|
+
if (Math.abs(containerEl.scrollTop - dom) >= SCROLL_TOLERANCE_PX)
|
|
38
|
+
containerEl.scrollTop = dom;
|
|
39
|
+
};
|
|
40
|
+
const place = (target) => {
|
|
41
|
+
const ext = extent();
|
|
42
|
+
liveContentTop = Math.max(0, Math.min(maxContentTop(ext), target));
|
|
43
|
+
setContentTop(liveContentTop);
|
|
44
|
+
syncElement(ext);
|
|
45
|
+
};
|
|
46
|
+
let scrollRafId = 0;
|
|
47
|
+
let scrollWindow = null;
|
|
48
|
+
const onScroll = (event) => {
|
|
49
|
+
const target = event.currentTarget;
|
|
50
|
+
const ext = extent();
|
|
51
|
+
if (Math.abs(domScrollTop(liveContentTop, ext) - target.scrollTop) <
|
|
52
|
+
SCROLL_TOLERANCE_PX)
|
|
53
|
+
return;
|
|
54
|
+
liveContentTop = contentScrollTop(target.scrollTop, ext);
|
|
55
|
+
if (scrollRafId !== 0)
|
|
56
|
+
return;
|
|
57
|
+
setContentTop(liveContentTop);
|
|
58
|
+
scrollWindow = getWindow(target);
|
|
59
|
+
scrollRafId = scrollWindow.requestAnimationFrame(() => {
|
|
60
|
+
scrollRafId = 0;
|
|
61
|
+
setContentTop(liveContentTop);
|
|
62
|
+
});
|
|
63
|
+
};
|
|
64
|
+
createEffect(on(extent, (ext) => {
|
|
65
|
+
const clamped = Math.min(liveContentTop, maxContentTop(ext));
|
|
66
|
+
if (clamped !== liveContentTop) {
|
|
67
|
+
liveContentTop = clamped;
|
|
68
|
+
setContentTop(clamped);
|
|
69
|
+
}
|
|
70
|
+
syncElement(ext);
|
|
71
|
+
}, { defer: true }));
|
|
72
|
+
const containerRef = (el) => {
|
|
73
|
+
if (containerEl) {
|
|
74
|
+
containerEl.removeEventListener('scroll', onScroll);
|
|
75
|
+
resizeObserver?.disconnect();
|
|
76
|
+
}
|
|
77
|
+
if (scrollRafId !== 0 && scrollWindow) {
|
|
78
|
+
scrollWindow.cancelAnimationFrame(scrollRafId);
|
|
79
|
+
scrollRafId = 0;
|
|
80
|
+
}
|
|
81
|
+
containerEl = el;
|
|
82
|
+
if (!el)
|
|
83
|
+
return;
|
|
84
|
+
setViewportHeight(el.clientHeight);
|
|
85
|
+
liveContentTop = contentScrollTop(el.scrollTop, extent());
|
|
86
|
+
setContentTop(liveContentTop);
|
|
87
|
+
el.addEventListener('scroll', onScroll, { passive: true });
|
|
88
|
+
resizeObserver = new ResizeObserver((entries) => {
|
|
89
|
+
for (const entry of entries)
|
|
90
|
+
setViewportHeight(entry.contentRect.height);
|
|
91
|
+
});
|
|
92
|
+
resizeObserver.observe(el);
|
|
93
|
+
};
|
|
94
|
+
const scrollToIndex = (index, align = 'auto', topInset = 0) => {
|
|
95
|
+
if (!containerEl)
|
|
96
|
+
return;
|
|
97
|
+
const viewport = containerEl.clientHeight;
|
|
98
|
+
const top = index * options.itemHeight;
|
|
99
|
+
if (align === 'center') {
|
|
100
|
+
place(top - Math.max(0, (viewport - options.itemHeight) / 2));
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
const bottom = top + options.itemHeight;
|
|
104
|
+
if (top < liveContentTop + topInset)
|
|
105
|
+
place(top - topInset);
|
|
106
|
+
else if (bottom > liveContentTop + viewport)
|
|
107
|
+
place(bottom - viewport);
|
|
108
|
+
};
|
|
109
|
+
onCleanup(() => {
|
|
110
|
+
if (scrollRafId !== 0 && scrollWindow) {
|
|
111
|
+
scrollWindow.cancelAnimationFrame(scrollRafId);
|
|
112
|
+
scrollRafId = 0;
|
|
113
|
+
}
|
|
114
|
+
if (containerEl)
|
|
115
|
+
containerEl.removeEventListener('scroll', onScroll);
|
|
116
|
+
resizeObserver?.disconnect();
|
|
117
|
+
});
|
|
118
|
+
return {
|
|
119
|
+
range,
|
|
120
|
+
totalHeight,
|
|
121
|
+
offsetY,
|
|
122
|
+
scrollTop: contentTop,
|
|
123
|
+
readScrollTop: () => liveContentTop,
|
|
124
|
+
viewportHeight,
|
|
125
|
+
containerRef,
|
|
126
|
+
scrollToIndex,
|
|
127
|
+
scrollToContentTop: place,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
@@ -1,36 +1,35 @@
|
|
|
1
|
-
export
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
export const MAX_SCROLL_EXTENT_PX = 16_000_000;
|
|
2
|
+
export const SCROLL_TOLERANCE_PX = 1;
|
|
3
|
+
export function scrollExtentOf(params) {
|
|
4
|
+
const content = params.count * params.itemHeight;
|
|
5
|
+
return {
|
|
6
|
+
content,
|
|
7
|
+
dom: Math.min(content, MAX_SCROLL_EXTENT_PX),
|
|
8
|
+
viewport: params.viewport,
|
|
9
|
+
};
|
|
4
10
|
}
|
|
5
|
-
export function
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
return Math.min(
|
|
11
|
+
export function contentScrollTop(domTop, extent) {
|
|
12
|
+
if (extent.content === extent.dom)
|
|
13
|
+
return domTop;
|
|
14
|
+
const domTravel = Math.max(1, extent.dom - extent.viewport);
|
|
15
|
+
const contentTravel = Math.max(0, extent.content - extent.viewport);
|
|
16
|
+
return (Math.min(domTop, domTravel) / domTravel) * contentTravel;
|
|
11
17
|
}
|
|
12
|
-
export function
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
const endIndex = getVirtualEndIndex({
|
|
19
|
-
scrollTop: params.scrollTop,
|
|
20
|
-
containerHeight: params.containerHeight,
|
|
21
|
-
itemHeight: params.itemHeight,
|
|
22
|
-
overscan: params.overscan,
|
|
23
|
-
itemsLength: params.itemsLength,
|
|
24
|
-
});
|
|
25
|
-
return { startIndex, endIndex };
|
|
18
|
+
export function domScrollTop(contentTop, extent) {
|
|
19
|
+
if (extent.content === extent.dom)
|
|
20
|
+
return contentTop;
|
|
21
|
+
const domTravel = Math.max(0, extent.dom - extent.viewport);
|
|
22
|
+
const contentTravel = Math.max(1, extent.content - extent.viewport);
|
|
23
|
+
return (Math.min(contentTop, contentTravel) / contentTravel) * domTravel;
|
|
26
24
|
}
|
|
27
|
-
export function
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
export function visibleRange(params) {
|
|
26
|
+
const first = Math.floor(params.contentTop / params.itemHeight);
|
|
27
|
+
const visible = Math.ceil(params.viewport / params.itemHeight);
|
|
28
|
+
return {
|
|
29
|
+
start: Math.max(0, first - params.overscan),
|
|
30
|
+
end: Math.min(params.count, first + visible + params.overscan),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
export function sliceOffset(params) {
|
|
34
|
+
return params.domTop + (params.start * params.itemHeight - params.contentTop);
|
|
36
35
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Index, Show, createMemo } from 'solid-js';
|
|
1
|
+
import { Index, Show, createMemo, createSelector } from 'solid-js';
|
|
2
2
|
import { VpSearch } from '@vokril/icons';
|
|
3
3
|
import { OverlayScrollArea } from '../overlay/OverlayScrollArea';
|
|
4
4
|
import { DEFAULT_TREE_CAPABILITIES } from './types';
|
|
5
|
-
import { buildTreeContainerAria, buildTreeRowAria } from './treeAria';
|
|
5
|
+
import { buildTreeContainerAria, buildTreeRowAria, buildTreeRowStructureAria, } from './treeAria';
|
|
6
6
|
import { t } from '../i18n/i18n';
|
|
7
7
|
import { TreeRow } from './TreeRow';
|
|
8
8
|
import { TreeStickyHeader } from './TreeStickyHeader';
|
|
@@ -22,11 +22,16 @@ export function TreeSurface(props) {
|
|
|
22
22
|
const activeGuideDepth = createMemo(() => {
|
|
23
23
|
if ((descriptor().indentGuide ?? 'none') !== 'active')
|
|
24
24
|
return -1;
|
|
25
|
-
const row = props.surface.
|
|
25
|
+
const row = props.surface.cursorRow();
|
|
26
26
|
if (!row)
|
|
27
27
|
return -1;
|
|
28
28
|
return row.depth - 1;
|
|
29
29
|
});
|
|
30
|
+
const visibleIndices = createMemo(() => {
|
|
31
|
+
const { start, end } = props.surface.scroller.range();
|
|
32
|
+
return Array.from({ length: end - start }, (_, offset) => start + offset);
|
|
33
|
+
});
|
|
34
|
+
const isCursorIndex = createSelector(() => controller().cursorIndex());
|
|
30
35
|
useListCommands({
|
|
31
36
|
container: () => containerEl,
|
|
32
37
|
supportsMultiselect: () => capabilities().canMultiSelect,
|
|
@@ -99,27 +104,29 @@ export function TreeSurface(props) {
|
|
|
99
104
|
<div class={styles.treeSlice} style={{
|
|
100
105
|
transform: `translate3d(0, ${props.surface.scroller.offsetY()}px, 0)`,
|
|
101
106
|
}}>
|
|
102
|
-
<Index each={
|
|
103
|
-
{(
|
|
104
|
-
const row = () =>
|
|
105
|
-
const
|
|
106
|
-
const isCursor = () => controller().cursorIndex() === index();
|
|
107
|
+
<Index each={visibleIndices()}>
|
|
108
|
+
{(index) => {
|
|
109
|
+
const row = createMemo(() => props.surface.source().at(index()));
|
|
110
|
+
const isCursor = () => isCursorIndex(index());
|
|
107
111
|
const isSelected = () => controller().selectedKeys().has(row().key);
|
|
112
|
+
const structure = createMemo(() => buildTreeRowStructureAria({
|
|
113
|
+
treeId: descriptor().id,
|
|
114
|
+
rows: props.surface.source(),
|
|
115
|
+
index: index(),
|
|
116
|
+
flat: !capabilities().canExpand,
|
|
117
|
+
}));
|
|
108
118
|
return (<TreeRow row={row()} index={index()} aria={buildTreeRowAria({
|
|
109
|
-
|
|
110
|
-
rows: props.surface.rows(),
|
|
111
|
-
index: index(),
|
|
119
|
+
structure: structure(),
|
|
112
120
|
focusMode: FOCUS_MODE,
|
|
113
121
|
isCursor: isCursor(),
|
|
114
122
|
isSelected: isSelected(),
|
|
115
|
-
flat: !capabilities().canExpand,
|
|
116
123
|
})} rowHeight={descriptor().rowHeight} isCursor={isCursor()} isSelected={isSelected()} treeHasFocus={treeHasFocus} showChevronGutter={showChevronGutter()} indentGuide={descriptor().indentGuide ?? 'none'} activeGuideDepth={activeGuideDepth()} dom={descriptor().rowProps?.(row())} content={descriptor().renderContent(row())} actions={descriptor().renderActions?.(row())} onSelect={handleSelect} onFocusRow={(target) => controller().focusIndex(target)} onToggle={(target) => descriptor().onToggle?.(target)} onActivateClick={handleActivateClick} onOpenMenu={handleOpenMenu}/>);
|
|
117
124
|
}}
|
|
118
125
|
</Index>
|
|
119
126
|
</div>
|
|
120
127
|
</div>
|
|
121
128
|
|
|
122
|
-
<Show when={props.surface.
|
|
129
|
+
<Show when={props.surface.source().length === 0 && descriptor().emptyLabel}>
|
|
123
130
|
<p class={styles.treeEmpty}>{descriptor().emptyLabel}</p>
|
|
124
131
|
</Show>
|
|
125
132
|
</OverlayScrollArea>
|