@applicaster/zapp-react-native-ui-components 16.0.0-alpha.1453660071 → 16.0.0-alpha.1454930193

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/SharedUI/CollapsibleTextContainer/__tests__/factory.test.ts

@@ -0,0 +1,32 @@
+import { CollapsibleTextContainer } from "../index";
+
+const getValue = (key: string) => {
+  const values: Record<string, unknown> = {
+    text_alignment: "left",
+    margin_top: 0,
+    margin_right: 0,
+    margin_bottom: 0,
+    margin_left: 0,
+    padding_top: 0,
+    padding_right: 0,
+    padding_bottom: 0,
+    padding_left: 0,
+    corner_radius: 0,
+    data_key: "title",
+    custom_data_key: undefined,
+  };
+
+  return values[key];
+};
+
+describe("CollapsibleTextContainer view tree", () => {
+  it("stretches to the parent width so labels wrap using the cell width", () => {
+    const result = CollapsibleTextContainer({
+      getValue,
+      elements: [],
+      additionalStyles: { backgroundColor: "transparent" },
+    });
+
+    expect(result.style.alignSelf).toBe("stretch");
+  });
+});

package/Components/MasterCell/SharedUI/CollapsibleTextContainer/index.ts

@@ -3,7 +3,6 @@ import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/he
 import {
   getColorFromData,
   getKeyForLabel,
-  mapSelfAlignment,
 } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
 
@@ -23,7 +22,7 @@ export const CollapsibleTextContainer = ({
   return {
     type: "CollapsibleTextContainer", // Collapsible Text Container,
     style: {
-      alignSelf: mapSelfAlignment(getValue("text_alignment")),
+      alignSelf: "stretch",
       marginTop: toNumberWithDefaultZero(getValue("margin_top")),
       marginRight: toNumberWithDefaultZero(getValue("margin_right")),
       marginBottom: toNumberWithDefaultZero(getValue("margin_bottom")),

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);

package/Components/ModalComponent/ActionsBottomSheet/ActionButton.tsx

@@ -0,0 +1,56 @@
+import React from "react";
+import { useEntryActionState } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
+import {
+  isActionAvailableFor,
+  RegisteredAction,
+} from "@applicaster/zapp-react-native-utils/uiActionsRegistrator";
+
+import { Button } from "../Button";
+
+export type ActionButtonProps = {
+  entry: ZappEntry;
+  item: RegisteredAction;
+  configuration: any;
+  width: number;
+  component?: ZappUIComponent & { parent?: ZappUIComponent };
+};
+
+type Props = ActionButtonProps & {
+  onPress?: (item: any) => void;
+};
+
+/**
+ * Unified action button for the modal bottom sheet.
+ *
+ * Every item is a `RegisteredAction` resolved from the registry (entry actions,
+ * registry actions and legacy context-provider actions alike), so the button
+ * simply reads `item.action` and drives it through `useEntryActionState`
+ * (backed by the action's observable / `addListener`).
+ */
+export function ActionButton(props: Props) {
+  const { item, entry, onPress: onItemPress, component } = props;
+
+  const action = item?.action;
+
+  const { state, invokeAction } = useEntryActionState(action, entry);
+
+  const onPress = React.useCallback(
+    (_item) => {
+      invokeAction({
+        context: "toast",
+        dismiss: () => onItemPress?.(item),
+        ...(component ? { component } : {}),
+      });
+    },
+    [invokeAction, item, onItemPress, component]
+  );
+
+  if (!isActionAvailableFor(action, entry as ZappEntry)) return null;
+
+  return (
+    <Button {...props} item={state} onPress={onPress} label={state?.label} />
+  );
+}
+
+// Explicitly set display name for the component
+ActionButton.displayName = "ActionButton";

package/Components/ModalComponent/ActionsBottomSheet/__tests__/openActionsBottomSheet.test.ts

@@ -0,0 +1,38 @@
+import { openBottomSheetModal } from "@applicaster/zapp-react-native-utils/modalState";
+import { boundActionButton } from "../boundActionButton";
+import { openActionsBottomSheet } from "../openActionsBottomSheet";
+
+jest.mock("@applicaster/zapp-react-native-utils/modalState", () => ({
+  openBottomSheetModal: jest.fn(),
+}));
+
+jest.mock("../boundActionButton", () => ({
+  boundActionButton: jest.fn(() => jest.fn()),
+}));
+
+describe("openActionsBottomSheet", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("binds the List component into the sheet row button", () => {
+    const entry = { id: "entry-1" } as ZappEntry;
+
+    const component = {
+      data: { source: "https://example.com/user/collections/abc" },
+    };
+
+    const actions = [
+      { identifier: "entry_action_0", action: { invokeAction: jest.fn() } },
+    ];
+
+    openActionsBottomSheet({
+      entry,
+      actions: actions as any,
+      component: component as any,
+    });
+
+    expect(boundActionButton).toHaveBeenCalledWith(entry, component);
+    expect(openBottomSheetModal).toHaveBeenCalledTimes(1);
+  });
+});

package/Components/ModalComponent/ActionsBottomSheet/boundActionButton.tsx

@@ -0,0 +1,24 @@
+import React from "react";
+
+import { ActionButton, ActionButtonProps } from "./ActionButton";
+
+/**
+ * Binds an entry to the sheet's row button.
+ *
+ * `BottomSheetModalContent` renders `buttonComponent` per item and does not
+ * know about entries, so the entry is closed over here instead.
+ */
+export const boundActionButton = (
+  entry: ZappEntry | ZappFeed,
+  component?: ZappUIComponent & { parent?: ZappUIComponent }
+) => {
+  const ActionButtonWithEntry = (props: ActionButtonProps) => (
+    <ActionButton {...props} entry={entry as ZappEntry} component={component} />
+  );
+
+  ActionButtonWithEntry.displayName = "ActionButtonWithEntry";
+
+  return ActionButtonWithEntry;
+};
+
+boundActionButton.displayName = "boundActionButton";

package/Components/ModalComponent/ActionsBottomSheet/index.ts

@@ -0,0 +1,9 @@
+export { ActionButton } from "./ActionButton";
+
+export type { ActionButtonProps } from "./ActionButton";
+
+export { boundActionButton } from "./boundActionButton";
+
+export { openActionsBottomSheet } from "./openActionsBottomSheet";
+
+export type { OpenActionsBottomSheetArgs } from "./openActionsBottomSheet";

package/Components/ModalComponent/ActionsBottomSheet/openActionsBottomSheet.ts

@@ -0,0 +1,61 @@
+import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
+import { openBottomSheetModal } from "@applicaster/zapp-react-native-utils/modalState";
+import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
+import { RegisteredAction } from "@applicaster/zapp-react-native-utils/uiActionsRegistrator";
+
+import { boundActionButton } from "./boundActionButton";
+
+const { log_warning } = createLogger({
+  subsystem: "ActionsBottomSheet",
+  category: "Presentation",
+});
+
+export type OpenActionsBottomSheetArgs = {
+  /** Entry the actions act on; bound into every row button. */
+  entry: ZappEntry | ZappFeed;
+  /** Already resolved and merged actions, in the order they should appear. */
+  actions: RegisteredAction[];
+  title?: string;
+  summary?: string;
+  /** List that opened the sheet; forwarded into row invokeAction context. */
+  component?: ZappUIComponent & { parent?: ZappUIComponent };
+};
+
+/**
+ * Presents a list of resolved actions in the shared bottom sheet.
+ *
+ * This is the core entry point for "show these actions in a sheet": the
+ * open-modal-bottom-sheet plugin uses it for its configured list, and the
+ * player overflow uses it for the actions that did not fit on the overlay.
+ * Neither has to know about the other, and neither needs the plugin installed.
+ */
+export function openActionsBottomSheet({
+  entry,
+  actions,
+  title,
+  summary,
+  component,
+}: OpenActionsBottomSheetArgs): void {
+  if (!actions?.length) {
+    // Every action resolved away - unavailable for this entry, or not
+    // invokable. An empty sheet looks broken, so say why and stay put.
+    log_warning(
+      "openActionsBottomSheet: nothing to present - not opening the sheet",
+      { entryId: (entry as ZappEntry)?.id }
+    );
+
+    return;
+  }
+
+  openBottomSheetModal({
+    modalBottomSheetContentProps: {
+      // TODO: should be optional - the button handles its own tap, but
+      //  BottomSheetModalContent still requires an onPress.
+      onPress: noop,
+      items: actions,
+      buttonComponent: boundActionButton(entry, component),
+      title,
+      summary,
+    },
+  });
+}