@applicaster/zapp-react-native-ui-components 12.0.0-rc.54 → 12.0.0-rc.56

package/Components/River/ComponentsMap/ComponentsMap.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as R from "ramda";
-import { View, StyleSheet, Platform, Animated, FlatList } from "react-native";
+import { View, StyleSheet, Platform, FlatList } from "react-native";
 import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 import { RiverItem } from "../RiverItem";
 import { RiverFooter } from "../RiverFooter";
@@ -217,7 +217,7 @@ function ComponentsMapComponent(props: Props) {
 
     const { height: headerHeight, scrollState } = navBarStore.getState();
 
-    const offsetY = nativeEvent.contentOffset.y;
+    const offsetY = Math.max(0, nativeEvent.contentOffset.y);
 
     if (
       !(scrollState === 0 || scrollState === -headerHeight) &&
@@ -240,7 +240,7 @@ function ComponentsMapComponent(props: Props) {
   const _onScrollEndDrag = React.useCallback(({ nativeEvent }) => {
     const { height: headerHeight, scrollState } = navBarStore.getState();
 
-    const offsetY = nativeEvent.contentOffset.y;
+    const offsetY = Math.max(0, nativeEvent.contentOffset.y);
 
     if (
       !(scrollState === 0 || scrollState === -headerHeight) &&
@@ -260,6 +260,20 @@ function ComponentsMapComponent(props: Props) {
     }
   }, []);
 
+  const onScroll = React.useCallback((event) => {
+    const {
+      nativeEvent: {
+        contentOffset: { y },
+        layoutMeasurement: { height },
+        contentSize: { height: contentHeight },
+      },
+    } = event;
+
+    if (y >= 0 && y + height <= contentHeight) {
+      scrollY.setValue(y);
+    }
+  }, []);
+
   if (shouldShowLoadingError) {
     return <RiverError />;
   }
@@ -298,20 +312,7 @@ function ComponentsMapComponent(props: Props) {
             ListFooterComponent={renderFooter}
             refreshControl={refreshControl}
             onScrollBeginDrag={onScrollBeginDrag}
-            onScroll={Animated.event(
-              [
-                {
-                  nativeEvent: {
-                    contentOffset: {
-                      y: scrollY,
-                    },
-                  },
-                },
-              ],
-              {
-                useNativeDriver: false,
-              }
-            )}
+            onScroll={onScroll}
             onMomentumScrollEnd={_onMomentumScrollEnd}
             onScrollEndDrag={_onScrollEndDrag}
             scrollEventThrottle={16}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "12.0.0-rc.54",
+  "version": "12.0.0-rc.56",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -34,10 +34,10 @@
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "12.0.0-rc.54",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.54",
-    "@applicaster/zapp-react-native-redux": "12.0.0-rc.54",
-    "@applicaster/zapp-react-native-utils": "12.0.0-rc.54",
+    "@applicaster/applicaster-types": "12.0.0-rc.56",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.56",
+    "@applicaster/zapp-react-native-redux": "12.0.0-rc.56",
+    "@applicaster/zapp-react-native-utils": "12.0.0-rc.56",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",