@applicaster/zapp-react-native-ui-components 15.0.0-rc.128 → 15.0.0-rc.129

package/Components/MasterCell/DefaultComponents/Button.tsx

@@ -2,7 +2,6 @@ import * as React from "react";
 import * as R from "ramda";
 
 import { TouchableOpacity } from "react-native";
-// import { SvgUri } from "react-native-svg";
 
 import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
 import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
@@ -35,20 +34,6 @@ type Props = {
   cellUUID?: string;
 };
 
-// function Svg({
-//   uri,
-//   style,
-//   ...props
-// }: {
-//   uri: {},
-//   style: { width: Number, height: number },
-// }) {
-//   const width = style?.width;
-//   const height = style?.height;
-
-//   return <SvgUri width={width} height={height} uri={uri} />;
-// }
-
 const components = {
   Image,
 };

package/Components/MasterCell/DefaultComponents/Text/index.tsx

@@ -6,7 +6,7 @@ import {
   dateFormat,
 } from "@applicaster/zapp-react-native-utils/cellUtils";
 
-import { useTextLabel } from "./hooks";
+import { useTextLabel, withFocusedStyles } from "./hooks";
 import { toNumber } from "@applicaster/zapp-react-native-utils/numberUtils";
 import { MeasurementPortalContext } from "../../../MeasurmentsPortal";
 import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
@@ -69,7 +69,7 @@ const _Text = ({
 
   return (
     <Text
-      style={[style, { height }]}
+      style={[withFocusedStyles({ style, otherProps }), { height }]}
       {...withoutLabel(otherProps)}
       allowFontScaling={false}
     >

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/Components/default-cell-renderer/viewTrees/mobile/index.ts

@@ -1,7 +1,6 @@
 import { DefaultCell } from "./DefaultCell";
 import { GridCell } from "./GridCell";
 import { HeroCell } from "./HeroCell";
-// import { ScreenSelectorLabel } from "./ScreenSelectorLabel";
 
 /**
  * Return a view tree ready to be injected with styles etc. Mapping is done
@@ -15,8 +14,6 @@ export function viewTreeResolver({ component_type }) {
   switch (component_type) {
     case "hero":
       return HeroCell;
-    // case "screen_picker":
-    //   return ScreenSelectorLabel;
     case "grid":
       return GridCell;
     case "horizontal_list":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "15.0.0-rc.128",
+  "version": "15.0.0-rc.129",
   "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.0.0-rc.128",
-    "@applicaster/zapp-react-native-bridge": "15.0.0-rc.128",
-    "@applicaster/zapp-react-native-redux": "15.0.0-rc.128",
-    "@applicaster/zapp-react-native-utils": "15.0.0-rc.128",
+    "@applicaster/applicaster-types": "15.0.0-rc.129",
+    "@applicaster/zapp-react-native-bridge": "15.0.0-rc.129",
+    "@applicaster/zapp-react-native-redux": "15.0.0-rc.129",
+    "@applicaster/zapp-react-native-utils": "15.0.0-rc.129",
     "fast-json-stable-stringify": "^2.1.0",
     "promise": "^8.3.0",
     "url": "^0.11.0",