@legendapp/list 1.0.0-beta.33 → 1.0.0-beta.34

package/index.d.mts

@@ -474,9 +474,9 @@ declare const LegendList: <T>(props: Omit<react_native.ScrollViewProps, "content
     keyExtractor?: ((item: T, index: number) => string) | undefined;
     ListEmptyComponent?: React$1.ComponentType<any> | React$1.ReactElement | null | undefined;
     ListFooterComponent?: React$1.ComponentType<any> | React$1.ReactElement | null | undefined;
-    ListFooterComponentStyle?: StyleProp<ViewStyle> | undefined;
+    ListFooterComponentStyle?: react_native.StyleProp<ViewStyle> | undefined;
     ListHeaderComponent?: React$1.ComponentType<any> | React$1.ReactElement | null | undefined;
-    ListHeaderComponentStyle?: StyleProp<ViewStyle> | undefined;
+    ListHeaderComponentStyle?: react_native.StyleProp<ViewStyle> | undefined;
     maintainScrollAtEnd?: boolean;
     maintainScrollAtEndThreshold?: number;
     maintainVisibleContentPosition?: boolean;

package/index.d.ts

@@ -474,9 +474,9 @@ declare const LegendList: <T>(props: Omit<react_native.ScrollViewProps, "content
     keyExtractor?: ((item: T, index: number) => string) | undefined;
     ListEmptyComponent?: React$1.ComponentType<any> | React$1.ReactElement | null | undefined;
     ListFooterComponent?: React$1.ComponentType<any> | React$1.ReactElement | null | undefined;
-    ListFooterComponentStyle?: StyleProp<ViewStyle> | undefined;
+    ListFooterComponentStyle?: react_native.StyleProp<ViewStyle> | undefined;
     ListHeaderComponent?: React$1.ComponentType<any> | React$1.ReactElement | null | undefined;
-    ListHeaderComponentStyle?: StyleProp<ViewStyle> | undefined;
+    ListHeaderComponentStyle?: react_native.StyleProp<ViewStyle> | undefined;
     maintainScrollAtEnd?: boolean;
     maintainScrollAtEndThreshold?: number;
     maintainVisibleContentPosition?: boolean;

package/index.js

@@ -261,7 +261,7 @@ var Container = ({
   const otherAxisPos = numColumns > 1 ? `${(column - 1) / numColumns * 100}%` : 0;
   const otherAxisSize = numColumns > 1 ? `${1 / numColumns * 100}%` : void 0;
   let verticalPaddingStyles;
-  if (columnWrapperStyle && !horizontal && numColumns > 1) {
+  if (columnWrapperStyle) {
     const { columnGap, rowGap, gap } = columnWrapperStyle;
     verticalPaddingStyles = {
       paddingBottom: !lastItemKeys.includes(itemKey) ? rowGap || gap || void 0 : void 0,
@@ -781,8 +781,11 @@ function maybeUpdateViewabilityCallback(ctx, configId, viewToken) {
 var DEFAULT_DRAW_DISTANCE = 250;
 var DEFAULT_ITEM_SIZE = 100;
 function createColumnWrapperStyle(contentContainerStyle) {
-  const { gap, columnGap, rowGap } = reactNative.StyleSheet.flatten(contentContainerStyle);
+  const { gap, columnGap, rowGap } = contentContainerStyle;
   if (gap || columnGap || rowGap) {
+    contentContainerStyle.gap = void 0;
+    contentContainerStyle.columnGap = void 0;
+    contentContainerStyle.rowGap = void 0;
     return {
       gap,
       columnGap,
@@ -822,6 +825,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     refScrollView,
     waitForInitialLayout = true,
     extraData,
+    contentContainerStyle: contentContainerStyleProp,
     onLayout: onLayoutProp,
     onRefresh,
     refreshing,
@@ -833,13 +837,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     onViewableItemsChanged,
     ...rest
   } = props;
-  const { style, contentContainerStyle } = props;
+  const { style } = props;
   const callbacks = React6.useRef({
     onStartReached: rest.onStartReached,
     onEndReached: rest.onEndReached
   });
   callbacks.current.onStartReached = rest.onStartReached;
   callbacks.current.onEndReached = rest.onEndReached;
+  const contentContainerStyle = reactNative.StyleSheet.flatten(contentContainerStyleProp);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
   const refScroller = React6.useRef(null);
@@ -1993,7 +1998,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           progressViewOffset
         }
       ),
-      style
+      style,
+      contentContainerStyle
     }
   ), __DEV__ && ENABLE_DEBUG_VIEW && /* @__PURE__ */ React6__namespace.createElement(DebugView, { state: refState.current }));
 });

package/index.mjs

@@ -1,6 +1,6 @@
 import * as React6 from 'react';
 import React6__default, { createContext, memo, useReducer, useEffect, useMemo, useRef, useCallback, useImperativeHandle, useSyncExternalStore, useContext, useState, forwardRef, useLayoutEffect } from 'react';
-import { View, Text, Platform, Animated, ScrollView, Dimensions, StyleSheet, RefreshControl } from 'react-native';
+import { View, Text, Platform, Animated, ScrollView, StyleSheet, Dimensions, RefreshControl } from 'react-native';
 
 // src/LegendList.tsx
 var ContextState = React6.createContext(null);
@@ -240,7 +240,7 @@ var Container = ({
   const otherAxisPos = numColumns > 1 ? `${(column - 1) / numColumns * 100}%` : 0;
   const otherAxisSize = numColumns > 1 ? `${1 / numColumns * 100}%` : void 0;
   let verticalPaddingStyles;
-  if (columnWrapperStyle && !horizontal && numColumns > 1) {
+  if (columnWrapperStyle) {
     const { columnGap, rowGap, gap } = columnWrapperStyle;
     verticalPaddingStyles = {
       paddingBottom: !lastItemKeys.includes(itemKey) ? rowGap || gap || void 0 : void 0,
@@ -760,8 +760,11 @@ function maybeUpdateViewabilityCallback(ctx, configId, viewToken) {
 var DEFAULT_DRAW_DISTANCE = 250;
 var DEFAULT_ITEM_SIZE = 100;
 function createColumnWrapperStyle(contentContainerStyle) {
-  const { gap, columnGap, rowGap } = StyleSheet.flatten(contentContainerStyle);
+  const { gap, columnGap, rowGap } = contentContainerStyle;
   if (gap || columnGap || rowGap) {
+    contentContainerStyle.gap = void 0;
+    contentContainerStyle.columnGap = void 0;
+    contentContainerStyle.rowGap = void 0;
     return {
       gap,
       columnGap,
@@ -801,6 +804,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     refScrollView,
     waitForInitialLayout = true,
     extraData,
+    contentContainerStyle: contentContainerStyleProp,
     onLayout: onLayoutProp,
     onRefresh,
     refreshing,
@@ -812,13 +816,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     onViewableItemsChanged,
     ...rest
   } = props;
-  const { style, contentContainerStyle } = props;
+  const { style } = props;
   const callbacks = useRef({
     onStartReached: rest.onStartReached,
     onEndReached: rest.onEndReached
   });
   callbacks.current.onStartReached = rest.onStartReached;
   callbacks.current.onEndReached = rest.onEndReached;
+  const contentContainerStyle = StyleSheet.flatten(contentContainerStyleProp);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
   const refScroller = useRef(null);
@@ -1972,7 +1977,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           progressViewOffset
         }
       ),
-      style
+      style,
+      contentContainerStyle
     }
   ), __DEV__ && ENABLE_DEBUG_VIEW && /* @__PURE__ */ React6.createElement(DebugView, { state: refState.current }));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/list",
-  "version": "1.0.0-beta.33",
+  "version": "1.0.0-beta.34",
   "description": "Legend List aims to be a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,