@legendapp/list 3.0.0-beta.39 → 3.0.0-beta.40

package/index.js

@@ -3577,14 +3577,32 @@ function doInitialAllocateContainers(ctx) {
   }
 }
 
+// src/platform/getWindowSize.ts
+function getWindowSize() {
+  if (typeof window === "undefined") {
+    return { height: 0, width: 0 };
+  }
+  return {
+    height: window.innerHeight,
+    width: window.innerWidth
+  };
+}
+
 // src/core/handleLayout.ts
-function handleLayout(ctx, layout, setCanRender) {
+function handleLayout(ctx, layoutParam, setCanRender) {
   const state = ctx.state;
-  const { maintainScrollAtEnd } = state.props;
-  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const { maintainScrollAtEnd, useWindowScroll } = state.props;
+  const scrollAxis = state.props.horizontal ? "width" : "height";
+  const otherAxis = state.props.horizontal ? "height" : "width";
+  let layout = layoutParam;
+  if (useWindowScroll) {
+    const windowScrollAxisLength = getWindowSize()[scrollAxis];
+    layout = windowScrollAxisLength > 0 ? { ...layoutParam, [scrollAxis]: windowScrollAxisLength } : layoutParam;
+  }
+  const measuredLength = layout[scrollAxis];
   const previousLength = state.scrollLength;
   const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
-  const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
+  const otherAxisSize = layout[otherAxis];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
   const prevOtherAxisSize = state.otherAxisSize;

package/index.mjs

@@ -3556,14 +3556,32 @@ function doInitialAllocateContainers(ctx) {
   }
 }
 
+// src/platform/getWindowSize.ts
+function getWindowSize() {
+  if (typeof window === "undefined") {
+    return { height: 0, width: 0 };
+  }
+  return {
+    height: window.innerHeight,
+    width: window.innerWidth
+  };
+}
+
 // src/core/handleLayout.ts
-function handleLayout(ctx, layout, setCanRender) {
+function handleLayout(ctx, layoutParam, setCanRender) {
   const state = ctx.state;
-  const { maintainScrollAtEnd } = state.props;
-  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const { maintainScrollAtEnd, useWindowScroll } = state.props;
+  const scrollAxis = state.props.horizontal ? "width" : "height";
+  const otherAxis = state.props.horizontal ? "height" : "width";
+  let layout = layoutParam;
+  if (useWindowScroll) {
+    const windowScrollAxisLength = getWindowSize()[scrollAxis];
+    layout = windowScrollAxisLength > 0 ? { ...layoutParam, [scrollAxis]: windowScrollAxisLength } : layoutParam;
+  }
+  const measuredLength = layout[scrollAxis];
   const previousLength = state.scrollLength;
   const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
-  const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
+  const otherAxisSize = layout[otherAxis];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
   const prevOtherAxisSize = state.otherAxisSize;

package/index.native.js

@@ -3154,15 +3154,29 @@ function doInitialAllocateContainers(ctx) {
     return true;
   }
 }
+function getWindowSize() {
+  const screenSize = ReactNative.Dimensions.get("window");
+  return {
+    height: screenSize.height,
+    width: screenSize.width
+  };
+}
 
 // src/core/handleLayout.ts
-function handleLayout(ctx, layout, setCanRender) {
+function handleLayout(ctx, layoutParam, setCanRender) {
   const state = ctx.state;
-  const { maintainScrollAtEnd } = state.props;
-  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const { maintainScrollAtEnd, useWindowScroll } = state.props;
+  const scrollAxis = state.props.horizontal ? "width" : "height";
+  const otherAxis = state.props.horizontal ? "height" : "width";
+  let layout = layoutParam;
+  if (useWindowScroll) {
+    const windowScrollAxisLength = getWindowSize()[scrollAxis];
+    layout = windowScrollAxisLength > 0 ? { ...layoutParam, [scrollAxis]: windowScrollAxisLength } : layoutParam;
+  }
+  const measuredLength = layout[scrollAxis];
   const previousLength = state.scrollLength;
   const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
-  const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
+  const otherAxisSize = layout[otherAxis];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
   const prevOtherAxisSize = state.otherAxisSize;
@@ -3468,13 +3482,6 @@ var useCombinedRef = (...refs) => {
   }, refs);
   return callback;
 };
-function getWindowSize() {
-  const screenSize = ReactNative.Dimensions.get("window");
-  return {
-    height: screenSize.height,
-    width: screenSize.width
-  };
-}
 var StyleSheet = ReactNative.StyleSheet;
 function useStickyScrollHandler(stickyHeaderIndices, horizontal, ctx, onScroll2) {
   const shouldUseRnAnimatedEngine = !ctx.state.props.stickyPositionComponentInternal;

package/index.native.mjs

@@ -3133,15 +3133,29 @@ function doInitialAllocateContainers(ctx) {
     return true;
   }
 }
+function getWindowSize() {
+  const screenSize = Dimensions.get("window");
+  return {
+    height: screenSize.height,
+    width: screenSize.width
+  };
+}
 
 // src/core/handleLayout.ts
-function handleLayout(ctx, layout, setCanRender) {
+function handleLayout(ctx, layoutParam, setCanRender) {
   const state = ctx.state;
-  const { maintainScrollAtEnd } = state.props;
-  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const { maintainScrollAtEnd, useWindowScroll } = state.props;
+  const scrollAxis = state.props.horizontal ? "width" : "height";
+  const otherAxis = state.props.horizontal ? "height" : "width";
+  let layout = layoutParam;
+  if (useWindowScroll) {
+    const windowScrollAxisLength = getWindowSize()[scrollAxis];
+    layout = windowScrollAxisLength > 0 ? { ...layoutParam, [scrollAxis]: windowScrollAxisLength } : layoutParam;
+  }
+  const measuredLength = layout[scrollAxis];
   const previousLength = state.scrollLength;
   const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
-  const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
+  const otherAxisSize = layout[otherAxis];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
   const prevOtherAxisSize = state.otherAxisSize;
@@ -3447,13 +3461,6 @@ var useCombinedRef = (...refs) => {
   }, refs);
   return callback;
 };
-function getWindowSize() {
-  const screenSize = Dimensions.get("window");
-  return {
-    height: screenSize.height,
-    width: screenSize.width
-  };
-}
 var StyleSheet = StyleSheet$1;
 function useStickyScrollHandler(stickyHeaderIndices, horizontal, ctx, onScroll2) {
   const shouldUseRnAnimatedEngine = !ctx.state.props.stickyPositionComponentInternal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/list",
-  "version": "3.0.0-beta.39",
+  "version": "3.0.0-beta.40",
   "description": "Legend List is a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,

package/react-native.js

@@ -3154,15 +3154,29 @@ function doInitialAllocateContainers(ctx) {
     return true;
   }
 }
+function getWindowSize() {
+  const screenSize = ReactNative.Dimensions.get("window");
+  return {
+    height: screenSize.height,
+    width: screenSize.width
+  };
+}
 
 // src/core/handleLayout.ts
-function handleLayout(ctx, layout, setCanRender) {
+function handleLayout(ctx, layoutParam, setCanRender) {
   const state = ctx.state;
-  const { maintainScrollAtEnd } = state.props;
-  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const { maintainScrollAtEnd, useWindowScroll } = state.props;
+  const scrollAxis = state.props.horizontal ? "width" : "height";
+  const otherAxis = state.props.horizontal ? "height" : "width";
+  let layout = layoutParam;
+  if (useWindowScroll) {
+    const windowScrollAxisLength = getWindowSize()[scrollAxis];
+    layout = windowScrollAxisLength > 0 ? { ...layoutParam, [scrollAxis]: windowScrollAxisLength } : layoutParam;
+  }
+  const measuredLength = layout[scrollAxis];
   const previousLength = state.scrollLength;
   const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
-  const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
+  const otherAxisSize = layout[otherAxis];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
   const prevOtherAxisSize = state.otherAxisSize;
@@ -3468,13 +3482,6 @@ var useCombinedRef = (...refs) => {
   }, refs);
   return callback;
 };
-function getWindowSize() {
-  const screenSize = ReactNative.Dimensions.get("window");
-  return {
-    height: screenSize.height,
-    width: screenSize.width
-  };
-}
 var StyleSheet = ReactNative.StyleSheet;
 function useStickyScrollHandler(stickyHeaderIndices, horizontal, ctx, onScroll2) {
   const shouldUseRnAnimatedEngine = !ctx.state.props.stickyPositionComponentInternal;

package/react-native.mjs

@@ -3133,15 +3133,29 @@ function doInitialAllocateContainers(ctx) {
     return true;
   }
 }
+function getWindowSize() {
+  const screenSize = Dimensions.get("window");
+  return {
+    height: screenSize.height,
+    width: screenSize.width
+  };
+}
 
 // src/core/handleLayout.ts
-function handleLayout(ctx, layout, setCanRender) {
+function handleLayout(ctx, layoutParam, setCanRender) {
   const state = ctx.state;
-  const { maintainScrollAtEnd } = state.props;
-  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const { maintainScrollAtEnd, useWindowScroll } = state.props;
+  const scrollAxis = state.props.horizontal ? "width" : "height";
+  const otherAxis = state.props.horizontal ? "height" : "width";
+  let layout = layoutParam;
+  if (useWindowScroll) {
+    const windowScrollAxisLength = getWindowSize()[scrollAxis];
+    layout = windowScrollAxisLength > 0 ? { ...layoutParam, [scrollAxis]: windowScrollAxisLength } : layoutParam;
+  }
+  const measuredLength = layout[scrollAxis];
   const previousLength = state.scrollLength;
   const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
-  const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
+  const otherAxisSize = layout[otherAxis];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
   const prevOtherAxisSize = state.otherAxisSize;
@@ -3447,13 +3461,6 @@ var useCombinedRef = (...refs) => {
   }, refs);
   return callback;
 };
-function getWindowSize() {
-  const screenSize = Dimensions.get("window");
-  return {
-    height: screenSize.height,
-    width: screenSize.width
-  };
-}
 var StyleSheet = StyleSheet$1;
 function useStickyScrollHandler(stickyHeaderIndices, horizontal, ctx, onScroll2) {
   const shouldUseRnAnimatedEngine = !ctx.state.props.stickyPositionComponentInternal;

package/react.js

@@ -3577,14 +3577,32 @@ function doInitialAllocateContainers(ctx) {
   }
 }
 
+// src/platform/getWindowSize.ts
+function getWindowSize() {
+  if (typeof window === "undefined") {
+    return { height: 0, width: 0 };
+  }
+  return {
+    height: window.innerHeight,
+    width: window.innerWidth
+  };
+}
+
 // src/core/handleLayout.ts
-function handleLayout(ctx, layout, setCanRender) {
+function handleLayout(ctx, layoutParam, setCanRender) {
   const state = ctx.state;
-  const { maintainScrollAtEnd } = state.props;
-  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const { maintainScrollAtEnd, useWindowScroll } = state.props;
+  const scrollAxis = state.props.horizontal ? "width" : "height";
+  const otherAxis = state.props.horizontal ? "height" : "width";
+  let layout = layoutParam;
+  if (useWindowScroll) {
+    const windowScrollAxisLength = getWindowSize()[scrollAxis];
+    layout = windowScrollAxisLength > 0 ? { ...layoutParam, [scrollAxis]: windowScrollAxisLength } : layoutParam;
+  }
+  const measuredLength = layout[scrollAxis];
   const previousLength = state.scrollLength;
   const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
-  const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
+  const otherAxisSize = layout[otherAxis];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
   const prevOtherAxisSize = state.otherAxisSize;

package/react.mjs

@@ -3556,14 +3556,32 @@ function doInitialAllocateContainers(ctx) {
   }
 }
 
+// src/platform/getWindowSize.ts
+function getWindowSize() {
+  if (typeof window === "undefined") {
+    return { height: 0, width: 0 };
+  }
+  return {
+    height: window.innerHeight,
+    width: window.innerWidth
+  };
+}
+
 // src/core/handleLayout.ts
-function handleLayout(ctx, layout, setCanRender) {
+function handleLayout(ctx, layoutParam, setCanRender) {
   const state = ctx.state;
-  const { maintainScrollAtEnd } = state.props;
-  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const { maintainScrollAtEnd, useWindowScroll } = state.props;
+  const scrollAxis = state.props.horizontal ? "width" : "height";
+  const otherAxis = state.props.horizontal ? "height" : "width";
+  let layout = layoutParam;
+  if (useWindowScroll) {
+    const windowScrollAxisLength = getWindowSize()[scrollAxis];
+    layout = windowScrollAxisLength > 0 ? { ...layoutParam, [scrollAxis]: windowScrollAxisLength } : layoutParam;
+  }
+  const measuredLength = layout[scrollAxis];
   const previousLength = state.scrollLength;
   const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
-  const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
+  const otherAxisSize = layout[otherAxis];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
   const prevOtherAxisSize = state.otherAxisSize;