@applicaster/zapp-react-native-utils 15.1.6-alpha.3988508055 → 15.1.6

package/actionsExecutor/ActionExecutorContext.tsx

@@ -19,11 +19,9 @@ import {
   appRestartAction,
   confirmDialogAction,
   createNavigateToScreenAction,
-  dismissBottomSheetAction,
   localStorageRemoveAction,
   localStorageSetAction,
   localStorageToggleFlagAction,
-  openBottomSheetAction,
   refreshComponentAction,
   screenSetVariableAction,
   screenToggleFlagAction,
@@ -92,8 +90,6 @@ const prepareDefaultActions = (actionExecutor) => {
 
   actionExecutor.registerAction("screenSetVariable", screenSetVariableAction);
   actionExecutor.registerAction("screenToggleFlag", screenToggleFlagAction);
-  actionExecutor.registerAction("openBottomSheet", openBottomSheetAction);
-  actionExecutor.registerAction("dismissBottomSheet", dismissBottomSheetAction);
   actionExecutor.registerAction("showToast", showToastAction);
 };
 

package/actionsExecutor/actions/__tests__/showToast.test.ts

@@ -11,14 +11,13 @@ describe("showToastAction", () => {
     jest.clearAllMocks();
   });
 
-  it("calls postEvent with showToast payload and returns ActionResult.Success", async () => {
+  it("calls postEvent with the provided options and returns Success", async () => {
     const action = {
       type: "showToast",
       options: {
         id: "toast-1",
         message: "Added to queue",
         extraMessage: "Extra info",
-        timeout: 3000,
       },
     };
 
@@ -32,13 +31,36 @@ describe("showToastAction", () => {
         message: "Added to queue",
         extraMessage: "Extra info",
         style: undefined,
-        timeout: 3000,
+        timeout: undefined,
       },
     ]);
 
     expect(result).toBe(ActionResult.Success);
   });
 
+  it("preserves an explicit timeout and style override", async () => {
+    const action = {
+      type: "showToast",
+      options: {
+        message: "Playlist created",
+        timeout: 3000,
+        style: { backgroundColor: "#00FF00" },
+      },
+    };
+
+    await showToastAction(action);
+
+    expect(postEvent).toHaveBeenCalledWith("showToast", [
+      {
+        id: undefined,
+        message: "Playlist created",
+        extraMessage: undefined,
+        style: { backgroundColor: "#00FF00" },
+        timeout: 3000,
+      },
+    ]);
+  });
+
   it("handles missing or empty options without throwing", async () => {
     const action = {
       type: "showToast",

package/actionsExecutor/actions/index.ts

@@ -28,7 +28,3 @@ export { screenToggleFlagAction } from "./screenToggleFlag";
 export { createNavigateToScreenAction } from "./navigateToScreen";
 
 export { showToastAction } from "./showToast";
-
-export { openBottomSheetAction } from "./openBottomSheet";
-
-export { dismissBottomSheetAction } from "./dismissBottomSheet";

package/actionsExecutor/actions/refreshComponent.ts

@@ -82,12 +82,6 @@ export const refreshComponentAction: ActionHandler = async (
       }) || source;
   }
 
-  if (!dataSource) {
-    log_info("handleAction: refreshComponent skipped: no dataSource found");
-
-    return ActionResult.Success;
-  }
-
   log_info(`handleAction: refreshComponent for dataSource:${dataSource}`, {
     source,
     inflatedUrl: dataSource,

package/actionsExecutor/actions/showToast.ts

@@ -17,13 +17,15 @@ export interface ShowToastActionOptions {
 export const showToastAction: ActionHandler<ShowToastActionOptions> = async (
   action
 ): Promise<ActionResult> => {
+  const options = action?.options;
+
   postEvent("showToast", [
     {
-      id: action?.options?.id,
-      message: action?.options?.message,
-      extraMessage: action?.options?.extraMessage,
-      style: action?.options?.style,
-      timeout: action?.options?.timeout,
+      id: options?.id,
+      message: options?.message,
+      extraMessage: options?.extraMessage,
+      style: options?.style,
+      timeout: options?.timeout,
     },
   ]);
 

package/actionsExecutor/feedDecorator.ts

@@ -27,7 +27,7 @@ function makeMultiSelect(feed: ZappFeed, key, decoratedFeed) {
   );
 
   const behavior = {
-    ...feed.extensions?.behavior,
+    ...feed.extensions?.["behavior"],
     select_mode: "multi",
     current_selection: `@{${scope}/${key}}`,
   };
@@ -75,7 +75,7 @@ function makeSingleSelect(feed: ZappFeed, key, decoratedFeed) {
   );
 
   const behavior = {
-    ...feed.extensions?.behavior,
+    ...feed.extensions?.["behavior"],
     select_mode: "single",
     current_selection: `@{${scope}/${key}}`,
   };
@@ -141,11 +141,11 @@ function makeSingleSelect(feed: ZappFeed, key, decoratedFeed) {
 }
 
 export const decorateFeed = (feed: ZappFeed) => {
-  if (!(feed.extensions?.role === "preference_editor")) {
+  if (!(feed.extensions?.["role"] === "preference_editor")) {
     return feed;
   }
 
-  const key = feed.extensions?.preference_editor_options?.key;
+  const key = feed.extensions?.["preference_editor_options"]?.["key"];
 
   if (!key) {
     log_error(
@@ -160,8 +160,8 @@ export const decorateFeed = (feed: ZappFeed) => {
   const decoratedFeed = R.clone(feed);
 
   const isSingleSelect =
-    (feed.extensions?.preference_editor_options?.select_mode ||
-      feed.extensions?.behavior?.select_mode) === "single";
+    (feed.extensions?.["preference_editor_options"]?.select_mode ||
+      feed.extensions?.["behavior"]?.select_mode) === "single";
 
   if (isSingleSelect) {
     return makeSingleSelect(feed, key, decoratedFeed);

package/actionsExecutor/types.ts

@@ -16,10 +16,8 @@ export interface ActionExecutionContext {
   /** The entry that defines the screen (if screen was opened from an entry) */
   screenEntry?: ZappEntry;
 
-  /** The UI component that triggered the action.
-   * From UIComponentContext as `{ ...component, parent }`.
-   */
-  component?: ZappUIComponent & { parent?: ZappUIComponent };
+  /** The UI component that triggered the action */
+  component?: ZappUIComponent;
 
   /** The route identifier for the current screen */
   screenRoute?: string;
@@ -33,7 +31,7 @@ export interface ActionExecutionContext {
   /** Callback function for action completion */
   callback?: (result: { success: boolean; error: any; abort: boolean }) => void;
 
-  screenState?: Record<any, any>;
+  screenState: Record<any, any>;
 }
 
 /**

package/modalState/index.ts

@@ -1,30 +1,83 @@
-export {
-  modalStore,
-  useModalStore,
-  openModal,
-  dismissModal,
-  openBottomSheetModal,
-  useModalStoreState,
-} from "./store";
-
-export type { ModalState, ModalStore } from "./store";
-
-export { modalOrchestrator } from "./ModalOrchestrator";
-
-export { ContentViewModel } from "./ContentViewModel";
-
-export type {
-  Menu,
-  MenuItem,
-  Header,
-  Content,
-  Action,
-  PresentSubMenuAction,
-  SecondaryAction,
-  SelectMode,
-  SelectionBehavior,
-} from "./types";
-
-export { isPresentSubMenuAction } from "./types";
-
-export { useBottomSheetContent } from "./useBottomSheetContent";
+import { useStore, createStore } from "zustand";
+
+interface ModalState {
+  visible: boolean;
+  screen: any;
+  options: Record<string, unknown>;
+  props: Record<string, unknown>;
+}
+
+interface ModalStore {
+  modalState: ModalState;
+  setModalState: (newState: Partial<ModalState>) => void;
+  openModal: (
+    item: any,
+    options?: Record<string, unknown>,
+    props?: Record<string, unknown>
+  ) => void;
+  dismissModal: () => void;
+}
+
+const initialModalState: ModalState = {
+  visible: false,
+  screen: null,
+  options: {},
+  props: {},
+};
+
+export const modalStore = createStore<ModalStore>((set) => ({
+  modalState: initialModalState,
+  setModalState: (newState) =>
+    set((state) => ({
+      modalState: { ...state.modalState, ...newState },
+    })),
+  openModal: ({ item, options = {}, props }: OpenModalArg) =>
+    set({
+      modalState: {
+        visible: true,
+        screen: item,
+        options: {
+          animated: true,
+          animationType: "slide",
+          onShow: () => {},
+          presentationStyle: "overFullScreen",
+          transparent: true,
+          ...options,
+          onDismiss: () => set({ modalState: initialModalState }),
+          onRequestClose: () => set({ modalState: initialModalState }),
+        },
+        props,
+      },
+    }),
+  dismissModal: () => set(() => ({ modalState: initialModalState })),
+}));
+
+export const useModalStore = <T>(selector: (state: ModalStore) => T) =>
+  useStore(modalStore, selector);
+
+export const openModal = modalStore.getInitialState().openModal;
+
+export const dismissModal = modalStore.getInitialState().dismissModal;
+
+export const openBottomSheetModal = ({
+  ModalBottomSheetContent,
+  modalBottomSheetContentProps,
+  props = {},
+  options = {},
+}: OpenModalBottomSheetArgs) => {
+  openModal({
+    item: {
+      ModalBottomSheetContent,
+      modalBottomSheetContentProps,
+    },
+    props,
+    options: {
+      animationType: "none",
+      animated: false,
+      ...options,
+    },
+  });
+};
+
+export const useModalStoreState = (): ModalState =>
+  useModalStore<ModalState>((state) => state.modalState);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "15.1.6-alpha.3988508055",
+  "version": "15.1.6",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.1.6-alpha.3988508055",
+    "@applicaster/applicaster-types": "15.1.6",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/reactHooks/layout/index.ts

@@ -49,7 +49,7 @@ export function useStatusBarHeight() {
   });
 }
 
-export const getNavbarHeight = () => {
+const getNavbarHeight = () => {
   return isTV() ? 60 : platformSelect({ ios: 44, android: 56 });
 };
 

package/actionsExecutor/actions/__tests__/dismissBottomSheet.test.ts

@@ -1,22 +0,0 @@
-import { dismissBottomSheetAction } from "../dismissBottomSheet";
-import { dismissModal } from "../../../modalState";
-import { ActionResult } from "../../ActionExecutor";
-
-jest.mock("../../../modalState", () => ({
-  dismissModal: jest.fn(),
-}));
-
-describe("dismissBottomSheetAction", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("calls dismissModal and returns ActionResult.Success", async () => {
-    const result = await dismissBottomSheetAction({
-      type: "dismissBottomSheet",
-    });
-
-    expect(dismissModal).toHaveBeenCalledTimes(1);
-    expect(result).toBe(ActionResult.Success);
-  });
-});

package/actionsExecutor/actions/__tests__/loadItemsFromSource.test.ts

@@ -1,88 +0,0 @@
-import { loadItemsFromSource } from "../openBottomSheet";
-
-const mockCall = jest.fn();
-
-jest.mock("@applicaster/zapp-pipes-v2-client", () => ({
-  RequestBuilder: jest.fn().mockImplementation(() => ({
-    setEntryContext: jest.fn().mockReturnThis(),
-    setScreenContext: jest.fn().mockReturnThis(),
-    setUrl: jest.fn().mockReturnThis(),
-    buildAxiosRequest: jest.fn().mockResolvedValue(undefined),
-    call: (...args: any[]) => mockCall(...args),
-  })),
-  PipesClientResponseHelper: jest.fn().mockImplementation(() => ({
-    error: null,
-  })),
-}));
-
-describe("loadItemsFromSource", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("returns items plus role and behavior from feed.extensions", async () => {
-    mockCall.mockResolvedValueOnce({
-      response: {
-        entry: [{ id: "a", title: "Playlist A", media_group: [] }],
-        extensions: {
-          role: "collection_selector",
-          behavior: {
-            select_mode: "multi",
-            current_selection: ["a"],
-            selector: "extensions.tag",
-          },
-        },
-      },
-    });
-
-    const result = await loadItemsFromSource("https://example.com/feed");
-
-    expect(result.role).toBe("collection_selector");
-
-    expect(result.behavior).toEqual({
-      selectMode: "multi",
-      currentSelection: ["a"],
-      selector: "extensions.tag",
-    });
-
-    expect(result.items).toHaveLength(1);
-    expect(result.items[0].isSelected).toBe(true);
-    expect(result.items[0].title).toBe("Playlist A");
-  });
-
-  it("returns undefined role/behavior when feed has no extensions", async () => {
-    mockCall.mockResolvedValueOnce({
-      response: {
-        entry: [{ id: "1", title: "Plain", media_group: [] }],
-      },
-    });
-
-    const result = await loadItemsFromSource("https://example.com/plain");
-
-    expect(result.role).toBeUndefined();
-    expect(result.behavior).toBeUndefined();
-    expect(result.items).toHaveLength(1);
-  });
-
-  it("preserves events in dynamic_collection_options", async () => {
-    mockCall.mockResolvedValueOnce({
-      response: {
-        entry: [],
-        extensions: {
-          dynamic_collection_options: {
-            operations: "add,remove",
-            events: {
-              add: [{ type: "showTextInput", options: {} }],
-            },
-          },
-        },
-      },
-    });
-
-    const result = await loadItemsFromSource("https://example.com/feed");
-
-    expect(result.dynamicCollection?.events).toEqual({
-      add: [{ type: "showTextInput", options: {} }],
-    });
-  });
-});

package/actionsExecutor/actions/__tests__/openBottomSheet.customContent.test.ts

@@ -1,76 +0,0 @@
-import { openBottomSheetAction } from "../openBottomSheet";
-import { ActionResult } from "../../ActionExecutor";
-import { openBottomSheetModal } from "../../../modalState/store";
-import { modalOrchestrator } from "../../../modalState/ModalOrchestrator";
-
-jest.mock("../../../modalState/store", () => ({
-  openBottomSheetModal: jest.fn(),
-}));
-
-jest.mock("../../../modalState/ModalOrchestrator", () => ({
-  modalOrchestrator: {
-    open: jest.fn(),
-  },
-  isPresentSubMenuAction: jest.requireActual("../../../modalState/types")
-    .isPresentSubMenuAction,
-}));
-
-describe("openBottomSheetAction custom content", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it("opens default sheet with contentComponent body props", async () => {
-    const CustomContent = function CustomContent() {
-      return null;
-    };
-
-    const result = await openBottomSheetAction({
-      type: "openBottomSheet",
-      options: {
-        header: { title: "Create Playlist" },
-        content: {
-          component: CustomContent,
-          props: {
-            inputLabel: "Name your playlist",
-            buttonLabel: "Create",
-            defaultValue: "",
-            submitAction: { type: "sendCloudEvent", options: {} },
-          },
-        },
-      },
-    } as any);
-
-    expect(result).toBe(ActionResult.Success);
-    expect(openBottomSheetModal).toHaveBeenCalledTimes(1);
-    expect(modalOrchestrator.open).not.toHaveBeenCalled();
-
-    const args = (openBottomSheetModal as jest.Mock).mock.calls[0][0];
-    // Default ModalComponent provides the standard header
-    expect(args.ModalBottomSheetContent).toBeUndefined();
-
-    expect(args.modalBottomSheetContentProps).toMatchObject({
-      title: "Create Playlist",
-      contentComponent: CustomContent,
-      contentComponentProps: {
-        inputLabel: "Name your playlist",
-        buttonLabel: "Create",
-        defaultValue: "",
-      },
-    });
-  });
-
-  it("returns Error when neither list data nor content.component is provided", async () => {
-    const result = await openBottomSheetAction({
-      type: "openBottomSheet",
-      options: {
-        header: { title: "Empty" },
-        content: {},
-      },
-    } as any);
-
-    expect(result).toBe(ActionResult.Error);
-    expect(openBottomSheetModal).not.toHaveBeenCalled();
-    expect(modalOrchestrator.open).not.toHaveBeenCalled();
-  });
-});

package/actionsExecutor/actions/dismissBottomSheet.ts

@@ -1,22 +0,0 @@
-/// <reference types="@applicaster/applicaster-types" />
-import { dismissModal } from "../../modalState";
-import { ActionResult } from "../ActionExecutor";
-import { ActionHandler } from "../types";
-import { createLogger } from "../../logger";
-
-const { log_info } = createLogger({
-  subsystem: "ActionExecutorContext",
-  category: "General",
-});
-
-/**
- * Dismisses the active bottom sheet / modal.
- */
-export const dismissBottomSheetAction: ActionHandler<
-  any
-> = async (): Promise<ActionResult> => {
-  log_info("handleAction: dismissBottomSheet");
-  dismissModal();
-
-  return ActionResult.Success;
-};