@applicaster/zapp-react-native-ui-components 16.0.0-rc.33 → 16.0.0-rc.35

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Button.ts

@@ -1,4 +1,7 @@
-import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
+import {
+  toNumberWithDefault,
+  toNumberWithDefaultZero,
+} from "@applicaster/zapp-react-native-utils/numberUtils";
 import { compact } from "@applicaster/zapp-react-native-utils/cellUtils";
 
 import { Asset } from "./Asset";
@@ -10,23 +13,37 @@ import {
   getPressableStyles,
   getTextLabelStyles,
 } from "./utils";
+import { ViewStyle } from "react-native";
+import { Spacer } from "./Spacer";
 
-const displayModeStyle = (value) => {
+const displayModeStyle = (value, isVertical: boolean) => {
   const mode = value("display_mode") || "dynamic";
 
-  if (mode === "fixed") {
-    return {
-      width: toNumberWithDefault(140, value("width")),
-    };
-  }
+  const defaultStyle = {
+    flexShrink: 1,
+  };
 
-  if (mode === "fill") {
-    return {
-      flex: 1,
-    };
-  }
+  const width = toNumberWithDefault(140, value("width"));
 
-  return {};
+  switch (mode) {
+    case "fixed":
+      return {
+        ...defaultStyle,
+        width,
+        maxWidth: width,
+      };
+    case "fill":
+      return {
+        ...defaultStyle,
+        width: isVertical ? "100%" : undefined,
+        flex: !isVertical ? 1 : undefined,
+      };
+    case "dynamic":
+    default:
+      return {
+        ...defaultStyle,
+      };
+  }
 };
 
 type Props = {
@@ -34,7 +51,8 @@ type Props = {
   value: Function;
   stylePrefix: string;
   specificPrefix: string;
-  spacingStyle: Record<string, unknown>;
+  spacingStyle: ViewStyle;
+  isVertical: boolean;
 };
 
 export const Button = ({
@@ -43,8 +61,9 @@ export const Button = ({
   stylePrefix,
   specificPrefix,
   spacingStyle,
+  isVertical,
 }: Props) => {
-  // Retrives values depending to the slot
+  // Retrieves values depending to the slot
   const getSlotBasedValue = (property: string) =>
     value(`${specificPrefix}_${property}`);
 
@@ -68,21 +87,30 @@ export const Button = ({
   const testID = `mobile_action_button_${index + 1}`;
   const actionIdentifier = getSlotBasedValue("assign_action");
   const assetAlignment = getValue("asset_alignment") || "left";
+
+  const hasHorizontalAlignment = ["left", "right"].includes(assetAlignment);
+  const vGutter = toNumberWithDefaultZero(getValue("vertical_gutter"));
+  const hGutter = toNumberWithDefaultZero(getValue("horizontal_gutter"));
   const actionAssetFlavour = getValue("action_asset_flavour");
   const contentsAlignment = getValue("contents_alignment") || "center";
+  const displayMode = getValue("display_mode") || "dynamic";
 
   return {
     type: "MobileActionButton",
     style: {
-      flexDirection: getContentDirection(assetAlignment),
-      alignContent: "center",
-      alignItems: getContentsAlignment(contentsAlignment, assetAlignment),
-      justifyContent: getContentsAlignment(contentsAlignment, assetAlignment),
+      // alignContent: "center", Why do we need this?
       ...getPressableStyles(getValue),
-      ...displayModeStyle(getValue),
+      ...displayModeStyle(getValue, isVertical),
       ...spacingStyle,
     },
     additionalProps: {
+      displayMode,
+      alignment: {
+        alignContent: "center",
+        flexDirection: getContentDirection(assetAlignment),
+        alignItems: getContentsAlignment(contentsAlignment, assetAlignment),
+        justifyContent: getContentsAlignment(contentsAlignment, assetAlignment),
+      },
       action: {
         identifier: actionIdentifier,
         flavour: actionAssetFlavour,
@@ -102,7 +130,12 @@ export const Button = ({
             testID,
           })
         : null,
-
+      Spacer({
+        enabled: assetEnabled && labelEnabled,
+        style: hasHorizontalAlignment
+          ? { width: hGutter }
+          : { height: vGutter },
+      }),
       labelEnabled
         ? TextLabelsContainer({
             style: getTextLabelStyles(getValue),
@@ -114,7 +147,8 @@ export const Button = ({
                 color: getValue("focused_font_color"),
               },
               transformText: getValue("text_transform") || "default",
-              numberOfLines: getValue("number_of_lines"),
+              numberOfLines: getValue("number_of_lines") || 1,
+              ellipsizeMode: "tail",
             },
             actionIdentifier,
             testID,

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Spacer.ts

@@ -1,16 +1,18 @@
 type Props = {
   enabled?: boolean;
+  style?: object;
 };
 
-export const Spacer = ({ enabled = false }: Props = {}) => {
+export const Spacer = ({
+  enabled = false,
+  style = { flex: 1 },
+}: Props = {}) => {
   if (!enabled) {
     return null;
   }
 
   return {
     type: "View",
-    style: {
-      flex: 1,
-    },
+    style,
   };
 };

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/TextLabelsContainer.ts

@@ -14,6 +14,9 @@ export const TextLabelsContainer = ({
 }: Props) => {
   return {
     type: "View",
+    style: {
+      flexShrink: 1,
+    },
     additionalProps: {
       mobileActionRole: "label_container",
     },
@@ -26,7 +29,6 @@ export const TextLabelsContainer = ({
             context: actionIdentifier,
             name: "label_1",
           },
-          state: "default",
           mobileActionRole: "label",
           testID: testID ? `${testID}-label` : undefined,
           ...extraProps,

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/PressableView.test.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Text as RNText, TouchableOpacity, View } from "react-native";
+import { Pressable, Text as RNText, View } from "react-native";
 import { render, fireEvent } from "@testing-library/react-native";
 import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
 
@@ -8,6 +8,11 @@ import { elementMapper } from "../../../../elementMapper";
 import { defaultComponents } from "../../../index";
 import { MobileActionButtons } from "..";
 import { AssetComponent } from "../AssetComponent";
+import { usePressedState } from "../../../../hooks/usePressedState";
+
+jest.mock("../../../../hooks/usePressedState", () => ({
+  usePressedState: jest.fn(),
+}));
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/actions", () => ({
   useActions: jest.fn(),
@@ -136,6 +141,7 @@ const baseNode = {
       borderColor: "rgba(4,4,4,1)",
     },
     testID: "mobile-action-button",
+    testOnly_pressed: false,
   },
   elements: [
     {
@@ -190,14 +196,20 @@ const baseNode = {
 describe("MobileActionButton", () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    (usePressedState as jest.Mock).mockReturnValue(false);
   });
 
-  const renderNode = (node = baseNode) =>
-    render(
+  const renderNode = ({ node = baseNode, pressed = false } = {}) => {
+    if (pressed) {
+      node.props.testOnly_pressed = true;
+    }
+
+    return render(
       <React.Fragment>
         {elementMapper(defaultComponents)(node as never)}
       </React.Fragment>
     );
+  };
 
   it("renders nested image and text children through elementMapper", () => {
     mockUseActions.mockReturnValue(buildActionContext());
@@ -210,12 +222,13 @@ describe("MobileActionButton", () => {
   });
 
   it("applies focused styles when action entry state is active", () => {
+    (usePressedState as jest.Mock).mockReturnValue(true);
     mockUseActions.mockReturnValue(buildActionContext({ active: true }));
 
-    const { getByTestId, getByText } = renderNode();
+    const { getByTestId, getByText } = renderNode({ pressed: true });
 
     expect(
-      getByTestId("mobile-action-button").props.style.backgroundColor
+      getByTestId("mobile-action-button").props.style[2].backgroundColor
     ).toBe("rgba(3,3,3,1)");
 
     expect(getByText("Play").props.style).toEqual(
@@ -253,6 +266,8 @@ describe("MobileActionButton", () => {
       })
     );
 
+    node.props.testOnly_pressed = false;
+
     const { UNSAFE_getAllByType, UNSAFE_getByType, getByTestId, getByText } =
       render(
         <React.Fragment>
@@ -260,14 +275,14 @@ describe("MobileActionButton", () => {
         </React.Fragment>
       );
 
-    const pressable = UNSAFE_getByType(TouchableOpacity);
+    const pressable = UNSAFE_getByType(Pressable);
     const label = getByText("Play");
     const asset = getByTestId("mobile_action_button_1-asset");
 
     expect(pressable.props.testID).toBe("mobile_action_button_1");
     expect(pressable.props.accessibilityLabel).toBe("entry-1");
 
-    expect(pressable.props.style).toMatchObject({
+    expect(pressable.props.style({ pressed: false })[0]).toMatchObject({
       backgroundColor: "rgba(1,1,1,1)",
       borderColor: "rgba(2,2,2,1)",
       borderWidth: 1,
@@ -278,15 +293,11 @@ describe("MobileActionButton", () => {
       height: 24,
     });
 
-    expect(label.props.style).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          color: "rgba(10,10,10,1)",
-          fontSize: 15,
-          lineHeight: 24,
-        }),
-      ])
-    );
+    expect(label.props.style[0]).toMatchObject({
+      color: "rgba(10,10,10,1)",
+      fontSize: 15,
+      lineHeight: 24,
+    });
 
     expect(UNSAFE_getAllByType(View).length).toBeGreaterThan(0);
     expect(UNSAFE_getAllByType(RNText).length).toBeGreaterThan(0);
@@ -324,7 +335,7 @@ describe("MobileActionButton", () => {
         buildActionContext({ mobileButtonAssets: MockAssetComponent })
       );
 
-      const { getByTestId } = renderNode(nodeWithFlavour1);
+      const { getByTestId } = renderNode({ node: nodeWithFlavour1 });
 
       expect(MockAssetComponent).toHaveBeenCalled();
       expect(getByTestId("mobile-action-button-asset")).toBeTruthy();
@@ -339,7 +350,7 @@ describe("MobileActionButton", () => {
         buildActionContext({ mobileButtonAssets: MockAssetComponent })
       );
 
-      renderNode(nodeWithFlavour1);
+      renderNode({ node: nodeWithFlavour1 });
 
       expect(MockAssetComponent).toHaveBeenCalledWith(
         expect.objectContaining({ flavour: "flavour_1" }),
@@ -356,7 +367,7 @@ describe("MobileActionButton", () => {
         buildActionContext({ mobileButtonAssets: MockAssetComponent })
       );
 
-      renderNode(nodeWithFlavour2);
+      renderNode({ node: nodeWithFlavour2 });
 
       expect(MockAssetComponent).toHaveBeenCalledWith(
         expect.objectContaining({ flavour: "flavour_2" }),
@@ -369,7 +380,7 @@ describe("MobileActionButton", () => {
         buildActionContext({ mobileButtonAssets: undefined })
       );
 
-      const { queryByTestId } = renderNode(nodeWithFlavour1);
+      const { queryByTestId } = renderNode({ node: nodeWithFlavour1 });
 
       expect(queryByTestId("mobile-action-button-asset")).toBeNull();
     });
@@ -385,7 +396,7 @@ describe("MobileActionButton", () => {
         })
       );
 
-      const { getByTestId } = renderNode(nodeWithFlavour1);
+      const { getByTestId } = renderNode({ node: nodeWithFlavour1 });
 
       expect(getByTestId("mobile-action-button-asset")).toBeTruthy();
     });

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/index.test.ts

@@ -241,10 +241,21 @@ describe("MobileActionButtons", () => {
     expect(overImageResult?.additionalProps?.contentStyle).toMatchObject({
       flexDirection: "column",
       alignItems: "center",
-      marginTop: 5,
-      marginRight: 6,
-      marginBottom: 7,
-      marginLeft: 8,
+      paddingTop: 5,
+      paddingRight: 6,
+      paddingBottom: 7,
+      paddingLeft: 8,
+    });
+
+    expect(overImageResult?.style).toMatchObject({
+      alignItems: "flex-end",
+      bottom: 0,
+      justifyContent: "flex-start",
+      left: 0,
+      position: "absolute",
+      right: 0,
+      top: 0,
+      zIndex: 10,
     });
 
     expect(

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/index.ts

@@ -6,6 +6,7 @@ import {
 } from "./utils";
 import { Button } from "./Button";
 import { buildActionButtonsModel } from "../../ActionButtonsCore/model";
+import { ViewStyle } from "react-native";
 
 const CONTAINER_PREFIX = "mobile_buttons_container";
 const BUTTON_PREFIX = "mobile_button";
@@ -42,9 +43,24 @@ export const MobileActionButtons = ({
     return null;
   }
 
+  const {
+    container: { stacking, verticalGutter, horizontalGutter },
+  } = model;
+
+  const isVertical = stacking === "vertical";
+  const isOverImage = position === "over_image";
+  const gutter = isVertical ? verticalGutter : horizontalGutter;
+
+  const containerPaddings = {
+    paddingTop: model.container.margins.top,
+    paddingRight: model.container.margins.right,
+    paddingBottom: model.container.margins.bottom,
+    paddingLeft: model.container.margins.left,
+  };
+
   const style = {
     alignItems: "center",
-    ...(placement === "over_image"
+    ...(isOverImage
       ? {
           position: "absolute",
           zIndex: 10,
@@ -60,28 +76,18 @@ export const MobileActionButtons = ({
   };
 
   const contentStyle = {
-    flexDirection: model.container.stacking === "vertical" ? "column" : "row",
-    alignSelf:
-      placement !== "over_image" ? model.container.horizontalAlign : undefined,
+    ...containerPaddings,
+    flexDirection: isVertical ? "column" : "row",
+    width: isVertical ? "100%" : undefined,
+    alignSelf: !isOverImage ? model.container.horizontalAlign : undefined,
     alignItems: model.container.horizontalAlign,
-    marginTop: model.container.margins.top,
-    marginRight: model.container.margins.right,
-    marginBottom: model.container.margins.bottom,
-    marginLeft: model.container.margins.left,
   };
 
   const elements = compact(
     model.buttons.map(({ renderIndex, specificPrefix, stylePrefix }) => {
       const isNotLast = renderIndex < model.buttons.length - 1;
 
-      const {
-        container: { stacking, verticalGutter, horizontalGutter },
-      } = model;
-
-      const isVertical = stacking === "vertical";
-      const gutter = isVertical ? verticalGutter : horizontalGutter;
-
-      const spacingStyle = {
+      const spacingStyle: ViewStyle = {
         [isVertical ? "marginBottom" : "marginRight"]: isNotLast ? gutter : 0,
       };
 
@@ -91,6 +97,7 @@ export const MobileActionButtons = ({
         stylePrefix,
         specificPrefix,
         spacingStyle,
+        isVertical,
       });
 
       if (!button) return null;

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/__tests__/insertButtons.test.ts

@@ -5,14 +5,19 @@ import {
 } from "..";
 
 describe("mobile action insertion helpers", () => {
-  const labels = [{ name: "text_label_1" }, { name: "text_label_2" }];
+  const slots = [
+    { name: "text_label_1", element: { type: "View", id: "text_label_1" } },
+    { name: "text_label_2", element: { type: "View", id: "text_label_2" } },
+  ];
+
+  const labels = slots.map((slot) => slot.element);
   const buttons = { type: "View", name: "buttons" };
 
   it("inserts label buttons below target label", () => {
     const result = insertButtonsBetweenLabels(
       { mobile_buttons_container_position: "below_text_label_1" },
       buttons,
-      labels
+      slots
     );
 
     expect(result).toEqual([labels[0], buttons, labels[1]]);
@@ -22,7 +27,7 @@ describe("mobile action insertion helpers", () => {
     const result = insertButtonsBetweenLabels(
       { mobile_buttons_container_position: "unknown" },
       buttons,
-      labels
+      slots
     );
 
     expect(result).toEqual([labels[0], labels[1]]);

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/index.ts

@@ -8,7 +8,7 @@ import { Platform } from "react-native";
 export const insertButtonsBetweenLabels = (
   configuration: Record<string, unknown>,
   buttons,
-  labels = []
+  slots = [] // { name, element } per canonical text label slot
 ) =>
   insertBetweenLabels(
     {
@@ -19,7 +19,7 @@ export const insertButtonsBetweenLabels = (
       appendWhenMissing: false,
     },
     buttons,
-    labels // "text_label_1", "text_label_2", "text_label_3", "text_label_4"
+    slots
   );
 
 export const insertButtonsBetweenLabelContainers = (

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

@@ -3,18 +3,20 @@ import { insertButtonsBetweenLabels } from "..";
 describe("insertButtonsBetweenLabels - depthlevel 1", () => {
   const buttons = "buttons";
 
-  const labels = [
-    { name: "label_1" },
-    { name: "label_2" },
-    { name: "label_3" },
+  const slots = [
+    { name: "label_1", element: { id: "label_1" } },
+    { name: "label_2", element: { id: "label_2" } },
+    { name: "label_3", element: { id: "label_3" } },
   ];
 
+  const labels = slots.map((slot) => slot.element);
+
   it("put buttons on top", () => {
     const configuration = {
       tv_buttons_container_position: "on_top",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([buttons, ...labels]);
   });
@@ -24,7 +26,7 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "unknown_position",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([...labels, buttons]);
   });
@@ -34,7 +36,7 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "label_1",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([labels[0], buttons, labels[1], labels[2]]);
   });
@@ -44,7 +46,7 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "label_2",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([labels[0], labels[1], buttons, labels[2]]);
   });
@@ -54,22 +56,52 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "label_3",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([labels[0], labels[1], labels[2], buttons]);
   });
 
-  it("put underneath all", () => {
+  it("put above label_2", () => {
+    const configuration = {
+      tv_buttons_container_position: "above_label_2",
+    };
+
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
+
+    expect(result).toEqual([labels[0], buttons, labels[1], labels[2]]);
+  });
+
+  it("keeps the slot when its label is empty (null element)", () => {
+    const slotsWithEmpty = [
+      { name: "label_1", element: { id: "label_1" } },
+      { name: "label_2", element: null },
+      { name: "label_3", element: { id: "label_3" } },
+    ];
+
+    const configuration = {
+      tv_buttons_container_position: "above_label_2",
+    };
+
+    const result = insertButtonsBetweenLabels(
+      configuration,
+      buttons,
+      slotsWithEmpty
+    );
+
+    expect(result).toEqual([{ id: "label_1" }, buttons, { id: "label_3" }]);
+  });
+
+  it("appends buttons when the target is unknown", () => {
     const configuration = {
       tv_buttons_container_position: "label_X",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([labels[0], labels[1], labels[2], buttons]);
   });
 
-  it("put underneath all", () => {
+  it("appends buttons when there are no slots", () => {
     const configuration = {
       tv_buttons_container_position: "label_X",
     };
@@ -88,7 +120,7 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "label_X",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, null, labels);
+    const result = insertButtonsBetweenLabels(configuration, null, slots);
 
     expect(result).toEqual(labels);
   });

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

@@ -34,7 +34,7 @@ export const memoizedGetPluginIdentifier = memoizee(getPluginIdentifier);
 export const insertButtonsBetweenLabels = (
   configuration: Record<string, unknown>,
   buttons,
-  labels = []
+  slots = [] // { name, element } per canonical text label slot
 ) =>
   insertBetweenLabels(
     {
@@ -45,7 +45,7 @@ export const insertButtonsBetweenLabels = (
       appendWhenMissing: true,
     },
     buttons,
-    labels
+    slots
   );
 
 export const insertButtonsBetweenLabelContainers = (

package/Components/MasterCell/contexts/PressedStateContext.ts

@@ -0,0 +1,3 @@
+import React from "react";
+
+export const PressedStateContext = React.createContext<boolean>(false);

package/Components/MasterCell/hooks/index.ts

@@ -1 +1,3 @@
 export { useAsyncRendering } from "./useAsyncRendering";
+
+export { usePressedState } from "./usePressedState";

package/Components/MasterCell/hooks/usePressedState.ts

@@ -0,0 +1,4 @@
+import React from "react";
+import { PressedStateContext } from "../contexts/PressedStateContext";
+
+export const usePressedState = () => React.useContext(PressedStateContext);