@userflow-tech/react-native 0.1.1 → 0.3.0

package/lib/module/runtime/UserflowProvider.js

@@ -3,68 +3,189 @@
 import * as React from 'react';
 import { StyleSheet, View } from 'react-native';
 import { FiberScanRoot } from "../anchors/fiber/FiberScanRoot.js";
-import { PreviewModeBanner } from "../pairing/PreviewModeBanner.js";
-import { getPairingController } from "../pairing/pairingRuntime.js";
-import { usePairingState } from "../pairing/usePairingState.js";
+import { DoubleTapBridge } from "../authoring/chrome/DoubleTapBridge.js";
+import { elementPickerController } from "../authoring/elementPickerController.js";
 import { ABSOLUTE_FILL } from "../surfaces/absoluteFill.js";
-import { FlowRenderer } from "./FlowRenderer.js";
+import { getSafeAreaInsetsContext, useUserflowSafeAreaInsets } from "../surfaces/safeArea.js";
+import { SurfaceLayoutInsetsProvider } from "../surfaces/surfaceLayoutInsets.js";
+import { BannerHost } from "./BannerHost.js";
+import { SdkErrorBoundary } from "./SdkErrorBoundary.js";
 import { TargetPressBridge } from "./TargetPressBridge.js";
+import { UserflowOverlay } from "./UserflowOverlay.js";
+import { getBannerSessionEngine } from "./bannerEngine.js";
+import { BannerEngineContext } from "./bannerEngineContext.js";
+import { bannerEdge } from "./bannerPlacement.js";
 import { getFlowSessionEngine } from "./flowEngine.js";
+import { isolateSync } from "./isolateCall.js";
+import { useBannerSession } from "./useBannerSession.js";
 import { getUserflowCore } from "./userflowCore.js";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const UserflowContext = /*#__PURE__*/React.createContext(null);
+function overlayResetKeyFromEngine(engine) {
+  const session = engine.getFlowSession();
+  if (!session) {
+    return '';
+  }
+  // `ForceGoToStep` updates displayedStepId without rewriting session.currentStep.
+  return `${session.id}:${engine.getCurrentStep()?.id ?? ''}`;
+}
+
+/**
+ * Session/step identity for retrying a crashed overlay. Lives in an effect so a
+ * throw cannot unmount host children (session hooks run inside the overlay
+ * boundary instead).
+ */
+function useOverlayErrorBoundaryResetKey(engine) {
+  const [resetKey, setResetKey] = React.useState(() => {
+    try {
+      return overlayResetKeyFromEngine(engine);
+    } catch {
+      return '';
+    }
+  });
+  React.useEffect(() => {
+    const apply = next => {
+      setResetKey(next);
+    };
+    isolateSync('overlay-reset-key', () => {
+      apply(overlayResetKeyFromEngine(engine));
+    });
+    return engine.on(() => {
+      isolateSync('overlay-reset-key', () => {
+        apply(overlayResetKeyFromEngine(engine));
+      });
+    });
+  }, [engine]);
+  return resetKey;
+}
+
 /**
  * Mount once at the application root, above the navigation container
  * (for example the root `_layout.tsx` or `App` component), after
  * calling {@link Userflow.init}.
  *
  * Children render normally. An absolute overlay sits above them with
- * `pointerEvents="box-none"` so taps pass through except where flow UI sits.
+ * `pointerEvents="box-none"` so taps pass through except where flow UI blocks
+ * them (modals always; tooltips when interaction blocking is enabled).
  * We deliberately do not use RN `<Modal>` — it is the wrong primitive for
  * non-modal tooltips (WS6).
  *
+ * Overlay render errors are contained by {@link SdkErrorBoundary}; host
+ * children are never inside that boundary. See
+ * `packages/react-native/docs/isolation.md`.
+ *
  * **Expo Router:** also mount `UserflowExpoRouterScreenTracker` from
- * `@userflow-tech/react-native/expo-router` under this provider so pathname changes
- * and path-like NAVIGATE actions are wired. The tracker is a separate entry so
- * apps without `expo-router` are not forced to install that peer.
+ * `@userflow-tech/react-native/expo-router` under this provider so pathname and
+ * navigation-state changes and path-like NAVIGATE actions are wired. The tracker
+ * is a separate entry so apps without `expo-router` are not forced to install
+ * that peer.
  *
  * **React Navigation:** wrap `NavigationContainer` with
  * {@link WithUserflowReactNavigation} from `@userflow-tech/react-native/navigation`.
  */
 export function UserflowProvider({
   children,
-  engine: engineProp
+  engine: engineProp,
+  bannerEngine: bannerEngineProp
 }) {
   const engine = engineProp ?? getFlowSessionEngine(getUserflowCore());
+  const bannerEngine = bannerEngineProp ?? getBannerSessionEngine(getUserflowCore());
   const contextValue = React.useMemo(() => ({
     engine
   }), [engine]);
-  const pairingState = usePairingState();
-  const onExitPreview = React.useCallback(() => {
-    void getPairingController(getUserflowCore()).exitPreview();
+  const overlayResetKey = useOverlayErrorBoundaryResetKey(engine);
+  const [trapHostAccessibility, setTrapHostAccessibility] = React.useState(false);
+  const onTrapChange = React.useCallback(trap => {
+    setTrapHostAccessibility(trap);
+  }, []);
+  const onOverlayError = React.useCallback(() => {
+    setTrapHostAccessibility(false);
   }, []);
-  return /*#__PURE__*/_jsx(UserflowContext.Provider, {
-    value: contextValue,
-    children: /*#__PURE__*/_jsxs(View, {
-      style: styles.root,
-      collapsable: false,
-      children: [/*#__PURE__*/_jsx(TargetPressBridge, {
-        children: /*#__PURE__*/_jsx(FiberScanRoot, {
-          children: children
+  const bannerSession = useBannerSession(bannerEngine);
+  const safeInsets = useUserflowSafeAreaInsets();
+  const [pickerActive, setPickerActive] = React.useState(() => elementPickerController.getState().active);
+  React.useEffect(() => {
+    return elementPickerController.subscribe(next => {
+      setPickerActive(next.active);
+    });
+  }, []);
+  const banner = bannerSession?.version.banner ?? null;
+  const flowEdge = banner && banner.overlay === false && !pickerActive ? bannerEdge(banner.embedMode) : null;
+  const hostInsets = flowEdge === 'top' || flowEdge === 'bottom' ? {
+    ...safeInsets,
+    top: flowEdge === 'top' ? 0 : safeInsets.top,
+    bottom: flowEdge === 'bottom' ? 0 : safeInsets.bottom
+  } : null;
+  const appContent = /*#__PURE__*/_jsx(View, {
+    style: styles.appContent,
+    testID: "userflow-app-content",
+    importantForAccessibility: trapHostAccessibility ? 'no-hide-descendants' : undefined,
+    accessibilityElementsHidden: trapHostAccessibility ? true : undefined,
+    children: /*#__PURE__*/_jsx(TargetPressBridge, {
+      children: /*#__PURE__*/_jsx(FiberScanRoot, {
+        children: children
+      })
+    })
+  });
+  return /*#__PURE__*/_jsx(BannerEngineContext.Provider, {
+    value: bannerEngine,
+    children: /*#__PURE__*/_jsx(UserflowContext.Provider, {
+      value: contextValue,
+      children: /*#__PURE__*/_jsx(SurfaceLayoutInsetsProvider, {
+        children: /*#__PURE__*/_jsx(DoubleTapBridge, {
+          children: /*#__PURE__*/_jsxs(View, {
+            style: styles.root,
+            collapsable: false,
+            testID: "userflow-root",
+            children: [/*#__PURE__*/_jsx(BannerHost, {
+              engine: bannerEngine,
+              placement: "flow",
+              edge: "top",
+              hidden: pickerActive
+            }), /*#__PURE__*/_jsx(HostSafeArea, {
+              insets: hostInsets,
+              children: appContent
+            }), /*#__PURE__*/_jsx(BannerHost, {
+              engine: bannerEngine,
+              placement: "flow",
+              edge: "bottom",
+              hidden: pickerActive
+            }), /*#__PURE__*/_jsx(View, {
+              style: styles.overlay,
+              pointerEvents: "box-none",
+              children: /*#__PURE__*/_jsx(SdkErrorBoundary, {
+                scope: "overlay",
+                resetKey: overlayResetKey,
+                onError: onOverlayError,
+                children: /*#__PURE__*/_jsx(UserflowOverlay, {
+                  engine: engine,
+                  bannerEngine: bannerEngine,
+                  onTrapChange: onTrapChange
+                })
+              })
+            })]
+          })
         })
-      }), /*#__PURE__*/_jsxs(View, {
-        style: styles.overlay,
-        pointerEvents: "box-none",
-        children: [/*#__PURE__*/_jsx(PreviewModeBanner, {
-          state: pairingState,
-          onExit: onExitPreview
-        }), /*#__PURE__*/_jsx(FlowRenderer, {
-          engine: engine
-        })]
-      })]
+      })
     })
   });
 }
+function HostSafeArea({
+  insets,
+  children
+}) {
+  const Context = getSafeAreaInsetsContext();
+  const defaultInsets = useUserflowSafeAreaInsets();
+  if (!Context) {
+    return /*#__PURE__*/_jsx(_Fragment, {
+      children: children
+    });
+  }
+  return /*#__PURE__*/_jsx(Context.Provider, {
+    value: insets ?? defaultInsets,
+    children: children
+  });
+}
 
 /** Access the flow session engine from inside {@link UserflowProvider}. */
 export function useUserflow() {
@@ -78,6 +199,9 @@ const styles = StyleSheet.create({
   root: {
     flex: 1
   },
+  appContent: {
+    flex: 1
+  },
   overlay: {
     ...ABSOLUTE_FILL
   }

package/lib/module/runtime/UserflowProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","StyleSheet","View","FiberScanRoot","PreviewModeBanner","getPairingController","usePairingState","ABSOLUTE_FILL","FlowRenderer","TargetPressBridge","getFlowSessionEngine","getUserflowCore","jsx","_jsx","jsxs","_jsxs","UserflowContext","createContext","UserflowProvider","children","engine","engineProp","contextValue","useMemo","pairingState","onExitPreview","useCallback","exitPreview","Provider","value","style","styles","root","collapsable","overlay","pointerEvents","state","onExit","useUserflow","ctx","useContext","Error","create","flex"],"sourceRoot":"../../../src","sources":["runtime/UserflowProvider.tsx"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAE/C,SAASC,aAAa,QAAQ,mCAAgC;AAC9D,SAASC,iBAAiB,QAAQ,iCAA8B;AAChE,SAASC,oBAAoB,QAAQ,8BAA2B;AAChE,SAASC,eAAe,QAAQ,+BAA4B;AAC5D,SAASC,aAAa,QAAQ,6BAA0B;AAExD,SAASC,YAAY,QAAQ,mBAAgB;AAC7C,SAASC,iBAAiB,QAAQ,wBAAqB;AACvD,SAASC,oBAAoB,QAAQ,iBAAc;AACnD,SAASC,eAAe,QAAQ,mBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAMjD,MAAMC,eAAe,gBAAGhB,KAAK,CAACiB,aAAa,CAA8B,IAAI,CAAC;AAQ9E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAAC;EAC/BC,QAAQ;EACRC,MAAM,EAAEC;AACa,CAAC,EAAsB;EAC5C,MAAMD,MAAM,GAAGC,UAAU,IAAIX,oBAAoB,CAACC,eAAe,CAAC,CAAC,CAAC;EACpE,MAAMW,YAAY,GAAGtB,KAAK,CAACuB,OAAO,CAAuB,OAAO;IAAEH;EAAO,CAAC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EACtF,MAAMI,YAAY,GAAGlB,eAAe,CAAC,CAAC;EAEtC,MAAMmB,aAAa,GAAGzB,KAAK,CAAC0B,WAAW,CAAC,MAAM;IAC5C,KAAKrB,oBAAoB,CAACM,eAAe,CAAC,CAAC,CAAC,CAACgB,WAAW,CAAC,CAAC;EAC5D,CAAC,EAAE,EAAE,CAAC;EAEN,oBACEd,IAAA,CAACG,eAAe,CAACY,QAAQ;IAACC,KAAK,EAAEP,YAAa;IAAAH,QAAA,eAC5CJ,KAAA,CAACb,IAAI;MAAC4B,KAAK,EAAEC,MAAM,CAACC,IAAK;MAACC,WAAW,EAAE,KAAM;MAAAd,QAAA,gBAC3CN,IAAA,CAACJ,iBAAiB;QAAAU,QAAA,eAChBN,IAAA,CAACV,aAAa;UAAAgB,QAAA,EAAEA;QAAQ,CAAgB;MAAC,CACxB,CAAC,eACpBJ,KAAA,CAACb,IAAI;QAAC4B,KAAK,EAAEC,MAAM,CAACG,OAAQ;QAACC,aAAa,EAAC,UAAU;QAAAhB,QAAA,gBACnDN,IAAA,CAACT,iBAAiB;UAACgC,KAAK,EAAEZ,YAAa;UAACa,MAAM,EAAEZ;QAAc,CAAE,CAAC,eACjEZ,IAAA,CAACL,YAAY;UAACY,MAAM,EAAEA;QAAO,CAAE,CAAC;MAAA,CAC5B,CAAC;IAAA,CACH;EAAC,CACiB,CAAC;AAE/B;;AAEA;AACA,OAAO,SAASkB,WAAWA,CAAA,EAAyB;EAClD,MAAMC,GAAG,GAAGvC,KAAK,CAACwC,UAAU,CAACxB,eAAe,CAAC;EAC7C,IAAI,CAACuB,GAAG,EAAE;IACR,MAAM,IAAIE,KAAK,CAAC,wDAAwD,CAAC;EAC3E;EACA,OAAOF,GAAG;AACZ;AAEA,MAAMR,MAAM,GAAG9B,UAAU,CAACyC,MAAM,CAAC;EAC/BV,IAAI,EAAE;IACJW,IAAI,EAAE;EACR,CAAC;EACDT,OAAO,EAAE;IACP,GAAG3B;EACL;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","StyleSheet","View","FiberScanRoot","DoubleTapBridge","elementPickerController","ABSOLUTE_FILL","getSafeAreaInsetsContext","useUserflowSafeAreaInsets","SurfaceLayoutInsetsProvider","BannerHost","SdkErrorBoundary","TargetPressBridge","UserflowOverlay","getBannerSessionEngine","BannerEngineContext","bannerEdge","getFlowSessionEngine","isolateSync","useBannerSession","getUserflowCore","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","UserflowContext","createContext","overlayResetKeyFromEngine","engine","session","getFlowSession","id","getCurrentStep","useOverlayErrorBoundaryResetKey","resetKey","setResetKey","useState","useEffect","apply","next","on","UserflowProvider","children","engineProp","bannerEngine","bannerEngineProp","contextValue","useMemo","overlayResetKey","trapHostAccessibility","setTrapHostAccessibility","onTrapChange","useCallback","trap","onOverlayError","bannerSession","safeInsets","pickerActive","setPickerActive","getState","active","subscribe","banner","version","flowEdge","overlay","embedMode","hostInsets","top","bottom","appContent","style","styles","testID","importantForAccessibility","undefined","accessibilityElementsHidden","Provider","value","root","collapsable","placement","edge","hidden","HostSafeArea","insets","pointerEvents","scope","onError","Context","defaultInsets","useUserflow","ctx","useContext","Error","create","flex"],"sourceRoot":"../../../src","sources":["runtime/UserflowProvider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/runtime/bannerEngine.js

@@ -0,0 +1,55 @@
+"use strict";
+
+import { BannerSessionEngine } from '@userflow-tech/core';
+import { evalJsController } from "../evalJs/evalJsController.js";
+import { openFlowNavigateUrl } from "../navigation/openFlowNavigateUrl.js";
+import { getFlowSessionEngine } from "./flowEngine.js";
+import { isolateAsync } from "./isolateCall.js";
+let bannerEngine = null;
+
+/** Build (once) the module-level banner session engine over a {@link UserflowCore} transport. */
+export function getBannerSessionEngine(core) {
+  if (!bannerEngine) {
+    bannerEngine = new BannerSessionEngine({
+      transport: {
+        send: message => core.send(message),
+        onServerMessage: handler => core.onServerMessage(handler),
+        setBannerSessionId: id => core.setBannerSessionId(id)
+      },
+      flowActions: () => getFlowSessionEngine(core),
+      onOpenExternalUrl: url => {
+        void isolateAsync('navigate', () => openFlowNavigateUrl(url), {
+          rethrowHostContract: false
+        });
+      },
+      onEvalJs: request => {
+        evalJsController.enqueue(request);
+      }
+    });
+  }
+  return bannerEngine;
+}
+
+/** Subscribe the engine to inbound server messages. Call after identify. */
+export function attachBannerSessionEngine(core) {
+  const engine = getBannerSessionEngine(core);
+  engine.attach();
+  return engine;
+}
+
+/** Clear the banner session and detach. Call from {@link Userflow.reset}. */
+export function resetBannerSessionEngine() {
+  bannerEngine?.reset();
+}
+
+/** Drop the local banner without detaching (preview exit, user switch). */
+export function clearBannerSessionEngineLocalSession() {
+  bannerEngine?.clearLocalSession();
+}
+
+/** Test helper: drop the singleton so the next get recreates it. */
+export function __resetBannerSessionEngineForTests() {
+  bannerEngine?.reset();
+  bannerEngine = null;
+}
+//# sourceMappingURL=bannerEngine.js.map

package/lib/module/runtime/bannerEngine.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["BannerSessionEngine","evalJsController","openFlowNavigateUrl","getFlowSessionEngine","isolateAsync","bannerEngine","getBannerSessionEngine","core","transport","send","message","onServerMessage","handler","setBannerSessionId","id","flowActions","onOpenExternalUrl","url","rethrowHostContract","onEvalJs","request","enqueue","attachBannerSessionEngine","engine","attach","resetBannerSessionEngine","reset","clearBannerSessionEngineLocalSession","clearLocalSession","__resetBannerSessionEngineForTests"],"sourceRoot":"../../../src","sources":["runtime/bannerEngine.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAA2B,qBAAqB;AAE5E,SAASC,gBAAgB,QAAQ,+BAA4B;AAC7D,SAASC,mBAAmB,QAAQ,sCAAmC;AAEvE,SAASC,oBAAoB,QAAQ,iBAAc;AACnD,SAASC,YAAY,QAAQ,kBAAe;AAE5C,IAAIC,YAAwC,GAAG,IAAI;;AAEnD;AACA,OAAO,SAASC,sBAAsBA,CAACC,IAAkB,EAAuB;EAC9E,IAAI,CAACF,YAAY,EAAE;IACjBA,YAAY,GAAG,IAAIL,mBAAmB,CAAC;MACrCQ,SAAS,EAAE;QACTC,IAAI,EAAGC,OAAO,IAAKH,IAAI,CAACE,IAAI,CAACC,OAAO,CAAC;QACrCC,eAAe,EAAGC,OAAO,IAAKL,IAAI,CAACI,eAAe,CAACC,OAAO,CAAC;QAC3DC,kBAAkB,EAAGC,EAAE,IAAKP,IAAI,CAACM,kBAAkB,CAACC,EAAE;MACxD,CAAC;MACDC,WAAW,EAAEA,CAAA,KAAMZ,oBAAoB,CAACI,IAAI,CAAC;MAC7CS,iBAAiB,EAAGC,GAAG,IAAK;QAC1B,KAAKb,YAAY,CAAC,UAAU,EAAE,MAAMF,mBAAmB,CAACe,GAAG,CAAC,EAAE;UAC5DC,mBAAmB,EAAE;QACvB,CAAC,CAAC;MACJ,CAAC;MACDC,QAAQ,EAAGC,OAAO,IAAK;QACrBnB,gBAAgB,CAACoB,OAAO,CAACD,OAAO,CAAC;MACnC;IACF,CAAC,CAAC;EACJ;EACA,OAAOf,YAAY;AACrB;;AAEA;AACA,OAAO,SAASiB,yBAAyBA,CAACf,IAAkB,EAAuB;EACjF,MAAMgB,MAAM,GAAGjB,sBAAsB,CAACC,IAAI,CAAC;EAC3CgB,MAAM,CAACC,MAAM,CAAC,CAAC;EACf,OAAOD,MAAM;AACf;;AAEA;AACA,OAAO,SAASE,wBAAwBA,CAAA,EAAS;EAC/CpB,YAAY,EAAEqB,KAAK,CAAC,CAAC;AACvB;;AAEA;AACA,OAAO,SAASC,oCAAoCA,CAAA,EAAS;EAC3DtB,YAAY,EAAEuB,iBAAiB,CAAC,CAAC;AACnC;;AAEA;AACA,OAAO,SAASC,kCAAkCA,CAAA,EAAS;EACzDxB,YAAY,EAAEqB,KAAK,CAAC,CAAC;EACrBrB,YAAY,GAAG,IAAI;AACrB","ignoreList":[]}

package/lib/module/runtime/bannerEngineContext.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import * as React from 'react';
+
+/** Banner engine for host slots. Null outside {@link UserflowProvider}. */
+export const BannerEngineContext = /*#__PURE__*/React.createContext(null);
+//# sourceMappingURL=bannerEngineContext.js.map

package/lib/module/runtime/bannerEngineContext.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","BannerEngineContext","createContext"],"sourceRoot":"../../../src","sources":["runtime/bannerEngineContext.ts"],"mappings":";;AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;;AAE9B;AACA,OAAO,MAAMC,mBAAmB,gBAAGD,KAAK,CAACE,aAAa,CAA6B,IAAI,CAAC","ignoreList":[]}

package/lib/module/runtime/bannerPlacement.js

@@ -0,0 +1,30 @@
+"use strict";
+
+import { resolveManualAnchorId } from "../anchors/resolveManualAnchorId.js";
+const warned = new Set();
+
+/** Body-first is the top edge; body-last is the bottom. Element modes use a placeholder. */
+export function bannerEdge(mode) {
+  if (mode === 'BODY_FIRST') return 'top';
+  if (mode === 'BODY_LAST') return 'bottom';
+  return null;
+}
+
+/**
+ * Id of the {@link EmbedBannerPlaceholder} an element-mode banner fills.
+ * Manual selectors use `#welcome-banner` or `welcome-banner`. Body modes
+ * return null so a top/bottom bar never occupies a host slot.
+ */
+export function embedBannerPlaceholderId(banner) {
+  if (bannerEdge(banner.embedMode)) return null;
+  return resolveManualAnchorId(banner.embedSelector?.css);
+}
+export function warnBannerOnce(key, message, warn = console.warn) {
+  if (warned.has(key)) return;
+  warned.add(key);
+  warn(message);
+}
+export function resetBannerWarningsForTests() {
+  warned.clear();
+}
+//# sourceMappingURL=bannerPlacement.js.map

package/lib/module/runtime/bannerPlacement.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["resolveManualAnchorId","warned","Set","bannerEdge","mode","embedBannerPlaceholderId","banner","embedMode","embedSelector","css","warnBannerOnce","key","message","warn","console","has","add","resetBannerWarningsForTests","clear"],"sourceRoot":"../../../src","sources":["runtime/bannerPlacement.ts"],"mappings":";;AAEA,SAASA,qBAAqB,QAAQ,qCAAkC;AAExE,MAAMC,MAAM,GAAG,IAAIC,GAAG,CAAS,CAAC;;AAEhC;AACA,OAAO,SAASC,UAAUA,CAACC,IAA8B,EAA2B;EAClF,IAAIA,IAAI,KAAK,YAAY,EAAE,OAAO,KAAK;EACvC,IAAIA,IAAI,KAAK,WAAW,EAAE,OAAO,QAAQ;EACzC,OAAO,IAAI;AACb;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,wBAAwBA,CAACC,MAAsB,EAAiB;EAC9E,IAAIH,UAAU,CAACG,MAAM,CAACC,SAAS,CAAC,EAAE,OAAO,IAAI;EAC7C,OAAOP,qBAAqB,CAACM,MAAM,CAACE,aAAa,EAAEC,GAAG,CAAC;AACzD;AAEA,OAAO,SAASC,cAAcA,CAC5BC,GAAW,EACXC,OAAe,EACfC,IAA+B,GAAGC,OAAO,CAACD,IAAI,EACxC;EACN,IAAIZ,MAAM,CAACc,GAAG,CAACJ,GAAG,CAAC,EAAE;EACrBV,MAAM,CAACe,GAAG,CAACL,GAAG,CAAC;EACfE,IAAI,CAACD,OAAO,CAAC;AACf;AAEA,OAAO,SAASK,2BAA2BA,CAAA,EAAS;EAClDhB,MAAM,CAACiB,KAAK,CAAC,CAAC;AAChB","ignoreList":[]}

package/lib/module/runtime/changedTouchPoints.js

@@ -0,0 +1,43 @@
+"use strict";
+
+/**
+ * Touches that just started/ended/cancelled for this event. Prefer
+ * `changedTouches` so multi-touch uses the finger(s) that actually changed —
+ * `touches[0]` may be an already-active finger. Each touch carries `identifier`
+ * so monitors can pair start/end per finger.
+ */
+export function changedTouchPoints(event) {
+  const {
+    changedTouches,
+    touches,
+    identifier,
+    pageX,
+    pageY
+  } = event.nativeEvent;
+  if (changedTouches && changedTouches.length > 0) {
+    return changedTouches.map(touch => ({
+      identifier: touch.identifier,
+      pageX: touch.pageX,
+      pageY: touch.pageY
+    }));
+  }
+  if (touches && touches.length > 0) {
+    const touch = touches[touches.length - 1];
+    return [{
+      identifier: touch.identifier,
+      pageX: touch.pageX,
+      pageY: touch.pageY
+    }];
+  }
+  return [{
+    identifier: identifier ?? 0,
+    pageX,
+    pageY
+  }];
+}
+export function forEachChangedTouch(event, fn) {
+  for (const touch of changedTouchPoints(event)) {
+    fn(touch.identifier, touch.pageX, touch.pageY);
+  }
+}
+//# sourceMappingURL=changedTouchPoints.js.map

package/lib/module/runtime/changedTouchPoints.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["changedTouchPoints","event","changedTouches","touches","identifier","pageX","pageY","nativeEvent","length","map","touch","forEachChangedTouch","fn"],"sourceRoot":"../../../src","sources":["runtime/changedTouchPoints.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,kBAAkBA,CAChCC,KAA4B,EACqC;EACjE,MAAM;IAAEC,cAAc;IAAEC,OAAO;IAAEC,UAAU;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGL,KAAK,CAACM,WAAW;EAC/E,IAAIL,cAAc,IAAIA,cAAc,CAACM,MAAM,GAAG,CAAC,EAAE;IAC/C,OAAON,cAAc,CAACO,GAAG,CAAEC,KAAK,KAAM;MACpCN,UAAU,EAAEM,KAAK,CAACN,UAAU;MAC5BC,KAAK,EAAEK,KAAK,CAACL,KAAK;MAClBC,KAAK,EAAEI,KAAK,CAACJ;IACf,CAAC,CAAC,CAAC;EACL;EACA,IAAIH,OAAO,IAAIA,OAAO,CAACK,MAAM,GAAG,CAAC,EAAE;IACjC,MAAME,KAAK,GAAGP,OAAO,CAACA,OAAO,CAACK,MAAM,GAAG,CAAC,CAAE;IAC1C,OAAO,CAAC;MAAEJ,UAAU,EAAEM,KAAK,CAACN,UAAU;MAAEC,KAAK,EAAEK,KAAK,CAACL,KAAK;MAAEC,KAAK,EAAEI,KAAK,CAACJ;IAAM,CAAC,CAAC;EACnF;EACA,OAAO,CAAC;IAAEF,UAAU,EAAEA,UAAU,IAAI,CAAC;IAAEC,KAAK;IAAEC;EAAM,CAAC,CAAC;AACxD;AAEA,OAAO,SAASK,mBAAmBA,CACjCV,KAA4B,EAC5BW,EAAsF,EAChF;EACN,KAAK,MAAMF,KAAK,IAAIV,kBAAkB,CAACC,KAAK,CAAC,EAAE;IAC7CW,EAAE,CAACF,KAAK,CAACN,UAAU,EAAEM,KAAK,CAACL,KAAK,EAAEK,KAAK,CAACJ,KAAK,CAAC;EAChD;AACF","ignoreList":[]}

package/lib/module/runtime/embedBannerRegistry.js

@@ -0,0 +1,24 @@
+"use strict";
+
+import { warnBannerOnce } from "./bannerPlacement.js";
+const counts = new Map();
+
+/** Record a mounted {@link EmbedBannerPlaceholder}. Returns the unregister function. */
+export function registerEmbedBannerPlaceholder(id) {
+  const next = (counts.get(id) ?? 0) + 1;
+  counts.set(id, next);
+  if (next > 1) {
+    warnBannerOnce(`embed-banner-dup:${id}`, `Userflow: more than one EmbedBannerPlaceholder uses id "${id}"`);
+  }
+  return () => {
+    const current = counts.get(id) ?? 0;
+    if (current <= 1) counts.delete(id);else counts.set(id, current - 1);
+  };
+}
+export function hasEmbedBannerPlaceholder(id) {
+  return (counts.get(id) ?? 0) > 0;
+}
+export function resetEmbedBannerPlaceholdersForTests() {
+  counts.clear();
+}
+//# sourceMappingURL=embedBannerRegistry.js.map

package/lib/module/runtime/embedBannerRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["warnBannerOnce","counts","Map","registerEmbedBannerPlaceholder","id","next","get","set","current","delete","hasEmbedBannerPlaceholder","resetEmbedBannerPlaceholdersForTests","clear"],"sourceRoot":"../../../src","sources":["runtime/embedBannerRegistry.ts"],"mappings":";;AAAA,SAASA,cAAc,QAAQ,sBAAmB;AAElD,MAAMC,MAAM,GAAG,IAAIC,GAAG,CAAiB,CAAC;;AAExC;AACA,OAAO,SAASC,8BAA8BA,CAACC,EAAU,EAAc;EACrE,MAAMC,IAAI,GAAG,CAACJ,MAAM,CAACK,GAAG,CAACF,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;EACtCH,MAAM,CAACM,GAAG,CAACH,EAAE,EAAEC,IAAI,CAAC;EACpB,IAAIA,IAAI,GAAG,CAAC,EAAE;IACZL,cAAc,CACZ,oBAAoBI,EAAE,EAAE,EACxB,2DAA2DA,EAAE,GAC/D,CAAC;EACH;EACA,OAAO,MAAM;IACX,MAAMI,OAAO,GAAGP,MAAM,CAACK,GAAG,CAACF,EAAE,CAAC,IAAI,CAAC;IACnC,IAAII,OAAO,IAAI,CAAC,EAAEP,MAAM,CAACQ,MAAM,CAACL,EAAE,CAAC,CAAC,KAC/BH,MAAM,CAACM,GAAG,CAACH,EAAE,EAAEI,OAAO,GAAG,CAAC,CAAC;EAClC,CAAC;AACH;AAEA,OAAO,SAASE,yBAAyBA,CAACN,EAAU,EAAW;EAC7D,OAAO,CAACH,MAAM,CAACK,GAAG,CAACF,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;AAClC;AAEA,OAAO,SAASO,oCAAoCA,CAAA,EAAS;EAC3DV,MAAM,CAACW,KAAK,CAAC,CAAC;AAChB","ignoreList":[]}

package/lib/module/runtime/flowEngine.js

@@ -1,8 +1,13 @@
 "use strict";
 
 import { FlowSessionEngine } from '@userflow-tech/core';
+import { evalJsController } from "../evalJs/evalJsController.js";
 import { openFlowNavigateUrl } from "../navigation/openFlowNavigateUrl.js";
+import { isolateAsync } from "./isolateCall.js";
 let flowEngine = null;
+/** Exit asked to end a draft that identify has not delivered yet. */
+let endDraftOnArrival = false;
+let unsubscribeDraftArrival = null;
 
 /** Build (once) the module-level flow session engine over a {@link UserflowCore} transport. */
 export function getFlowSessionEngine(core) {
@@ -14,9 +19,17 @@ export function getFlowSessionEngine(core) {
         setFlowSessionId: id => core.setFlowSessionId(id)
       },
       onOpenExternalUrl: url => {
-        void openFlowNavigateUrl(url);
-      }
+        void isolateAsync('navigate', () => openFlowNavigateUrl(url), {
+          rethrowHostContract: false
+        });
+      },
+      onEvalJs: request => {
+        evalJsController.enqueue(request);
+      },
+      updateUser: attributes => core.updateUser(attributes),
+      updateGroup: (attributes, options) => core.updateGroup(attributes, options)
     });
+    if (endDraftOnArrival) watchForRestoredDraft();
   }
   return flowEngine;
 }
@@ -41,13 +54,71 @@ export function clearFlowSessionEngineLocalSession() {
   flowEngine?.clearLocalSession();
 }
 
-/** Whether any mid-flow session (live or draft/preview) is currently on screen. */
+/**
+ * Whether a mid-flow session is held (live, draft, or suppressed by Temporarily
+ * Hide). Foreground idle uses this so a hidden session keeps the socket that
+ * can deliver the attribute update which shows it again.
+ */
 export function hasActiveFlowSession() {
-  return flowEngine?.getFlowSession() != null;
+  return flowEngine?.hasHeldFlowSession() === true;
+}
+
+/**
+ * End the current flow on the server if it is a Builder preview draft. The
+ * server restores every active draft on identify, so clearing it locally is
+ * not enough to keep it from returning on the next launch.
+ *
+ * A draft Temporarily Hide is suppressing is still ended. `getFlowSession()`
+ * hides it, but the server will send it again. When exit runs before identify
+ * has delivered the draft, the next draft session is ended when it arrives.
+ * {@link cancelPendingDraftEnd} drops that wait; a new preview must call it
+ * so the preview's own draft is not ended.
+ */
+export async function endDraftFlowSession() {
+  const session = flowEngine?.getHeldFlowSession();
+  if (flowEngine && session?.draftMode) {
+    cancelPendingDraftEnd();
+    await flowEngine.endFlow('USER_CLOSED');
+    return;
+  }
+  watchForRestoredDraft();
+}
+
+/** Drop a pending end from {@link endDraftFlowSession}. A new preview calls this. */
+export function cancelPendingDraftEnd() {
+  endDraftOnArrival = false;
+  unsubscribeDraftArrival?.();
+  unsubscribeDraftArrival = null;
+}
+function watchForRestoredDraft() {
+  endDraftOnArrival = true;
+  if (!flowEngine || unsubscribeDraftArrival) return;
+  const engine = flowEngine;
+  unsubscribeDraftArrival = engine.on(event => {
+    if (event.type !== 'sessionChange' || !endDraftOnArrival) return;
+    const session = engine.getHeldFlowSession();
+    if (!session?.draftMode) return;
+    cancelPendingDraftEnd();
+    void engine.endFlow('USER_CLOSED').catch(() => {
+      // The session can disappear before EndFlow is built. Nothing to send.
+    });
+  });
+}
+
+/**
+ * `userflow.endFlow()` from an Evaluate JavaScript page. Ends the current
+ * session only if one of the page's scripts came from it, so a stale page
+ * cannot end a flow that started later.
+ */
+export async function endEvalJsFlowSession(sessionIds) {
+  const session = flowEngine?.getFlowSession();
+  if (!flowEngine || !session || !sessionIds.has(session.id)) return;
+  await flowEngine.endFlow('USERFLOWJS');
 }
 
 /** Test helper: drop the singleton so the next get recreates it. */
 export function __resetFlowSessionEngineForTests() {
+  cancelPendingDraftEnd();
   flowEngine?.reset();
   flowEngine = null;
 }

package/lib/module/runtime/flowEngine.js.map

@@ -1 +1 @@
-{"version":3,"names":["FlowSessionEngine","openFlowNavigateUrl","flowEngine","getFlowSessionEngine","core","transport","send","message","onServerMessage","handler","setFlowSessionId","id","onOpenExternalUrl","url","attachFlowSessionEngine","engine","attach","resetFlowSessionEngine","reset","clearFlowSessionEngineLocalSession","clearLocalSession","hasActiveFlowSession","getFlowSession","__resetFlowSessionEngineForTests"],"sourceRoot":"../../../src","sources":["runtime/flowEngine.ts"],"mappings":";;AAAA,SAASA,iBAAiB,QAA2B,qBAAqB;AAE1E,SAASC,mBAAmB,QAAQ,sCAAmC;AAEvE,IAAIC,UAAoC,GAAG,IAAI;;AAE/C;AACA,OAAO,SAASC,oBAAoBA,CAACC,IAAkB,EAAqB;EAC1E,IAAI,CAACF,UAAU,EAAE;IACfA,UAAU,GAAG,IAAIF,iBAAiB,CAAC;MACjCK,SAAS,EAAE;QACTC,IAAI,EAAGC,OAAO,IAAKH,IAAI,CAACE,IAAI,CAACC,OAAO,CAAC;QACrCC,eAAe,EAAGC,OAAO,IAAKL,IAAI,CAACI,eAAe,CAACC,OAAO,CAAC;QAC3DC,gBAAgB,EAAGC,EAAE,IAAKP,IAAI,CAACM,gBAAgB,CAACC,EAAE;MACpD,CAAC;MACDC,iBAAiB,EAAGC,GAAG,IAAK;QAC1B,KAAKZ,mBAAmB,CAACY,GAAG,CAAC;MAC/B;IACF,CAAC,CAAC;EACJ;EACA,OAAOX,UAAU;AACnB;;AAEA;AACA,OAAO,SAASY,uBAAuBA,CAACV,IAAkB,EAAqB;EAC7E,MAAMW,MAAM,GAAGZ,oBAAoB,CAACC,IAAI,CAAC;EACzCW,MAAM,CAACC,MAAM,CAAC,CAAC;EACf,OAAOD,MAAM;AACf;;AAEA;AACA,OAAO,SAASE,sBAAsBA,CAAA,EAAS;EAC7Cf,UAAU,EAAEgB,KAAK,CAAC,CAAC;AACrB;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASC,kCAAkCA,CAAA,EAAS;EACzDjB,UAAU,EAAEkB,iBAAiB,CAAC,CAAC;AACjC;;AAEA;AACA,OAAO,SAASC,oBAAoBA,CAAA,EAAY;EAC9C,OAAOnB,UAAU,EAAEoB,cAAc,CAAC,CAAC,IAAI,IAAI;AAC7C;;AAEA;AACA,OAAO,SAASC,gCAAgCA,CAAA,EAAS;EACvDrB,UAAU,EAAEgB,KAAK,CAAC,CAAC;EACnBhB,UAAU,GAAG,IAAI;AACnB","ignoreList":[]}
+{"version":3,"names":["FlowSessionEngine","evalJsController","openFlowNavigateUrl","isolateAsync","flowEngine","endDraftOnArrival","unsubscribeDraftArrival","getFlowSessionEngine","core","transport","send","message","onServerMessage","handler","setFlowSessionId","id","onOpenExternalUrl","url","rethrowHostContract","onEvalJs","request","enqueue","updateUser","attributes","updateGroup","options","watchForRestoredDraft","attachFlowSessionEngine","engine","attach","resetFlowSessionEngine","reset","clearFlowSessionEngineLocalSession","clearLocalSession","hasActiveFlowSession","hasHeldFlowSession","endDraftFlowSession","session","getHeldFlowSession","draftMode","cancelPendingDraftEnd","endFlow","on","event","type","catch","endEvalJsFlowSession","sessionIds","getFlowSession","has","__resetFlowSessionEngineForTests"],"sourceRoot":"../../../src","sources":["runtime/flowEngine.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/runtime/flowSessionViewState.js

@@ -5,36 +5,61 @@
 export function initialFlowSessionViewState(session) {
   return {
     session,
-    currentStepId: session?.currentStep?.id ?? null
+    currentStepId: session?.currentStep?.id ?? null,
+    stepShowNonce: 0
   };
 }
 
 /**
  * Reduces engine events into view state.
  *
- * Important: `goToStep` updates `currentStepId` without requiring a new
- * `sessionChange` — the engine mutates `session.currentStep` in place and
- * `ForceGoToStep` does not update it at all.
+ * `goToStep` updates `currentStepId` without a new `sessionChange`. A later
+ * same-session SetFlowSession must not snap back to `session.currentStep` —
+ * tracking a button event enqueues `check_sessions`, which can push a stale
+ * current step. Web `FlowApp` `updateSession` keeps the local step for the
+ * same session id (and only falls back if that step was deleted from the
+ * version).
  */
 export function reduceFlowSessionViewState(state, event) {
   switch (event.type) {
     case 'sessionChange':
       return {
         session: event.session,
-        currentStepId: event.session?.currentStep?.id ?? null
+        currentStepId: resolveSessionChangeStepId(state, event.session),
+        stepShowNonce: state.session?.id === event.session?.id ? state.stepShowNonce : 0
       };
     case 'goToStep':
       return {
         ...state,
-        currentStepId: event.stepId
+        currentStepId: event.stepId,
+        stepShowNonce: state.stepShowNonce + 1
       };
     case 'flowEnded':
       return {
         session: null,
-        currentStepId: null
+        currentStepId: null,
+        stepShowNonce: 0
       };
   }
 }
+function resolveSessionChangeStepId(state, session) {
+  if (session == null) {
+    return null;
+  }
+  if (state.session?.id !== session.id || state.currentStepId == null) {
+    return session.currentStep?.id ?? null;
+  }
+  const previousStep = state.session.version.steps.find(step => step.id === state.currentStepId);
+  const byCrossVersionId = previousStep == null ? undefined : session.version.steps.find(step => step.crossVersionId === previousStep.crossVersionId);
+  if (byCrossVersionId) {
+    return byCrossVersionId.id;
+  }
+  const byId = session.version.steps.find(step => step.id === state.currentStepId);
+  if (byId) {
+    return byId.id;
+  }
+  return session.currentStep?.id ?? null;
+}
 export function resolveCurrentStep(session, currentStepId) {
   if (!session || !currentStepId) return null;
   return session.version.steps.find(step => step.id === currentStepId) ?? null;