@applicaster/zapp-react-native-utils 16.0.0-rc.9 → 16.0.0-rc.90

package/modalState/ContentViewModel.ts

@@ -0,0 +1,113 @@
+import { BehaviorSubject, Observable } from "rxjs";
+import {
+  Content,
+  MenuItem,
+  SelectionBehavior,
+  DynamicCollectionOptions,
+} from "./types";
+import { loadItemsFromSource } from "../actionsExecutor/actions/openBottomSheet";
+import { resolveEditableCollection } from "./EditableCollectionRegistry";
+import { EditableCollection } from "./EditableCollection";
+
+export interface ContentState {
+  items: MenuItem[];
+  isLoading: boolean;
+  error?: Error | string;
+  role?: string;
+  behavior?: SelectionBehavior;
+  dynamicCollection?: DynamicCollectionOptions;
+  themePluginId?: string;
+}
+
+export class ContentViewModel {
+  private state$: BehaviorSubject<ContentState>;
+  readonly itemsUrl?: string;
+  public editableCollection: EditableCollection | null = null;
+  private content: Content;
+
+  constructor(content: Content) {
+    this.content = content;
+    this.itemsUrl = content.itemsUrl;
+
+    this.state$ = new BehaviorSubject<ContentState>({
+      items: content.items || [],
+      isLoading: false,
+      role: content.role,
+      behavior: content.behavior,
+      dynamicCollection: content.dynamicCollection,
+      themePluginId: content.themePluginId,
+    });
+
+    this.initEditableCollection(content);
+
+    if (this.itemsUrl && this.state$.value.items.length === 0) {
+      this.refetch();
+    }
+  }
+
+  private initEditableCollection(content: Content) {
+    this.editableCollection = resolveEditableCollection(content, this.refetch);
+  }
+
+  getState = (): ContentState => this.state$.value;
+
+  get stateObservable(): Observable<ContentState> {
+    return this.state$.asObservable();
+  }
+
+  subscribe = (listener: (state: ContentState) => void) => {
+    const subscription = this.state$.subscribe(listener);
+
+    return () => subscription.unsubscribe();
+  };
+
+  private updateState(partialState: Partial<ContentState>) {
+    this.state$.next({ ...this.state$.value, ...partialState });
+  }
+
+  refetch = async () => {
+    if (!this.itemsUrl) return;
+
+    this.updateState({ isLoading: true, error: undefined });
+
+    try {
+      const separator = this.itemsUrl.includes("?") ? "&" : "?";
+      const cacheBustedUrl = `${this.itemsUrl}${separator}_t=${Date.now()}`;
+
+      const { items, role, behavior, dynamicCollection } =
+        await loadItemsFromSource(cacheBustedUrl);
+
+      this.content = {
+        ...this.content,
+        items,
+        role,
+        behavior,
+        dynamicCollection,
+      };
+
+      this.updateState({
+        items,
+        role,
+        behavior,
+        dynamicCollection,
+        isLoading: false,
+      });
+
+      if (this.editableCollection) {
+        // Reuse the existing collection instance. Pushing the freshly loaded
+        // server items replaces any optimistic local state with the
+        // authoritative result (and rolls forward a successful mutation).
+        this.editableCollection.sync?.(items);
+      } else {
+        // The collection may only become resolvable once options arrive from
+        // the feed (e.g. inline content had none). Create it lazily here.
+        this.initEditableCollection(this.content);
+      }
+    } catch (err) {
+      this.updateState({
+        error: err?.message || "Failed to load",
+        isLoading: false,
+      });
+    }
+  };
+}

package/modalState/EditableCollection.ts

@@ -0,0 +1,17 @@
+import { Observable } from "rxjs";
+import { MenuItem, Operation } from "./types";
+
+export interface EditableCollection {
+  items$: Observable<MenuItem[]>;
+  operations: Operation[];
+  add?(item?: MenuItem): void | Promise<void>;
+  remove?(index: number): void | Promise<void>;
+  move?(itemIds: string[]): void | Promise<void>;
+  deleteCollection?(): void | Promise<void>;
+  /**
+   * Push authoritative items (e.g. a fresh server feed after a mutation) into
+   * the collection, replacing any optimistic local state. Called by the
+   * ContentViewModel on refetch so the instance is reused instead of recreated.
+   */
+  sync?(items: MenuItem[]): void;
+}

package/modalState/EditableCollectionRegistry.ts

@@ -0,0 +1,51 @@
+import { Content } from "./types";
+import { EditableCollection } from "./EditableCollection";
+import { RemoteEditableCollection } from "./RemoteEditableCollection";
+import { createLogger } from "../logger";
+
+const { log_error } = createLogger({
+  subsystem: "modalState",
+  category: "EditableCollectionRegistry",
+});
+
+type ProviderFactory = () => EditableCollection;
+
+export class EditableCollectionRegistry {
+  private static providers: Record<string, ProviderFactory> = {};
+
+  static register(token: string, factory: ProviderFactory) {
+    this.providers[token] = factory;
+  }
+
+  static getProvider(token: string): EditableCollection | null {
+    const factory = this.providers[token];
+
+    return factory ? factory() : null;
+  }
+}
+
+export function resolveEditableCollection(
+  content: Content,
+  refetch: () => Promise<void>
+): EditableCollection | null {
+  const options = content.dynamicCollection;
+  if (!options) return null;
+
+  if (options.provider) {
+    const provider = EditableCollectionRegistry.getProvider(options.provider);
+
+    if (!provider) {
+      log_error(
+        `No EditableCollection provider registered for token "${options.provider}"`
+      );
+    }
+
+    return provider;
+  }
+
+  if (options.postUrl) {
+    return new RemoteEditableCollection(content, refetch);
+  }
+
+  return null;
+}

package/modalState/ModalOrchestrator.ts

@@ -0,0 +1,211 @@
+import { dismissModal, modalStore, openBottomSheetModal } from "./store";
+import {
+  getMenuItemActions,
+  isPresentSubMenuAction,
+  Menu,
+  MenuItem,
+  PresentSubMenuAction,
+} from "./types";
+import { ContentViewModel } from "./ContentViewModel";
+
+export type { Menu, MenuItem };
+
+export { isPresentSubMenuAction, getMenuItemActions };
+
+/**
+ * Converts a Menu model into the props expected by BottomSheetModalContent.
+ * - Maps MenuItem.title → label (required by BottomSheetModalContent)
+ * - Maps MenuItem.icon  → image src
+ * - Flattens header.title / header.subtitle into top-level title / summary
+ */
+interface StackEntry {
+  menu: Menu;
+  onItemPress?: (item: MenuItem) => void | Promise<void>;
+  viewModel: ContentViewModel;
+}
+
+function menuToModalArgs(
+  menu: Menu,
+  viewModel: ContentViewModel,
+  onItemPress: (item: MenuItem) => void | Promise<void>,
+  key: string
+): OpenModalBottomSheetArgs {
+  const items = menu.content.items.map((item) => ({
+    ...item,
+    // BottomSheetModalContent renders `theme[item.label] ?? item.label`
+    label: item.title,
+  }));
+
+  return {
+    modalBottomSheetContentProps: {
+      key,
+      items,
+      itemsUrl: menu.content.itemsUrl,
+      title: menu.header?.title ?? menu.content.title,
+      summary: menu.header?.subtitle,
+      styleOverrides: menu.content.styleOverrides,
+      onPress: onItemPress,
+      viewModel,
+    },
+    options: {},
+  };
+}
+
+/**
+ * ModalOrchestrator manages a stack of Menu modals, enabling push/pop
+ * navigation between bottom sheet screens.
+ *
+ * Usage:
+ *   modalOrchestrator.open(menu);
+ *   modalOrchestrator.back();    // go to previous modal in the stack
+ *   modalOrchestrator.close();   // dismiss all and clear the stack
+ */
+class ModalOrchestrator {
+  private _stack: StackEntry[] = [];
+
+  /** Number of entries currently in the stack. */
+  get stackSize(): number {
+    return this._stack.length;
+  }
+
+  /** Whether there is a previous modal to go back to. */
+  get canGoBack(): boolean {
+    return this._stack.length > 1;
+  }
+
+  /** The Menu currently shown, or null if the stack is empty. */
+  get current(): Menu | null {
+    return this._stack[this._stack.length - 1]?.menu ?? null;
+  }
+
+  /**
+   * Push a new Menu onto the stack and display it.
+   * If a menu item carries a PresentSubMenuAction it will automatically
+   * push the sub-menu when pressed; all other items delegate to
+   * the optional `onItemPress` callback.
+   */
+  open(
+    menu: Menu,
+    onItemPress?: (item: MenuItem) => void | Promise<void>
+  ): void {
+    const viewModel = new ContentViewModel(menu.content);
+    this._stack.push({ menu, onItemPress, viewModel });
+    this._present(menu, viewModel, onItemPress);
+  }
+
+  /**
+   * Pop the current modal and return to the previous one.
+   * If the stack has only one entry, closes entirely.
+   */
+  back(): void {
+    if (this._stack.length === 0) {
+      return;
+    }
+
+    this._stack.pop();
+
+    const previous = this._stack[this._stack.length - 1];
+
+    if (previous) {
+      this._present(previous.menu, previous.viewModel, previous.onItemPress);
+    } else {
+      dismissModal();
+    }
+  }
+
+  /**
+   * Close all modals and clear the entire stack.
+   */
+  close(): void {
+    this._stack = [];
+    dismissModal();
+  }
+
+  /**
+   * Replace the current top of the stack without adding a new history entry.
+   */
+  replace(
+    menu: Menu,
+    onItemPress?: (item: MenuItem) => void | Promise<void>
+  ): void {
+    if (this._stack.length === 0) {
+      this.open(menu, onItemPress);
+
+      return;
+    }
+
+    const viewModel = new ContentViewModel(menu.content);
+    this._stack[this._stack.length - 1] = { menu, onItemPress, viewModel };
+    this._present(menu, viewModel, onItemPress);
+  }
+
+  private _buildOnPress(
+    onItemPress?: (item: MenuItem) => void | Promise<void>
+  ): (item: MenuItem) => void | Promise<void> {
+    return async (item: MenuItem) => {
+      if (onItemPress) {
+        await onItemPress(item);
+      }
+
+      const actions = getMenuItemActions(item);
+
+      const subMenuAction = actions.find(isPresentSubMenuAction) as
+        | PresentSubMenuAction
+        | undefined;
+
+      if (subMenuAction) {
+        // Navigate deeper into the sub-menu
+        this.open(subMenuAction.menu, onItemPress);
+      }
+    };
+  }
+
+  /**
+   * Called when the UI dismisses the modal (swipe / overlay tap).
+   * Clears the stack without calling dismissModal() again to avoid
+   * a feedback loop with the store reset.
+   */
+  private _onUIDismiss(): void {
+    this._stack = [];
+  }
+
+  /**
+   * True when the Zustand modal store already has a visible bottom sheet.
+   * Used to skip the slide-in animation when navigating to a deeper level.
+   */
+  private get _isOpen(): boolean {
+    return modalStore.getState().modalState.visible;
+  }
+
+  private _present(
+    menu: Menu,
+    viewModel: ContentViewModel,
+    onItemPress?: (item: MenuItem) => void | Promise<void>
+  ): void {
+    const key = `menu-level-${this._stack.length}`;
+
+    const args = menuToModalArgs(
+      menu,
+      viewModel,
+      this._buildOnPress(onItemPress),
+      key
+    );
+
+    const alreadyOpen = this._isOpen;
+
+    openBottomSheetModal({
+      ...args,
+      options: {
+        ...args.options,
+        // Skip the slide-in when updating an already-visible sheet (sub-level nav)
+        animated: !alreadyOpen,
+        animationType: alreadyOpen ? "none" : "slide",
+        // Keep the stack in sync when the user dismisses via swipe or overlay
+        onDismiss: () => this._onUIDismiss(),
+        onRequestClose: () => this._onUIDismiss(),
+      },
+    });
+  }
+}
+
+export const modalOrchestrator = new ModalOrchestrator();

package/modalState/RemoteEditableCollection.ts

@@ -0,0 +1,235 @@
+import { BehaviorSubject, Observable } from "rxjs";
+import { Content, MenuItem, Operation } from "./types";
+import { EditableCollection } from "./EditableCollection";
+import { reorderByIds } from "../arrayUtils";
+import { actionExecutor } from "../actionsExecutor/ActionExecutor";
+import { createLogger } from "../logger";
+
+const { log_debug, log_warning, log_error } = createLogger({
+  subsystem: "modalState",
+  category: "RemoteEditableCollection",
+});
+
+export class RemoteEditableCollection implements EditableCollection {
+  public items$: Observable<MenuItem[]>;
+  public operations: Operation[];
+  private itemsSubject: BehaviorSubject<MenuItem[]>;
+  private refetch: () => Promise<void>;
+  private content: Content;
+  private pendingMutationsCount = 0;
+
+  constructor(content: Content, refetch: () => Promise<void>) {
+    this.content = content;
+    this.refetch = refetch;
+    this.operations = content.dynamicCollection?.operations || [];
+    this.itemsSubject = new BehaviorSubject<MenuItem[]>(content.items || []);
+    this.items$ = this.itemsSubject.asObservable();
+  }
+
+  /**
+   * Replace the current items with an authoritative server list (called after
+   * a successful mutation reloads the feed). Overrides optimistic state.
+   */
+  sync(items: MenuItem[]): void {
+    if (this.pendingMutationsCount > 0) {
+      log_debug(
+        `sync: Suppressing server sync because ${this.pendingMutationsCount} local mutation(s) are in-flight`
+      );
+
+      return;
+    }
+
+    this.itemsSubject.next(items);
+  }
+
+  async remove(index: number): Promise<void> {
+    const items = this.itemsSubject.value;
+    const snapshot = [...items];
+    const item = items[index];
+
+    if (!item) return;
+
+    this.pendingMutationsCount++;
+
+    // Optimistic update
+    const newItems = items.filter((_, i) => i !== index);
+    this.itemsSubject.next(newItems);
+
+    let actionFailed = false;
+
+    try {
+      await this.executeActionAlias(item, "remove_item");
+    } catch (e) {
+      actionFailed = true;
+      log_error("Remove failed, rolling back", { error: e });
+      this.itemsSubject.next(snapshot);
+    } finally {
+      this.pendingMutationsCount = Math.max(0, this.pendingMutationsCount - 1);
+    }
+
+    if (!actionFailed) {
+      await this.refetch();
+    }
+  }
+
+  async move(itemIds: string[]): Promise<void> {
+    const items = this.itemsSubject.value;
+    const snapshot = [...items];
+
+    if (itemIds && itemIds.length > 0) {
+      this.pendingMutationsCount++;
+      const newItems = reorderByIds(items, itemIds);
+      this.itemsSubject.next(newItems);
+
+      let actionFailed = false;
+
+      try {
+        const targetItem = newItems[0] || items[0];
+
+        await this.executeActionAlias(targetItem, "reorder_item", {
+          itemIds,
+        });
+      } catch (e) {
+        actionFailed = true;
+        log_error("Move failed, rolling back", { error: e });
+        this.itemsSubject.next(snapshot);
+      } finally {
+        this.pendingMutationsCount = Math.max(
+          0,
+          this.pendingMutationsCount - 1
+        );
+      }
+
+      if (!actionFailed) {
+        await this.refetch();
+      }
+    }
+  }
+
+  async add(_item?: MenuItem): Promise<void> {
+    const items = this.itemsSubject.value;
+    const snapshot = [...items];
+
+    const addEvents = this.content.dynamicCollection?.events?.add;
+
+    if (!addEvents || addEvents.length === 0) {
+      log_warning("No events.add action found for create collection operation");
+
+      return;
+    }
+
+    this.pendingMutationsCount++;
+    let actionFailed = false;
+
+    try {
+      for (const action of addEvents) {
+        if (this.content.context) {
+          await actionExecutor.handleAction(
+            action as any,
+            this.content.context
+          );
+        } else {
+          await actionExecutor.handleAction(action as any);
+        }
+      }
+    } catch (e) {
+      actionFailed = true;
+      log_error("Add/create collection failed", { error: e });
+      this.itemsSubject.next(snapshot);
+    } finally {
+      this.pendingMutationsCount = Math.max(0, this.pendingMutationsCount - 1);
+    }
+
+    if (!actionFailed) {
+      await this.refetch();
+    }
+  }
+
+  async deleteCollection(): Promise<void> {
+    const items = this.itemsSubject.value;
+    const snapshot = [...items];
+
+    this.pendingMutationsCount++;
+    this.itemsSubject.next([]);
+
+    let actionFailed = false;
+
+    try {
+      const firstItem = items[0];
+
+      if (firstItem) {
+        await this.executeActionAlias(firstItem, [
+          "delete_collection",
+          "clear_collection",
+        ]);
+      }
+    } catch (e) {
+      actionFailed = true;
+      log_error("deleteCollection failed, rolling back", { error: e });
+      this.itemsSubject.next(snapshot);
+    } finally {
+      this.pendingMutationsCount = Math.max(0, this.pendingMutationsCount - 1);
+    }
+
+    if (!actionFailed) {
+      await this.refetch();
+    }
+  }
+
+  private async executeActionAlias(
+    item: MenuItem,
+    alias: string | string[],
+    data?: Record<string, unknown>
+  ): Promise<void> {
+    const entryActions = item.entryActions || [];
+    const aliases = Array.isArray(alias) ? alias : [alias];
+
+    const actionGroup = entryActions.find(
+      (ea) => ea.button?.alias && aliases.includes(ea.button.alias)
+    );
+
+    log_debug("executeActionAlias:", {
+      alias,
+      itemId: item.id,
+      entryActionsCount: entryActions.length,
+      availableAliases: entryActions.map((ea) => ea.button?.alias),
+      foundActionGroup: !!actionGroup,
+      data,
+    });
+
+    if (!actionGroup || !actionGroup.actions) {
+      log_warning(`No entry action found for alias "${aliases.join(", ")}"`, {
+        itemId: item.id,
+      });
+
+      return;
+    }
+
+    // Execute each action in the group
+    for (const action of actionGroup.actions) {
+      const actionToExecute = data
+        ? {
+            ...action,
+            options: {
+              ...action.options,
+              ...data,
+              data: {
+                ...(action.options?.data || {}),
+                ...data,
+              },
+            },
+          }
+        : action;
+
+      log_debug("handling action:", actionToExecute);
+
+      await actionExecutor.handleAction(
+        actionToExecute as any,
+        {
+          ...this.content.context,
+          entry: item as any,
+        } as any
+      );
+    }
+  }
+}

package/modalState/__tests__/ContentViewModel.editable.test.ts

@@ -0,0 +1,69 @@
+import { ContentViewModel } from "../ContentViewModel";
+import { loadItemsFromSource } from "../../actionsExecutor/actions/openBottomSheet";
+import { EditableCollectionRegistry } from "../EditableCollectionRegistry";
+import { EditableCollection } from "../EditableCollection";
+import { BehaviorSubject } from "rxjs";
+import type { MenuItem } from "../types";
+
+jest.mock("../../actionsExecutor/actions/openBottomSheet", () => ({
+  loadItemsFromSource: jest.fn(),
+}));
+
+const load = loadItemsFromSource as jest.Mock;
+
+describe("ContentViewModel — editable collection", () => {
+  beforeEach(() => {
+    (EditableCollectionRegistry as any).providers = {};
+    jest.clearAllMocks();
+  });
+
+  it("resolves the collection once and syncs fresh items on refetch (no recreation)", async () => {
+    const sync = jest.fn();
+
+    const collection: EditableCollection = {
+      items$: new BehaviorSubject<MenuItem[]>([]).asObservable(),
+      operations: ["remove"],
+      sync,
+    };
+
+    const factory = jest.fn(() => collection);
+    EditableCollectionRegistry.register("@{provider/test}", factory);
+
+    const serverItems: MenuItem[] = [{ id: "1", title: "Fetched" }];
+
+    load.mockResolvedValue({
+      items: serverItems,
+      role: "dynamic_collection",
+      dynamicCollection: {
+        operations: ["remove"],
+        provider: "@{provider/test}",
+      },
+    });
+
+    const viewModel = new ContentViewModel({
+      title: "Queue",
+      items: [],
+      itemsUrl: "pipesv2://queue-action",
+      dynamicCollection: {
+        operations: ["remove"],
+        provider: "@{provider/test}",
+      },
+    });
+
+    // constructor resolves the provider, then refetches (items empty + itemsUrl)
+    await new Promise(process.nextTick);
+
+    expect(viewModel.editableCollection).toBe(collection);
+    // factory used exactly once — instance reused, not rebuilt on refetch
+    expect(factory).toHaveBeenCalledTimes(1);
+    // authoritative server items pushed into the existing instance
+    expect(sync).toHaveBeenLastCalledWith(serverItems);
+
+    sync.mockClear();
+
+    await viewModel.refetch();
+
+    expect(factory).toHaveBeenCalledTimes(1);
+    expect(sync).toHaveBeenCalledWith(serverItems);
+  });
+});