Skip to content

Commit 864290d

Browse files
committed
fix(ui): fix calculation of aria-setsize
1 parent 6453660 commit 864290d

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

packages/ui/src/components/virtual-scroll/VirtualScroll.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,17 @@ function VirtualScroll<T>(props: DVirtualScrollProps<T>, ref: React.ForwardedRef
168168
const getList = (arr: (T | typeof EMPTY)[], parent: T[] = []): React.ReactNode[] => {
169169
const fillSize = [0, 0];
170170
const list: React.ReactNode[] = [];
171-
const setsize = arr.filter((item) => item !== EMPTY && (dItemNested?.(item)?.inAriaSetsize ?? true)).length;
171+
const setsize = arr.filter((item) => {
172+
if (item === EMPTY) {
173+
return false;
174+
} else {
175+
const nestedData = dItemNested?.(item);
176+
if (nestedData && nestedData.list) {
177+
return nestedData.inAriaSetsize;
178+
}
179+
}
180+
return true;
181+
}).length;
172182

173183
for (const [index, item] of arr.entries()) {
174184
let key: DId = '';

0 commit comments

Comments
 (0)