@oxyhq/services 22.9.0 → 22.11.0

package/lib/module/ui/hooks/queries/useFileQueries.js

@@ -0,0 +1,120 @@
+"use strict";
+
+/**
+ * User file-library queries + cache helpers.
+ *
+ * The file list is owned by React Query (`useInfiniteQuery`), NOT a zustand
+ * store: server pages live in the query cache, and every optimistic mutation
+ * (upload / delete / visibility) edits that cache via the pure `*InCache`
+ * helpers below. The `queryFn` is side-effect-free — it only fetches and maps a
+ * page. This is what lets the file manager stay effect-free while preserving
+ * infinite scroll, pull-to-refresh, and optimistic upload reconciliation.
+ */
+
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { useOxy } from "../../context/OxyContext.js";
+import { queryKeys } from "./queryKeys.js";
+
+/** Files fetched per page. */
+export const FILES_PAGE_SIZE = 40;
+
+/** Raw file record as returned by `oxyServices.listUserFiles` / `assetUpload`. */
+
+/** One page of the infinite file list. */
+
+/** Normalize a raw API file record into the client `FileMetadata` shape. */
+export function mapRawFileToMetadata(raw) {
+  return {
+    id: raw.id,
+    filename: raw.originalName ?? raw.sha256 ?? '',
+    contentType: raw.mime ?? '',
+    length: raw.size ?? 0,
+    chunkSize: 0,
+    uploadDate: raw.createdAt ?? '',
+    metadata: raw.metadata ?? {},
+    variants: raw.variants ?? []
+  };
+}
+
+/**
+ * Infinite-paginated list of the owner's files. Fires on mount and whenever
+ * `ownerId` changes (a new key); `staleTime: 0` reloads on every open. The
+ * rendered list is `data.pages.flatMap(p => p.files)`.
+ */
+export const useUserFilesInfinite = ownerId => {
+  const {
+    oxyServices
+  } = useOxy();
+  return useInfiniteQuery({
+    queryKey: queryKeys.files.list(ownerId),
+    queryFn: async ({
+      pageParam
+    }) => {
+      const offset = typeof pageParam === 'number' ? pageParam : 0;
+      const response = await oxyServices.listUserFiles(FILES_PAGE_SIZE, offset);
+      const raw = response.files ?? [];
+      const files = raw.map(mapRawFileToMetadata);
+      return {
+        files,
+        total: response.total ?? offset + files.length,
+        hasMore: Boolean(response.hasMore),
+        nextOffset: offset + FILES_PAGE_SIZE
+      };
+    },
+    initialPageParam: 0,
+    getNextPageParam: lastPage => lastPage.hasMore ? lastPage.nextOffset : undefined,
+    enabled: Boolean(ownerId),
+    staleTime: 0,
+    refetchOnWindowFocus: false
+  });
+};
+
+// --- Pure cache transforms (optimistic updates) -----------------------------
+// Each edits the cached `InfiniteData` for one owner. All no-op when nothing is
+// cached yet (e.g. an upload before the first page loads) — the subsequent
+// `invalidateQueries` reconcile then brings the authoritative record.
+
+const fileListKey = ownerId => queryKeys.files.list(ownerId);
+const mapPages = (data, fn) => ({
+  ...data,
+  pages: data.pages.map(page => ({
+    ...page,
+    files: fn(page.files)
+  }))
+});
+
+/** Prepend an (optimistic) file to the first page. */
+export function prependFileToCache(queryClient, ownerId, file) {
+  queryClient.setQueryData(fileListKey(ownerId), data => {
+    if (!data || data.pages.length === 0) return data;
+    return {
+      ...data,
+      pages: data.pages.map((page, index) => index === 0 ? {
+        ...page,
+        files: [file, ...page.files]
+      } : page)
+    };
+  });
+}
+
+/** Remove a file (by id) from every page. */
+export function removeFileFromCache(queryClient, ownerId, fileId) {
+  queryClient.setQueryData(fileListKey(ownerId), data => data ? mapPages(data, files => files.filter(f => f.id !== fileId)) : data);
+}
+
+/** Swap an optimistic file (by id) for its persisted counterpart. */
+export function replaceFileInCache(queryClient, ownerId, oldId, newFile) {
+  queryClient.setQueryData(fileListKey(ownerId), data => data ? mapPages(data, files => files.map(f => f.id === oldId ? newFile : f)) : data);
+}
+
+/** Shallow-merge a metadata patch into a cached file (e.g. visibility change). */
+export function patchFileMetadataInCache(queryClient, ownerId, fileId, metadataPatch) {
+  queryClient.setQueryData(fileListKey(ownerId), data => data ? mapPages(data, files => files.map(f => f.id === fileId ? {
+    ...f,
+    metadata: {
+      ...f.metadata,
+      ...metadataPatch
+    }
+  } : f)) : data);
+}
+//# sourceMappingURL=useFileQueries.js.map

package/lib/module/ui/hooks/queries/useFileQueries.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useInfiniteQuery","useOxy","queryKeys","FILES_PAGE_SIZE","mapRawFileToMetadata","raw","id","filename","originalName","sha256","contentType","mime","length","size","chunkSize","uploadDate","createdAt","metadata","variants","useUserFilesInfinite","ownerId","oxyServices","queryKey","files","list","queryFn","pageParam","offset","response","listUserFiles","map","total","hasMore","Boolean","nextOffset","initialPageParam","getNextPageParam","lastPage","undefined","enabled","staleTime","refetchOnWindowFocus","fileListKey","mapPages","data","fn","pages","page","prependFileToCache","queryClient","file","setQueryData","index","removeFileFromCache","fileId","filter","f","replaceFileInCache","oldId","newFile","patchFileMetadataInCache","metadataPatch"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useFileQueries.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/useAvatarPicker.js

@@ -3,23 +3,30 @@
 /**
  * Avatar Picker Hook
  *
- * Extracts avatar selection logic from OxyContext for better modularity.
+ * The ONE write path for a user's profile picture. It owns no UI: the whole
+ * choose-and-crop experience is a single surface.
  *
- * Flow:
- *   1. Open the FileManagement bottom sheet in select mode for image files.
- *   2. After the user picks an image, route to the AvatarCrop screen so they
- *      can square-crop + zoom before the avatar is set.
- *   3. The cropped JPEG is uploaded as a NEW file via `oxyServices.assetUpload`
- *      and that file becomes the user's avatar.
+ * Flow (typed promise over the shared surface stack — no callback props):
+ *   1. `openWithinOrPresent('ChangeAvatar')` opens the source list (device gallery,
+ *      camera, existing Oxy files, remove) — MORPHING into the caller's surface
+ *      when one is open, else presenting cold. Whichever source the user picks, it
+ *      navigates WITHIN to the crop editor — so there is exactly one cropper and
+ *      one entry into it.
+ *   2. The surface resolves with the cropped JPEG, with `{ removed: true }` when
+ *      the user removed their photo, or `undefined` when they cancelled.
+ *   3. A crop is uploaded as a NEW file via `oxyServices.assetUpload` and set as
+ *      the avatar; a removal clears the avatar field.
  *
- * `expo-image-manipulator` is required for the crop step (declared as an
- * optional peer in the consuming app) — see AvatarCropScreen.
+ * `expo-image-manipulator` is required for the crop step and `expo-image-picker`
+ * for the device/camera sources (both declared as optional peers in the
+ * consuming app) — see AvatarCropScreen / ChangeAvatarScreen.
  */
 
 import { useCallback } from 'react';
 import { translate, updateAvatarVisibility } from '@oxyhq/core';
 import { toast } from '@oxyhq/bloom';
 import { updateProfileWithAvatar } from "../utils/avatarUtils.js";
+import { openWithinOrPresent } from "../navigation/surfaces.js";
 
 /** Upload result shape returned by oxyServices.assetUpload (single-file path). */
 
@@ -35,8 +42,7 @@ export function useAvatarPicker({
   oxyServices,
   currentLanguage,
   activeSessionId,
-  queryClient,
-  showBottomSheet
+  queryClient
 }) {
   /**
    * Final step: take the cropped JPEG, upload it as a new public file, then
@@ -64,55 +70,32 @@ export function useAvatarPicker({
     }
   }, [activeSessionId, currentLanguage, oxyServices, queryClient]);
 
-  /**
-   * After the user picks a file in the FileManagement sheet, resolve a working
-   * source URL and route to the crop screen.
-   *
-   * The picked file is usually PRIVATE, so the synchronous
-   * `getFileDownloadUrl` (public CDN origin) would 404 and the crop screen's
-   * `Image.getSize` would fail silently. We resolve the authenticated URL via
-   * `assetGetUrl` (which throws on failure — unlike `getFileDownloadUrlAsync`,
-   * which swallows errors and falls back to the broken public URL) so a
-   * failure surfaces a real user-facing error instead of a blank crop canvas.
-   * No variant is requested — cropping needs the original.
-   */
-  const handleFilePicked = useCallback(async file => {
-    if (!file.contentType?.startsWith('image/')) {
-      toast.error(translate(currentLanguage ?? undefined, 'editProfile.toasts.selectImage') || 'Please select an image file');
-      return;
-    }
-    let sourceUri;
+  /** Clear the avatar so the profile falls back to the user's initials. */
+  const removeAvatar = useCallback(async () => {
     try {
-      const resolved = await oxyServices.assetGetUrl(file.id);
-      if (!resolved?.url) {
-        throw new Error('No download URL returned for the selected image');
-      }
-      sourceUri = resolved.url;
+      await updateProfileWithAvatar({
+        avatar: ''
+      }, oxyServices, activeSessionId, queryClient);
+      toast.success(translate(currentLanguage ?? undefined, 'editProfile.toasts.avatarRemoved'));
     } catch (e) {
       const message = e instanceof Error ? e.message : undefined;
-      toast.error(message || translate(currentLanguage ?? undefined, 'editProfile.toasts.cropMeasureFailed') || 'Could not load the selected image');
+      toast.error(message || translate(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed'));
+    }
+  }, [activeSessionId, currentLanguage, oxyServices, queryClient]);
+  const openAvatarPicker = useCallback(async () => {
+    // The source list + crop editor are ONE flow. When triggered from a screen
+    // already inside a surface (EditProfile, ManageAccount, WelcomeNewUser — every
+    // current entry point), it MORPHS into that surface and pops back on finish;
+    // triggered with no surface open it presents cold. Either way it resolves with
+    // the cropped JPEG, a removal, or `undefined` when the user backs out.
+    const result = await openWithinOrPresent('ChangeAvatar');
+    if (!result) return;
+    if ('removed' in result) {
+      await removeAvatar();
       return;
     }
-    showBottomSheet({
-      screen: 'AvatarCrop',
-      props: {
-        imageUri: sourceUri,
-        onConfirm: finalizeCroppedAvatar
-      }
-    });
-  }, [currentLanguage, finalizeCroppedAvatar, oxyServices, showBottomSheet]);
-  const openAvatarPicker = useCallback(() => {
-    showBottomSheet({
-      screen: 'FileManagement',
-      props: {
-        selectMode: true,
-        multiSelect: false,
-        disabledMimeTypes: ['video/', 'audio/', 'application/pdf'],
-        afterSelect: 'none',
-        onSelect: handleFilePicked
-      }
-    });
-  }, [handleFilePicked, showBottomSheet]);
+    await finalizeCroppedAvatar(result);
+  }, [finalizeCroppedAvatar, removeAvatar]);
   return {
     openAvatarPicker
   };

package/lib/module/ui/hooks/useAvatarPicker.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","translate","updateAvatarVisibility","toast","updateProfileWithAvatar","extractUploadedFileId","result","undefined","id","file","first","files","useAvatarPicker","oxyServices","currentLanguage","activeSessionId","queryClient","showBottomSheet","finalizeCroppedAvatar","cropped","uploadResult","assetUpload","uri","type","mime","name","Date","now","newFileId","Error","avatar","success","e","message","error","handleFilePicked","contentType","startsWith","sourceUri","resolved","assetGetUrl","url","screen","props","imageUri","onConfirm","openAvatarPicker","selectMode","multiSelect","disabledMimeTypes","afterSelect","onSelect"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAvatarPicker.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","translate","updateAvatarVisibility","toast","updateProfileWithAvatar","openWithinOrPresent","extractUploadedFileId","result","undefined","id","file","first","files","useAvatarPicker","oxyServices","currentLanguage","activeSessionId","queryClient","finalizeCroppedAvatar","cropped","uploadResult","assetUpload","uri","type","mime","name","Date","now","newFileId","Error","avatar","success","e","message","error","removeAvatar","openAvatarPicker"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAvatarPicker.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/useReduceMotion.js

@@ -0,0 +1,53 @@
+"use strict";
+
+/**
+ * useReduceMotion
+ *
+ * Reactive boolean reflecting the OS "reduce motion" accessibility preference.
+ * Wraps `AccessibilityInfo` as an external store via `useSyncExternalStore` — the
+ * effect-free, React-Compiler-safe way to read an external mutable source. The
+ * initial value is read asynchronously once (the platform API is a Promise) and
+ * cached module-side; subsequent changes arrive via the `reduceMotionChanged`
+ * event. Mirrors the `useOnlineStatus` pattern.
+ *
+ * Consumers use it to pin entrance/stagger animations off under reduce-motion.
+ */
+
+import { useSyncExternalStore } from 'react';
+import { AccessibilityInfo } from 'react-native';
+let cachedReduceMotion = false;
+let initialized = false;
+const listeners = new Set();
+const notifyAll = () => {
+  for (const listener of listeners) listener();
+};
+const setCached = value => {
+  if (cachedReduceMotion === value) return;
+  cachedReduceMotion = value;
+  notifyAll();
+};
+const subscribeReduceMotion = notify => {
+  // Populate the cache the first time anyone subscribes (the platform read is
+  // async, so it cannot be a synchronous `getSnapshot`).
+  if (!initialized) {
+    initialized = true;
+    AccessibilityInfo.isReduceMotionEnabled().then(setCached).catch(() => {
+      // No preference available — the `false` default stands.
+    });
+  }
+  listeners.add(notify);
+  const sub = AccessibilityInfo.addEventListener('reduceMotionChanged', setCached);
+  return () => {
+    listeners.delete(notify);
+    sub.remove();
+  };
+};
+const getSnapshot = () => cachedReduceMotion;
+
+// SSR/web-first paint: assume motion is allowed (no reduce) until the async read
+// resolves — matches the prior default.
+const getServerSnapshot = () => false;
+export function useReduceMotion() {
+  return useSyncExternalStore(subscribeReduceMotion, getSnapshot, getServerSnapshot);
+}
+//# sourceMappingURL=useReduceMotion.js.map

package/lib/module/ui/hooks/useReduceMotion.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useSyncExternalStore","AccessibilityInfo","cachedReduceMotion","initialized","listeners","Set","notifyAll","listener","setCached","value","subscribeReduceMotion","notify","isReduceMotionEnabled","then","catch","add","sub","addEventListener","delete","remove","getSnapshot","getServerSnapshot","useReduceMotion"],"sourceRoot":"../../../../src","sources":["ui/hooks/useReduceMotion.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,oBAAoB,QAAQ,OAAO;AAC5C,SAASC,iBAAiB,QAAQ,cAAc;AAEhD,IAAIC,kBAAkB,GAAG,KAAK;AAC9B,IAAIC,WAAW,GAAG,KAAK;AACvB,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;AAEvC,MAAMC,SAAS,GAAGA,CAAA,KAAY;EAC1B,KAAK,MAAMC,QAAQ,IAAIH,SAAS,EAAEG,QAAQ,CAAC,CAAC;AAChD,CAAC;AAED,MAAMC,SAAS,GAAIC,KAAc,IAAW;EACxC,IAAIP,kBAAkB,KAAKO,KAAK,EAAE;EAClCP,kBAAkB,GAAGO,KAAK;EAC1BH,SAAS,CAAC,CAAC;AACf,CAAC;AAED,MAAMI,qBAAqB,GAAIC,MAAkB,IAAmB;EAChE;EACA;EACA,IAAI,CAACR,WAAW,EAAE;IACdA,WAAW,GAAG,IAAI;IAClBF,iBAAiB,CAACW,qBAAqB,CAAC,CAAC,CACpCC,IAAI,CAACL,SAAS,CAAC,CACfM,KAAK,CAAC,MAAM;MACT;IAAA,CACH,CAAC;EACV;EACAV,SAAS,CAACW,GAAG,CAACJ,MAAM,CAAC;EACrB,MAAMK,GAAG,GAAGf,iBAAiB,CAACgB,gBAAgB,CAAC,qBAAqB,EAAET,SAAS,CAAC;EAChF,OAAO,MAAM;IACTJ,SAAS,CAACc,MAAM,CAACP,MAAM,CAAC;IACxBK,GAAG,CAACG,MAAM,CAAC,CAAC;EAChB,CAAC;AACL,CAAC;AAED,MAAMC,WAAW,GAAGA,CAAA,KAAelB,kBAAkB;;AAErD;AACA;AACA,MAAMmB,iBAAiB,GAAGA,CAAA,KAAe,KAAK;AAE9C,OAAO,SAASC,eAAeA,CAAA,EAAY;EACvC,OAAOtB,oBAAoB,CAACU,qBAAqB,EAAEU,WAAW,EAAEC,iBAAiB,CAAC;AACtF","ignoreList":[]}

package/lib/module/ui/hooks/useSurfaceHeader.js

@@ -0,0 +1,42 @@
+"use strict";
+
+import { createContext, useContext, useLayoutEffect } from 'react';
+
+/**
+ * The header content a mounted surface screen contributes at runtime: its
+ * (translated) title/subtitle and optional slot nodes. Back/close affordances
+ * are owned by the surface host (`SurfaceScreen`) — a screen never wires them.
+ *
+ * A `right` slot is the canonical place for a screen-state action (e.g. a Save
+ * button whose disabled/loading state reflects the form). Slot nodes MUST be
+ * referentially stable (memoize them with `useMemo`) so the header does not
+ * thrash.
+ */
+
+/**
+ * Provided by {@link ../components/SurfaceScreen}. Bridges a screen's runtime
+ * header contribution up to the host, which merges it with the back/close
+ * wiring and drives the Dialog's own nav header. `null` outside a surface (or in
+ * a headerless surface), so {@link useSurfaceHeader} is a safe no-op there.
+ */
+export const SurfaceHeaderContext = /*#__PURE__*/createContext(null);
+
+/**
+ * Declare the Dialog nav header's content from within a surface screen — its
+ * title/subtitle and any action slot. Merges over nothing (the host owns
+ * back/close), replaces on change, and clears on unmount. Call it unconditionally;
+ * it is a no-op outside a header-mode surface.
+ */
+export function useSurfaceHeader(content) {
+  const ctx = useContext(SurfaceHeaderContext);
+  const set = ctx?.setContent;
+  // Set synchronously in the commit's layout phase so the bar/title fill in
+  // BEFORE the browser paints — no first-frame flash of an empty bar.
+  useLayoutEffect(() => {
+    if (!set) return;
+    set(content ?? null);
+    return () => set(null);
+    // Slot nodes (`left`/`right`) are compared by identity; callers memoize them.
+  }, [set, content?.title, content?.titleContent, content?.subtitle, content?.largeTitle, content?.left, content?.right, content?.onBack]);
+}
+//# sourceMappingURL=useSurfaceHeader.js.map

package/lib/module/ui/hooks/useSurfaceHeader.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createContext","useContext","useLayoutEffect","SurfaceHeaderContext","useSurfaceHeader","content","ctx","set","setContent","title","titleContent","subtitle","largeTitle","left","right","onBack"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSurfaceHeader.ts"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,eAAe,QAAQ,OAAO;;AAGlE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,gBAAGH,aAAa,CAAmC,IAAI,CAAC;;AAEzF;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASI,gBAAgBA,CAACC,OAAgD,EAAQ;EACvF,MAAMC,GAAG,GAAGL,UAAU,CAACE,oBAAoB,CAAC;EAC5C,MAAMI,GAAG,GAAGD,GAAG,EAAEE,UAAU;EAC3B;EACA;EACAN,eAAe,CAAC,MAAM;IACpB,IAAI,CAACK,GAAG,EAAE;IACVA,GAAG,CAACF,OAAO,IAAI,IAAI,CAAC;IACpB,OAAO,MAAME,GAAG,CAAC,IAAI,CAAC;IACtB;EACF,CAAC,EAAE,CACDA,GAAG,EACHF,OAAO,EAAEI,KAAK,EACdJ,OAAO,EAAEK,YAAY,EACrBL,OAAO,EAAEM,QAAQ,EACjBN,OAAO,EAAEO,UAAU,EACnBP,OAAO,EAAEQ,IAAI,EACbR,OAAO,EAAES,KAAK,EACdT,OAAO,EAAEU,MAAM,CAChB,CAAC;AACJ","ignoreList":[]}

package/lib/module/ui/hooks/useSwitchableAccounts.js

@@ -29,7 +29,7 @@ const EMPTY_SNAPSHOT = {
  * real per-account name / email / avatar / color.
  *
  * This is a thin binding over the shared `AccountDialogController` in
- * `@oxyhq/core` (the SAME headless source the {@link OxyAccountDialog} renders),
+ * `@oxyhq/core` (the SAME headless source the {@link OxyAccountDialogScreen} renders),
  * so there is ONE projection (`projectSwitchableAccounts`) and one switch path
  * (`controller.switchTo`) across the whole SDK — the local duplicate projection
  * this hook used to own has been removed. Every switch routes through

package/lib/module/ui/navigation/accountDialogManager.js

@@ -1,12 +1,31 @@
 "use strict";
 
 /**
- * Imperative controls for the unified {@link OxyAccountDialog}.
+ * Imperative, outside-React entry points for the unified `OxyAccountDialogScreen`.
+ *
+ * These delegate to the live handles the mounted `OxyProvider` registers via
+ * {@link registerAccountDialogControls}. Under the hood `open`/`close` present
+ * and dismiss the `AccountDialog` surface on the shared Bloom surface stack
+ * (`OxyContext.openAccountDialog` → `presentDetached('AccountDialog', …)`), so
+ * whether the dialog is open is owned by that stack — this module is only the
+ * thin bridge that reaches the provider's controller (which sets the dialog
+ * view) from a non-React call site.
  */
 
-/** Live open/close handles registered by the mounted provider. */
+/**
+ * Live open/close handles registered by the mounted provider. `open` presents
+ * the `AccountDialog` surface (and points its view); `close` dismisses it. Both
+ * are stack operations — this interface never carries visibility state.
+ */
+
+/**
+ * Optional consumer overrides for account-dialog actions. `ProfileButton` (and
+ * similar hosts) register these while mounted so inbox/accounts can route
+ * "Manage" / "Add account" to app-local navigation instead of the SDK default.
+ */
 
 let controls = null;
+let consumerHooks = null;
 const visibilityListeners = new Set();
 export function registerAccountDialogControls(next) {
   controls = next;
@@ -17,6 +36,19 @@ export function registerAccountDialogControls(next) {
   };
 }
 
+/** Register app-local manage/add/profile handlers for the account dialog. */
+export function registerAccountDialogConsumerHooks(next) {
+  consumerHooks = next;
+  return () => {
+    if (consumerHooks === next) {
+      consumerHooks = null;
+    }
+  };
+}
+export function getAccountDialogConsumerHooks() {
+  return consumerHooks;
+}
+
 /** Open the account dialog on `view` (default `accounts`). No-op before mount. */
 export function openAccountDialog(view) {
   controls?.open(view);

package/lib/module/ui/navigation/accountDialogManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["controls","visibilityListeners","Set","registerAccountDialogControls","next","openAccountDialog","view","open","closeAccountDialog","close","notifyAccountDialogVisibility","visible","listener","subscribeToAccountDialog","add","delete"],"sourceRoot":"../../../../src","sources":["ui/navigation/accountDialogManager.ts"],"mappings":";;AAAA;AACA;AACA;;AAIA;;AAMA,IAAIA,QAAsC,GAAG,IAAI;AACjD,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAA6B,CAAC;AAEjE,OAAO,SAASC,6BAA6BA,CAACC,IAA2B,EAAc;EACrFJ,QAAQ,GAAGI,IAAI;EACf,OAAO,MAAM;IACX,IAAIJ,QAAQ,KAAKI,IAAI,EAAE;MACrBJ,QAAQ,GAAG,IAAI;IACjB;EACF,CAAC;AACH;;AAEA;AACA,OAAO,SAASK,iBAAiBA,CAACC,IAAwB,EAAQ;EAChEN,QAAQ,EAAEO,IAAI,CAACD,IAAI,CAAC;AACtB;;AAEA;AACA,OAAO,SAASE,kBAAkBA,CAAA,EAAS;EACzCR,QAAQ,EAAES,KAAK,CAAC,CAAC;AACnB;;AAEA;AACA,OAAO,SAASC,6BAA6BA,CAACC,OAAgB,EAAQ;EACpE,KAAK,MAAMC,QAAQ,IAAIX,mBAAmB,EAAE;IAC1CW,QAAQ,CAACD,OAAO,CAAC;EACnB;AACF;;AAEA;AACA,OAAO,SAASE,wBAAwBA,CAACD,QAAoC,EAAc;EACzFX,mBAAmB,CAACa,GAAG,CAACF,QAAQ,CAAC;EACjC,OAAO,MAAM;IACXX,mBAAmB,CAACc,MAAM,CAACH,QAAQ,CAAC;EACtC,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["controls","consumerHooks","visibilityListeners","Set","registerAccountDialogControls","next","registerAccountDialogConsumerHooks","getAccountDialogConsumerHooks","openAccountDialog","view","open","closeAccountDialog","close","notifyAccountDialogVisibility","visible","listener","subscribeToAccountDialog","add","delete"],"sourceRoot":"../../../../src","sources":["ui/navigation/accountDialogManager.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;AACA;;AAOA,IAAIA,QAAsC,GAAG,IAAI;AACjD,IAAIC,aAAgD,GAAG,IAAI;AAC3D,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAA6B,CAAC;AAEjE,OAAO,SAASC,6BAA6BA,CAACC,IAA2B,EAAc;EACrFL,QAAQ,GAAGK,IAAI;EACf,OAAO,MAAM;IACX,IAAIL,QAAQ,KAAKK,IAAI,EAAE;MACrBL,QAAQ,GAAG,IAAI;IACjB;EACF,CAAC;AACH;;AAEA;AACA,OAAO,SAASM,kCAAkCA,CAChDD,IAAuC,EAC3B;EACZJ,aAAa,GAAGI,IAAI;EACpB,OAAO,MAAM;IACX,IAAIJ,aAAa,KAAKI,IAAI,EAAE;MAC1BJ,aAAa,GAAG,IAAI;IACtB;EACF,CAAC;AACH;AAEA,OAAO,SAASM,6BAA6BA,CAAA,EAAsC;EACjF,OAAON,aAAa;AACtB;;AAEA;AACA,OAAO,SAASO,iBAAiBA,CAACC,IAAwB,EAAQ;EAChET,QAAQ,EAAEU,IAAI,CAACD,IAAI,CAAC;AACtB;;AAEA;AACA,OAAO,SAASE,kBAAkBA,CAAA,EAAS;EACzCX,QAAQ,EAAEY,KAAK,CAAC,CAAC;AACnB;;AAEA;AACA,OAAO,SAASC,6BAA6BA,CAACC,OAAgB,EAAQ;EACpE,KAAK,MAAMC,QAAQ,IAAIb,mBAAmB,EAAE;IAC1Ca,QAAQ,CAACD,OAAO,CAAC;EACnB;AACF;;AAEA;AACA,OAAO,SAASE,wBAAwBA,CAACD,QAAoC,EAAc;EACzFb,mBAAmB,CAACe,GAAG,CAACF,QAAQ,CAAC;EACjC,OAAO,MAAM;IACXb,mBAAmB,CAACgB,MAAM,CAACH,QAAQ,CAAC;EACtC,CAAC;AACH","ignoreList":[]}

package/lib/module/ui/navigation/bottomSheetManager.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import { isValidRoute } from "./routes.js";
-import { getSurfacePresentation } from "./surfaceRegistry.js";
+import { getSurfaceConfig } from "./surfaceRegistry.js";
 import { closeAllRouteSurfaces, presentRoute, topRouteSurface } from "./surfaces.js";
 
 /**
@@ -17,11 +17,10 @@ import { closeAllRouteSurfaces, presentRoute, topRouteSurface } from "./surfaces
  */
 
 /**
- * Open a bottom-sheet route. If the top-most active surface hosts the SAME
- * presentation (the common all-sheets case) the route is drilled into it; a route
- * with a different presentation (the image picker's full-bleed surface) is
- * presented as a NEW surface on top. Opening with no active surface presents the
- * first one.
+ * Open a bottom-sheet route. By DEFAULT it drills into the top-most active
+ * surface — morphing it in place (every screen morphs). A NEW surface is stacked
+ * on top only when the target route declares `stacks` (reserved for genuine
+ * overlays — none today). Opening with no active surface presents the first one.
  *
  * `fullScreen` is accepted for signature compatibility and ignored — a route's
  * surface is now derived from its registry config, not a per-call flag.
@@ -34,7 +33,7 @@ export const showBottomSheet = screenOrConfig => {
     return;
   }
   const top = topRouteSurface();
-  if (top && top.presentation === getSurfacePresentation(screen, props)) {
+  if (top && !getSurfaceConfig(screen, props).stacks) {
     top.navigate(screen, props);
   } else {
     presentRoute(screen, props);

package/lib/module/ui/navigation/bottomSheetManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["isValidRoute","getSurfacePresentation","closeAllRouteSurfaces","presentRoute","topRouteSurface","showBottomSheet","screenOrConfig","screen","props","__DEV__","console","warn","top","presentation","navigate","closeBottomSheet","goBack"],"sourceRoot":"../../../../src","sources":["ui/navigation/bottomSheetManager.ts"],"mappings":";;AACA,SAASA,YAAY,QAAQ,aAAU;AACvC,SAASC,sBAAsB,QAAQ,sBAAmB;AAC1D,SAASC,qBAAqB,EAAEC,YAAY,EAAEC,eAAe,QAAQ,eAAY;;AAEjF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAC1BC,cAEgF,IACvE;EACT,MAAMC,MAAM,GAAG,OAAOD,cAAc,KAAK,QAAQ,GAAGA,cAAc,GAAGA,cAAc,CAACC,MAAM;EAC1F,MAAMC,KAAK,GAAG,OAAOF,cAAc,KAAK,QAAQ,GAAG,CAAC,CAAC,GAAGA,cAAc,CAACE,KAAK,IAAI,CAAC,CAAC;EAElF,IAAI,CAACR,YAAY,CAACO,MAAM,CAAC,EAAE;IACzB,IAAIE,OAAO,EAAEC,OAAO,CAACC,IAAI,CAAC,gCAAgCJ,MAAM,EAAE,CAAC;IACnE;EACF;EAEA,MAAMK,GAAG,GAAGR,eAAe,CAAC,CAAC;EAC7B,IAAIQ,GAAG,IAAIA,GAAG,CAACC,YAAY,KAAKZ,sBAAsB,CAACM,MAAM,EAAEC,KAAK,CAAC,EAAE;IACrEI,GAAG,CAACE,QAAQ,CAACP,MAAM,EAAEC,KAAK,CAAC;EAC7B,CAAC,MAAM;IACLL,YAAY,CAACI,MAAM,EAAEC,KAAK,CAAC;EAC7B;AACF,CAAC;;AAED;AACA,OAAO,MAAMO,gBAAgB,GAAGA,CAAA,KAAY;EAC1Cb,qBAAqB,CAAC,CAAC;AACzB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMc,MAAM,GAAGA,CAAA,KAAe;EACnC,MAAMJ,GAAG,GAAGR,eAAe,CAAC,CAAC;EAC7B,OAAOQ,GAAG,GAAGA,GAAG,CAACI,MAAM,CAAC,CAAC,GAAG,KAAK;AACnC,CAAC","ignoreList":[]}
+{"version":3,"names":["isValidRoute","getSurfaceConfig","closeAllRouteSurfaces","presentRoute","topRouteSurface","showBottomSheet","screenOrConfig","screen","props","__DEV__","console","warn","top","stacks","navigate","closeBottomSheet","goBack"],"sourceRoot":"../../../../src","sources":["ui/navigation/bottomSheetManager.ts"],"mappings":";;AACA,SAASA,YAAY,QAAQ,aAAU;AACvC,SAASC,gBAAgB,QAAQ,sBAAmB;AACpD,SAASC,qBAAqB,EAAEC,YAAY,EAAEC,eAAe,QAAQ,eAAY;;AAEjF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAC1BC,cAEgF,IACvE;EACT,MAAMC,MAAM,GAAG,OAAOD,cAAc,KAAK,QAAQ,GAAGA,cAAc,GAAGA,cAAc,CAACC,MAAM;EAC1F,MAAMC,KAAK,GAAG,OAAOF,cAAc,KAAK,QAAQ,GAAG,CAAC,CAAC,GAAGA,cAAc,CAACE,KAAK,IAAI,CAAC,CAAC;EAElF,IAAI,CAACR,YAAY,CAACO,MAAM,CAAC,EAAE;IACzB,IAAIE,OAAO,EAAEC,OAAO,CAACC,IAAI,CAAC,gCAAgCJ,MAAM,EAAE,CAAC;IACnE;EACF;EAEA,MAAMK,GAAG,GAAGR,eAAe,CAAC,CAAC;EAC7B,IAAIQ,GAAG,IAAI,CAACX,gBAAgB,CAACM,MAAM,EAAEC,KAAK,CAAC,CAACK,MAAM,EAAE;IAClDD,GAAG,CAACE,QAAQ,CAACP,MAAM,EAAEC,KAAK,CAAC;EAC7B,CAAC,MAAM;IACLL,YAAY,CAACI,MAAM,EAAEC,KAAK,CAAC;EAC7B;AACF,CAAC;;AAED;AACA,OAAO,MAAMO,gBAAgB,GAAGA,CAAA,KAAY;EAC1Cb,qBAAqB,CAAC,CAAC;AACzB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMc,MAAM,GAAGA,CAAA,KAAe;EACnC,MAAMJ,GAAG,GAAGR,eAAe,CAAC,CAAC;EAC7B,OAAOQ,GAAG,GAAGA,GAAG,CAACI,MAAM,CAAC,CAAC,GAAG,KAAK;AACnC,CAAC","ignoreList":[]}

package/lib/module/ui/navigation/routes.js

@@ -6,7 +6,7 @@
 
 // Define all available route names
 
-// Unified account switcher + sign-in surface (folded OxyAccountDialog body)
+// Unified account switcher + sign-in surface (OxyAccountDialogScreen body)
 
 // Lazy screen loaders - functions that return screen components on-demand
 // This breaks the require cycle by deferring imports until screens are actually needed
@@ -46,14 +46,15 @@ const screenLoaders = {
   CreateAccount: () => require('../screens/CreateAccountScreen').default,
   AccountMembers: () => require('../screens/AccountMembersScreen').default,
   AccountSettings: () => require('../screens/AccountSettingsScreen').default,
+  ChangeAvatar: () => require('../screens/ChangeAvatarScreen').default,
   AvatarCrop: () => require('../screens/AvatarCropScreen').default,
   Notifications: () => require('../screens/NotificationsScreen').default,
   ConnectedApps: () => require('../screens/ConnectedAppsScreen').default,
   Preferences: () => require('../screens/PreferencesScreen').default,
   // Unified account switcher + sign-in surface. Its body lives in the
-  // `OxyAccountDialog` component (folded from the standalone dialog); the
+  // `OxyAccountDialogScreen` component (folded from the standalone dialog); the
   // surface stack provides the Dialog chrome around it.
-  AccountDialog: () => require('../components/OxyAccountDialog').default
+  AccountDialog: () => require('../components/OxyAccountDialogScreen').default
 };
 
 // Cache loaded components to avoid re-requiring

package/lib/module/ui/navigation/routes.js.map

@@ -1 +1 @@
-{"version":3,"names":["screenLoaders","ManageAccount","require","default","AccountVerification","PaymentGateway","Profile","LanguageSelector","PrivacySettings","SearchSettings","FileManagement","HelpSupport","FAQ","Feedback","LegalDocuments","AppInfo","PremiumSubscription","WelcomeNewUser","UserLinks","HistoryView","SavesCollections","EditProfile","EditProfileField","LearnMoreUsernames","TrustCenter","TrustLeaderboard","TrustRewards","TrustRules","AboutTrust","TrustFAQ","FollowersList","FollowingList","CreateAccount","AccountMembers","AccountSettings","AvatarCrop","Notifications","ConnectedApps","Preferences","AccountDialog","screenCache","Map","getScreenComponent","routeName","has","get","loader","component","set","error","__DEV__","console","undefined","isValidRoute"],"sourceRoot":"../../../../src","sources":["ui/navigation/routes.ts"],"mappings":";;AAGA;AACA;AACA;;AAEA;;AAsCuB;;AAEvB;AACA;AACA,MAAMA,aAAsE,GAAG;EAC3EC,aAAa,EAAEA,CAAA,KAAMC,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtEC,mBAAmB,EAAEA,CAAA,KAAMF,OAAO,CAAC,sCAAsC,CAAC,CAACC,OAAO;EAClFE,cAAc,EAAEA,CAAA,KAAMH,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEG,OAAO,EAAEA,CAAA,KAAMJ,OAAO,CAAC,0BAA0B,CAAC,CAACC,OAAO;EAC1DI,gBAAgB,EAAEA,CAAA,KAAML,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EAC5EK,eAAe,EAAEA,CAAA,KAAMN,OAAO,CAAC,kCAAkC,CAAC,CAACC,OAAO;EAC1EM,cAAc,EAAEA,CAAA,KAAMP,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEO,cAAc,EAAEA,CAAA,KAAMR,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEQ,WAAW,EAAEA,CAAA,KAAMT,OAAO,CAAC,8BAA8B,CAAC,CAACC,OAAO;EAClES,GAAG,EAAEA,CAAA,KAAMV,OAAO,CAAC,sBAAsB,CAAC,CAACC,OAAO;EAClDU,QAAQ,EAAEA,CAAA,KAAMX,OAAO,CAAC,2BAA2B,CAAC,CAACC,OAAO;EAC5DW,cAAc,EAAEA,CAAA,KAAMZ,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEY,OAAO,EAAEA,CAAA,KAAMb,OAAO,CAAC,0BAA0B,CAAC,CAACC,OAAO;EAC1Da,mBAAmB,EAAEA,CAAA,KAAMd,OAAO,CAAC,sCAAsC,CAAC,CAACC,OAAO;EAClFc,cAAc,EAAEA,CAAA,KAAMf,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxEe,SAAS,EAAEA,CAAA,KAAMhB,OAAO,CAAC,4BAA4B,CAAC,CAACC,OAAO;EAC9DgB,WAAW,EAAEA,CAAA,KAAMjB,OAAO,CAAC,8BAA8B,CAAC,CAACC,OAAO;EAClEiB,gBAAgB,EAAEA,CAAA,KAAMlB,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EAC5EkB,WAAW,EAAEA,CAAA,KAAMnB,OAAO,CAAC,8BAA8B,CAAC,CAACC,OAAO;EAClEmB,gBAAgB,EAAEA,CAAA,KAAMpB,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EAC5E;EACAoB,kBAAkB,EAAEA,CAAA,KAAMrB,OAAO,CAAC,qCAAqC,CAAC,CAACC,OAAO;EAChF;EACAqB,WAAW,EAAEA,CAAA,KAAMtB,OAAO,CAAC,oCAAoC,CAAC,CAACC,OAAO;EACxEsB,gBAAgB,EAAEA,CAAA,KAAMvB,OAAO,CAAC,yCAAyC,CAAC,CAACC,OAAO;EAClFuB,YAAY,EAAEA,CAAA,KAAMxB,OAAO,CAAC,qCAAqC,CAAC,CAACC,OAAO;EAC1EwB,UAAU,EAAEA,CAAA,KAAMzB,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EACtEyB,UAAU,EAAEA,CAAA,KAAM1B,OAAO,CAAC,mCAAmC,CAAC,CAACC,OAAO;EACtE0B,QAAQ,EAAEA,CAAA,KAAM3B,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EAClE;EACA2B,aAAa,EAAEA,CAAA,KAAM5B,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtE4B,aAAa,EAAEA,CAAA,KAAM7B,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtE6B,aAAa,EAAEA,CAAA,KAAM9B,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtE8B,cAAc,EAAEA,CAAA,KAAM/B,OAAO,CAAC,iCAAiC,CAAC,CAACC,OAAO;EACxE+B,eAAe,EAAEA,CAAA,KAAMhC,OAAO,CAAC,kCAAkC,CAAC,CAACC,OAAO;EAC1EgC,UAAU,EAAEA,CAAA,KAAMjC,OAAO,CAAC,6BAA6B,CAAC,CAACC,OAAO;EAChEiC,aAAa,EAAEA,CAAA,KAAMlC,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtEkC,aAAa,EAAEA,CAAA,KAAMnC,OAAO,CAAC,gCAAgC,CAAC,CAACC,OAAO;EACtEmC,WAAW,EAAEA,CAAA,KAAMpC,OAAO,CAAC,8BAA8B,CAAC,CAACC,OAAO;EAClE;EACA;EACA;EACAoC,aAAa,EAAEA,CAAA,KAAMrC,OAAO,CAAC,gCAAgC,CAAC,CAACC;AACnE,CAAC;;AAED;AACA,MAAMqC,WAAW,GAAG,IAAIC,GAAG,CAA4C,CAAC;;AAExE;AACA,OAAO,MAAMC,kBAAkB,GAAIC,SAAoB,IAAiD;EACpG;EACA,IAAIH,WAAW,CAACI,GAAG,CAACD,SAAS,CAAC,EAAE;IAC5B,OAAOH,WAAW,CAACK,GAAG,CAACF,SAAS,CAAC;EACrC;;EAEA;EACA,MAAMG,MAAM,GAAG9C,aAAa,CAAC2C,SAAS,CAAC;EACvC,IAAIG,MAAM,EAAE;IACR,IAAI;MACA,MAAMC,SAAS,GAAGD,MAAM,CAAC,CAAC;MAC1BN,WAAW,CAACQ,GAAG,CAACL,SAAS,EAAEI,SAAS,CAAC;MACrC,OAAOA,SAAS;IACpB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACZ,IAAIC,OAAO,EAAE;QACTC,OAAO,CAACF,KAAK,CAAC,mCAAmCN,SAAS,EAAE,EAAEM,KAAK,CAAC;MACxE;MACA,OAAOG,SAAS;IACpB;EACJ;EAEA,OAAOA,SAAS;AACpB,CAAC;;AAED;AACA;AACA,OAAO,MAAMC,YAAY,GAAIV,SAAiB,IAA6B;EACvE,OAAOA,SAAS,IAAI3C,aAAa;AACrC,CAAC","ignoreList":[]}
+{"version":3,"names":["screenLoaders","ManageAccount","require","default","AccountVerification","PaymentGateway","Profile","LanguageSelector","PrivacySettings","SearchSettings","FileManagement","HelpSupport","FAQ","Feedback","LegalDocuments","AppInfo","PremiumSubscription","WelcomeNewUser","UserLinks","HistoryView","SavesCollections","EditProfile","EditProfileField","LearnMoreUsernames","TrustCenter","TrustLeaderboard","TrustRewards","TrustRules","AboutTrust","TrustFAQ","FollowersList","FollowingList","CreateAccount","AccountMembers","AccountSettings","ChangeAvatar","AvatarCrop","Notifications","ConnectedApps","Preferences","AccountDialog","screenCache","Map","getScreenComponent","routeName","has","get","loader","component","set","error","__DEV__","console","undefined","isValidRoute"],"sourceRoot":"../../../../src","sources":["ui/navigation/routes.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/navigation/surfaceBackBridge.js

@@ -0,0 +1,63 @@
+"use strict";
+
+import { BackHandler, Platform } from 'react-native';
+
+/**
+ * Per-surface system-back handlers (Android hardware back + web Escape).
+ *
+ * Bloom's `SurfaceHost` dismisses the whole top surface on back/Escape. The SDK
+ * needs the old `BottomSheetRouter` semantics first: pop nav history, step a
+ * wizard back, then dismiss. A single global listener delegates to the topmost
+ * registered handler so stacked surfaces route correctly.
+ */
+
+const handlerStack = [];
+let androidInstalled = false;
+let escapeInstalled = false;
+function invokeTopHandler() {
+  const handler = handlerStack[handlerStack.length - 1];
+  return handler ? handler() : false;
+}
+function installAndroidHandler() {
+  if (androidInstalled || Platform.OS !== 'android') return;
+  androidInstalled = true;
+  BackHandler.addEventListener('hardwareBackPress', () => {
+    if (handlerStack.length === 0) return false;
+    return invokeTopHandler();
+  });
+}
+function installEscapeHandler() {
+  if (escapeInstalled || Platform.OS !== 'web') return;
+  if (typeof window === 'undefined') return;
+  escapeInstalled = true;
+  window.addEventListener('keydown', event => {
+    if (event.key !== 'Escape' || handlerStack.length === 0) return;
+    invokeTopHandler();
+    event.stopImmediatePropagation();
+    event.preventDefault();
+  }, true);
+}
+
+/** Register before Bloom's `SurfaceHost` mounts so Escape capture runs first. */
+installEscapeHandler();
+
+/** Push a handler for one live surface; returns unregister. */
+export function pushSurfaceBackHandler(handler) {
+  handlerStack.push(handler);
+  installAndroidHandler();
+  return () => {
+    const index = handlerStack.lastIndexOf(handler);
+    if (index >= 0) handlerStack.splice(index, 1);
+  };
+}
+
+/** Test-only: invoke the top handler. */
+export function __invokeTopSurfaceBackForTests() {
+  return invokeTopHandler();
+}
+
+/** Test-only reset. */
+export function __resetSurfaceBackBridgeForTests() {
+  handlerStack.length = 0;
+}
+//# sourceMappingURL=surfaceBackBridge.js.map

package/lib/module/ui/navigation/surfaceBackBridge.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["BackHandler","Platform","handlerStack","androidInstalled","escapeInstalled","invokeTopHandler","handler","length","installAndroidHandler","OS","addEventListener","installEscapeHandler","window","event","key","stopImmediatePropagation","preventDefault","pushSurfaceBackHandler","push","index","lastIndexOf","splice","__invokeTopSurfaceBackForTests","__resetSurfaceBackBridgeForTests"],"sourceRoot":"../../../../src","sources":["ui/navigation/surfaceBackBridge.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,QAAQ,QAAQ,cAAc;;AAEpD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA,MAAMC,YAAkC,GAAG,EAAE;AAC7C,IAAIC,gBAAgB,GAAG,KAAK;AAC5B,IAAIC,eAAe,GAAG,KAAK;AAE3B,SAASC,gBAAgBA,CAAA,EAAY;EACnC,MAAMC,OAAO,GAAGJ,YAAY,CAACA,YAAY,CAACK,MAAM,GAAG,CAAC,CAAC;EACrD,OAAOD,OAAO,GAAGA,OAAO,CAAC,CAAC,GAAG,KAAK;AACpC;AAEA,SAASE,qBAAqBA,CAAA,EAAS;EACrC,IAAIL,gBAAgB,IAAIF,QAAQ,CAACQ,EAAE,KAAK,SAAS,EAAE;EACnDN,gBAAgB,GAAG,IAAI;EACvBH,WAAW,CAACU,gBAAgB,CAAC,mBAAmB,EAAE,MAAM;IACtD,IAAIR,YAAY,CAACK,MAAM,KAAK,CAAC,EAAE,OAAO,KAAK;IAC3C,OAAOF,gBAAgB,CAAC,CAAC;EAC3B,CAAC,CAAC;AACJ;AAEA,SAASM,oBAAoBA,CAAA,EAAS;EACpC,IAAIP,eAAe,IAAIH,QAAQ,CAACQ,EAAE,KAAK,KAAK,EAAE;EAC9C,IAAI,OAAOG,MAAM,KAAK,WAAW,EAAE;EACnCR,eAAe,GAAG,IAAI;EACtBQ,MAAM,CAACF,gBAAgB,CACrB,SAAS,EACRG,KAAK,IAAK;IACT,IAAIA,KAAK,CAACC,GAAG,KAAK,QAAQ,IAAIZ,YAAY,CAACK,MAAM,KAAK,CAAC,EAAE;IACzDF,gBAAgB,CAAC,CAAC;IAClBQ,KAAK,CAACE,wBAAwB,CAAC,CAAC;IAChCF,KAAK,CAACG,cAAc,CAAC,CAAC;EACxB,CAAC,EACD,IACF,CAAC;AACH;;AAEA;AACAL,oBAAoB,CAAC,CAAC;;AAEtB;AACA,OAAO,SAASM,sBAAsBA,CAACX,OAA2B,EAAc;EAC9EJ,YAAY,CAACgB,IAAI,CAACZ,OAAO,CAAC;EAC1BE,qBAAqB,CAAC,CAAC;EACvB,OAAO,MAAM;IACX,MAAMW,KAAK,GAAGjB,YAAY,CAACkB,WAAW,CAACd,OAAO,CAAC;IAC/C,IAAIa,KAAK,IAAI,CAAC,EAAEjB,YAAY,CAACmB,MAAM,CAACF,KAAK,EAAE,CAAC,CAAC;EAC/C,CAAC;AACH;;AAEA;AACA,OAAO,SAASG,8BAA8BA,CAAA,EAAY;EACxD,OAAOjB,gBAAgB,CAAC,CAAC;AAC3B;;AAEA;AACA,OAAO,SAASkB,gCAAgCA,CAAA,EAAS;EACvDrB,YAAY,CAACK,MAAM,GAAG,CAAC;AACzB","ignoreList":[]}