@oxyhq/services 22.10.0 → 22.11.1

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

@@ -4,8 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.closeAccountDialog = closeAccountDialog;
+exports.getAccountDialogConsumerHooks = getAccountDialogConsumerHooks;
 exports.notifyAccountDialogVisibility = notifyAccountDialogVisibility;
 exports.openAccountDialog = openAccountDialog;
+exports.registerAccountDialogConsumerHooks = registerAccountDialogConsumerHooks;
 exports.registerAccountDialogControls = registerAccountDialogControls;
 exports.subscribeToAccountDialog = subscribeToAccountDialog;
 /**
@@ -26,7 +28,14 @@ exports.subscribeToAccountDialog = subscribeToAccountDialog;
  * 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();
 function registerAccountDialogControls(next) {
   controls = next;
@@ -37,6 +46,19 @@ function registerAccountDialogControls(next) {
   };
 }
 
+/** Register app-local manage/add/profile handlers for the account dialog. */
+function registerAccountDialogConsumerHooks(next) {
+  consumerHooks = next;
+  return () => {
+    if (consumerHooks === next) {
+      consumerHooks = null;
+    }
+  };
+}
+function getAccountDialogConsumerHooks() {
+  return consumerHooks;
+}
+
 /** Open the account dialog on `view` (default `accounts`). No-op before mount. */
 function openAccountDialog(view) {
   controls?.open(view);

package/lib/commonjs/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;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;;AAMA,IAAIA,QAAsC,GAAG,IAAI;AACjD,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAA6B,CAAC;AAE1D,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;AACO,SAASK,iBAAiBA,CAACC,IAAwB,EAAQ;EAChEN,QAAQ,EAAEO,IAAI,CAACD,IAAI,CAAC;AACtB;;AAEA;AACO,SAASE,kBAAkBA,CAAA,EAAS;EACzCR,QAAQ,EAAES,KAAK,CAAC,CAAC;AACnB;;AAEA;AACO,SAASC,6BAA6BA,CAACC,OAAgB,EAAQ;EACpE,KAAK,MAAMC,QAAQ,IAAIX,mBAAmB,EAAE;IAC1CW,QAAQ,CAACD,OAAO,CAAC;EACnB;AACF;;AAEA;AACO,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;AAE1D,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;AACO,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;AAEO,SAASM,6BAA6BA,CAAA,EAAsC;EACjF,OAAON,aAAa;AACtB;;AAEA;AACO,SAASO,iBAAiBA,CAACC,IAAwB,EAAQ;EAChET,QAAQ,EAAEU,IAAI,CAACD,IAAI,CAAC;AACtB;;AAEA;AACO,SAASE,kBAAkBA,CAAA,EAAS;EACzCX,QAAQ,EAAEY,KAAK,CAAC,CAAC;AACnB;;AAEA;AACO,SAASC,6BAA6BA,CAACC,OAAgB,EAAQ;EACpE,KAAK,MAAMC,QAAQ,IAAIb,mBAAmB,EAAE;IAC1Ca,QAAQ,CAACD,OAAO,CAAC;EACnB;AACF;;AAEA;AACO,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/commonjs/ui/navigation/bottomSheetManager.js

@@ -20,11 +20,10 @@ var _surfaces = require("./surfaces.js");
  */
 
 /**
- * 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.
@@ -37,7 +36,7 @@ const showBottomSheet = screenOrConfig => {
     return;
   }
   const top = (0, _surfaces.topRouteSurface)();
-  if (top && top.presentation === (0, _surfaceRegistry.getSurfacePresentation)(screen, props)) {
+  if (top && !(0, _surfaceRegistry.getSurfaceConfig)(screen, props).stacks) {
     top.navigate(screen, props);
   } else {
     (0, _surfaces.presentRoute)(screen, props);

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

@@ -1 +1 @@
-{"version":3,"names":["_routes","require","_surfaceRegistry","_surfaces","showBottomSheet","screenOrConfig","screen","props","isValidRoute","__DEV__","console","warn","top","topRouteSurface","presentation","getSurfacePresentation","navigate","presentRoute","exports","closeBottomSheet","closeAllRouteSurfaces","goBack"],"sourceRoot":"../../../../src","sources":["ui/navigation/bottomSheetManager.ts"],"mappings":";;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMG,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,CAAC,IAAAC,oBAAY,EAACF,MAAM,CAAC,EAAE;IACzB,IAAIG,OAAO,EAAEC,OAAO,CAACC,IAAI,CAAC,gCAAgCL,MAAM,EAAE,CAAC;IACnE;EACF;EAEA,MAAMM,GAAG,GAAG,IAAAC,yBAAe,EAAC,CAAC;EAC7B,IAAID,GAAG,IAAIA,GAAG,CAACE,YAAY,KAAK,IAAAC,uCAAsB,EAACT,MAAM,EAAEC,KAAK,CAAC,EAAE;IACrEK,GAAG,CAACI,QAAQ,CAACV,MAAM,EAAEC,KAAK,CAAC;EAC7B,CAAC,MAAM;IACL,IAAAU,sBAAY,EAACX,MAAM,EAAEC,KAAK,CAAC;EAC7B;AACF,CAAC;;AAED;AAAAW,OAAA,CAAAd,eAAA,GAAAA,eAAA;AACO,MAAMe,gBAAgB,GAAGA,CAAA,KAAY;EAC1C,IAAAC,+BAAqB,EAAC,CAAC;AACzB,CAAC;;AAED;AACA;AACA;AACA;AAHAF,OAAA,CAAAC,gBAAA,GAAAA,gBAAA;AAIO,MAAME,MAAM,GAAGA,CAAA,KAAe;EACnC,MAAMT,GAAG,GAAG,IAAAC,yBAAe,EAAC,CAAC;EAC7B,OAAOD,GAAG,GAAGA,GAAG,CAACS,MAAM,CAAC,CAAC,GAAG,KAAK;AACnC,CAAC;AAACH,OAAA,CAAAG,MAAA,GAAAA,MAAA","ignoreList":[]}
+{"version":3,"names":["_routes","require","_surfaceRegistry","_surfaces","showBottomSheet","screenOrConfig","screen","props","isValidRoute","__DEV__","console","warn","top","topRouteSurface","getSurfaceConfig","stacks","navigate","presentRoute","exports","closeBottomSheet","closeAllRouteSurfaces","goBack"],"sourceRoot":"../../../../src","sources":["ui/navigation/bottomSheetManager.ts"],"mappings":";;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMG,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,CAAC,IAAAC,oBAAY,EAACF,MAAM,CAAC,EAAE;IACzB,IAAIG,OAAO,EAAEC,OAAO,CAACC,IAAI,CAAC,gCAAgCL,MAAM,EAAE,CAAC;IACnE;EACF;EAEA,MAAMM,GAAG,GAAG,IAAAC,yBAAe,EAAC,CAAC;EAC7B,IAAID,GAAG,IAAI,CAAC,IAAAE,iCAAgB,EAACR,MAAM,EAAEC,KAAK,CAAC,CAACQ,MAAM,EAAE;IAClDH,GAAG,CAACI,QAAQ,CAACV,MAAM,EAAEC,KAAK,CAAC;EAC7B,CAAC,MAAM;IACL,IAAAU,sBAAY,EAACX,MAAM,EAAEC,KAAK,CAAC;EAC7B;AACF,CAAC;;AAED;AAAAW,OAAA,CAAAd,eAAA,GAAAA,eAAA;AACO,MAAMe,gBAAgB,GAAGA,CAAA,KAAY;EAC1C,IAAAC,+BAAqB,EAAC,CAAC;AACzB,CAAC;;AAED;AACA;AACA;AACA;AAHAF,OAAA,CAAAC,gBAAA,GAAAA,gBAAA;AAIO,MAAME,MAAM,GAAGA,CAAA,KAAe;EACnC,MAAMT,GAAG,GAAG,IAAAC,yBAAe,EAAC,CAAC;EAC7B,OAAOD,GAAG,GAAGA,GAAG,CAACS,MAAM,CAAC,CAAC,GAAG,KAAK;AACnC,CAAC;AAACH,OAAA,CAAAG,MAAA,GAAAA,MAAA","ignoreList":[]}

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

@@ -50,6 +50,7 @@ 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,

package/lib/commonjs/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","exports","isValidRoute"],"sourceRoot":"../../../../src","sources":["ui/navigation/routes.ts"],"mappings":"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","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","exports","isValidRoute"],"sourceRoot":"../../../../src","sources":["ui/navigation/routes.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/navigation/surfaceNavStack.js

@@ -44,9 +44,46 @@ function createSurfaceNavStack(route, props) {
     } = store.getState();
     return frames[frames.length - 1];
   };
+
+  // Result-bearing sub-flows currently running in this surface (the morphed-in
+  // avatar picker, and — NESTED within it — the "My Oxy files" media selector).
+  // A STACK: flows nest (ChangeAvatar → FileManagement → back to ChangeAvatar).
+  // Held OUTSIDE the store (resolvers are functions; flow presence must not
+  // re-render frames). Each flow's `returnLength` is the frame count BEFORE its
+  // entry frame was pushed, so settling pops back to exactly the frame that
+  // started it. `flowStack` is ordered outer → inner; the top is the innermost.
+  const flowStack = [];
+  const requestDismiss = result => {
+    // Dismissing the whole surface abandons EVERY pending sub-flow — settle each
+    // promise so an awaiting caller (the avatar picker) never hangs.
+    while (flowStack.length) flowStack.pop()?.resolve(undefined);
+    if (store.getState().closing) return;
+    store.setState({
+      closing: true,
+      closeResult: result
+    });
+  };
+  const goBack = () => {
+    const {
+      frames
+    } = store.getState();
+    if (frames.length <= 1) return false;
+    const nextLength = frames.length - 1;
+    store.setState({
+      frames: frames.slice(0, -1)
+    });
+    // Backing out past a sub-flow's entry frame cancels it (resolve undefined).
+    // A single pop crosses at most one boundary, but loop for safety.
+    while (flowStack.length && nextLength <= flowStack[flowStack.length - 1].returnLength) {
+      flowStack.pop()?.resolve(undefined);
+    }
+    return true;
+  };
   return {
     store,
     getTop,
+    requestDismiss,
+    goBack,
     navigate(nextRoute, nextProps) {
       store.setState(state => ({
         frames: [...state.frames, makeFrame(nextRoute, nextProps)]
@@ -57,16 +94,6 @@ function createSurfaceNavStack(route, props) {
         frames: [...state.frames.slice(0, -1), makeFrame(nextRoute, nextProps)]
       }));
     },
-    goBack() {
-      const {
-        frames
-      } = store.getState();
-      if (frames.length <= 1) return false;
-      store.setState({
-        frames: frames.slice(0, -1)
-      });
-      return true;
-    },
     canGoBack() {
       const {
         frames
@@ -86,12 +113,32 @@ function createSurfaceNavStack(route, props) {
         };
       });
     },
-    requestDismiss(result) {
-      if (store.getState().closing) return;
-      store.setState({
-        closing: true,
-        closeResult: result
+    beginFlow(nextRoute, nextProps) {
+      const returnLength = store.getState().frames.length;
+      store.setState(state => ({
+        frames: [...state.frames, makeFrame(nextRoute, nextProps)]
+      }));
+      return new Promise(resolve => {
+        flowStack.push({
+          returnLength,
+          resolve
+        });
       });
+    },
+    resolveFlowOrDismiss(result) {
+      const flow = flowStack.pop();
+      if (!flow) {
+        // No flow → this screen owns its surface; dismiss it as before.
+        requestDismiss(result);
+        return;
+      }
+      store.setState(state => ({
+        frames: state.frames.slice(0, flow.returnLength)
+      }));
+      flow.resolve(result);
+    },
+    abandonActiveFlow() {
+      while (flowStack.length) flowStack.pop()?.resolve(undefined);
     }
   };
 }

package/lib/commonjs/ui/navigation/surfaceNavStack.js.map

@@ -1 +1 @@
-{"version":3,"names":["_vanilla","require","makeFrame","route","props","resolved","step","initialStep","createSurfaceNavStack","store","createStore","frames","closing","closeResult","undefined","getTop","getState","length","navigate","nextRoute","nextProps","setState","state","replace","slice","goBack","canGoBack","setStep","index","requestDismiss","result"],"sourceRoot":"../../../../src","sources":["ui/navigation/surfaceNavStack.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_vanilla","require","makeFrame","route","props","resolved","step","initialStep","createSurfaceNavStack","store","createStore","frames","closing","closeResult","undefined","getTop","getState","length","flowStack","requestDismiss","result","pop","resolve","setState","goBack","nextLength","slice","returnLength","navigate","nextRoute","nextProps","state","replace","canGoBack","setStep","index","beginFlow","Promise","push","resolveFlowOrDismiss","flow","abandonActiveFlow"],"sourceRoot":"../../../../src","sources":["ui/navigation/surfaceNavStack.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/navigation/surfaceRegistry.js

@@ -35,15 +35,18 @@ void _registryCoversRoutes;
  * How a surface renders — the SDK's presentation taxonomy. Each value maps to a
  * concrete Bloom `Dialog` placement/chrome in `surfaces.ts`:
  *
- *   - `'sheet'`      → responsive `{ base: 'bottom', md: 'center' }` (the default:
- *                      a bottom sheet on narrow viewports, a centered card on wide).
- *   - `'center'`     → a plain centered modal at every width.
+ *   - `'sheet'`      → responsive `{ base: 'bottom', md: 'center' }` (the default,
+ *                      and — since every screen morphs — the presentation of EVERY
+ *                      route today: a bottom sheet on narrow, a centered card wide).
+ *   - `'center'`     → a plain centered modal at every width. Currently unused.
  *   - `'drawer'`     → responsive `{ base: 'bottom', md: 'left' }` side drawer.
- *   - `'fullScreen'` → approximated with the shared `Dialog`: a full-height sheet /
- *                      large centered card, flush (`contentPadding: 0`) content, a
- *                      black canvas and programmatic-only dismiss (the flagship
- *                      image picker). A real Bloom `'fullScreen'` placement is a
- *                      follow-up if the approximation reads wrong on device.
+ *                      Currently unused.
+ *   - `'fullScreen'` → a flush black-canvas surface (`contentPadding: 0`,
+ *                      programmatic-only dismiss). Currently unused: the flagship
+ *                      photo picker now MORPHS in place as a `sheet` (it paints its
+ *                      own black canvas + bar inside the themed panel), so nothing
+ *                      needs a stacked full-bleed surface. Retained for a future
+ *                      route that genuinely must be full-bleed.
  */
 
 /**
@@ -63,13 +66,14 @@ const DEFAULT_SURFACE_CONFIG = {
   presentation: 'sheet',
   scrollable: true,
   header: true,
+  morph: true,
+  stacks: false,
   manualActivation: true,
   dynamicBackdrop: true
 };
 
 /**
  * Routes that render NO Dialog nav header — they own their chrome:
- * - `AvatarCrop` — its own translucent Cancel / title / Done top bar.
  * - `PaymentGateway` — the payment surface owns its controls.
  * - `WelcomeNewUser` — a full-bleed onboarding wizard with its own step chrome.
  * - `Profile` — a full profile view, no nav-header chrome.
@@ -78,8 +82,15 @@ const DEFAULT_SURFACE_CONFIG = {
  * `AccountDialog` used to be here — it now uses the SHARED Dialog nav header like
  * every other screen (its per-view title/subtitle + view-back go through
  * `useSurfaceHeader`), so the account/sign-in surface no longer feels bespoke.
+ *
+ * `AvatarCrop` used to be here too, for its own translucent Cancel/title/Done
+ * bar. It is now reached ONLY by navigating within a `ChangeAvatar` surface, and
+ * the Dialog's `header` is fixed for a surface's whole life — a headerless frame
+ * inside a header-mode surface would stack two bars. So the crop declares its
+ * title + its "Use photo" action through `useSurfaceHeader` like every other
+ * screen, and keeps only its dark crop stage.
  */
-const HEADERLESS_ROUTES = new Set(['AvatarCrop', 'PaymentGateway', 'WelcomeNewUser', 'Profile']);
+const HEADERLESS_ROUTES = new Set(['PaymentGateway', 'WelcomeNewUser', 'Profile']);
 
 /**
  * Predicate matching `FileManagementScreen`'s internal `isImageOnlyPicker`
@@ -113,19 +124,29 @@ const isFileManagementImageOnlyPicker = props => {
 const OWN_SCROLL_CONTAINER_ROUTES = new Set(['FileManagement', 'ConnectedApps', 'TrustLeaderboard', 'FollowersList', 'FollowingList']);
 
 /**
- * Resolve the surface configuration for a route + props. Defaults to the
- * responsive sheet; the image-only FileManagement picker upgrades to a full-bleed
- * `'fullScreen'` surface, and every route that owns its own scroll container is
- * marked `scrollable: false`.
+ * Resolve the surface configuration for a route + props. Every route defaults to
+ * the responsive sheet and MORPHS in place when navigated to from within a surface
+ * (no route stacks — genuine overlays are Bloom-raw `surfaces.present`/`confirm`
+ * calls, outside this registry). The image-only FileManagement picker is a normal
+ * sheet that owns its own scroll + translucent bar (no Dialog nav header); every
+ * other own-scroller is marked `scrollable: false`.
  */
 const getSurfaceConfig = (route, props) => {
   if (route === 'FileManagement' && isFileManagementImageOnlyPicker(props)) {
-    // The full-bleed image picker owns its own translucent top bar — no nav header.
+    // The flagship photo picker MORPHS in place like every other screen. It is an
+    // own-scroller (`PhotoPickerView`'s FlatList) that paints its OWN full-bleed
+    // black canvas + translucent top bar INSIDE the themed panel, so it takes no
+    // Dialog nav header. It needs ROOM for the photo grid, so it declares an
+    // explicit LARGE morph target — the panel grows UP to a near-full-height,
+    // wider card on entry (and back down on pick→crop), the grid scrolling within.
     return {
       ...DEFAULT_SURFACE_CONFIG,
-      presentation: 'fullScreen',
       scrollable: false,
-      header: false
+      header: false,
+      frameSize: {
+        heightRatio: 0.9,
+        maxWidth: 640
+      }
     };
   }
   if (HEADERLESS_ROUTES.has(route)) {

package/lib/commonjs/ui/navigation/surfaceRegistry.js.map

@@ -1 +1 @@
-{"version":3,"names":["_registryCoversRoutes","DEFAULT_SURFACE_CONFIG","presentation","scrollable","header","manualActivation","dynamicBackdrop","HEADERLESS_ROUTES","Set","isFileManagementImageOnlyPicker","props","selectMode","disabled","disabledMimeTypes","Array","isArray","length","has","predicate","some","mt","blocksVideos","startsWith","blocksAudio","blocksDocs","OWN_SCROLL_CONTAINER_ROUTES","getSurfaceConfig","route","exports","getSurfacePresentation"],"sourceRoot":"../../../../src","sources":["ui/navigation/surfaceRegistry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_registryCoversRoutes","DEFAULT_SURFACE_CONFIG","presentation","scrollable","header","morph","stacks","manualActivation","dynamicBackdrop","HEADERLESS_ROUTES","Set","isFileManagementImageOnlyPicker","props","selectMode","disabled","disabledMimeTypes","Array","isArray","length","has","predicate","some","mt","blocksVideos","startsWith","blocksAudio","blocksDocs","OWN_SCROLL_CONTAINER_ROUTES","getSurfaceConfig","route","frameSize","heightRatio","maxWidth","exports","getSurfacePresentation"],"sourceRoot":"../../../../src","sources":["ui/navigation/surfaceRegistry.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/navigation/surfaces.js

@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.closeAllRouteSurfaces = closeAllRouteSurfaces;
 exports.navigateWithinOrPresent = navigateWithinOrPresent;
+exports.openWithinOrPresent = openWithinOrPresent;
 exports.present = present;
 exports.presentDetached = presentDetached;
 exports.presentRoute = presentRoute;
 exports.replaceWithinOrPresent = replaceWithinOrPresent;
 exports.surfaces = void 0;
+exports.topMorphableSurface = topMorphableSurface;
 exports.topRouteSurface = topRouteSurface;
 exports.useSurfaces = useSurfaces;
 var _react = require("react");
@@ -61,6 +63,11 @@ function bloomOptionsFor(config) {
   // Threaded onto every placement so a route that owns its own scroll container
   // (`scrollable: false`) opts out of the Dialog's internal ScrollView.
   const scrollable = config.scrollable;
+  // Surface-level morph opt-out (the DEPTH axis is untouched — this only governs
+  // whether the panel reshapes when the content is swapped in place). Each frame
+  // additionally declares its own opt-out through `useDialogFrame` in
+  // `SurfaceScreen`, so a surface can morph for most routes and not for one.
+  const morph = config.morph;
   // Nav-header mode marker: turns on the Dialog's OWN sticky gradient nav bar +
   // large collapsing title over its scroll content. The title/subtitle/action
   // slots are contributed at runtime by the mounted screen via `useSurfaceHeader`
@@ -74,6 +81,7 @@ function bloomOptionsFor(config) {
         placement: 'center',
         scrollable,
         header,
+        morph,
         ...SDK_SURFACE_CHROME
       };
     case 'drawer':
@@ -84,6 +92,7 @@ function bloomOptionsFor(config) {
         },
         scrollable,
         header,
+        morph,
         ...SDK_SURFACE_CHROME
       };
     case 'fullScreen':
@@ -97,6 +106,7 @@ function bloomOptionsFor(config) {
         maxHeightRatio: 0.9,
         dismissOnBackdrop: false,
         scrollable,
+        morph,
         style: FULLSCREEN_SURFACE_STYLE,
         panelStyle: FULLSCREEN_SURFACE_STYLE
       };
@@ -105,6 +115,7 @@ function bloomOptionsFor(config) {
         placement: SHEET_PLACEMENT,
         scrollable,
         header,
+        morph,
         ...SDK_SURFACE_CHROME
       };
   }
@@ -121,6 +132,8 @@ function bloomOptionsFor(config) {
  * The type-erased handle the `showBottomSheet` adapter needs from a tracked
  * surface: what it hosts, and how to drive/dismiss it. Kept result-type-free so
  * the (generic) `SurfaceInstance<K>` never has to be widened into a shared array.
+ * Exported so `OxyContext` can hold the surface it MORPHS the account dialog into
+ * (see {@link topRouteSurface}).
  */
 
 /**
@@ -130,6 +143,17 @@ function bloomOptionsFor(config) {
  * navigable base. Entries self-remove when their surface is dismissed.
  */
 const activeRouteSurfaces = [];
+
+/**
+ * The frontmost DETACHED surface (the AccountDialog), while open. Detached
+ * surfaces are kept OUT of `activeRouteSurfaces` so `closeAllRouteSurfaces` never
+ * touches them — but the AccountDialog IS a valid morph target: a result-bearing
+ * flow opened from within it (the account-menu hero avatar → `ChangeAvatar`) must
+ * morph INTO it, not stack a new surface behind it. Invariant: whenever set, this
+ * surface is frontmost — every account-menu action that opens a tracked surface
+ * (Manage, Help, …) dismisses the dialog FIRST, so the two never overlap.
+ */
+let detachedFrontSurface = null;
 function presentInternal(route, props, opts, track) {
   const navStack = (0, _surfaceNavStack.createSurfaceNavStack)(route, props);
   const config = (0, _surfaceRegistry.getSurfaceConfig)(route, props);
@@ -141,12 +165,10 @@ function presentInternal(route, props, opts, track) {
   const result = _surfaces.surfaces.present(surface => /*#__PURE__*/(0, _react.createElement)(_SurfaceScreen.default, {
     navStack,
     surface,
-    presentation: config.presentation,
     dismissOnBackdrop: bloomOpts.dismissOnBackdrop ?? true
   }), bloomOpts);
   const instance = {
     route,
-    presentation: config.presentation,
     navigate: (nextRoute, nextProps) => {
       const top = navStack.getTop();
       if (top.route === nextRoute) navStack.replace(nextRoute, nextProps);else navStack.navigate(nextRoute, nextProps);
@@ -155,22 +177,35 @@ function presentInternal(route, props, opts, track) {
     goBack: () => navStack.goBack(),
     canGoBack: () => navStack.canGoBack(),
     setStep: step => navStack.setStep(step),
+    beginFlow: (nextRoute, nextProps) => navStack.beginFlow(nextRoute, nextProps),
     dismiss: dismissResult => navStack.requestDismiss(dismissResult),
     result
   };
+
+  // If the surface is torn down (backdrop, `closeAll`, host unmount) while a
+  // result-bearing sub-flow is still open, settle that flow so an awaiting caller
+  // never hangs. Runs for tracked and detached surfaces alike.
+  result.finally(() => navStack.abandonActiveFlow());
+  const tracked = {
+    route: instance.route,
+    navigate: instance.navigate,
+    goBack: instance.goBack,
+    beginFlow: instance.beginFlow,
+    dismiss: () => instance.dismiss()
+  };
   if (track) {
-    const tracked = {
-      route: instance.route,
-      presentation: instance.presentation,
-      navigate: instance.navigate,
-      goBack: instance.goBack,
-      dismiss: () => instance.dismiss()
-    };
     activeRouteSurfaces.push(tracked);
     result.finally(() => {
       const index = activeRouteSurfaces.indexOf(tracked);
       if (index >= 0) activeRouteSurfaces.splice(index, 1);
     });
+  } else {
+    // Detached (the AccountDialog): NOT in the closeAll lineage, but recorded as
+    // the frontmost morph target so a flow opened from within it morphs IN.
+    detachedFrontSurface = tracked;
+    result.finally(() => {
+      if (detachedFrontSurface === tracked) detachedFrontSurface = null;
+    });
   }
   return instance;
 }
@@ -204,6 +239,16 @@ function topRouteSurface() {
   return activeRouteSurfaces[activeRouteSurfaces.length - 1];
 }
 
+/**
+ * The frontmost surface a result-bearing flow should morph INTO: the detached
+ * AccountDialog if open (it sits on top of everything), else the top tracked
+ * route surface. Used by {@link openWithinOrPresent} so the account-menu hero
+ * avatar morphs the dialog into `ChangeAvatar` instead of stacking a new surface.
+ */
+function topMorphableSurface() {
+  return detachedFrontSurface ?? topRouteSurface();
+}
+
 /**
  * Dismiss every active route surface (the whole `showBottomSheet` session). The
  * AccountDialog is untracked, so it is untouched. Iterates a snapshot because
@@ -214,27 +259,59 @@ function closeAllRouteSurfaces() {
 }
 
 /**
- * Drill in from a screen: navigate WITHIN the current surface when the target's
- * presentation matches, else present the target as a NEW surface on top (so a
- * sheet screen opening the full-bleed picker gets the right chrome).
+ * Drill in from a screen. From inside a surface the DEFAULT is to navigate WITHIN
+ * it — the panel MORPHS from the current frame's size to the next's. EVERY screen
+ * morphs; a NEW surface is stacked on top ONLY when the target route declares
+ * `stacks` (reserved for genuine overlays — none today, since action sheets /
+ * confirms / prompts are Bloom-raw `surfaces.present` calls outside this
+ * registry). A stacked surface gets its own backdrop + entry animation; dismissing
+ * it unwinds back to the surface that opened it.
  */
-function navigateWithinOrPresent(currentPresentation, navStack, route, props) {
+function navigateWithinOrPresent(navStack, route, props) {
   const nextProps = props ?? {};
-  if ((0, _surfaceRegistry.getSurfacePresentation)(route, nextProps) === currentPresentation) {
-    navStack.navigate(route, nextProps);
-  } else {
+  if ((0, _surfaceRegistry.getSurfaceConfig)(route, nextProps).stacks) {
     presentRoute(route, nextProps);
+  } else {
+    navStack.navigate(route, nextProps);
   }
 }
 
-/** Replace variant of {@link navigateWithinOrPresent}. */
-function replaceWithinOrPresent(currentPresentation, navStack, route, props) {
+/** Replace variant of {@link navigateWithinOrPresent} (swaps the top frame). */
+function replaceWithinOrPresent(navStack, route, props) {
   const nextProps = props ?? {};
-  if ((0, _surfaceRegistry.getSurfacePresentation)(route, nextProps) === currentPresentation) {
-    navStack.replace(route, nextProps);
-  } else {
+  if ((0, _surfaceRegistry.getSurfaceConfig)(route, nextProps).stacks) {
     presentRoute(route, nextProps);
+  } else {
+    navStack.replace(route, nextProps);
+  }
+}
+
+/**
+ * Open a result-bearing route the SAME way a drill-in navigates (the morph-by-
+ * default rule), but returning the route's dismissal RESULT to the caller.
+ *
+ * When a surface is already open and the target morphs into it (the default —
+ * anything not marked `stacks`), it runs as a SUB-FLOW inside that surface: the
+ * panel morphs from the current screen into the target, and the promise resolves
+ * with the target's `dismiss(result)` (or `undefined` when cancelled), popping
+ * back to the caller's frame WITHOUT closing the host. Otherwise (no surface, or a
+ * route that stacks) it presents a fresh surface and resolves with its dismissal —
+ * identical to the historical `present(route).result`.
+ *
+ * The entry seam for the avatar picker AND its nested "My Oxy files" media
+ * selector: each awaits its result whether it morphed into the caller's surface
+ * or opened cold, with no morph-vs-present branch of its own.
+ */
+function openWithinOrPresent(route, props) {
+  const nextProps = props ?? {};
+  const host = topMorphableSurface();
+  if (host && !(0, _surfaceRegistry.getSurfaceConfig)(route, nextProps).stacks) {
+    // Morph: run as a sub-flow inside the host. The erased `Promise<unknown>` is
+    // narrowed to this route's result at the typed boundary (the sub-flow resolves
+    // with exactly the value a descendant screen passes to `dismiss(result)`).
+    return host.beginFlow(route, nextProps);
   }
+  return present(route, props).result;
 }
 
 /**