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

package/Components/MasterCell/DefaultComponents/PressableView.tsx

@@ -1,13 +1,16 @@
-import React from "react";
-import { TouchableOpacity, ViewStyle } from "react-native";
+import React, { useCallback } from "react";
+import { Pressable, ViewStyle } from "react-native";
+import { PressedStateContext } from "../contexts/PressedStateContext";
 
 type Props = {
   children?: React.ReactNode;
   style?: ViewStyle | ViewStyle[];
+  pressedStyle?: ViewStyle | ViewStyle[];
   testID?: string;
   accessibilityLabel?: string;
   accessibilityHint?: string;
   onPress?: () => void;
+  testOnly_pressed?: boolean;
 };
 
 export function PressableView({
@@ -16,19 +19,36 @@ export function PressableView({
   testID,
   accessibilityLabel,
   accessibilityHint,
+  pressedStyle,
   onPress,
+  testOnly_pressed = false,
 }: Props) {
   return (
-    <TouchableOpacity
-      activeOpacity={1}
+    <Pressable
+      testOnly_pressed={testOnly_pressed}
       onPress={onPress}
       testID={testID}
       accessibilityLabel={accessibilityLabel}
       accessibilityHint={accessibilityHint}
       accessible={!!(testID || accessibilityLabel)}
-      style={style}
+      style={useCallback(
+        ({ pressed }) => [
+          style,
+          pressed && {
+            opacity: 1,
+          },
+          pressed && pressedStyle,
+        ],
+        [style, pressedStyle]
+      )}
     >
-      {children}
-    </TouchableOpacity>
+      {({ pressed }) => {
+        return (
+          <PressedStateContext.Provider value={pressed}>
+            {children}
+          </PressedStateContext.Provider>
+        );
+      }}
+    </Pressable>
   );
 }

package/Components/MasterCell/DefaultComponents/Text/hooks/useText.ts

@@ -83,6 +83,10 @@ export const useTextLabel = ({ label, entry }): string => {
   return prepareHebrewText(label, isRTL);
 };
 
+/**
+ * Uses `otherProps.state` ("focused" | "default") to select between `focusedStyles` and `normalStyles`.
+ * For mobile action buttons, map `usePressedState()` (boolean) to this state value (e.g. pressed ? "focused" : "default").
+ */
 export const withFocusedStyles = ({ style, otherProps }) => {
   const state = R.path(["state"], otherProps);
 

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

@@ -1,6 +1,6 @@
-import React from "react";
-import { StyleSheet, View, ViewStyle } from "react-native";
+import React, { useCallback } from "react";
 import { PressableView } from "../../PressableView";
+import { usePressedState } from "../../../hooks";
 
 import { ActionButtonController } from "../../ActionButtonsCore/components";
 
@@ -16,28 +16,142 @@ type ChildElementProps = {
   entry?: any;
 };
 
-const styles = StyleSheet.create({
-  pressableView: {
-    flexDirection: "row",
-    overflow: "hidden",
-  },
-  maxWidthFull: {
-    width: "100%",
-  },
-  innerWrapper: {
-    flexDirection: "row",
-    flexGrow: 0,
-    flexShrink: 1,
-    overflow: "hidden",
-  },
-});
-
 const isValidElement = (
   child: React.ReactNode
 ): child is React.ReactElement<ChildElementProps> =>
   React.isValidElement(child);
 
-export const ActionButton = ({ style, children, action, entry, ...props }) => {
+type ActionButtonContentProps = {
+  style: any;
+  children: React.ReactNode;
+  action: any;
+  focusedStyles: any;
+  entry: any;
+  props: Record<string, any>;
+  actionContext: any;
+  actionState: any;
+  isActive: boolean;
+  onPress: () => any;
+};
+
+const ActionButtonContent = ({
+  children,
+  action,
+  entry,
+  actionContext,
+  actionState,
+  isActive,
+}: ActionButtonContentProps) => {
+  const isPressed = usePressedState();
+
+  const supportsEntryState =
+    typeof actionContext?.initialEntryState === "function";
+
+  const shouldRenderAsset = Boolean(
+    supportsEntryState ? actionState?.mobileButtonAssets : false
+  );
+
+  const shouldRenderLabel = Boolean(
+    supportsEntryState && resolveLabelText(actionState?.label)
+  );
+
+  const _cloneChildrenWithState = useCallback(
+    (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
+        // Use isPressed state for mobile buttons to set focused state on mobile
+        if (role === "label") {
+          nextProps.state = isActive || isPressed ? "focused" : "default";
+          nextProps.entry = entry;
+        }
+
+        if (nextChildren !== child.props.children) {
+          nextProps.children = nextChildren;
+        }
+
+        return React.cloneElement(child, nextProps);
+      });
+    },
+    [
+      shouldRenderAsset,
+      shouldRenderLabel,
+      actionState,
+      action.flavour,
+      action.width,
+      action.height,
+      isActive,
+      isPressed,
+      entry,
+    ]
+  );
+
+  if (!shouldRenderAsset && !shouldRenderLabel) {
+    return null;
+  }
+
+  return _cloneChildrenWithState(children);
+};
+
+export const ActionButton = ({
+  style,
+  children,
+  action,
+  focusedStyles,
+  entry,
+  ...props
+}) => {
   return (
     <ActionButtonController
       action={action}
@@ -48,126 +162,28 @@ export const ActionButton = ({ style, children, action, entry, ...props }) => {
         );
       }}
     >
-      {({ 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 as ViewStyle),
-                    ...(props.focusedStyles as ViewStyle),
-                  }
-                : (style as ViewStyle),
-              styles.pressableView,
-            ]}
-            onPress={onPress}
-            accessibilityLabel={props.accessibilityLabel || `${entry?.id}`}
-            accessibilityHint={props.accessibilityHint}
+      {(renderProps) => (
+        <PressableView
+          testOnly_pressed={props.testOnly_pressed}
+          testID={props.testID || `${entry?.id}`}
+          style={style}
+          pressedStyle={focusedStyles}
+          onPress={renderProps.onPress}
+          accessibilityLabel={props.accessibilityLabel || `${entry?.id}`}
+          accessibilityHint={props.accessibilityHint}
+        >
+          <ActionButtonContent
+            style={style}
+            action={action}
+            focusedStyles={focusedStyles}
+            entry={entry}
+            props={props}
+            {...renderProps}
           >
-            <View
-              // eslint-disable-next-line react-native/no-inline-styles
-              style={{
-                width: props.displayMode === "fill" ? "100%" : undefined,
-                maxWidth: (style as ViewStyle).maxWidth,
-                ...((style as ViewStyle).maxWidth
-                  ? styles.maxWidthFull
-                  : undefined),
-              }}
-            >
-              <View style={[styles.innerWrapper, props.alignment]}>
-                {_cloneChildrenWithState(children)}
-              </View>
-            </View>
-          </PressableView>
-        );
-      }}
+            {children}
+          </ActionButtonContent>
+        </PressableView>
+      )}
     </ActionButtonController>
   );
 };

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

@@ -29,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[0]).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/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);