[MOO-2029]: fix for virtual scrolling issue on main

packages/pluggableWidgets/gallery-native/CHANGELOG.md

@@ -6,10 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-## [2.0.0] - 2024-12-3
+### Fixed
+
+-  We've fixed an issue where the Gallery widget would not properly load more items when scrolling down quickly.
+
+## [2.0.1] - 2025-8-5
 
 -   Updated react-native-device-info to latest version.
 
+## [2.0.0] - 2024-12-3
+
 ### Changed
 
 -   Updated @mendix/pluggable-widgets-tools from version v9.0.0 to v10.15.0.

packages/pluggableWidgets/gallery-native/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gallery-native",
   "widgetName": "Gallery",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A flexible gallery widget that renders columns, rows and layouts.",
   "copyright": "© Mendix Technology BV 2022. All rights reserved.",
   "license": "Apache-2.0",

packages/pluggableWidgets/gallery-native/src/components/Gallery.tsx

@@ -1,4 +1,4 @@
-import { createElement, ReactElement, ReactNode } from "react";
+import { createElement, ReactElement, ReactNode, useCallback } from "react";
 import { Text, FlatList, Pressable, View, ViewProps, Platform, TouchableOpacity } from "react-native";
 import { ObjectItem, DynamicValue } from "mendix";
 import DeviceInfo from "react-native-device-info";
@@ -32,38 +32,52 @@ export const Gallery = <T extends ObjectItem>(props: GalleryProps<T>): ReactElem
     const numColumns = DeviceInfo.isTablet() ? props.tabletColumns : props.phoneColumns;
     const firstItemId = props.items?.[0]?.id;
     const lastItemId = props.items?.[props.items.length - 1]?.id;
+    const { name, style, itemRenderer } = props;
 
     const onEndReached = (): void => {
         if (props.pagination === "virtualScrolling" && props.hasMoreItems) {
             props.loadMoreItems();
         }
     };
 
-    const renderItem = (item: { item: T }): ReactElement =>
-        props.itemRenderer((children, onPress) => {
-            const listItemWrapperProps: ViewProps = {
-                style: isScrollDirectionVertical && { width: `${100 / numColumns}%` },
-                testID: `${props.name}-list-item-${item.item.id}`
-            };
-            const renderListItemContent = (
-                <View
-                    style={[
-                        props.style.listItem,
-                        firstItemId === item.item.id && props.style.firstItem,
-                        lastItemId === item.item.id && props.style.lastItem
-                    ]}
-                >
-                    {children}
-                </View>
-            );
-            return onPress ? (
-                <Pressable {...listItemWrapperProps} onPress={onPress}>
-                    {renderListItemContent}
-                </Pressable>
-            ) : (
-                <View {...listItemWrapperProps}>{renderListItemContent}</View>
-            );
-        }, item.item);
+    const renderItem = useCallback(
+        (item: { item: T }): ReactElement =>
+            itemRenderer((children, onPress) => {
+                const listItemWrapperProps: ViewProps = {
+                    style: isScrollDirectionVertical && { width: `${100 / numColumns}%` },
+                    testID: `${name}-list-item-${item.item.id}`
+                };
+                const renderListItemContent = (
+                    <View
+                        style={[
+                            style.listItem,
+                            firstItemId === item.item.id && style.firstItem,
+                            lastItemId === item.item.id && style.lastItem
+                        ]}
+                    >
+                        {children}
+                    </View>
+                );
+                return onPress ? (
+                    <Pressable {...listItemWrapperProps} onPress={onPress}>
+                        {renderListItemContent}
+                    </Pressable>
+                ) : (
+                    <View {...listItemWrapperProps}>{renderListItemContent}</View>
+                );
+            }, item.item),
+        [
+            isScrollDirectionVertical,
+            numColumns,
+            itemRenderer,
+            name,
+            style.listItem,
+            style.firstItem,
+            style.lastItem,
+            firstItemId,
+            lastItemId
+        ]
+    );
 
     const loadMoreButton = (): ReactElement | null => {
         const renderButton = (
@@ -80,7 +94,7 @@ export const Gallery = <T extends ObjectItem>(props: GalleryProps<T>): ReactElem
         );
 
         const buttonProps = {
-            testID: `${props.name}-pagination-button`,
+            testID: `${name}-pagination-button`,
             onPress: () => props.hasMoreItems && props.loadMoreItems && props.loadMoreItems(),
             style: loadMoreButtonContainerStyle
         };
@@ -111,7 +125,7 @@ export const Gallery = <T extends ObjectItem>(props: GalleryProps<T>): ReactElem
     );
 
     return (
-        <View testID={`${props.name}`} style={props.style.container}>
+        <View testID={`${name}`} style={props.style.container}>
             {props.filters ? <View>{props.filters}</View> : null}
             <FlatList
                 {...(isScrollDirectionVertical && props.pullDown ? { onRefresh: props.pullDown } : {})}
@@ -127,10 +141,11 @@ export const Gallery = <T extends ObjectItem>(props: GalleryProps<T>): ReactElem
                 keyExtractor={item => item.id}
                 ListEmptyComponent={renderEmptyPlaceholder}
                 onEndReached={onEndReached}
+                onEndReachedThreshold={0.6}
                 scrollEventThrottle={50}
                 renderItem={renderItem}
                 style={props.style.list}
-                testID={`${props.name}-list`}
+                testID={`${name}-list`}
             />
         </View>
     );

packages/pluggableWidgets/gallery-native/src/components/__tests__/__snapshots__/Gallery.spec.tsx.snap

@@ -50,6 +50,7 @@ exports[`Gallery rendering rendering with load more button it shouldn't render t
     keyExtractor={[Function]}
     onContentSizeChange={[Function]}
     onEndReached={[Function]}
+    onEndReachedThreshold={0.6}
     onLayout={[Function]}
     onMomentumScrollBegin={[Function]}
     onMomentumScrollEnd={[Function]}
@@ -377,6 +378,7 @@ exports[`Gallery rendering rendering with load more button renders correctly 1`]
     keyExtractor={[Function]}
     onContentSizeChange={[Function]}
     onEndReached={[Function]}
+    onEndReachedThreshold={0.6}
     onLayout={[Function]}
     onMomentumScrollBegin={[Function]}
     onMomentumScrollEnd={[Function]}
@@ -750,6 +752,7 @@ exports[`Gallery rendering rendering with load more button renders correctly wit
     keyExtractor={[Function]}
     onContentSizeChange={[Function]}
     onEndReached={[Function]}
+    onEndReachedThreshold={0.6}
     onLayout={[Function]}
     onMomentumScrollBegin={[Function]}
     onMomentumScrollEnd={[Function]}
@@ -1123,6 +1126,7 @@ exports[`Gallery rendering renders correctly 1`] = `
     keyExtractor={[Function]}
     onContentSizeChange={[Function]}
     onEndReached={[Function]}
+    onEndReachedThreshold={0.6}
     onLayout={[Function]}
     onMomentumScrollBegin={[Function]}
     onMomentumScrollEnd={[Function]}
@@ -1450,6 +1454,7 @@ exports[`Gallery rendering renders correctly horizontal 1`] = `
     keyExtractor={[Function]}
     onContentSizeChange={[Function]}
     onEndReached={[Function]}
+    onEndReachedThreshold={0.6}
     onLayout={[Function]}
     onMomentumScrollBegin={[Function]}
     onMomentumScrollEnd={[Function]}
@@ -1758,6 +1763,7 @@ exports[`Gallery rendering renders correctly with empty list and custom placehol
     keyExtractor={[Function]}
     onContentSizeChange={[Function]}
     onEndReached={[Function]}
+    onEndReachedThreshold={0.6}
     onLayout={[Function]}
     onMomentumScrollBegin={[Function]}
     onMomentumScrollEnd={[Function]}
@@ -1844,6 +1850,7 @@ exports[`Gallery rendering renders correctly with filter 1`] = `
     keyExtractor={[Function]}
     onContentSizeChange={[Function]}
     onEndReached={[Function]}
+    onEndReachedThreshold={0.6}
     onLayout={[Function]}
     onMomentumScrollBegin={[Function]}
     onMomentumScrollEnd={[Function]}

packages/pluggableWidgets/gallery-native/src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Gallery" version="2.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Gallery" version="2.0.2" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Gallery.xml" />
         </widgetFiles>