@applicaster/zapp-react-native-ui-components 15.0.0-rc.144 → 15.0.0-rc.146

package/Components/MasterCell/DefaultComponents/__tests__/DataProvider.test.tsx

@@ -0,0 +1,141 @@
+import React from "react";
+import { render } from "@testing-library/react-native";
+
+import { defaultComponents } from "../index";
+import { elementMapper } from "../../elementMapper";
+
+const WrapperProbe = jest.fn(({ children }) => <>{children}</>);
+const LeafProbe = jest.fn(() => null);
+
+const components = {
+  ...defaultComponents,
+  View: WrapperProbe,
+  Text: LeafProbe,
+};
+
+const entry = { id: "entry-1" };
+const item = { id: "item-1" };
+
+const renderNode = (node) =>
+  render(
+    <React.Fragment>{elementMapper(components)(node as never)}</React.Fragment>
+  );
+
+describe("DataProvider", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("injects resolved runtime props under dataProviderProps into the direct child and its direct children only", () => {
+    renderNode({
+      type: "DataProvider",
+      props: { _dataKey: "entry", entry },
+      elements: [
+        {
+          type: "View",
+          props: {},
+          elements: [
+            {
+              type: "View",
+              props: {},
+              elements: [{ type: "Text", props: {} }],
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(WrapperProbe).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({
+        dataProviderProps: expect.objectContaining({ entry }),
+      }),
+      expect.anything()
+    );
+
+    expect(WrapperProbe).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        dataProviderProps: expect.objectContaining({ entry }),
+      }),
+      expect.anything()
+    );
+
+    expect(LeafProbe).toHaveBeenCalledWith(
+      expect.not.objectContaining({
+        dataProviderProps: expect.anything(),
+      }),
+      expect.anything()
+    );
+  });
+
+  it("derives the namespaced values from the resolved runtime props", () => {
+    renderNode({
+      type: "DataProvider",
+      props: { _dataKey: "item", item },
+      elements: [
+        {
+          type: "View",
+          props: {},
+          elements: [{ type: "View", props: {} }],
+        },
+      ],
+    });
+
+    expect(WrapperProbe).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({
+        dataProviderProps: expect.objectContaining({ item }),
+      }),
+      expect.anything()
+    );
+
+    expect(WrapperProbe).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        dataProviderProps: expect.objectContaining({ item }),
+      }),
+      expect.anything()
+    );
+  });
+
+  it("does not overwrite explicit dataProviderProps on the direct child", () => {
+    const explicitEntry = { id: "explicit" };
+
+    renderNode({
+      type: "DataProvider",
+      props: { _dataKey: "entry", entry },
+      elements: [
+        {
+          type: "View",
+          props: {
+            dataProviderProps: {
+              entry: explicitEntry,
+              source: "child",
+            },
+          },
+          elements: [{ type: "View", props: {} }],
+        },
+      ],
+    });
+
+    expect(WrapperProbe).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({
+        dataProviderProps: expect.objectContaining({
+          entry: explicitEntry,
+          source: "child",
+        }),
+      }),
+      expect.anything()
+    );
+
+    expect(WrapperProbe).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        dataProviderProps: expect.objectContaining({ entry }),
+      }),
+      expect.anything()
+    );
+  });
+});

package/Components/MasterCell/DefaultComponents/index.ts

@@ -6,17 +6,19 @@ import PureImage from "./Image";
 import { CollapsibleTextContainer } from "../SharedUI/CollapsibleTextContainer/CollapsibleTextContainer";
 import { Toggle } from "./Toggle";
 import { Button } from "./Button";
-import { FocusableView } from "./FocusableView";
 import ProgressBar from "../SharedUI/ProgressBar/ProgressBar";
 import { LiveImage } from "./LiveImage";
 import { DynamicBadge } from "./DynamicBadge";
 import { SecondaryImage } from "./SecondaryImage/Image";
 import { BorderContainerView } from "./BorderContainerView";
 import { CellBadge } from "./CellBadge";
+import { DataProvider } from "./DataProvider";
 import { TvActionButtons } from "./tv/TvActionButtons";
-import { ButtonContainerView } from "./tv/ButtonContainerView";
+import { TvActionButton } from "./tv/TvActionButtons/TvActionButton";
+import { ButtonContainerView } from "./ButtonContainerView";
 import { ImageBorderContainer } from "./ImageBorderContainer";
 import { PressableView } from "./PressableView";
+import { ActionButton as MobileActionButton } from "./mobile/MobileActionButtons/ActionButton";
 
 export const defaultComponents = {
   View,
@@ -27,7 +29,6 @@ export const defaultComponents = {
   Image,
   PureImage,
   ButtonContainerView,
-  FocusableView,
   ProgressBar,
   Toggle,
   LiveImage,
@@ -36,5 +37,8 @@ export const defaultComponents = {
   DynamicBadge,
   SecondaryImage,
   TvActionButtons,
+  TvActionButton,
+  MobileActionButton,
   CellBadge,
+  DataProvider,
 };

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/ActionButton.tsx

@@ -0,0 +1,135 @@
+import React from "react";
+import { PressableView } from "../../PressableView";
+
+import { ActionButtonController } from "../../ActionButtonsCore/components";
+
+import { masterCellLogger } from "../../../logger";
+import { resolveLabelText, selectByAssetFlavour } from "./utils";
+
+type ChildElementProps = {
+  children?: React.ReactNode;
+  mobileActionRole?: "asset" | "label" | "label_container";
+  uri?: string;
+  asset?: React.ReactNode;
+  state?: "default" | "focused";
+  entry?: any;
+};
+
+const isValidElement = (
+  child: React.ReactNode
+): child is React.ReactElement<ChildElementProps> =>
+  React.isValidElement(child);
+
+export const ActionButton = ({ style, children, action, entry, ...props }) => {
+  return (
+    <ActionButtonController
+      action={action}
+      entry={entry}
+      onMissingActionContext={(identifier) => {
+        masterCellLogger.warning(
+          `You're missing an action plugin(${identifier || action?.identifier}) required by your mobile action button.`
+        );
+      }}
+    >
+      {({ actionContext, actionState, isActive, onPress }) => {
+        const supportsEntryState =
+          typeof actionContext?.initialEntryState === "function";
+
+        const shouldRenderAsset = Boolean(
+          supportsEntryState ? actionState?.mobileButtonAssets : false
+        );
+
+        const shouldRenderLabel = Boolean(
+          supportsEntryState && resolveLabelText(actionState?.label)
+        );
+
+        const _cloneChildrenWithState = (
+          nodes?: React.ReactNode
+        ): React.ReactNode => {
+          return React.Children.map(nodes, (child) => {
+            if (!isValidElement(child)) {
+              return child;
+            }
+
+            const role = child.props.mobileActionRole;
+
+            const nextChildren = _cloneChildrenWithState(child.props.children);
+
+            // Prevents of the asset rendering when the action doesn't provide asset for current entry state
+            if (role === "asset" && !shouldRenderAsset) {
+              return null;
+            }
+
+            // Prevents of the label rendering when the action doesn't provide label for current entry state.
+            // Also prevents of the label container when it doesn't have children to avoid unnecessary empty space.
+            if (role === "label" && !shouldRenderLabel) {
+              return null;
+            }
+
+            // Prevents of the label container rendering when it doesn't have children to avoid unnecessary empty space.
+            if (
+              role === "label_container" &&
+              React.Children.count(nextChildren) === 0
+            ) {
+              return null;
+            }
+
+            const nextProps: Partial<ChildElementProps> = {};
+
+            // Inject asset or uri to Asset component with role asset
+            if (role === "asset") {
+              const resolvedAsset = selectByAssetFlavour(
+                actionState,
+                action.flavour,
+                isActive
+              );
+
+              if (typeof resolvedAsset === "function") {
+                const AssetComponent =
+                  resolvedAsset as CellActionAssetComponent;
+
+                nextProps.asset = (
+                  <AssetComponent
+                    flavour={action.flavour || "flavour_1"}
+                    width={action.width}
+                    height={action.height}
+                  />
+                );
+              } else {
+                nextProps.uri = resolvedAsset;
+              }
+            }
+
+            // Inject state and entry to Text component with role label
+            if (role === "label") {
+              nextProps.state = isActive ? "focused" : "default";
+              nextProps.entry = entry;
+            }
+
+            if (nextChildren !== child.props.children) {
+              nextProps.children = nextChildren;
+            }
+
+            return React.cloneElement(child, nextProps);
+          });
+        };
+
+        if (!shouldRenderAsset && !shouldRenderLabel) {
+          return null;
+        }
+
+        return (
+          <PressableView
+            testID={props.testID || `${entry?.id}`}
+            style={isActive ? { ...style, ...props.focusedStyles } : style}
+            onPress={onPress}
+            accessibilityLabel={props.accessibilityLabel || `${entry?.id}`}
+            accessibilityHint={props.accessibilityHint}
+          >
+            {_cloneChildrenWithState(children)}
+          </PressableView>
+        );
+      }}
+    </ActionButtonController>
+  );
+};

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

@@ -1,40 +1,31 @@
-import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
+import { AssetComponent } from "./AssetComponent";
 
 type Props = {
-  prefix: string;
-  value: Function;
   testID?: string;
+  style?: Record<string, unknown>;
 };
 
-/** Asset used in conjunction with PressableView inside mobile action buttons, uri is provided by PressableView  */
-export const Asset = ({ prefix, value, testID }: Props) => {
-  if (!value(`${prefix}_asset_enabled`)) {
-    return null;
-  }
+type AssetNode = {
+  type: "ReactComponent";
+  style?: Record<string, unknown>;
+  additionalProps: {
+    component: typeof AssetComponent;
+    requiresCellUUID: true;
+    renderChildren: false;
+    mobileActionRole: "asset";
+    testID?: string;
+  };
+};
 
+/** Asset used in conjunction with ActionButton inside mobile action buttons, uri is provided by ActionButton  */
+export const Asset = ({ testID, style }: Props): AssetNode => {
   return {
-    type: "Image",
-    style: {
-      width: toNumberWithDefaultZero(value(`${prefix}_asset_width`)),
-      height: toNumberWithDefaultZero(value(`${prefix}_asset_height`)),
-      marginTop: toNumberWithDefaultZero(value(`${prefix}_asset_margin_top`)),
-      marginRight: toNumberWithDefaultZero(
-        value(`${prefix}_asset_margin_right`)
-      ),
-      marginBottom: toNumberWithDefaultZero(
-        value(`${prefix}_asset_margin_bottom`)
-      ),
-      marginLeft: toNumberWithDefaultZero(value(`${prefix}_asset_margin_left`)),
-      backgroundColor: "transparent",
-    },
-    data: [
-      {
-        func: (entry) => entry,
-        args: [],
-        propName: "entry",
-      },
-    ],
+    type: "ReactComponent",
+    style,
     additionalProps: {
+      component: AssetComponent,
+      requiresCellUUID: true,
+      renderChildren: false,
       mobileActionRole: "asset",
       testID: testID ? `${testID}-asset` : undefined,
     },

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/AssetComponent.tsx

@@ -0,0 +1,22 @@
+import React from "react";
+import { View } from "react-native";
+import { ImageContainer } from "../../ImageContainer";
+
+type Props = {
+  style?: Record<string, unknown>;
+  uri?: string;
+  asset?: React.ReactNode;
+  testID?: string;
+  cellUUID?: string;
+};
+
+export const AssetComponent = (props: Props & Record<string, unknown>) => {
+  return props.asset && React.isValidElement(props.asset) ? (
+    <View style={props.style} testID={props.testID}>
+      {React.cloneElement(props.asset, { cellUUID: props.cellUUID })}
+    </View>
+  ) : (
+    // @ts-ignore
+    <ImageContainer {...props} uri={props.uri} />
+  );
+};

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

@@ -1,20 +1,22 @@
-import {
-  toNumberWithDefault,
-  toNumberWithDefaultZero,
-} from "@applicaster/zapp-react-native-utils/numberUtils";
+import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 import { compact } from "@applicaster/zapp-react-native-utils/cellUtils";
 
 import { Asset } from "./Asset";
-import { Spacer } from "./Spacer";
 import { TextLabelsContainer } from "./TextLabelsContainer";
-import { getContentDirection, getContentsAlignment } from "./helpers";
+import {
+  getAssetStyles,
+  getContentDirection,
+  getContentsAlignment,
+  getPressableStyles,
+  getTextLabelStyles,
+} from "./utils";
 
-const displayModeStyle = ({ value, prefix }) => {
-  const mode = value(`${prefix}_display_mode`) || "dynamic";
+const displayModeStyle = (value) => {
+  const mode = value("display_mode") || "dynamic";
 
   if (mode === "fixed") {
     return {
-      width: toNumberWithDefault(140, value(`${prefix}_width`)),
+      width: toNumberWithDefault(140, value("width")),
     };
   }
 
@@ -42,86 +44,82 @@ export const Button = ({
   specificPrefix,
   spacingStyle,
 }: Props) => {
-  if (!value(`${specificPrefix}_button_enabled`)) {
+  // Retrives values depending to the slot
+  const getSlotBasedValue = (property: string) =>
+    value(`${specificPrefix}_${property}`);
+
+  /**
+   * Retrieves values depending to the independ_style toggle:
+   * (e.g for button value button_2_label_enabled returns button_1_label_enabled when independent_style: false)
+   */
+  const getValue = (property: string) => value(`${stylePrefix}_${property}`);
+
+  const assetEnabled = getValue("asset_enabled");
+  const labelEnabled = getValue("label_enabled");
+
+  if (!getSlotBasedValue("button_enabled")) {
     return null;
   }
 
-  const testID = `mobile_action_button_${index + 1}`;
-  const actionIdentifier = value(`${specificPrefix}_assign_action`);
-  const assetAlignment = value(`${stylePrefix}_asset_alignment`) || "left";
-  const actionAssetFlavour = value(`${stylePrefix}_action_asset_flavour`);
+  if (!assetEnabled && !labelEnabled) {
+    return null;
+  }
 
-  const contentsAlignment =
-    value(`${stylePrefix}_contents_alignment`) || "center";
+  const testID = `mobile_action_button_${index + 1}`;
+  const actionIdentifier = getSlotBasedValue("assign_action");
+  const assetAlignment = getValue("asset_alignment") || "left";
+  const actionAssetFlavour = getValue("action_asset_flavour");
+  const contentsAlignment = getValue("contents_alignment") || "center";
 
   return {
-    type: "PressableView",
+    type: "MobileActionButton",
     style: {
       flexDirection: getContentDirection(assetAlignment),
-      alignItems: "center",
-      justifyContent: getContentsAlignment(contentsAlignment),
-
-      marginTop: toNumberWithDefaultZero(value(`${stylePrefix}_margin_top`)),
-      marginRight: toNumberWithDefaultZero(
-        value(`${stylePrefix}_margin_right`)
-      ),
-      marginBottom: toNumberWithDefaultZero(
-        value(`${stylePrefix}_margin_bottom`)
-      ),
-      marginLeft: toNumberWithDefaultZero(value(`${stylePrefix}_margin_left`)),
-
-      paddingTop: toNumberWithDefaultZero(value(`${stylePrefix}_padding_top`)),
-      paddingRight: toNumberWithDefaultZero(
-        value(`${stylePrefix}_padding_right`)
-      ),
-      paddingBottom: toNumberWithDefaultZero(
-        value(`${stylePrefix}_padding_bottom`)
-      ),
-      paddingLeft: toNumberWithDefaultZero(
-        value(`${stylePrefix}_padding_left`)
-      ),
-
-      borderWidth: toNumberWithDefaultZero(value(`${stylePrefix}_border_size`)),
-      borderRadius: toNumberWithDefaultZero(
-        value(`${stylePrefix}_corner_radius`)
-      ),
-      borderColor: value(`${stylePrefix}_border_color`),
-      backgroundColor: value(`${stylePrefix}_background_color`),
-
-      ...displayModeStyle({ value, prefix: stylePrefix }),
+      alignContent: "center",
+      alignItems: getContentsAlignment(contentsAlignment, assetAlignment),
+      justifyContent: getContentsAlignment(contentsAlignment, assetAlignment),
+      ...getPressableStyles(getValue),
+      ...displayModeStyle(getValue),
       ...spacingStyle,
     },
     additionalProps: {
       action: {
         identifier: actionIdentifier,
         flavour: actionAssetFlavour,
+        width: toNumberWithDefault(24, getValue("asset_width")),
+        height: toNumberWithDefault(24, getValue("asset_height")),
       },
       focusedStyles: {
-        backgroundColor: value(`${stylePrefix}_focused_background_color`),
-        borderColor: value(`${stylePrefix}_focused_border_color`),
+        backgroundColor: getValue("focused_background_color"),
+        borderColor: getValue("focused_border_color"),
       },
       testID,
     },
     elements: compact([
-      Asset({
-        prefix: stylePrefix,
-        value,
-        testID,
-      }),
-      Spacer(),
-      TextLabelsContainer({
-        prefix: stylePrefix,
-        value,
-        actionIdentifier,
-        testID,
-      }),
+      assetEnabled
+        ? Asset({
+            style: getAssetStyles(getValue),
+            testID,
+          })
+        : null,
+
+      labelEnabled
+        ? TextLabelsContainer({
+            style: getTextLabelStyles(getValue),
+            extraProps: {
+              normalStyles: {
+                color: getValue("font_color"),
+              },
+              focusedStyles: {
+                color: getValue("focused_font_color"),
+              },
+              transformText: getValue("text_transform") || "default",
+              numberOfLines: getValue("number_of_lines"),
+            },
+            actionIdentifier,
+            testID,
+          })
+        : null,
     ]),
-    data: [
-      {
-        func: (x) => x,
-        args: [],
-        propName: "item",
-      },
-    ],
   };
 };

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

@@ -1,32 +1,37 @@
-import { compact } from "@applicaster/zapp-react-native-utils/cellUtils";
-
-import { TextLabel } from "./TextLabel";
-
 type Props = {
-  prefix: string;
-  value: Function;
   actionIdentifier: string;
   testID?: string;
+  style?: object;
+  labelEnabled?: boolean;
+  extraProps?: object;
 };
 
 export const TextLabelsContainer = ({
-  prefix,
-  value,
   actionIdentifier,
   testID,
+  style,
+  extraProps,
 }: Props) => {
   return {
     type: "View",
     additionalProps: {
       mobileActionRole: "label_container",
     },
-    elements: compact([
-      TextLabel({
-        prefix,
-        value,
-        actionIdentifier,
-        testID,
-      }),
-    ]),
+    elements: [
+      {
+        type: "Text",
+        style: style,
+        additionalProps: {
+          label: {
+            context: actionIdentifier,
+            name: "label_1",
+          },
+          state: "default",
+          mobileActionRole: "label",
+          testID: testID ? `${testID}-label` : undefined,
+          ...extraProps,
+        },
+      },
+    ],
   };
 };