@applicaster/zapp-react-native-ui-components 15.1.0 → 15.1.1

package/Components/River/RefreshControl.tsx

@@ -16,6 +16,7 @@ import { useShallow } from "zustand/react/shallow";
 import { useScreenContextV2 } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useLoadPipesDataDispatch } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { useGetUrlInflater } from "@applicaster/zapp-react-native-utils/reactHooks/feed/useInflatedUrl";
 
 const BRIGHTNESS_THRESHOLD = 160;
 const ABOVE_DEFAULT_COLOR = "gray";
@@ -64,35 +65,51 @@ export const usePullToRefresh = (
 
   const [refreshing, setRefreshing] = React.useState(false);
 
-  const feeds: string[] = React.useMemo(
+  const feedSources = React.useMemo(
     () =>
       (riverComponents || [])
-        .map((riverComponent) => path(["data", "source"], riverComponent))
-        .filter((feed) => !isNilOrEmpty(feed)),
+        .map((riverComponent) => ({
+          source: path(["data", "source"], riverComponent),
+          mapping: path(["data", "mapping"], riverComponent),
+        }))
+        .filter(({ source }) => !isNilOrEmpty(source)),
     [riverComponents]
   );
 
-  const feedsLength = feeds.length;
+  const feedsLength = feedSources.length;
 
   const [requestsCompletedCounter, setRequestsCompletedCounter] =
     React.useState(0);
 
   const loadPipesDataDispatcher = useLoadPipesDataDispatch();
+  const urlInflater = useGetUrlInflater();
 
   React.useEffect(() => {
     // will not work for pipes v1 on 1st level screens
     if (refreshing && !isPipesV1) {
-      feeds.forEach((feed) => {
-        loadPipesDataDispatcher(feed, {
-          silentRefresh: true,
-          clearCache: true,
-          callback: () => {
-            setRequestsCompletedCounter(R.inc);
-          },
-        });
+      feedSources.forEach(({ source, mapping }) => {
+        const inflatedUrl = urlInflater(source, mapping);
+
+        if (inflatedUrl) {
+          loadPipesDataDispatcher(inflatedUrl, {
+            silentRefresh: true,
+            clearCache: true,
+            callback: () => {
+              setRequestsCompletedCounter(R.inc);
+            },
+          });
+        } else {
+          setRequestsCompletedCounter(R.inc);
+        }
       });
     }
-  }, [refreshing, isPipesV1, feeds, loadPipesDataDispatcher]);
+  }, [
+    refreshing,
+    isPipesV1,
+    feedSources,
+    loadPipesDataDispatcher,
+    urlInflater,
+  ]);
 
   React.useEffect(() => {
     if (requestsCompletedCounter === feedsLength) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "15.1.0",
+  "version": "15.1.1",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.1.0",
-    "@applicaster/zapp-react-native-bridge": "15.1.0",
-    "@applicaster/zapp-react-native-redux": "15.1.0",
-    "@applicaster/zapp-react-native-utils": "15.1.0",
+    "@applicaster/applicaster-types": "15.1.1",
+    "@applicaster/zapp-react-native-bridge": "15.1.1",
+    "@applicaster/zapp-react-native-redux": "15.1.1",
+    "@applicaster/zapp-react-native-utils": "15.1.1",
     "fast-json-stable-stringify": "^2.1.0",
     "promise": "^8.3.0",
     "url": "^0.11.0",