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

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

@@ -7,159 +7,71 @@ describe("getPluginIdentifier", () => {
     memoizedGetPluginIdentifier.clear();
   });
 
-  it("returns the first valid plugin identifier", () => {
+  it("returns the requested slot action identifier", () => {
     expect.assertions(2);
 
     const configuration = {
-      tv_buttons_button_1_other: "value",
       tv_buttons_button_1_assign_action:
         "tv_buttons_button_1_assign_action_value",
-      tv_buttons_button_2_assign_action:
-        "tv_buttons_button_2_assign_action_value",
+      tv_buttons_button_3_assign_action:
+        "tv_buttons_button_3_assign_action_value",
     };
 
-    const index = 0;
-    const result = getPluginIdentifier(configuration, prefix, index);
+    const slot = 3;
+    const result = getPluginIdentifier(configuration, prefix, slot);
 
     const memoizedResult = memoizedGetPluginIdentifier(
       configuration,
       prefix,
-      index
-    );
-
-    expect(result).toEqual(configuration.tv_buttons_button_1_assign_action);
-    expect(memoizedResult).toEqual(result);
-  });
-
-  it("returns the second valid plugin identifier", () => {
-    expect.assertions(2);
-
-    const configuration = {
-      tv_buttons_button_1_other: "value_1",
-      tv_buttons_button_1_assign_action:
-        "tv_buttons_button_1_assign_action_value",
-      tv_buttons_button_2_other: "value_2",
-      tv_buttons_button_2_assign_action:
-        "tv_buttons_button_2_assign_action_value",
-    };
-
-    const index = 1;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    const memoizedResult = memoizedGetPluginIdentifier(
-      configuration,
-      prefix,
-      index
-    );
-
-    expect(result).toEqual(configuration.tv_buttons_button_2_assign_action);
-    expect(memoizedResult).toEqual(result);
-  });
-
-  it("returns undefined when there are no assign_action keys", () => {
-    expect.assertions(2);
-
-    const configuration = {};
-    const index = 0;
-
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    const memoizedResult = memoizedGetPluginIdentifier(
-      configuration,
-      prefix,
-      index
-    );
-
-    expect(result).toBeUndefined();
-    expect(memoizedResult).toBeUndefined();
-  });
-
-  it("skips undefined values and returns the correct plugin identifier", () => {
-    expect.assertions(2);
-
-    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);
-
-    const memoizedResult = memoizedGetPluginIdentifier(
-      configuration,
-      prefix,
-      index
+      slot
     );
 
     expect(result).toEqual(configuration.tv_buttons_button_3_assign_action);
     expect(memoizedResult).toEqual(result);
   });
 
-  it("handles missing intermediate keys and returns the correct plugin identifier", () => {
+  it("returns undefined for a disabled or missing slot", () => {
     expect.assertions(2);
 
     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);
+    const slot = 2;
+    const result = getPluginIdentifier(configuration, prefix, slot);
 
     const memoizedResult = memoizedGetPluginIdentifier(
       configuration,
       prefix,
-      index
+      slot
     );
 
-    expect(result).toEqual(configuration.tv_buttons_button_3_assign_action);
+    expect(result).toBeUndefined();
     expect(memoizedResult).toEqual(result);
   });
 
-  it("skips empty string values and returns the first non-empty assign_action", () => {
+  it("returns undefined for empty string values", () => {
     expect.assertions(2);
 
     const configuration = {
-      tv_buttons_button_1_assign_action: "",
-      tv_buttons_button_2_assign_action: "tv_buttons_button_2_assign_action",
+      tv_buttons_button_2_assign_action: "",
     };
 
-    const index = 0;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    const memoizedResult = memoizedGetPluginIdentifier(
-      configuration,
-      prefix,
-      index
-    );
-
-    expect(result).toEqual(configuration.tv_buttons_button_2_assign_action);
-    expect(memoizedResult).toEqual(result);
-  });
+    const slot = 2;
 
-  it("returns undefined for negative index", () => {
-    expect.assertions(2);
-
-    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);
+    const result = getPluginIdentifier(configuration, prefix, slot);
 
     const memoizedResult = memoizedGetPluginIdentifier(
       configuration,
       prefix,
-      index
+      slot
     );
 
     expect(result).toBeUndefined();
     expect(memoizedResult).toBeUndefined();
   });
 
-  it("returns undefined for out-of-bounds index", () => {
+  it("returns undefined for negative slots", () => {
     expect.assertions(2);
 
     const configuration = {
@@ -167,85 +79,37 @@ describe("getPluginIdentifier", () => {
       tv_buttons_button_2_assign_action: "b",
     };
 
-    const index = 5;
-    const result = getPluginIdentifier(configuration, prefix, index);
-
-    const memoizedResult = memoizedGetPluginIdentifier(
-      configuration,
-      prefix,
-      index
-    );
-
-    expect(result).toBeUndefined();
-    expect(memoizedResult).toBeUndefined();
-  });
-
-  it("ignores keys with wrong prefix or format", () => {
-    expect.assertions(2);
-
-    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);
+    const slot = -1;
+    const result = getPluginIdentifier(configuration, prefix, slot);
 
     const memoizedResult = memoizedGetPluginIdentifier(
       configuration,
       prefix,
-      index
+      slot
     );
 
     expect(result).toBeUndefined();
     expect(memoizedResult).toBeUndefined();
   });
 
-  it("returns undefined if all assign_actions are null or empty", () => {
+  it("handles non-string values by returning the configured slot value", () => {
     expect.assertions(2);
 
     const configuration = {
-      tv_buttons_button_1_assign_action: null,
-      tv_buttons_button_2_assign_action: undefined,
-      tv_buttons_button_3_assign_action: "",
+      tv_buttons_button_2_assign_action: true,
     };
 
-    const index = 0;
-    const result = getPluginIdentifier(configuration, prefix, index);
+    const slot = 2;
+    const result = getPluginIdentifier(configuration, prefix, slot);
 
     const memoizedResult = memoizedGetPluginIdentifier(
       configuration,
       prefix,
-      index
+      slot
     );
 
-    expect(result).toBeUndefined();
-    expect(memoizedResult).toBeUndefined();
-  });
-
-  it("handles non-string values correctly", () => {
-    expect.assertions(6);
-
-    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",
-    });
-
-    expect(memoizedGetPluginIdentifier(configuration, prefix, 0)).toEqual(123);
-    expect(memoizedGetPluginIdentifier(configuration, prefix, 1)).toEqual(true);
-
-    expect(memoizedGetPluginIdentifier(configuration, prefix, 2)).toEqual({
-      nested: "value",
-    });
+    expect(result).toBe(true);
+    expect(memoizedResult).toBe(true);
   });
 });
 
@@ -261,32 +125,32 @@ 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("returns the requested slot even when values are identical", () => {
     expect.assertions(2);
 
-    const index = 0;
-    const result = getPluginIdentifier(configuration, prefix, index);
+    const slot = 1;
+    const result = getPluginIdentifier(configuration, prefix, slot);
 
     const memoizedResult = memoizedGetPluginIdentifier(
       configuration,
       prefix,
-      index
+      slot
     );
 
     expect(result).toEqual(configuration.tv_buttons_button_1_assign_action);
     expect(memoizedResult).toEqual(result);
   });
 
-  it("returns the second plugin identifier when values are identical", () => {
+  it("returns the second slot when values are identical", () => {
     expect.assertions(2);
 
-    const index = 1;
-    const result = getPluginIdentifier(configuration, prefix, index);
+    const slot = 2;
+    const result = getPluginIdentifier(configuration, prefix, slot);
 
     const memoizedResult = memoizedGetPluginIdentifier(
       configuration,
       prefix,
-      index
+      slot
     );
 
     expect(result).toEqual(configuration.tv_buttons_button_2_assign_action);

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

@@ -1,177 +1,68 @@
-import * as R from "ramda";
 import memoizee from "memoizee";
-
 import { isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
+import { getEnabledButtonSlots } from "../../../ActionButtonsCore/selectors";
+import {
+  insertBetweenLabelContainers,
+  insertBetweenLabels,
+} from "../../../ActionButtonsCore/placement";
 
 export const getButtonsCount = (
   configuration: Record<string, unknown>,
   prefix: string
 ): number => {
-  const button1Key = `${prefix}_button_1_button_enabled`;
-  const button2Key = `${prefix}_button_2_button_enabled`;
-  const button3Key = `${prefix}_button_3_button_enabled`;
-
-  return R.toPairs(configuration).filter(
-    ([key, value]) =>
-      [button1Key, button2Key, button3Key].includes(key) && value
-  ).length;
+  return getEnabledButtonSlots(configuration, `${prefix}_button`).length;
 };
 
 export const getPluginIdentifier = (
   configuration: Record<string, unknown>,
   prefix: string,
-  index: number
+  slot: 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++;
-    }
-  }
+  const value = configuration[
+    `${prefix}_button_${slot}_assign_action`
+  ] as string;
 
-  return undefined;
+  return value == null || value === "" ? undefined : value;
 };
 
 export const memoizedGetPluginIdentifier = memoizee(getPluginIdentifier);
 
-type Label = {
-  name: string;
-};
-
-type LabelContainer = {
-  elements: Array<Label>;
-};
-
-type LabelExtraContainer = {
-  elements: Array<LabelContainer>;
-};
-
-const withButtons = (labelName, buttons, labels) => {
-  return labels.reduce((acc, label) => {
-    if (label.name === labelName) {
-      return [...acc, label, buttons];
-    }
-
-    return [...acc, label];
-  }, []);
-};
-
-const withButtonsInContainer = (labelName, buttons, views) => {
-  return views.map((view) => {
-    return {
-      ...view,
-      elements: view.elements.reduce((acc, label) => {
-        if (label.name === labelName) {
-          return [...acc, label, buttons];
-        }
-
-        return [...acc, label];
-      }, []),
-    };
-  });
-};
-
 export const insertButtonsBetweenLabels = (
   configuration: Record<string, unknown>,
   buttons,
-  labels: Label[] = []
-) => {
-  if (R.isNil(buttons)) {
-    return labels;
-  }
-
-  const position = R.pathOr(
-    undefined,
-    ["tv_buttons_container_position"],
-    configuration
+  labels = []
+) =>
+  insertBetweenLabels(
+    {
+      position: configuration.tv_buttons_container_position as
+        | string
+        | undefined,
+      allowOnTop: true,
+      appendWhenMissing: true,
+    },
+    buttons,
+    labels
   );
 
-  if (position === "on_top") {
-    return [buttons, ...labels];
-  }
-
-  const labelsWithButtons = withButtons(position, buttons, labels);
-
-  if (R.equals(labelsWithButtons, labels)) {
-    // put buttons after all labels by default
-    return [...labels, buttons];
-  }
-
-  return labelsWithButtons;
-};
-
 export const insertButtonsBetweenLabelContainers = (
   configuration: Record<string, unknown>,
   buttons,
-  labelContainers: Array<LabelExtraContainer> = []
-) => {
-  if (R.isNil(buttons)) {
-    return labelContainers;
-  }
-
-  if (R.isEmpty(labelContainers)) {
-    return [buttons];
-  }
-
-  const position = R.pathOr(
-    undefined,
-    ["tv_buttons_container_position"],
-    configuration
+  labelContainers = []
+) =>
+  insertBetweenLabelContainers(
+    {
+      position: configuration.tv_buttons_container_position as
+        | string
+        | undefined,
+      allowOnTop: true,
+      appendWhenMissing: true,
+    },
+    buttons,
+    labelContainers
   );
 
-  if (position === "on_top") {
-    const firstContainerLabels = R.lensPath([0, "elements"]);
-
-    return R.over(firstContainerLabels, R.prepend(buttons), labelContainers);
-  }
-
-  const labelContainersWithButtons = labelContainers.map((labelContainer) => {
-    return {
-      ...labelContainer,
-      elements: withButtonsInContainer(
-        position,
-        buttons,
-        labelContainer.elements
-      ),
-    };
-  });
-
-  if (R.equals(labelContainersWithButtons, labelContainers)) {
-    // put buttons in last container
-    const lastContainerLabels = R.lensPath([
-      labelContainers.length - 1,
-      "elements",
-    ]);
-
-    return R.over(lastContainerLabels, R.append(buttons), labelContainers);
-  }
-
-  return labelContainersWithButtons;
-};
-
-export const mapSelfAlignment = (horizontalPosition) => {
-  switch (horizontalPosition) {
-    case "left":
-      return "flex-start";
-    case "right":
-      return "flex-end";
-    case "center":
-      return "center";
-    default:
-      return "flex-start";
-  }
-};
-
 export const getTextTransform = (textTransform: string) => {
-  if (R.isNil(textTransform) || R.isEmpty(textTransform)) {
+  if (textTransform == null || textTransform === "") {
     return "none";
   }
 

package/Components/MasterCell/elementMapper.tsx

@@ -19,6 +19,7 @@ const focusableTypes = new Set([
   "View",
   "ButtonContainerView",
   "FocusableView",
+  "PressableView",
   "CollapsibleTextContainer",
   "BorderContainerView",
 ]);

package/package.json

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