mirror of
https://github.com/anomalyco/opencode.git
synced 2026-05-23 04:26:05 +00:00
93 lines
3.5 KiB
Diff
93 lines
3.5 KiB
Diff
diff --git a/lib/solid/Virtualizer.d.ts b/lib/solid/Virtualizer.d.ts
|
|
index 144dd7f..819aab9 100644
|
|
--- a/lib/solid/Virtualizer.d.ts
|
|
+++ b/lib/solid/Virtualizer.d.ts
|
|
@@ -38,6 +38,10 @@ export interface VirtualizerHandle {
|
|
* @param index index of item
|
|
*/
|
|
getItemSize(index: number): number;
|
|
+ /**
|
|
+ * Synchronously measure currently mounted items and update cached item sizes.
|
|
+ */
|
|
+ measure(): void;
|
|
/**
|
|
* Scroll to the item specified by index.
|
|
* @param index index of item
|
|
diff --git a/lib/solid/index.jsx b/lib/solid/index.jsx
|
|
index 029201a..3949cd4 100644
|
|
--- a/lib/solid/index.jsx
|
|
+++ b/lib/solid/index.jsx
|
|
@@ -1085,6 +1085,7 @@ const createResizer = (store, isHorizontal) => {
|
|
let viewportElement;
|
|
const sizeKey = isHorizontal ? "width" : "height";
|
|
const mountedIndexes = new WeakMap();
|
|
+ const mountedItems = new Map();
|
|
const resizeObserver = createResizeObserver((entries) => {
|
|
const resizes = [];
|
|
for (const { target, contentRect } of entries) {
|
|
@@ -1111,12 +1112,27 @@ const createResizer = (store, isHorizontal) => {
|
|
},
|
|
$observeItem: (el, i) => {
|
|
mountedIndexes.set(el, i);
|
|
+ mountedItems.set(i, el);
|
|
resizeObserver._observe(el);
|
|
return () => {
|
|
mountedIndexes.delete(el);
|
|
+ if (mountedItems.get(i) === el) {
|
|
+ mountedItems.delete(i);
|
|
+ }
|
|
resizeObserver._unobserve(el);
|
|
};
|
|
},
|
|
+ $measureItems: () => {
|
|
+ const resizes = [];
|
|
+ mountedItems.forEach((el, index) => {
|
|
+ if (!el.offsetParent)
|
|
+ return;
|
|
+ resizes.push([index, el.getBoundingClientRect()[sizeKey]]);
|
|
+ });
|
|
+ if (resizes.length) {
|
|
+ store.$update(ACTION_ITEM_RESIZE, resizes);
|
|
+ }
|
|
+ },
|
|
$dispose: resizeObserver._dispose,
|
|
};
|
|
};
|
|
@@ -1354,6 +1370,8 @@ const Virtualizer = (props) => {
|
|
const range = createMemo((prev) => {
|
|
stateVersion();
|
|
const next = store.$getRange(props.bufferSize);
|
|
+ next[0] = Math.max(0, next[0]);
|
|
+ next[1] = Math.min(props.data.length - 1, next[1]);
|
|
if (prev && isSameRange(prev, next)) {
|
|
return prev;
|
|
}
|
|
@@ -1380,6 +1398,7 @@ const Virtualizer = (props) => {
|
|
findItemIndex: store.$findItemIndex,
|
|
getItemOffset: store.$getItemOffset,
|
|
getItemSize: store.$getItemSize,
|
|
+ measure: resizer.$measureItems,
|
|
scrollToIndex: scroller.$scrollToIndex,
|
|
scrollTo: scroller.$scrollTo,
|
|
scrollBy: scroller.$scrollBy,
|
|
@@ -1417,6 +1436,11 @@ const Virtualizer = (props) => {
|
|
const indexes = [];
|
|
if (props.keepMounted) {
|
|
const mounted = new Set(props.keepMounted);
|
|
+ mounted.forEach((index) => {
|
|
+ if (index < 0 || index >= count) {
|
|
+ mounted.delete(index);
|
|
+ }
|
|
+ });
|
|
for (let [i, j] = range(); i <= j; i++) {
|
|
mounted.add(i);
|
|
}
|
|
@@ -1528,6 +1552,8 @@ const WindowVirtualizer = (props) => {
|
|
const range = createMemo((prev) => {
|
|
stateVersion();
|
|
const next = store.$getRange(props.bufferSize);
|
|
+ next[0] = Math.max(0, next[0]);
|
|
+ next[1] = Math.min(props.data.length - 1, next[1]);
|
|
if (prev && isSameRange(prev, next)) {
|
|
return prev;
|
|
}
|