@userflow-tech/react-native 0.1.1 → 0.2.0

package/lib/commonjs/runtime/flowSessionViewState.js

@@ -11,36 +11,61 @@ exports.resolveCurrentStep = resolveCurrentStep;
 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).
  */
 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;
+}
 function resolveCurrentStep(session, currentStepId) {
   if (!session || !currentStepId) return null;
   return session.version.steps.find(step => step.id === currentStepId) ?? null;

package/lib/commonjs/runtime/flowSessionViewState.js.map

@@ -1 +1 @@
-{"version":3,"names":["initialFlowSessionViewState","session","currentStepId","currentStep","id","reduceFlowSessionViewState","state","event","type","stepId","resolveCurrentStep","version","steps","find","step"],"sourceRoot":"../../../src","sources":["runtime/flowSessionViewState.ts"],"mappings":";;;;;;;;AAGA;;AAMO,SAASA,2BAA2BA,CACzCC,OAAmC,EACb;EACtB,OAAO;IACLA,OAAO;IACPC,aAAa,EAAED,OAAO,EAAEE,WAAW,EAAEC,EAAE,IAAI;EAC7C,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,0BAA0BA,CACxCC,KAA2B,EAC3BC,KAA6B,EACP;EACtB,QAAQA,KAAK,CAACC,IAAI;IAChB,KAAK,eAAe;MAClB,OAAO;QACLP,OAAO,EAAEM,KAAK,CAACN,OAAO;QACtBC,aAAa,EAAEK,KAAK,CAACN,OAAO,EAAEE,WAAW,EAAEC,EAAE,IAAI;MACnD,CAAC;IACH,KAAK,UAAU;MACb,OAAO;QACL,GAAGE,KAAK;QACRJ,aAAa,EAAEK,KAAK,CAACE;MACvB,CAAC;IACH,KAAK,WAAW;MACd,OAAO;QACLR,OAAO,EAAE,IAAI;QACbC,aAAa,EAAE;MACjB,CAAC;EACL;AACF;AAEO,SAASQ,kBAAkBA,CAChCT,OAAmC,EACnCC,aAA4B,EACH;EACzB,IAAI,CAACD,OAAO,IAAI,CAACC,aAAa,EAAE,OAAO,IAAI;EAC3C,OAAOD,OAAO,CAACU,OAAO,CAACC,KAAK,CAACC,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACV,EAAE,KAAKF,aAAa,CAAC,IAAI,IAAI;AAChF","ignoreList":[]}
+{"version":3,"names":["initialFlowSessionViewState","session","currentStepId","currentStep","id","stepShowNonce","reduceFlowSessionViewState","state","event","type","resolveSessionChangeStepId","stepId","previousStep","version","steps","find","step","byCrossVersionId","undefined","crossVersionId","byId","resolveCurrentStep"],"sourceRoot":"../../../src","sources":["runtime/flowSessionViewState.ts"],"mappings":";;;;;;;;AAGA;;AAYO,SAASA,2BAA2BA,CACzCC,OAAmC,EACb;EACtB,OAAO;IACLA,OAAO;IACPC,aAAa,EAAED,OAAO,EAAEE,WAAW,EAAEC,EAAE,IAAI,IAAI;IAC/CC,aAAa,EAAE;EACjB,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,0BAA0BA,CACxCC,KAA2B,EAC3BC,KAA6B,EACP;EACtB,QAAQA,KAAK,CAACC,IAAI;IAChB,KAAK,eAAe;MAClB,OAAO;QACLR,OAAO,EAAEO,KAAK,CAACP,OAAO;QACtBC,aAAa,EAAEQ,0BAA0B,CAACH,KAAK,EAAEC,KAAK,CAACP,OAAO,CAAC;QAC/DI,aAAa,EAAEE,KAAK,CAACN,OAAO,EAAEG,EAAE,KAAKI,KAAK,CAACP,OAAO,EAAEG,EAAE,GAAGG,KAAK,CAACF,aAAa,GAAG;MACjF,CAAC;IACH,KAAK,UAAU;MACb,OAAO;QACL,GAAGE,KAAK;QACRL,aAAa,EAAEM,KAAK,CAACG,MAAM;QAC3BN,aAAa,EAAEE,KAAK,CAACF,aAAa,GAAG;MACvC,CAAC;IACH,KAAK,WAAW;MACd,OAAO;QACLJ,OAAO,EAAE,IAAI;QACbC,aAAa,EAAE,IAAI;QACnBG,aAAa,EAAE;MACjB,CAAC;EACL;AACF;AAEA,SAASK,0BAA0BA,CACjCH,KAA2B,EAC3BN,OAAmC,EACpB;EACf,IAAIA,OAAO,IAAI,IAAI,EAAE;IACnB,OAAO,IAAI;EACb;EACA,IAAIM,KAAK,CAACN,OAAO,EAAEG,EAAE,KAAKH,OAAO,CAACG,EAAE,IAAIG,KAAK,CAACL,aAAa,IAAI,IAAI,EAAE;IACnE,OAAOD,OAAO,CAACE,WAAW,EAAEC,EAAE,IAAI,IAAI;EACxC;EACA,MAAMQ,YAAY,GAAGL,KAAK,CAACN,OAAO,CAACY,OAAO,CAACC,KAAK,CAACC,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACZ,EAAE,KAAKG,KAAK,CAACL,aAAa,CAAC;EAChG,MAAMe,gBAAgB,GACpBL,YAAY,IAAI,IAAI,GAChBM,SAAS,GACTjB,OAAO,CAACY,OAAO,CAACC,KAAK,CAACC,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACG,cAAc,KAAKP,YAAY,CAACO,cAAc,CAAC;EAC/F,IAAIF,gBAAgB,EAAE;IACpB,OAAOA,gBAAgB,CAACb,EAAE;EAC5B;EACA,MAAMgB,IAAI,GAAGnB,OAAO,CAACY,OAAO,CAACC,KAAK,CAACC,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACZ,EAAE,KAAKG,KAAK,CAACL,aAAa,CAAC;EAClF,IAAIkB,IAAI,EAAE;IACR,OAAOA,IAAI,CAAChB,EAAE;EAChB;EACA,OAAOH,OAAO,CAACE,WAAW,EAAEC,EAAE,IAAI,IAAI;AACxC;AAEO,SAASiB,kBAAkBA,CAChCpB,OAAmC,EACnCC,aAA4B,EACH;EACzB,IAAI,CAACD,OAAO,IAAI,CAACC,aAAa,EAAE,OAAO,IAAI;EAC3C,OAAOD,OAAO,CAACY,OAAO,CAACC,KAAK,CAACC,IAAI,CAAEC,IAAI,IAAKA,IAAI,CAACZ,EAAE,KAAKF,aAAa,CAAC,IAAI,IAAI;AAChF","ignoreList":[]}

package/lib/commonjs/runtime/useFlowSessionState.js

@@ -19,7 +19,8 @@ function useFlowSessionState(engine) {
   return {
     session: state.session,
     currentStepId: state.currentStepId,
-    currentStep: (0, _flowSessionViewState.resolveCurrentStep)(state.session, state.currentStepId)
+    currentStep: (0, _flowSessionViewState.resolveCurrentStep)(state.session, state.currentStepId),
+    stepShowNonce: state.stepShowNonce
   };
 }
 //# sourceMappingURL=useFlowSessionState.js.map

package/lib/commonjs/runtime/useFlowSessionState.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_flowSessionViewState","useFlowSessionState","engine","state","dispatch","useReducer","reduceFlowSessionViewState","undefined","initialFlowSessionViewState","getFlowSession","useEffect","type","session","on","currentStepId","currentStep","resolveCurrentStep"],"sourceRoot":"../../../src","sources":["runtime/useFlowSessionState.ts"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,qBAAA,GAAAD,OAAA;AAYA;AACO,SAASE,mBAAmBA,CAACC,MAAyB,EAAoB;EAC/E,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAC,iBAAU,EAACC,gDAA0B,EAAEC,SAAS,EAAE,MAC1E,IAAAC,iDAA2B,EAACN,MAAM,CAACO,cAAc,CAAC,CAAC,CACrD,CAAC;EAED,IAAAC,gBAAS,EAAC,MAAM;IACdN,QAAQ,CAAC;MACPO,IAAI,EAAE,eAAe;MACrBC,OAAO,EAAEV,MAAM,CAACO,cAAc,CAAC;IACjC,CAAC,CAAC;IACF,OAAOP,MAAM,CAACW,EAAE,CAACT,QAAQ,CAAC;EAC5B,CAAC,EAAE,CAACF,MAAM,CAAC,CAAC;EAEZ,OAAO;IACLU,OAAO,EAAET,KAAK,CAACS,OAAO;IACtBE,aAAa,EAAEX,KAAK,CAACW,aAAa;IAClCC,WAAW,EAAE,IAAAC,wCAAkB,EAACb,KAAK,CAACS,OAAO,EAAET,KAAK,CAACW,aAAa;EACpE,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["_react","require","_flowSessionViewState","useFlowSessionState","engine","state","dispatch","useReducer","reduceFlowSessionViewState","undefined","initialFlowSessionViewState","getFlowSession","useEffect","type","session","on","currentStepId","currentStep","resolveCurrentStep","stepShowNonce"],"sourceRoot":"../../../src","sources":["runtime/useFlowSessionState.ts"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,qBAAA,GAAAD,OAAA;AAaA;AACO,SAASE,mBAAmBA,CAACC,MAAyB,EAAoB;EAC/E,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAC,iBAAU,EAACC,gDAA0B,EAAEC,SAAS,EAAE,MAC1E,IAAAC,iDAA2B,EAACN,MAAM,CAACO,cAAc,CAAC,CAAC,CACrD,CAAC;EAED,IAAAC,gBAAS,EAAC,MAAM;IACdN,QAAQ,CAAC;MACPO,IAAI,EAAE,eAAe;MACrBC,OAAO,EAAEV,MAAM,CAACO,cAAc,CAAC;IACjC,CAAC,CAAC;IACF,OAAOP,MAAM,CAACW,EAAE,CAACT,QAAQ,CAAC;EAC5B,CAAC,EAAE,CAACF,MAAM,CAAC,CAAC;EAEZ,OAAO;IACLU,OAAO,EAAET,KAAK,CAACS,OAAO;IACtBE,aAAa,EAAEX,KAAK,CAACW,aAAa;IAClCC,WAAW,EAAE,IAAAC,wCAAkB,EAACb,KAAK,CAACS,OAAO,EAAET,KAAK,CAACW,aAAa,CAAC;IACnEG,aAAa,EAAEd,KAAK,CAACc;EACvB,CAAC;AACH","ignoreList":[]}

package/lib/commonjs/screenTracker.js

@@ -3,15 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.SCREEN_VIEWED_EVENT = void 0;
 exports.disableScreenTracking = disableScreenTracking;
 exports.enableScreenTracking = enableScreenTracking;
+exports.getCurrentScreenLocation = getCurrentScreenLocation;
 exports.handleScreenChange = handleScreenChange;
+exports.reportCurrentScreen = reportCurrentScreen;
 exports.resetScreenTrackerForTests = resetScreenTrackerForTests;
+exports.screenViewedAttributes = screenViewedAttributes;
 exports.setScreenChangeReporter = setScreenChangeReporter;
+/** Predefined mobile screen-view event (web analogue: `page_viewed`). */
+const SCREEN_VIEWED_EVENT = exports.SCREEN_VIEWED_EVENT = 'screen_viewed';
+
 /** Called when a new location is accepted (after enable + dedupe). */
 
 let enabled = false;
 let currentKey = null;
+/** Last accepted (or pending) location — used by the in-app element picker. */
+let currentLocation = null;
 /** Latest location seen while tracking was disabled; flushed on enable. */
 let pendingLocation = null;
 let reporter = null;
@@ -19,6 +28,20 @@ function locationKey(location) {
   return 'path' in location ? `path:${location.path}` : `screen:${location.screen}`;
 }
 
+/** Event attributes for `screen_viewed`, or `null` when the location has no identity. */
+function screenViewedAttributes(location) {
+  if ('path' in location) {
+    if (!location.path) return null;
+    return {
+      screen_path: location.path
+    };
+  }
+  if (!location.screen) return null;
+  return {
+    screen_name: location.screen
+  };
+}
+
 /**
  * Registers the callback invoked when the active screen/path changes.
  * The React Native facade wires this to `UserflowCore.updateScreen`.
@@ -28,9 +51,15 @@ function setScreenChangeReporter(next) {
 }
 function report(location) {
   currentKey = locationKey(location);
+  currentLocation = location;
   reporter?.(location);
 }
 
+/** Latest screen/path the SDK has recorded, or `null` before the first report. */
+function getCurrentScreenLocation() {
+  return currentLocation ?? pendingLocation;
+}
+
 /** Activates screen-change tracking after a successful {@link Userflow.init}. */
 function enableScreenTracking() {
   enabled = true;
@@ -47,13 +76,16 @@ function enableScreenTracking() {
 function disableScreenTracking() {
   enabled = false;
   currentKey = null;
+  currentLocation = null;
   pendingLocation = null;
 }
 
 /**
  * Records a navigation to `location` when tracking is enabled.
- * Duplicate consecutive locations are ignored. On change, notifies the reporter
- * so the SDK can push `UpdateClientContext` to the backend.
+ * Duplicate consecutive locations are ignored unless `{ force: true }` (used
+ * after overlay dismiss, AppState resume, and first identify). On change,
+ * notifies the reporter so the SDK can push `UpdateClientContext` and
+ * `screen_viewed`.
  *
  * Locations observed before {@link enableScreenTracking} are remembered and
  * flushed when tracking is enabled (so init-after-mount still picks up the
@@ -62,7 +94,7 @@ function disableScreenTracking() {
  * - Expo Router: `{ path: "/settings/billing" }` → wire `screenPath`
  * - React Navigation / manual: `{ screen: "BillingSettings" }` → wire `screenName`
  */
-function handleScreenChange(location) {
+function handleScreenChange(location, options) {
   if (!location) return;
   if ('path' in location) {
     if (!location.path) return;
@@ -73,14 +105,24 @@ function handleScreenChange(location) {
     pendingLocation = location;
     return;
   }
-  if (locationKey(location) === currentKey) return;
+  if (!options?.force && locationKey(location) === currentKey) return;
   pendingLocation = null;
   report(location);
 }
 
+/** Re-report the current screen, bypassing consecutive dedupe (resume / identify). */
+function reportCurrentScreen() {
+  const location = getCurrentScreenLocation();
+  if (!location) return;
+  handleScreenChange(location, {
+    force: true
+  });
+}
+
 /** @internal Resets tracker state between tests. Does not clear the reporter. */
 function resetScreenTrackerForTests() {
   enabled = false;
+  currentLocation = null;
   currentKey = null;
   pendingLocation = null;
 }

package/lib/commonjs/screenTracker.js.map

@@ -1 +1 @@
-{"version":3,"names":["enabled","currentKey","pendingLocation","reporter","locationKey","location","path","screen","setScreenChangeReporter","next","report","enableScreenTracking","disableScreenTracking","handleScreenChange","resetScreenTrackerForTests"],"sourceRoot":"../../src","sources":["screenTracker.ts"],"mappings":";;;;;;;;;;AAEA;;AAGA,IAAIA,OAAO,GAAG,KAAK;AACnB,IAAIC,UAAyB,GAAG,IAAI;AACpC;AACA,IAAIC,eAA4C,GAAG,IAAI;AACvD,IAAIC,QAAqC,GAAG,IAAI;AAEhD,SAASC,WAAWA,CAACC,QAA8B,EAAU;EAC3D,OAAO,MAAM,IAAIA,QAAQ,GAAG,QAAQA,QAAQ,CAACC,IAAI,EAAE,GAAG,UAAUD,QAAQ,CAACE,MAAM,EAAE;AACnF;;AAEA;AACA;AACA;AACA;AACO,SAASC,uBAAuBA,CAACC,IAAiC,EAAQ;EAC/EN,QAAQ,GAAGM,IAAI;AACjB;AAEA,SAASC,MAAMA,CAACL,QAA8B,EAAQ;EACpDJ,UAAU,GAAGG,WAAW,CAACC,QAAQ,CAAC;EAClCF,QAAQ,GAAGE,QAAQ,CAAC;AACtB;;AAEA;AACO,SAASM,oBAAoBA,CAAA,EAAS;EAC3CX,OAAO,GAAG,IAAI;EACd,IAAIE,eAAe,IAAIE,WAAW,CAACF,eAAe,CAAC,KAAKD,UAAU,EAAE;IAClE,MAAMI,QAAQ,GAAGH,eAAe;IAChCA,eAAe,GAAG,IAAI;IACtBQ,MAAM,CAACL,QAAQ,CAAC;EAClB,CAAC,MAAM;IACLH,eAAe,GAAG,IAAI;EACxB;AACF;;AAEA;AACO,SAASU,qBAAqBA,CAAA,EAAS;EAC5CZ,OAAO,GAAG,KAAK;EACfC,UAAU,GAAG,IAAI;EACjBC,eAAe,GAAG,IAAI;AACxB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASW,kBAAkBA,CAACR,QAA0C,EAAQ;EACnF,IAAI,CAACA,QAAQ,EAAE;EACf,IAAI,MAAM,IAAIA,QAAQ,EAAE;IACtB,IAAI,CAACA,QAAQ,CAACC,IAAI,EAAE;EACtB,CAAC,MAAM,IAAI,CAACD,QAAQ,CAACE,MAAM,EAAE;IAC3B;EACF;EAEA,IAAI,CAACP,OAAO,EAAE;IACZE,eAAe,GAAGG,QAAQ;IAC1B;EACF;EAEA,IAAID,WAAW,CAACC,QAAQ,CAAC,KAAKJ,UAAU,EAAE;EAC1CC,eAAe,GAAG,IAAI;EACtBQ,MAAM,CAACL,QAAQ,CAAC;AAClB;;AAEA;AACO,SAASS,0BAA0BA,CAAA,EAAS;EACjDd,OAAO,GAAG,KAAK;EACfC,UAAU,GAAG,IAAI;EACjBC,eAAe,GAAG,IAAI;AACxB","ignoreList":[]}
+{"version":3,"names":["SCREEN_VIEWED_EVENT","exports","enabled","currentKey","currentLocation","pendingLocation","reporter","locationKey","location","path","screen","screenViewedAttributes","screen_path","screen_name","setScreenChangeReporter","next","report","getCurrentScreenLocation","enableScreenTracking","disableScreenTracking","handleScreenChange","options","force","reportCurrentScreen","resetScreenTrackerForTests"],"sourceRoot":"../../src","sources":["screenTracker.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/surfaces/CardFade.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CardFade = CardFade;
+var React = _interopRequireWildcard(require("react"));
+var _reactNative = require("react-native");
+var _cardTransition = require("./cardTransition.js");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+/**
+ * Card chrome root that fades itself through step transitions.
+ *
+ * This has to wrap the card view itself, not sit higher up in a surface: the
+ * fade starts from this component's mount, and a tooltip's surface renders long
+ * before its card does.
+ */
+function CardFade({
+  style,
+  ...rest
+}) {
+  const opacity = (0, _cardTransition.useCardOpacity)();
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Animated.View, {
+    ...rest,
+    style: opacity ? [style, {
+      opacity
+    }] : style
+  });
+}
+//# sourceMappingURL=CardFade.js.map

package/lib/commonjs/surfaces/CardFade.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","_interopRequireWildcard","require","_reactNative","_cardTransition","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","CardFade","style","rest","opacity","useCardOpacity","jsx","Animated","View"],"sourceRoot":"../../../src","sources":["surfaces/CardFade.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;AAAkD,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAD,wBAAAK,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAP,uBAAA,YAAAA,CAAAK,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAIlD;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASkB,QAAQA,CAAC;EAAEC,KAAK;EAAE,GAAGC;AAAoB,CAAC,EAAsB;EAC9E,MAAMC,OAAO,GAAG,IAAAC,8BAAc,EAAC,CAAC;EAChC,oBAAO,IAAAxB,WAAA,CAAAyB,GAAA,EAAC3B,YAAA,CAAA4B,QAAQ,CAACC,IAAI;IAAA,GAAKL,IAAI;IAAED,KAAK,EAAEE,OAAO,GAAG,CAACF,KAAK,EAAE;MAAEE;IAAQ,CAAC,CAAC,GAAGF;EAAM,CAAE,CAAC;AACnF","ignoreList":[]}

package/lib/commonjs/surfaces/CloseButton.js

@@ -3,15 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.CLOSE_BUTTON_SIZE = exports.CLOSE_BUTTON_INSET = void 0;
 exports.CloseButton = CloseButton;
 var React = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-/** Web close control: 24×24 hit target, 8px from the top-trailing corner. Pass muted color from {@link resolveCloseButtonColor}. */
+const CLOSE_BUTTON_SIZE = exports.CLOSE_BUTTON_SIZE = 24;
+const CLOSE_BUTTON_INSET = exports.CLOSE_BUTTON_INSET = 8;
+/** Web close control: 24×24 hit target. Pass muted color from {@link resolveCloseButtonColor}. */
 function CloseButton({
   onPress,
-  color
+  color,
+  top = CLOSE_BUTTON_INSET,
+  right = CLOSE_BUTTON_INSET
 }) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
     testID: "userflow-modal-close",
@@ -21,6 +26,8 @@ function CloseButton({
     style: ({
       pressed
     }) => [styles.button, {
+      top,
+      right,
       opacity: pressed ? 0.6 : 1
     }],
     hitSlop: 8,
@@ -35,11 +42,9 @@ function CloseButton({
 const styles = _reactNative.StyleSheet.create({
   button: {
     position: 'absolute',
-    top: 8,
-    right: 8,
     zIndex: 2,
-    width: 24,
-    height: 24,
+    width: CLOSE_BUTTON_SIZE,
+    height: CLOSE_BUTTON_SIZE,
     alignItems: 'center',
     justifyContent: 'center'
   },

package/lib/commonjs/surfaces/CloseButton.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","_interopRequireWildcard","require","_reactNative","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","CloseButton","onPress","color","jsx","Pressable","testID","accessibilityRole","accessibilityLabel","style","pressed","styles","button","opacity","hitSlop","children","Text","icon","StyleSheet","create","position","top","right","zIndex","width","height","alignItems","justifyContent","fontSize","fontWeight","lineHeight"],"sourceRoot":"../../../src","sources":["surfaces/CloseButton.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAA2D,IAAAE,WAAA,GAAAF,OAAA;AAAA,SAAAD,wBAAAI,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAN,uBAAA,YAAAA,CAAAI,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAO3D;AACO,SAASkB,WAAWA,CAAC;EAAEC,OAAO;EAAEC;AAAwB,CAAC,EAAsB;EACpF,oBACE,IAAAtB,WAAA,CAAAuB,GAAA,EAACxB,YAAA,CAAAyB,SAAS;IACRC,MAAM,EAAC,sBAAsB;IAC7BC,iBAAiB,EAAC,QAAQ;IAC1BC,kBAAkB,EAAC,OAAO;IAC1BN,OAAO,EAAEA,OAAQ;IACjBO,KAAK,EAAEA,CAAC;MAAEC;IAAQ,CAAC,KAAK,CAACC,MAAM,CAACC,MAAM,EAAE;MAAEC,OAAO,EAAEH,OAAO,GAAG,GAAG,GAAG;IAAE,CAAC,CAAE;IACxEI,OAAO,EAAE,CAAE;IAAAC,QAAA,eAEX,IAAAlC,WAAA,CAAAuB,GAAA,EAACxB,YAAA,CAAAoC,IAAI;MAACP,KAAK,EAAE,CAACE,MAAM,CAACM,IAAI,EAAE;QAAEd;MAAM,CAAC,CAAE;MAAAY,QAAA,EAAC;IAAC,CAAM;EAAC,CACtC,CAAC;AAEhB;AAEA,MAAMJ,MAAM,GAAGO,uBAAU,CAACC,MAAM,CAAC;EAC/BP,MAAM,EAAE;IACNQ,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE,CAAC;IACNC,KAAK,EAAE,CAAC;IACRC,MAAM,EAAE,CAAC;IACTC,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,EAAE;IACVC,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE;EAClB,CAAC;EACDV,IAAI,EAAE;IACJW,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,KAAK;IACjBC,UAAU,EAAE;EACd;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","_interopRequireWildcard","require","_reactNative","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","CLOSE_BUTTON_SIZE","exports","CLOSE_BUTTON_INSET","CloseButton","onPress","color","top","right","jsx","Pressable","testID","accessibilityRole","accessibilityLabel","style","pressed","styles","button","opacity","hitSlop","children","Text","icon","StyleSheet","create","position","zIndex","width","height","alignItems","justifyContent","fontSize","fontWeight","lineHeight"],"sourceRoot":"../../../src","sources":["surfaces/CloseButton.tsx"],"mappings":";;;;;;;AAAA,IAAAA,KAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAA2D,IAAAE,WAAA,GAAAF,OAAA;AAAA,SAAAD,wBAAAI,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAN,uBAAA,YAAAA,CAAAI,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAEpD,MAAMkB,iBAAiB,GAAAC,OAAA,CAAAD,iBAAA,GAAG,EAAE;AAC5B,MAAME,kBAAkB,GAAAD,OAAA,CAAAC,kBAAA,GAAG,CAAC;AAWnC;AACO,SAASC,WAAWA,CAAC;EAC1BC,OAAO;EACPC,KAAK;EACLC,GAAG,GAAGJ,kBAAkB;EACxBK,KAAK,GAAGL;AACQ,CAAC,EAAsB;EACvC,oBACE,IAAAtB,WAAA,CAAA4B,GAAA,EAAC7B,YAAA,CAAA8B,SAAS;IACRC,MAAM,EAAC,sBAAsB;IAC7BC,iBAAiB,EAAC,QAAQ;IAC1BC,kBAAkB,EAAC,OAAO;IAC1BR,OAAO,EAAEA,OAAQ;IACjBS,KAAK,EAAEA,CAAC;MAAEC;IAAQ,CAAC,KAAK,CAACC,MAAM,CAACC,MAAM,EAAE;MAAEV,GAAG;MAAEC,KAAK;MAAEU,OAAO,EAAEH,OAAO,GAAG,GAAG,GAAG;IAAE,CAAC,CAAE;IACpFI,OAAO,EAAE,CAAE;IAAAC,QAAA,eAEX,IAAAvC,WAAA,CAAA4B,GAAA,EAAC7B,YAAA,CAAAyC,IAAI;MAACP,KAAK,EAAE,CAACE,MAAM,CAACM,IAAI,EAAE;QAAEhB;MAAM,CAAC,CAAE;MAAAc,QAAA,EAAC;IAAC,CAAM;EAAC,CACtC,CAAC;AAEhB;AAEA,MAAMJ,MAAM,GAAGO,uBAAU,CAACC,MAAM,CAAC;EAC/BP,MAAM,EAAE;IACNQ,QAAQ,EAAE,UAAU;IACpBC,MAAM,EAAE,CAAC;IACTC,KAAK,EAAE1B,iBAAiB;IACxB2B,MAAM,EAAE3B,iBAAiB;IACzB4B,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE;EAClB,CAAC;EACDR,IAAI,EAAE;IACJS,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,KAAK;IACjBC,UAAU,EAAE;EACd;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/surfaces/ModalSurface.js

@@ -7,6 +7,7 @@ exports.ModalSurface = ModalSurface;
 var React = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _RichContentRenderer = require("../content/RichContentRenderer.js");
+var _CardFade = require("./CardFade.js");
 var _CloseButton = require("./CloseButton.js");
 var _resolveCloseButtonColor = require("./resolveCloseButtonColor.js");
 var _MadeWithUserflow = require("./MadeWithUserflow.js");
@@ -14,14 +15,14 @@ var _ProgressBar = require("./ProgressBar.js");
 var _absoluteFill = require("./absoluteFill.js");
 var _parseBackdropOpacity = require("./parseBackdropOpacity.js");
 var _progress = require("./progress.js");
-var _safeArea = require("./safeArea.js");
 var _resolveModalLayout = require("./resolveModalLayout.js");
+var _surfaceLayoutInsets = require("./surfaceLayoutInsets.js");
 var _themeChrome = require("./themeChrome.js");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * Modal chrome: full-screen backdrop + centered themed card with TreeDoc body.
- * Also used as a temporary fallback for BUBBLE/HIDDEN until dedicated surfaces.
+ * Also used as a temporary fallback for BUBBLE until a dedicated surface.
  *
  * Touch model: backdrop is a full-screen Pressable; the centering wrapper is
  * `box-none` so taps outside the card hit the backdrop, while the card itself
@@ -45,9 +46,13 @@ function ModalSurface({
   const endAsUserClosed = React.useCallback(() => {
     void engine.endFlow('USER_CLOSED');
   }, [engine]);
-  const insets = (0, _safeArea.useUserflowSafeAreaInsets)();
+  const onBackdropPress = React.useCallback(() => {
+    if (canDismissBackdrop) {
+      endAsUserClosed();
+    }
+  }, [canDismissBackdrop, endAsUserClosed]);
   const windowDims = (0, _reactNative.useWindowDimensions)();
-  const centerPadding = (0, _resolveModalLayout.resolveModalCenterPadding)(insets);
+  const centerPadding = (0, _surfaceLayoutInsets.useSurfaceLayoutInsets)();
   const cardMaxWidth = (0, _resolveModalLayout.resolveModalCardMaxWidth)(theme, currentStep.width, windowDims.width);
   const cardMaxHeight = (0, _resolveModalLayout.resolveModalCardMaxHeight)(windowDims.height, centerPadding);
   const buttonsAlign = (0, _resolveModalLayout.resolveModalButtonsAlign)(theme, windowDims.width);
@@ -55,6 +60,9 @@ function ModalSurface({
   const progressBottom = theme.progressBarEnabled && theme.progressBarPosition === 'BOTTOM';
   const showBranding = session.flow.company.flowBranding;
   const contentPadding = chrome.contentPadding;
+  const closeClearance = _CloseButton.CLOSE_BUTTON_INSET + _CloseButton.CLOSE_BUTTON_SIZE;
+  const scrollPaddingTop = showClose ? Math.max(contentPadding, closeClearance) : contentPadding;
+  const scrollPaddingRight = showClose ? Math.max(contentPadding, closeClearance) : contentPadding;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
     style: styles.root,
     testID: "userflow-modal-surface",
@@ -65,8 +73,7 @@ function ModalSurface({
       accessibilityLabel: canDismissBackdrop ? 'Dismiss' : undefined,
       accessibilityElementsHidden: !canDismissBackdrop,
       importantForAccessibility: canDismissBackdrop ? 'yes' : 'no-hide-descendants',
-      disabled: !canDismissBackdrop,
-      onPress: canDismissBackdrop ? endAsUserClosed : undefined,
+      onPress: onBackdropPress,
       style: [_absoluteFill.ABSOLUTE_FILL, {
         backgroundColor: theme.backdropColor,
         opacity: backdropOpacity
@@ -74,60 +81,66 @@ function ModalSurface({
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
       style: [styles.center, centerPadding],
       pointerEvents: "box-none",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CardFade.CardFade, {
         testID: "userflow-modal-card",
         accessibilityViewIsModal: true,
         pointerEvents: "auto",
         style: [chrome.cardStyle, styles.cardShadow, {
           maxWidth: cardMaxWidth,
-          maxHeight: cardMaxHeight,
           width: '100%',
           borderRadius: chrome.borderRadius
         }],
         children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
           testID: "userflow-modal-card-fill",
           style: [chrome.fillStyle, styles.cardFill, {
-            borderRadius: chrome.borderRadius
+            borderRadius: chrome.borderRadius,
+            maxHeight: cardMaxHeight
           }],
-          children: [showClose ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CloseButton.CloseButton, {
-            onPress: endAsUserClosed,
-            color: (0, _resolveCloseButtonColor.resolveCloseButtonColor)(theme)
-          }) : null, progressTop ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProgressBar.ProgressBar, {
+          children: [progressTop ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProgressBar.ProgressBar, {
             enabled: true,
             fraction: progress.fraction,
             position: "TOP",
             theme: theme,
             totalSteps: progress.total,
             contentPadding: contentPadding
-          }) : null, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.ScrollView, {
+          }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ScrollView, {
             testID: "userflow-flow-scroll",
             style: styles.scroll,
             contentContainerStyle: [styles.scrollContent, {
-              paddingHorizontal: contentPadding,
-              paddingTop: contentPadding,
+              paddingLeft: contentPadding,
+              paddingRight: scrollPaddingRight,
+              paddingTop: scrollPaddingTop,
               paddingBottom: showBranding ? 0 : contentPadding
             }],
             keyboardShouldPersistTaps: "handled",
             nestedScrollEnabled: true,
             bounces: false,
             showsVerticalScrollIndicator: true,
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_RichContentRenderer.RichContentRenderer, {
-              content: currentStep.content,
-              buttons: currentStep.buttons,
-              theme: theme,
-              sessionData: session.data,
-              lookupAttribute: lookupAttribute,
-              defaultButtonsAlign: buttonsAlign,
-              onActions: actions => {
-                void engine.handleActions(actions);
-              }
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_MadeWithUserflow.MadeWithUserflow, {
-              company: session.flow.company,
-              color: theme.fontColor,
-              contentPadding: contentPadding,
-              embedded: true
-            })]
-          }), progressBottom ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProgressBar.ProgressBar, {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+              testID: "userflow-modal-content",
+              style: styles.content,
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_RichContentRenderer.RichContentRenderer, {
+                content: currentStep.content,
+                buttons: currentStep.buttons,
+                theme: theme,
+                sessionData: session.data,
+                lookupAttribute: lookupAttribute,
+                defaultButtonsAlign: buttonsAlign,
+                heading1FontWeight: "normal",
+                onActions: actions => {
+                  void engine.handleActions(actions);
+                }
+              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_MadeWithUserflow.MadeWithUserflow, {
+                company: session.flow.company,
+                color: theme.fontColor,
+                contentPadding: contentPadding,
+                embedded: true
+              })]
+            })
+          }), showClose ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CloseButton.CloseButton, {
+            onPress: endAsUserClosed,
+            color: (0, _resolveCloseButtonColor.resolveCloseButtonColor)(theme)
+          }) : null, progressBottom ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProgressBar.ProgressBar, {
             enabled: true,
             fraction: progress.fraction,
             position: "BOTTOM",
@@ -159,12 +172,15 @@ const styles = _reactNative.StyleSheet.create({
     flexShrink: 1
   },
   scroll: {
-    flexGrow: 0,
+    flexGrow: 1,
     flexShrink: 1,
     minHeight: 0
   },
   scrollContent: {
     flexGrow: 1
+  },
+  content: {
+    position: 'relative'
   }
 });
 //# sourceMappingURL=ModalSurface.js.map

package/lib/commonjs/surfaces/ModalSurface.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","_interopRequireWildcard","require","_reactNative","_RichContentRenderer","_CloseButton","_resolveCloseButtonColor","_MadeWithUserflow","_ProgressBar","_absoluteFill","_parseBackdropOpacity","_progress","_safeArea","_resolveModalLayout","_themeChrome","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ModalSurface","engine","session","currentStep","theme","lookupAttribute","version","chrome","resolveBubbleChrome","progress","resolveStepProgress","id","showClose","closeDisabled","backdropOpacity","parseBackdropOpacity","canDismissBackdrop","modalBackdropOnclick","endAsUserClosed","useCallback","endFlow","insets","useUserflowSafeAreaInsets","windowDims","useWindowDimensions","centerPadding","resolveModalCenterPadding","cardMaxWidth","resolveModalCardMaxWidth","width","cardMaxHeight","resolveModalCardMaxHeight","height","buttonsAlign","resolveModalButtonsAlign","progressTop","progressBarEnabled","progressBarPosition","progressBottom","showBranding","flow","company","flowBranding","contentPadding","jsxs","View","style","styles","root","testID","pointerEvents","children","jsx","Pressable","accessibilityRole","accessibilityLabel","undefined","accessibilityElementsHidden","importantForAccessibility","disabled","onPress","ABSOLUTE_FILL","backgroundColor","backdropColor","opacity","center","accessibilityViewIsModal","cardStyle","cardShadow","maxWidth","maxHeight","borderRadius","fillStyle","cardFill","CloseButton","color","resolveCloseButtonColor","ProgressBar","enabled","fraction","position","totalSteps","total","ScrollView","scroll","contentContainerStyle","scrollContent","paddingHorizontal","paddingTop","paddingBottom","keyboardShouldPersistTaps","nestedScrollEnabled","bounces","showsVerticalScrollIndicator","RichContentRenderer","content","buttons","sessionData","data","defaultButtonsAlign","onActions","actions","handleActions","MadeWithUserflow","fontColor","embedded","StyleSheet","create","justifyContent","alignItems","flexShrink","minHeight","flexGrow"],"sourceRoot":"../../../src","sources":["surfaces/ModalSurface.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","_interopRequireWildcard","require","_reactNative","_RichContentRenderer","_CardFade","_CloseButton","_resolveCloseButtonColor","_MadeWithUserflow","_ProgressBar","_absoluteFill","_parseBackdropOpacity","_progress","_resolveModalLayout","_surfaceLayoutInsets","_themeChrome","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ModalSurface","engine","session","currentStep","theme","lookupAttribute","version","chrome","resolveBubbleChrome","progress","resolveStepProgress","id","showClose","closeDisabled","backdropOpacity","parseBackdropOpacity","canDismissBackdrop","modalBackdropOnclick","endAsUserClosed","useCallback","endFlow","onBackdropPress","windowDims","useWindowDimensions","centerPadding","useSurfaceLayoutInsets","cardMaxWidth","resolveModalCardMaxWidth","width","cardMaxHeight","resolveModalCardMaxHeight","height","buttonsAlign","resolveModalButtonsAlign","progressTop","progressBarEnabled","progressBarPosition","progressBottom","showBranding","flow","company","flowBranding","contentPadding","closeClearance","CLOSE_BUTTON_INSET","CLOSE_BUTTON_SIZE","scrollPaddingTop","Math","max","scrollPaddingRight","jsxs","View","style","styles","root","testID","pointerEvents","children","jsx","Pressable","accessibilityRole","accessibilityLabel","undefined","accessibilityElementsHidden","importantForAccessibility","onPress","ABSOLUTE_FILL","backgroundColor","backdropColor","opacity","center","CardFade","accessibilityViewIsModal","cardStyle","cardShadow","maxWidth","borderRadius","fillStyle","cardFill","maxHeight","ProgressBar","enabled","fraction","position","totalSteps","total","ScrollView","scroll","contentContainerStyle","scrollContent","paddingLeft","paddingRight","paddingTop","paddingBottom","keyboardShouldPersistTaps","nestedScrollEnabled","bounces","showsVerticalScrollIndicator","content","RichContentRenderer","buttons","sessionData","data","defaultButtonsAlign","heading1FontWeight","onActions","actions","handleActions","MadeWithUserflow","color","fontColor","embedded","CloseButton","resolveCloseButtonColor","StyleSheet","create","justifyContent","alignItems","flexShrink","minHeight","flexGrow"],"sourceRoot":"../../../src","sources":["surfaces/ModalSurface.tsx"],"mappings":"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","ignoreList":[]}