fix(ui): fix calculation of aria-setsize

DevCloudFE · Oct 24, 2022 · 864290d · 864290d
1 parent 6453660
commit 864290d
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/packages/ui/src/components/virtual-scroll/VirtualScroll.tsx b/packages/ui/src/components/virtual-scroll/VirtualScroll.tsx
@@ -168,7 +168,17 @@ function VirtualScroll<T>(props: DVirtualScrollProps<T>, ref: React.ForwardedRef
     const getList = (arr: (T | typeof EMPTY)[], parent: T[] = []): React.ReactNode[] => {
       const fillSize = [0, 0];
       const list: React.ReactNode[] = [];
-      const setsize = arr.filter((item) => item !== EMPTY && (dItemNested?.(item)?.inAriaSetsize ?? true)).length;
+      const setsize = arr.filter((item) => {
+        if (item === EMPTY) {
+          return false;
+        } else {
+          const nestedData = dItemNested?.(item);
+          if (nestedData && nestedData.list) {
+            return nestedData.inAriaSetsize;
+          }
+        }
+        return true;
+      }).length;
 
       for (const [index, item] of arr.entries()) {
         let key: DId = '';