@userflow-tech/react-native 0.4.5 → 0.6.0

package/lib/module/surfaces/BannerBar.js

@@ -7,7 +7,9 @@ import { Animated, Pressable, StyleSheet, Text, View } from 'react-native';
 import { BannerStepButton } from "../content/BannerStepButton.js";
 import { RichContentRenderer } from "../content/RichContentRenderer.js";
 import { mixThemeColors } from "../content/themeColor.js";
-import { BANNER_CLOSE_SLOT_SIZE, BANNER_ROOT_PADDING, bannerFrameStyle, bannerInnerStyle, resolveBannerBarBorderRadius } from "./bannerBarLayout.js";
+import { usePushBannerHostInsetRegistration } from "../runtime/pushBannerLayoutContext.js";
+import { BANNER_CLOSE_SLOT_SIZE, BANNER_ROOT_PADDING, bannerBarRootStyle, bannerFrameStyle, bannerInnerStyle, bannerPushLayoutChrome, resolveBannerBarBorderRadius } from "./bannerBarLayout.js";
+import { useUserflowSafeAreaInsets } from "./safeArea.js";
 import { BANNER_BUTTON_GAP, BANNER_CLOSE_BORDER_RADIUS, bannerOverlayShadowStyle } from "./bannerBarTokens.js";
 import { resolveBannerBackgroundColor, resolveBannerForegroundColor } from "./resolveBannerTheme.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -17,6 +19,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 export function BannerBar({
   session,
+  pushLayoutEdge = null,
+  overlaySafeEdge = null,
   onActions,
   onDismiss
 }) {
@@ -30,9 +34,15 @@ export function BannerBar({
     fontColor: foregroundColor
   }), [theme, backgroundColor, foregroundColor]);
   const lookupAttribute = React.useMemo(() => genSessionDataLookup(session.data), [session.data]);
-  const opacity = React.useRef(new Animated.Value(banner?.animate ? 0 : 1)).current;
+  const insets = useUserflowSafeAreaInsets();
+  const overlay = banner?.overlay !== false;
+  const hostInsetEdge = !overlay && pushLayoutEdge ? pushLayoutEdge : null;
+  const safeAreaEdge = hostInsetEdge ?? overlaySafeEdge ?? null;
+  const onPushChromeLayout = usePushBannerHostInsetRegistration(hostInsetEdge, session.id, hostInsetEdge != null);
+  const fadeIn = banner?.animate === true && hostInsetEdge == null;
+  const opacity = React.useRef(new Animated.Value(fadeIn ? 0 : 1)).current;
   React.useEffect(() => {
-    if (!banner?.animate) {
+    if (!fadeIn) {
       opacity.setValue(1);
       return;
     }
@@ -46,74 +56,82 @@ export function BannerBar({
     return () => {
       animation.stop();
     };
-  }, [banner?.animate, opacity, session.id]);
+  }, [fadeIn, opacity, session.id]);
   if (!banner) return null;
-  const overlay = banner.overlay !== false;
   const frameStyle = bannerFrameStyle(banner);
+  const rootStyle = bannerBarRootStyle(banner);
   const innerStyle = bannerInnerStyle(banner);
   const closePressedBackground = mixThemeColors(backgroundColor, foregroundColor, 0.12);
   const overlayEdge = banner.embedMode === BannerEmbedMode.BODY_LAST ? 'bottom' : 'top';
   const barRadius = resolveBannerBarBorderRadius(banner);
+  const insetChrome = safeAreaEdge ? bannerPushLayoutChrome(safeAreaEdge, insets, backgroundColor) : null;
+  const insetChromeOutsideFade = insetChrome != null && fadeIn;
+  const bar = /*#__PURE__*/_jsxs(View, {
+    testID: "userflow-banner",
+    style: [styles.root, rootStyle, {
+      backgroundColor
+    }, barRadius != null ? {
+      borderRadius: barRadius,
+      overflow: 'hidden'
+    } : null],
+    children: [/*#__PURE__*/_jsx(View, {
+      style: styles.startSpacer
+    }), /*#__PURE__*/_jsxs(View, {
+      style: innerStyle,
+      children: [/*#__PURE__*/_jsx(View, {
+        style: styles.content,
+        children: /*#__PURE__*/_jsx(RichContentRenderer, {
+          content: banner.content,
+          buttons: [],
+          theme: bannerTheme,
+          sessionData: session.data,
+          lookupAttribute: lookupAttribute,
+          onActions: onActions
+        })
+      }), banner.buttons.length > 0 ? /*#__PURE__*/_jsx(View, {
+        style: styles.buttons,
+        children: banner.buttons.map(button => /*#__PURE__*/_jsx(BannerStepButton, {
+          button: button,
+          theme: bannerTheme,
+          sessionData: session.data,
+          onActions: onActions
+        }, button.id))
+      }) : null]
+    }), session.version.closeDisabled ? /*#__PURE__*/_jsx(View, {
+      style: styles.startSpacer
+    }) : /*#__PURE__*/_jsx(Pressable, {
+      testID: "userflow-banner-dismiss",
+      accessibilityRole: "button",
+      accessibilityLabel: "Dismiss",
+      hitSlop: 8,
+      onPress: () => onDismiss(EndFlowReasonInput.USER_CLOSED),
+      style: ({
+        pressed
+      }) => [styles.close, pressed ? {
+        backgroundColor: closePressedBackground
+      } : null],
+      children: /*#__PURE__*/_jsx(Text, {
+        style: [styles.dismissIcon, {
+          color: foregroundColor
+        }],
+        children: "\xD7"
+      })
+    })]
+  });
+  const animatedBar = /*#__PURE__*/_jsx(Animated.View, {
+    onLayout: hostInsetEdge ? onPushChromeLayout : undefined,
+    style: [{
+      opacity
+    }, overlay ? bannerOverlayShadowStyle(overlayEdge) : null, insetChromeOutsideFade ? null : insetChrome],
+    children: bar
+  });
   return /*#__PURE__*/_jsx(View, {
     testID: "userflow-banner-frame",
     style: frameStyle,
-    children: /*#__PURE__*/_jsx(Animated.View, {
-      style: [{
-        opacity
-      }, overlay ? bannerOverlayShadowStyle(overlayEdge) : null],
-      children: /*#__PURE__*/_jsxs(View, {
-        testID: "userflow-banner",
-        style: [styles.root, {
-          backgroundColor
-        }, barRadius != null ? {
-          borderRadius: barRadius,
-          overflow: 'hidden'
-        } : null],
-        children: [/*#__PURE__*/_jsx(View, {
-          style: styles.startSpacer
-        }), /*#__PURE__*/_jsxs(View, {
-          style: innerStyle,
-          children: [/*#__PURE__*/_jsx(View, {
-            style: styles.content,
-            children: /*#__PURE__*/_jsx(RichContentRenderer, {
-              content: banner.content,
-              buttons: [],
-              theme: bannerTheme,
-              sessionData: session.data,
-              lookupAttribute: lookupAttribute,
-              onActions: onActions
-            })
-          }), banner.buttons.length > 0 ? /*#__PURE__*/_jsx(View, {
-            style: styles.buttons,
-            children: banner.buttons.map(button => /*#__PURE__*/_jsx(BannerStepButton, {
-              button: button,
-              theme: bannerTheme,
-              sessionData: session.data,
-              onActions: onActions
-            }, button.id))
-          }) : null]
-        }), session.version.closeDisabled ? /*#__PURE__*/_jsx(View, {
-          style: styles.startSpacer
-        }) : /*#__PURE__*/_jsx(Pressable, {
-          testID: "userflow-banner-dismiss",
-          accessibilityRole: "button",
-          accessibilityLabel: "Dismiss",
-          hitSlop: 8,
-          onPress: () => onDismiss(EndFlowReasonInput.USER_CLOSED),
-          style: ({
-            pressed
-          }) => [styles.close, pressed ? {
-            backgroundColor: closePressedBackground
-          } : null],
-          children: /*#__PURE__*/_jsx(Text, {
-            style: [styles.dismissIcon, {
-              color: foregroundColor
-            }],
-            children: "\xD7"
-          })
-        })]
-      })
-    })
+    children: insetChromeOutsideFade ? /*#__PURE__*/_jsx(View, {
+      style: insetChrome,
+      children: animatedBar
+    }) : animatedBar
   });
 }
 const styles = StyleSheet.create({

package/lib/module/surfaces/BannerBar.js.map

@@ -1 +1 @@
-{"version":3,"names":["genSessionDataLookup","BannerEmbedMode","EndFlowReasonInput","React","Animated","Pressable","StyleSheet","Text","View","BannerStepButton","RichContentRenderer","mixThemeColors","BANNER_CLOSE_SLOT_SIZE","BANNER_ROOT_PADDING","bannerFrameStyle","bannerInnerStyle","resolveBannerBarBorderRadius","BANNER_BUTTON_GAP","BANNER_CLOSE_BORDER_RADIUS","bannerOverlayShadowStyle","resolveBannerBackgroundColor","resolveBannerForegroundColor","jsx","_jsx","jsxs","_jsxs","BannerBar","session","onActions","onDismiss","banner","version","theme","backgroundColor","foregroundColor","bannerTheme","useMemo","fontColor","lookupAttribute","data","opacity","useRef","Value","animate","current","useEffect","setValue","animation","timing","toValue","duration","useNativeDriver","start","stop","id","overlay","frameStyle","innerStyle","closePressedBackground","overlayEdge","embedMode","BODY_LAST","barRadius","testID","style","children","styles","root","borderRadius","overflow","startSpacer","content","buttons","sessionData","length","map","button","closeDisabled","accessibilityRole","accessibilityLabel","hitSlop","onPress","USER_CLOSED","pressed","close","dismissIcon","color","create","flexDirection","alignItems","padding","flexGrow","flexShrink","maxWidth","height","minWidth","flexWrap","gap","width","justifyContent","fontSize","lineHeight","fontWeight"],"sourceRoot":"../../../src","sources":["surfaces/BannerBar.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["genSessionDataLookup","BannerEmbedMode","EndFlowReasonInput","React","Animated","Pressable","StyleSheet","Text","View","BannerStepButton","RichContentRenderer","mixThemeColors","usePushBannerHostInsetRegistration","BANNER_CLOSE_SLOT_SIZE","BANNER_ROOT_PADDING","bannerBarRootStyle","bannerFrameStyle","bannerInnerStyle","bannerPushLayoutChrome","resolveBannerBarBorderRadius","useUserflowSafeAreaInsets","BANNER_BUTTON_GAP","BANNER_CLOSE_BORDER_RADIUS","bannerOverlayShadowStyle","resolveBannerBackgroundColor","resolveBannerForegroundColor","jsx","_jsx","jsxs","_jsxs","BannerBar","session","pushLayoutEdge","overlaySafeEdge","onActions","onDismiss","banner","version","theme","backgroundColor","foregroundColor","bannerTheme","useMemo","fontColor","lookupAttribute","data","insets","overlay","hostInsetEdge","safeAreaEdge","onPushChromeLayout","id","fadeIn","animate","opacity","useRef","Value","current","useEffect","setValue","animation","timing","toValue","duration","useNativeDriver","start","stop","frameStyle","rootStyle","innerStyle","closePressedBackground","overlayEdge","embedMode","BODY_LAST","barRadius","insetChrome","insetChromeOutsideFade","bar","testID","style","styles","root","borderRadius","overflow","children","startSpacer","content","buttons","sessionData","length","map","button","closeDisabled","accessibilityRole","accessibilityLabel","hitSlop","onPress","USER_CLOSED","pressed","close","dismissIcon","color","animatedBar","onLayout","undefined","create","flexDirection","alignItems","padding","flexGrow","flexShrink","maxWidth","height","minWidth","flexWrap","gap","width","justifyContent","fontSize","lineHeight","fontWeight"],"sourceRoot":"../../../src","sources":["surfaces/BannerBar.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/surfaces/BannerSurface.js

@@ -10,19 +10,35 @@ import { bannerNeedsWebView } from "./bannerWebView/bannerNeedsWebView.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 let warnedMissingWebView = false;
 
-/**
- * Native banner bar, or a WebView when a button runs Evaluate JavaScript or the
- * theme has published custom CSS (same CDN stylesheet as userflow.js iframes).
- */
+/** Native banner bar, or a WebView when `customBannerEnabled` is set on the banner. */
 export function BannerSurface({
   session,
+  pushLayoutEdge = null,
+  overlaySafeEdge = null,
   onActions,
   onDismiss
 }) {
   const banner = session.version.banner;
-  const theme = session.version.theme;
-  const needsWebView = banner != null && bannerNeedsWebView(banner, theme);
+  const needsWebView = banner != null && bannerNeedsWebView(banner);
   const webView = needsWebView ? getEvalJsWebView() : null;
+  React.useEffect(() => {
+    if (!banner || !__DEV__) {
+      return;
+    }
+    // eslint-disable-next-line no-console -- intentional development diagnostic
+    console.log('[Userflow] banner shown', {
+      flowId: session.flow.id,
+      flowName: session.flow.name,
+      bannerSessionId: session.id,
+      versionId: session.version.id,
+      embedMode: banner.embedMode,
+      overlay: banner.overlay !== false,
+      webView: needsWebView,
+      pushLayoutEdge: pushLayoutEdge ?? null,
+      overlaySafeEdge: overlaySafeEdge ?? null,
+      hostAsOverlay: banner.overlay !== false || needsWebView
+    });
+  }, [banner, needsWebView, overlaySafeEdge, pushLayoutEdge, session.flow.id, session.flow.name, session.id, session.version.id]);
   React.useLayoutEffect(() => {
     if (!needsWebView || !webView) {
       return;
@@ -50,18 +66,24 @@ export function BannerSurface({
       }
       return /*#__PURE__*/_jsx(BannerBar, {
         session: session,
+        pushLayoutEdge: pushLayoutEdge,
+        overlaySafeEdge: overlaySafeEdge,
         onActions: onActions,
         onDismiss: onDismiss
       });
     }
     return /*#__PURE__*/_jsx(BannerWebViewBar, {
       session: session,
+      pushLayoutEdge: pushLayoutEdge,
+      overlaySafeEdge: overlaySafeEdge,
       onActions: onActions,
       onDismiss: dismissWebViewBanner
     });
   }
   return /*#__PURE__*/_jsx(BannerBar, {
     session: session,
+    pushLayoutEdge: pushLayoutEdge,
+    overlaySafeEdge: overlaySafeEdge,
     onActions: onActions,
     onDismiss: onDismiss
   });

package/lib/module/surfaces/BannerSurface.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","evalJsController","getEvalJsWebView","BannerBar","BannerWebViewBar","clearBannerAutoRunEvalSession","bannerNeedsWebView","jsx","_jsx","warnedMissingWebView","BannerSurface","session","onActions","onDismiss","banner","version","theme","needsWebView","webView","useLayoutEffect","setBannerOwnsWebView","id","dismissWebViewBanner","useCallback","endReason","reset","__DEV__","console","warn","resetBannerSurfaceWarningsForTests"],"sourceRoot":"../../../src","sources":["surfaces/BannerSurface.tsx"],"mappings":";;AAKA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,gBAAgB,QAAQ,+BAA4B;AAC7D,SAASC,gBAAgB,QAAQ,yBAAsB;AAEvD,SAASC,SAAS,QAAQ,gBAAa;AACvC,SAASC,gBAAgB,QAAQ,qCAAkC;AACnE,SAASC,6BAA6B,QAAQ,yCAAsC;AACpF,SAASC,kBAAkB,QAAQ,uCAAoC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQxE,IAAIC,oBAAoB,GAAG,KAAK;;AAEhC;AACA;AACA;AACA;AACA,OAAO,SAASC,aAAaA,CAAC;EAC5BC,OAAO;EACPC,SAAS;EACTC;AACkB,CAAC,EAA6B;EAChD,MAAMC,MAAM,GAAGH,OAAO,CAACI,OAAO,CAACD,MAAM;EACrC,MAAME,KAAK,GAAGL,OAAO,CAACI,OAAO,CAACC,KAAK;EACnC,MAAMC,YAAY,GAAGH,MAAM,IAAI,IAAI,IAAIR,kBAAkB,CAACQ,MAAM,EAAEE,KAAK,CAAC;EACxE,MAAME,OAAO,GAAGD,YAAY,GAAGf,gBAAgB,CAAC,CAAC,GAAG,IAAI;EAExDF,KAAK,CAACmB,eAAe,CAAC,MAAM;IAC1B,IAAI,CAACF,YAAY,IAAI,CAACC,OAAO,EAAE;MAC7B;IACF;IACAjB,gBAAgB,CAACmB,oBAAoB,CAAC,IAAI,CAAC;IAC3C,OAAO,MAAM;MACXnB,gBAAgB,CAACmB,oBAAoB,CAAC,KAAK,CAAC;IAC9C,CAAC;EACH,CAAC,EAAE,CAACH,YAAY,EAAEC,OAAO,EAAEP,OAAO,CAACU,EAAE,CAAC,CAAC;EAEvC,MAAMC,oBAAoB,GAAGtB,KAAK,CAACuB,WAAW,CAC3CC,SAA6B,IAAK;IACjCnB,6BAA6B,CAACM,OAAO,CAACU,EAAE,CAAC;IACzCpB,gBAAgB,CAACwB,KAAK,CAAC,CAAC;IACxBZ,SAAS,CAACW,SAAS,CAAC;EACtB,CAAC,EACD,CAACX,SAAS,EAAEF,OAAO,CAACU,EAAE,CACxB,CAAC;EAED,IAAI,CAACP,MAAM,EAAE;IACX,OAAO,IAAI;EACb;EACA,IAAIG,YAAY,EAAE;IAChB,IAAI,CAACC,OAAO,EAAE;MACZ,IAAI,CAACT,oBAAoB,EAAE;QACzBA,oBAAoB,GAAG,IAAI;QAC3B,IAAIiB,OAAO,EAAE;UACXC,OAAO,CAACC,IAAI,CACV,+EAA+E,GAC7E,+FAA+F,GAC/F,sFACJ,CAAC;QACH;MACF;MACA,oBAAOpB,IAAA,CAACL,SAAS;QAACQ,OAAO,EAAEA,OAAQ;QAACC,SAAS,EAAEA,SAAU;QAACC,SAAS,EAAEA;MAAU,CAAE,CAAC;IACpF;IACA,oBACEL,IAAA,CAACJ,gBAAgB;MAACO,OAAO,EAAEA,OAAQ;MAACC,SAAS,EAAEA,SAAU;MAACC,SAAS,EAAES;IAAqB,CAAE,CAAC;EAEjG;EACA,oBAAOd,IAAA,CAACL,SAAS;IAACQ,OAAO,EAAEA,OAAQ;IAACC,SAAS,EAAEA,SAAU;IAACC,SAAS,EAAEA;EAAU,CAAE,CAAC;AACpF;;AAEA;AACA,OAAO,SAASgB,kCAAkCA,CAAA,EAAS;EACzDpB,oBAAoB,GAAG,KAAK;AAC9B","ignoreList":[]}
+{"version":3,"names":["React","evalJsController","getEvalJsWebView","BannerBar","BannerWebViewBar","clearBannerAutoRunEvalSession","bannerNeedsWebView","jsx","_jsx","warnedMissingWebView","BannerSurface","session","pushLayoutEdge","overlaySafeEdge","onActions","onDismiss","banner","version","needsWebView","webView","useEffect","__DEV__","console","log","flowId","flow","id","flowName","name","bannerSessionId","versionId","embedMode","overlay","hostAsOverlay","useLayoutEffect","setBannerOwnsWebView","dismissWebViewBanner","useCallback","endReason","reset","warn","resetBannerSurfaceWarningsForTests"],"sourceRoot":"../../../src","sources":["surfaces/BannerSurface.tsx"],"mappings":";;AAKA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,gBAAgB,QAAQ,+BAA4B;AAC7D,SAASC,gBAAgB,QAAQ,yBAAsB;AAEvD,SAASC,SAAS,QAAQ,gBAAa;AACvC,SAASC,gBAAgB,QAAQ,qCAAkC;AACnE,SAASC,6BAA6B,QAAQ,yCAAsC;AACpF,SAASC,kBAAkB,QAAQ,uCAAoC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAYxE,IAAIC,oBAAoB,GAAG,KAAK;;AAEhC;AACA,OAAO,SAASC,aAAaA,CAAC;EAC5BC,OAAO;EACPC,cAAc,GAAG,IAAI;EACrBC,eAAe,GAAG,IAAI;EACtBC,SAAS;EACTC;AACkB,CAAC,EAA6B;EAChD,MAAMC,MAAM,GAAGL,OAAO,CAACM,OAAO,CAACD,MAAM;EACrC,MAAME,YAAY,GAAGF,MAAM,IAAI,IAAI,IAAIV,kBAAkB,CAACU,MAAM,CAAC;EACjE,MAAMG,OAAO,GAAGD,YAAY,GAAGhB,gBAAgB,CAAC,CAAC,GAAG,IAAI;EAExDF,KAAK,CAACoB,SAAS,CAAC,MAAM;IACpB,IAAI,CAACJ,MAAM,IAAI,CAACK,OAAO,EAAE;MACvB;IACF;IACA;IACAC,OAAO,CAACC,GAAG,CAAC,yBAAyB,EAAE;MACrCC,MAAM,EAAEb,OAAO,CAACc,IAAI,CAACC,EAAE;MACvBC,QAAQ,EAAEhB,OAAO,CAACc,IAAI,CAACG,IAAI;MAC3BC,eAAe,EAAElB,OAAO,CAACe,EAAE;MAC3BI,SAAS,EAAEnB,OAAO,CAACM,OAAO,CAACS,EAAE;MAC7BK,SAAS,EAAEf,MAAM,CAACe,SAAS;MAC3BC,OAAO,EAAEhB,MAAM,CAACgB,OAAO,KAAK,KAAK;MACjCb,OAAO,EAAED,YAAY;MACrBN,cAAc,EAAEA,cAAc,IAAI,IAAI;MACtCC,eAAe,EAAEA,eAAe,IAAI,IAAI;MACxCoB,aAAa,EAAEjB,MAAM,CAACgB,OAAO,KAAK,KAAK,IAAId;IAC7C,CAAC,CAAC;EACJ,CAAC,EAAE,CACDF,MAAM,EACNE,YAAY,EACZL,eAAe,EACfD,cAAc,EACdD,OAAO,CAACc,IAAI,CAACC,EAAE,EACff,OAAO,CAACc,IAAI,CAACG,IAAI,EACjBjB,OAAO,CAACe,EAAE,EACVf,OAAO,CAACM,OAAO,CAACS,EAAE,CACnB,CAAC;EAEF1B,KAAK,CAACkC,eAAe,CAAC,MAAM;IAC1B,IAAI,CAAChB,YAAY,IAAI,CAACC,OAAO,EAAE;MAC7B;IACF;IACAlB,gBAAgB,CAACkC,oBAAoB,CAAC,IAAI,CAAC;IAC3C,OAAO,MAAM;MACXlC,gBAAgB,CAACkC,oBAAoB,CAAC,KAAK,CAAC;IAC9C,CAAC;EACH,CAAC,EAAE,CAACjB,YAAY,EAAEC,OAAO,EAAER,OAAO,CAACe,EAAE,CAAC,CAAC;EAEvC,MAAMU,oBAAoB,GAAGpC,KAAK,CAACqC,WAAW,CAC3CC,SAA6B,IAAK;IACjCjC,6BAA6B,CAACM,OAAO,CAACe,EAAE,CAAC;IACzCzB,gBAAgB,CAACsC,KAAK,CAAC,CAAC;IACxBxB,SAAS,CAACuB,SAAS,CAAC;EACtB,CAAC,EACD,CAACvB,SAAS,EAAEJ,OAAO,CAACe,EAAE,CACxB,CAAC;EAED,IAAI,CAACV,MAAM,EAAE;IACX,OAAO,IAAI;EACb;EACA,IAAIE,YAAY,EAAE;IAChB,IAAI,CAACC,OAAO,EAAE;MACZ,IAAI,CAACV,oBAAoB,EAAE;QACzBA,oBAAoB,GAAG,IAAI;QAC3B,IAAIY,OAAO,EAAE;UACXC,OAAO,CAACkB,IAAI,CACV,+EAA+E,GAC7E,+FAA+F,GAC/F,sFACJ,CAAC;QACH;MACF;MACA,oBACEhC,IAAA,CAACL,SAAS;QACRQ,OAAO,EAAEA,OAAQ;QACjBC,cAAc,EAAEA,cAAe;QAC/BC,eAAe,EAAEA,eAAgB;QACjCC,SAAS,EAAEA,SAAU;QACrBC,SAAS,EAAEA;MAAU,CACtB,CAAC;IAEN;IACA,oBACEP,IAAA,CAACJ,gBAAgB;MACfO,OAAO,EAAEA,OAAQ;MACjBC,cAAc,EAAEA,cAAe;MAC/BC,eAAe,EAAEA,eAAgB;MACjCC,SAAS,EAAEA,SAAU;MACrBC,SAAS,EAAEqB;IAAqB,CACjC,CAAC;EAEN;EACA,oBACE5B,IAAA,CAACL,SAAS;IACRQ,OAAO,EAAEA,OAAQ;IACjBC,cAAc,EAAEA,cAAe;IAC/BC,eAAe,EAAEA,eAAgB;IACjCC,SAAS,EAAEA,SAAU;IACrBC,SAAS,EAAEA;EAAU,CACtB,CAAC;AAEN;;AAEA;AACA,OAAO,SAAS0B,kCAAkCA,CAAA,EAAS;EACzDhC,oBAAoB,GAAG,KAAK;AAC9B","ignoreList":[]}

package/lib/module/surfaces/ProgressBar.js

@@ -2,6 +2,7 @@
 
 import * as React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
+import { resolveContentFontFamily } from "../content/resolveContentFontFamily.js";
 import { foregroundAlpha } from "../content/themeColor.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const PROGRESS_BAR_NUMBERED = 'NUMBERED';
@@ -47,7 +48,7 @@ export function ProgressBar({
         testID: "userflow-progress-numbered",
         style: [styles.numberedLabel, {
           color: foregroundAlpha(theme.fontColor, 0.55),
-          fontFamily: theme.fontFamily || undefined,
+          fontFamily: resolveContentFontFamily(theme),
           fontSize: Math.max(12, Math.round(theme.fontSize * 0.875))
         }],
         children: label

package/lib/module/surfaces/ProgressBar.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","StyleSheet","Text","View","foregroundAlpha","jsx","_jsx","PROGRESS_BAR_NUMBERED","progressBarType","theme","String","toUpperCase","numberedStepLabel","fraction","totalSteps","maxSteps","Math","max","selected","min","floor","ProgressBar","enabled","position","contentPadding","clamped","type","testId","label","testID","style","styles","numberedTrack","top","bottomNumbered","paddingHorizontal","alignItems","numberedCentered","accessibilityRole","accessibilityLabel","pointerEvents","children","numberedLabel","color","fontColor","fontFamily","undefined","fontSize","round","track","bottom","accessibilityValue","now","fill","width","backgroundColor","defaultButtonBackgroundColor","create","left","right","height","overflow","zIndex","fontWeight"],"sourceRoot":"../../../src","sources":["surfaces/ProgressBar.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","StyleSheet","Text","View","resolveContentFontFamily","foregroundAlpha","jsx","_jsx","PROGRESS_BAR_NUMBERED","progressBarType","theme","String","toUpperCase","numberedStepLabel","fraction","totalSteps","maxSteps","Math","max","selected","min","floor","ProgressBar","enabled","position","contentPadding","clamped","type","testId","label","testID","style","styles","numberedTrack","top","bottomNumbered","paddingHorizontal","alignItems","numberedCentered","accessibilityRole","accessibilityLabel","pointerEvents","children","numberedLabel","color","fontColor","fontFamily","fontSize","round","track","bottom","accessibilityValue","now","fill","width","backgroundColor","defaultButtonBackgroundColor","create","left","right","height","overflow","zIndex","fontWeight"],"sourceRoot":"../../../src","sources":["surfaces/ProgressBar.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/surfaces/TooltipSurface.js

@@ -1,25 +1,29 @@
 "use strict";
 
+import { decodeMobileAutoData } from '@userflow-tech/protocol';
 import * as React from 'react';
 import { ActivityIndicator, Dimensions, Keyboard, ScrollView, StyleSheet, Text, View } from 'react-native';
 import { anchorRegistry } from "../anchors/AnchorRegistry.js";
 import { autoAnchorRegistry } from "../anchors/AutoAnchorRegistry.js";
 import { addAnimationFrameCallback, removeAnimationFrameCallback } from "../anchors/animationFrame.js";
+import { isAppActive, subscribeAppActive } from "../anchors/appActive.js";
 import { fiberScanRoot } from "../anchors/fiber/FiberScanRoot.js";
 import { clipToScrollViewports } from "../anchors/fiber/visibleRect.js";
-import { clearFiberAnchorCache, invalidateFiberAnchor, resolveAnchorHost } from "../anchors/resolveAnchorHost.js";
+import { clearFiberAnchorCache, invalidateFiberAnchor, resolveAnchorHost, subscribeAnchorScreenChange } from "../anchors/resolveAnchorHost.js";
 import { resolveAutoAnchorHost } from "../anchors/resolveAutoAnchorHost.js";
 import { resolveManualAnchorId } from "../anchors/resolveManualAnchorId.js";
 import { scrollAnchorIntoView } from "../anchors/scrollAnchorIntoView.js";
 import { getScrollPadding } from "../anchors/scrollConfig.js";
 import { targetPressMonitor } from "../anchors/targetPressMonitor.js";
 import { RichContentRenderer } from "../content/RichContentRenderer.js";
+import { resolveContentFontFamily } from "../content/resolveContentFontFamily.js";
 import { CardFade } from "./CardFade.js";
 import { CloseButton } from "./CloseButton.js";
 import { MADE_WITH_USERFLOW_GAP, MadeWithUserflow } from "./MadeWithUserflow.js";
 import { ProgressBar } from "./ProgressBar.js";
 import { ABSOLUTE_FILL } from "./absoluteFill.js";
 import { useCardTransitionPhase } from "./cardTransition.js";
+import { stepTrapsHostAccessibility } from "./hostAccessibilityTrap.js";
 import { parseBackdropOpacity } from "./parseBackdropOpacity.js";
 import { resolveStepProgress } from "./progress.js";
 import { resolveCloseButtonColor } from "./resolveCloseButtonColor.js";
@@ -37,11 +41,8 @@ import { parseBackdropPadding } from "./tooltip/parseBackdropPadding.js";
 import { warnTooltipPlacementUnanchored, warnTooltipSidePlacementDropped } from "./tooltip/placementDiagnostics.js";
 import { buildEffectiveViewport, expandRect, isRectFullyVisible, rectsEqual } from "./tooltip/rect.js";
 import { resolveTooltipSideCardWidth, tooltipMinCardHeight, tooltipMinSideCardWidth, tooltipSideGap, tooltipVerticalGap } from "./tooltip/resolveSideCardWidth.js";
+import { TargetSearchSchedule } from "./tooltip/targetSearchSchedule.js";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/** Interval for re-resolving a missing / remounted anchor (not for live measure). */
-const RESOLVE_MS = 250;
-/** Slower resolve poll after FLAG/ERROR report so a late-mounting target can recover. */
-const RESOLVE_SLOW_MS = 1000;
 /**
  * One-frame delay before the first resolve after a step/reset so dialog
  * teardown cannot arm the missing-target timer with a 0-size measure.
@@ -97,6 +98,7 @@ export function TooltipSurface({
 }) {
   const version = session.version;
   const chrome = resolveBubbleChrome(theme, 'tooltip');
+  const contentFontFamily = resolveContentFontFamily(theme);
   const progress = resolveStepProgress(version, currentStep.id);
   const showClose = !version.closeDisabled;
   const backdropOpacity = parseBackdropOpacity(theme.backdropOpacity);
@@ -104,6 +106,8 @@ export function TooltipSurface({
   const selector = currentStep.selector;
   const isAuto = selector?.type === 'AUTO';
   const autoData = selector?.autoData ?? null;
+  // Decoded once per step rather than on every search.
+  const decodedAutoData = React.useMemo(() => isAuto ? decodeMobileAutoData(autoData) : null, [isAuto, autoData]);
   const anchorId = isAuto ? null : resolveManualAnchorId(selector?.css);
   const targetKey = isAuto ? `auto:${autoData ?? ''}` : anchorId ?? '';
   const highlight = currentStep.backdrop ? resolveHighlightChrome(theme, backdropPadding) : null;
@@ -133,7 +137,6 @@ export function TooltipSurface({
   });
   const [placement, setPlacement] = React.useState(desiredPlacement ?? 'BELOW');
   const [missingMode, setMissingMode] = React.useState('waiting');
-  const [registryTick, setRegistryTick] = React.useState(0);
   /** True after at least one *failed* measure for the current step/anchor. */
   const [measureAttempted, setMeasureAttempted] = React.useState(false);
   /**
@@ -208,17 +211,6 @@ export function TooltipSurface({
       mountedRef.current = false;
     };
   }, []);
-  React.useEffect(() => {
-    const bump = () => setRegistryTick(n => n + 1);
-    const unsubRegistry = anchorRegistry.subscribe(bump);
-    const unsubAuto = autoAnchorRegistry.subscribe(bump);
-    const unsubScan = fiberScanRoot.subscribe(bump);
-    return () => {
-      unsubRegistry();
-      unsubAuto();
-      unsubScan();
-    };
-  }, []);
   React.useEffect(() => {
     reportedRef.current = false;
     scrollAttemptsRef.current = 0;
@@ -355,12 +347,12 @@ export function TooltipSurface({
   }, [effectiveViewport]);
 
   /**
-   * Resolve the anchor host (registry / fiber scan). Used by the interval and
-   * on registry ticks — intentionally NOT on every animation frame.
+   * Resolve the anchor host (registry / fiber scan). Driven by
+   * {@link TargetSearchSchedule} — intentionally NOT on every animation frame.
    */
   const resolveTarget = React.useCallback(() => {
     if (!mountedRef.current) return;
-    const resolution = isAuto ? resolveAutoAnchorHost(autoData) : anchorId ? resolveAnchorHost(anchorId) : null;
+    const resolution = isAuto ? resolveAutoAnchorHost(decodedAutoData) : anchorId ? resolveAnchorHost(anchorId) : null;
     if (!resolution || resolution.status !== 'found') {
       dropHost();
       return;
@@ -397,7 +389,7 @@ export function TooltipSurface({
       maybeScrollIntoView(rect);
       applyTarget(rect);
     });
-  }, [anchorId, applyTarget, autoData, dropHost, isAuto, maybeScrollIntoView]);
+  }, [anchorId, applyTarget, decodedAutoData, dropHost, isAuto, maybeScrollIntoView]);
 
   /**
    * Live re-measure of an already-resolved host. Driven by the shared rAF hub
@@ -433,42 +425,50 @@ export function TooltipSurface({
       applyTarget(rect);
     });
   }, [applyTarget, dropHost, maybeScrollIntoView]);
-  React.useEffect(() => {
-    if (!resolveArmed) return;
-    resolveTarget();
-  }, [resolveTarget, registryTick, resolveArmed]);
+  const resolveTargetRef = React.useRef(resolveTarget);
+  resolveTargetRef.current = resolveTarget;
+  const searchRef = React.useRef(null);
+  const searchAllowsRecovery = behavior === 'FLAG' || behavior === 'ERROR' || behavior === 'END' && session.draftMode;
+  const searchStopped = missingMode === 'reported' && !searchAllowsRecovery;
 
-  // Resolve poll: recover missing / remounted anchors. Live measurement is on rAF.
+  // Target search: steady poll while anchored, backoff while missing, nothing
+  // while the app is in the background. Live measurement is on rAF. A new step
+  // or target restarts it right away; a same-step restart (`resetNonce`) goes
+  // through `resolveArmed`, after the first-resolve delay.
   React.useEffect(() => {
-    if (!resolveArmed) {
+    if (!resolveArmed || searchStopped) {
       return;
     }
-    const allowsRecovery = behavior === 'FLAG' || behavior === 'ERROR' || behavior === 'END' && session.draftMode;
-    const pauseAfterReport = missingMode === 'reported' && !allowsRecovery;
-    if (pauseAfterReport) {
-      return;
-    }
-    resolveTarget();
-    const intervalMs = missingMode === 'reported' ? RESOLVE_SLOW_MS : RESOLVE_MS;
-    const handle = setInterval(resolveTarget, intervalMs);
-    const dimSub = Dimensions.addEventListener('change', resolveTarget);
+    const search = new TargetSearchSchedule(() => resolveTargetRef.current());
+    searchRef.current = search;
+    search.setMode(targetRef.current ? 'anchored' : 'missing');
+    const trigger = () => search.trigger();
+    const unsubscribers = [anchorRegistry.subscribe(trigger), autoAnchorRegistry.subscribe(trigger), fiberScanRoot.subscribe(trigger), subscribeAnchorScreenChange(() => search.rearm()), subscribeAppActive(active => active ? search.resume() : search.pause())];
+    if (!isAppActive()) search.pause();
+    search.runNow();
+    const dimSub = Dimensions.addEventListener('change', () => search.runNow());
     const onKeyboardShow = event => {
       setKeyboardBottomInset(Math.max(0, event.endCoordinates?.height ?? 0));
-      resolveTarget();
+      search.runNow();
     };
     const onKeyboardHide = () => {
       setKeyboardBottomInset(0);
-      resolveTarget();
+      search.runNow();
     };
     const kbShow = Keyboard.addListener('keyboardDidShow', onKeyboardShow);
     const kbHide = Keyboard.addListener('keyboardDidHide', onKeyboardHide);
     return () => {
-      clearInterval(handle);
+      for (const unsubscribe of unsubscribers) unsubscribe();
       dimSub.remove();
       kbShow.remove();
       kbHide.remove();
+      search.dispose();
+      if (searchRef.current === search) searchRef.current = null;
     };
-  }, [resolveTarget, missingMode, behavior, session.draftMode, resolveArmed]);
+  }, [resolveArmed, searchStopped, currentStep.id, targetKey]);
+  React.useEffect(() => {
+    searchRef.current?.setMode(target ? 'anchored' : 'missing');
+  }, [target]);
 
   // rAF tracking while a host is resolved (and we are not paused after report).
   React.useEffect(() => {
@@ -727,6 +727,9 @@ export function TooltipSurface({
   }
   const showBranding = session.flow.company.flowBranding;
   const contentPadding = chrome.contentPadding;
+  // Modal only while the host is trapped too. Otherwise VoiceOver would skip
+  // the host app, including the target this step asks the user to press.
+  const cardIsModal = stepTrapsHostAccessibility(currentStep);
 
   // Still pending the first measure attempt — only the blocker shows.
   if (isMissing && missingMode === 'waiting' && !measureAttempted) {
@@ -742,7 +745,7 @@ export function TooltipSurface({
         pointerEvents: "box-none",
         children: /*#__PURE__*/_jsx(CardFade, {
           testID: "userflow-tooltip-waiting",
-          accessibilityViewIsModal: true,
+          accessibilityViewIsModal: cardIsModal,
           pointerEvents: "auto",
           style: [chrome.shadowStyle, styles.waitingCard, cardLayoutStyle, {
             borderRadius: chrome.borderRadius,
@@ -766,6 +769,7 @@ export function TooltipSurface({
               }), /*#__PURE__*/_jsx(Text, {
                 style: {
                   color: theme.fontColor,
+                  fontFamily: contentFontFamily,
                   fontSize: theme.fontSize,
                   marginTop: 12,
                   textAlign: 'center'
@@ -807,12 +811,14 @@ export function TooltipSurface({
         children: [/*#__PURE__*/_jsx(Text, {
           style: [styles.missingTitle, {
             color: theme.fontColor,
+            fontFamily: contentFontFamily,
             fontSize: theme.fontSize
           }],
           children: "Target not found"
         }), /*#__PURE__*/_jsx(Text, {
           style: {
             color: theme.fontColor,
+            fontFamily: contentFontFamily,
             fontSize: theme.fontSize,
             opacity: 0.8
           },
@@ -848,7 +854,7 @@ export function TooltipSurface({
         pointerEvents: "box-none",
         children: /*#__PURE__*/_jsx(CardFade, {
           testID: "userflow-tooltip-card",
-          accessibilityViewIsModal: true,
+          accessibilityViewIsModal: cardIsModal,
           pointerEvents: "auto",
           onLayout: onCardLayout,
           style: [chrome.shadowStyle, styles.fallbackCard, cardLayoutStyle, {
@@ -882,6 +888,7 @@ export function TooltipSurface({
       onLayout: onCardLayout,
       maxHeight: layout.maxCardHeight,
       showNotch: layout.showNotch,
+      accessibilityViewIsModal: cardIsModal,
       style: {
         position: 'absolute',
         left: layout.cardPosition.x,