Fix #6015: VirtualScroll emty items defensive check (#6017)

primefaces · Feb 20, 2024 · 6cd5730 · 6cd5730
1 parent 008e592
commit 6cd5730
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/components/lib/virtualscroller/VirtualScroller.js b/components/lib/virtualscroller/VirtualScroller.js
@@ -217,7 +217,7 @@ export const VirtualScroller = React.memo(
                 Promise.resolve().then(() => {
                     lazyLoadState.current = {
                         first: props.step ? (both ? { rows: 0, cols: firstState.cols } : 0) : firstState,
-                        last: Math.min(props.step ? props.step : last, props.items.length)
+                        last: Math.min(props.step ? props.step : last, (props.items || []).length)
                     };
 
                     props.onLazyLoad && props.onLazyLoad(lazyLoadState.current);
@@ -252,7 +252,7 @@ export const VirtualScroller = React.memo(
         };
 
         const getLast = (last = 0, isCols) => {
-            return props.items ? Math.min(isCols ? (props.columns || props.items[0]).length : props.items.length, last) : 0;
+            return props.items ? Math.min(isCols ? (props.columns || props.items[0])?.length || 0 : (props.items || []).length, last) : 0;
         };
 
         const getContentPosition = () => {
@@ -416,8 +416,8 @@ export const VirtualScroller = React.memo(
 
                 if (props.lazy && isPageChanged(first)) {
                     const newLazyLoadState = {
-                        first: props.step ? Math.min(getPageByFirst(first) * props.step, props.items.length - props.step) : first,
-                        last: Math.min(props.step ? (getPageByFirst(first) + 1) * props.step : last, props.items.length)
+                        first: props.step ? Math.min(getPageByFirst(first) * props.step, (props.items || []).length - props.step) : first,
+                        last: Math.min(props.step ? (getPageByFirst(first) + 1) * props.step : last, (props.items || []).length)
                     };
 
                     const isLazyStateChanged = !lazyLoadState.current || lazyLoadState.current.first !== newLazyLoadState.first || lazyLoadState.current.last !== newLazyLoadState.last;
@@ -496,7 +496,7 @@ export const VirtualScroller = React.memo(
         };
 
         const loaderOptions = (index, extOptions) => {
-            const count = loaderArrState.length;
+            const count = loaderArrState.length || 0;
 
             return {
                 index,