@applicaster/zapp-react-native-ui-components 14.0.7-rc.3 → 14.0.7

package/Components/GeneralContentScreen/utils/useCurationAPI.ts

@@ -9,10 +9,9 @@ import {
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { Categories } from "./logger";
 import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
-import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useRoute";
+import { useScreenContext } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
 
 import {
-  ZappPipesEntryContext,
   ZappPipesScreenContext,
   ZappPipesSearchContext,
 } from "@applicaster/zapp-react-native-ui-components/Contexts";
@@ -136,7 +135,6 @@ export const useCurationAPI = (
     [components]
   );
 
-  const { pathname } = useRoute();
   const [searchContext] = ZappPipesSearchContext.useZappPipesContext();
   const [screenContext] = ZappPipesScreenContext.useZappPipesContext();
 
@@ -146,10 +144,12 @@ export const useCurationAPI = (
     screenContextType === TABS_SCREEN_TYPE ||
     screenContextType === QB_TABS_SCREEN_TYPE;
 
-  const [entryContext] = ZappPipesEntryContext.useZappPipesContext(
-    pathname,
-    isNestedScreen
-  );
+  const screenContextData = useScreenContext();
+
+  const entryContext = ((isNestedScreen && screenContextData?.nested?.entry
+    ? screenContextData?.nested?.entry
+    : (screenContextData?.entry?.payload ?? screenContextData?.entry)) ||
+    {}) as ZappEntry;
 
   const urlsMap = useMemo<{ [key: string]: string }>(() => {
     const map = {};

package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/index.ts

@@ -4,7 +4,7 @@ import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/nu
 import { Button } from "./Button";
 import {
   getButtonsCount,
-  memoizedGetPluginIdentifier,
+  getPluginIdentifier,
   mapSelfAlignment,
 } from "./utils";
 
@@ -80,11 +80,7 @@ export const TvActionButtons = ({
           prefix: independentStyles ? prefixSpecificButton : buttonId(1),
           value,
           platformValue,
-          pluginIdentifier: memoizedGetPluginIdentifier(
-            configuration,
-            PREFIX,
-            index
-          ),
+          pluginIdentifier: getPluginIdentifier(configuration, PREFIX, index),
           suffixId: prefixSpecificButton,
           preferredFocus: index === 0,
         });

package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/__tests__/getPluginIdentifier.test.ts

@@ -3,7 +3,7 @@ import { getPluginIdentifier } from "..";
 describe("getPluginIdentifier", () => {
   const prefix = "tv_buttons";
 
-  it("returns the first valid plugin identifier", () => {
+  it("get first plugin identifier", () => {
     const configuration = {
       tv_buttons_button_1_other: "value",
       tv_buttons_button_1_assign_action:
@@ -13,12 +13,13 @@ describe("getPluginIdentifier", () => {
     };
 
     const index = 0;
+
     const result = getPluginIdentifier(configuration, prefix, index);
 
     expect(result).toEqual(configuration.tv_buttons_button_1_assign_action);
   });
 
-  it("returns the second valid plugin identifier", () => {
+  it("get second plugin identifier", () => {
     const configuration = {
       tv_buttons_button_1_other: "value_1",
       tv_buttons_button_1_assign_action:
@@ -29,124 +30,24 @@ describe("getPluginIdentifier", () => {
     };
 
     const index = 1;
+
     const result = getPluginIdentifier(configuration, prefix, index);
 
     expect(result).toEqual(configuration.tv_buttons_button_2_assign_action);
   });
 
-  it("returns undefined when there are no assign_action keys", () => {
+  it("get undefined if no assign_actions at all", () => {
     const configuration = {};
-    const index = 0;
-
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    expect(result).toBeUndefined();
-  });
-
-  it("skips undefined values and returns the correct plugin identifier", () => {
-    const configuration = {
-      tv_buttons_button_1_assign_action: "tv_buttons_button_1_assign_action",
-      tv_buttons_button_2_assign_action: undefined,
-      tv_buttons_button_3_assign_action: "tv_buttons_button_3_assign_action",
-    };
-
-    const index = 1;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    expect(result).toEqual(configuration.tv_buttons_button_3_assign_action);
-  });
-
-  it("handles missing intermediate keys and returns the correct plugin identifier", () => {
-    const configuration = {
-      tv_buttons_button_1_assign_action: "tv_buttons_button_1_assign_action",
-      tv_buttons_button_3_assign_action: "tv_buttons_button_3_assign_action",
-    };
-
-    const index = 1;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    expect(result).toEqual(configuration.tv_buttons_button_3_assign_action);
-  });
-
-  it("skips empty string values and returns the first non-empty assign_action", () => {
-    const configuration = {
-      tv_buttons_button_1_assign_action: "",
-      tv_buttons_button_2_assign_action: "tv_buttons_button_2_assign_action",
-    };
 
     const index = 0;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    expect(result).toEqual(configuration.tv_buttons_button_2_assign_action);
-  });
-
-  it("returns undefined for negative index", () => {
-    const configuration = {
-      tv_buttons_button_1_assign_action: "a",
-      tv_buttons_button_2_assign_action: "b",
-    };
 
-    const index = -1;
     const result = getPluginIdentifier(configuration, prefix, index);
 
     expect(result).toBeUndefined();
   });
-
-  it("returns undefined for out-of-bounds index", () => {
-    const configuration = {
-      tv_buttons_button_1_assign_action: "a",
-      tv_buttons_button_2_assign_action: "b",
-    };
-
-    const index = 5;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    expect(result).toBeUndefined();
-  });
-
-  it("ignores keys with wrong prefix or format", () => {
-    const configuration = {
-      tv_buttons_button_1_assign_action: "a",
-      tv_buttons_wrongprefix_2_assign_action: "b",
-      tv_buttons_button_x_assign_action: "c",
-    };
-
-    const index = 1;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    expect(result).toBeUndefined();
-  });
-
-  it("returns undefined if all assign_actions are null or empty", () => {
-    const configuration = {
-      tv_buttons_button_1_assign_action: null,
-      tv_buttons_button_2_assign_action: undefined,
-      tv_buttons_button_3_assign_action: "",
-    };
-
-    const index = 0;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    expect(result).toBeUndefined();
-  });
-
-  it("handles non-string values correctly", () => {
-    const configuration = {
-      tv_buttons_button_1_assign_action: 123,
-      tv_buttons_button_2_assign_action: true,
-      tv_buttons_button_3_assign_action: { nested: "value" },
-    };
-
-    expect(getPluginIdentifier(configuration, prefix, 0)).toEqual(123);
-    expect(getPluginIdentifier(configuration, prefix, 1)).toEqual(true);
-
-    expect(getPluginIdentifier(configuration, prefix, 2)).toEqual({
-      nested: "value",
-    });
-  });
 });
 
-describe("getPluginIdentifier - when configuration has duplicate values", () => {
+describe("getPluginIdentifier - when configuration has same values for different keys", () => {
   const prefix = "tv_buttons";
 
   const configuration = {
@@ -154,15 +55,17 @@ describe("getPluginIdentifier - when configuration has duplicate values", () =>
     tv_buttons_button_2_assign_action: "navigation_action",
   };
 
-  it("returns the first plugin identifier when values are identical", () => {
+  it("get first plugin identifier", () => {
     const index = 0;
+
     const result = getPluginIdentifier(configuration, prefix, index);
 
     expect(result).toEqual(configuration.tv_buttons_button_1_assign_action);
   });
 
-  it("returns the second plugin identifier when values are identical", () => {
+  it("get second plugin identifier", () => {
     const index = 1;
+
     const result = getPluginIdentifier(configuration, prefix, index);
 
     expect(result).toEqual(configuration.tv_buttons_button_2_assign_action);

package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/index.ts

@@ -1,7 +1,7 @@
 import * as R from "ramda";
-import memoizee from "memoizee";
 
 import { isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
+import { isNotNil } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
 
 export const getButtonsCount = (
   configuration: Record<string, unknown>,
@@ -21,28 +21,22 @@ export const getPluginIdentifier = (
   configuration: Record<string, unknown>,
   prefix: string,
   index: number
-): string | undefined => {
-  const re = new RegExp(`${prefix}_button_\\d_assign_action`);
-  let count = 0;
-
-  for (const [key, value] of Object.entries(configuration)) {
-    if (
-      key.startsWith(`${prefix}_button`) &&
-      re.test(key) &&
-      value != null &&
-      value !== ""
-    ) {
-      if (count === index) return value as string;
-      count++;
-    }
-  }
+): string => {
+  const match = `${prefix}_button_\\d_assign_action`;
+  const re = new RegExp(match);
 
-  return undefined;
-};
+  const rejectNils = R.compose(R.path([index]), R.filter(isNotNil));
 
-export const memoizedGetPluginIdentifier = memoizee(getPluginIdentifier, {
-  primitive: true,
-});
+  return rejectNils(
+    R.toPairs(configuration)
+      .filter(([key]) => R.startsWith(`${prefix}_button`, key))
+      .map(([key, value]) => {
+        const matched = key.match(re);
+
+        return matched ? value : undefined;
+      })
+  );
+};
 
 type Label = {
   name: string;

package/package.json

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