@repliqo/sdk-react-native 0.3.4 → 0.3.6

package/dist/components/RepliqoScrollView.d.ts

@@ -5,7 +5,9 @@ import { ScrollView, type ScrollViewProps } from 'react-native';
  *
  *  1. Reports scroll offset for accurate heatmap touch coords
  *  2. Captures viewport tiles on scroll stops AND during continuous
- *     scroll for collaborative screen building — the backend composites
- *     these into a full-content image over time
+ *     scroll for collaborative screen building
+ *  3. Registers its window-relative bounds with the SDK so touches can
+ *     be auto-classified as "content" (inside ScrollView) or "fixed"
+ *     (outside, e.g. nav bars/headers)
  */
 export declare const RepliqoScrollView: React.ForwardRefExoticComponent<ScrollViewProps & React.RefAttributes<ScrollView>>;

package/dist/components/RepliqoScrollView.js

@@ -49,31 +49,100 @@ const THROTTLE_MS = 400;
  * where the user never pauses long enough for the debounce to fire.
  */
 const SCROLL_INTERVAL_MS = 1200;
+/**
+ * During scroll, throttle window-bounds re-measurement to at most once per
+ * this many ms. Bounds rarely change while scrolling, but we still want to
+ * catch orientation changes / keyboard / overlay animations.
+ */
+const REMEASURE_THROTTLE_MS = 500;
+let scrollViewIdCounter = 0;
+const nextScrollViewId = () => `repliqo-scroll-${++scrollViewIdCounter}`;
 /**
  * Drop-in replacement for React Native's ScrollView that:
  *
  *  1. Reports scroll offset for accurate heatmap touch coords
  *  2. Captures viewport tiles on scroll stops AND during continuous
- *     scroll for collaborative screen building — the backend composites
- *     these into a full-content image over time
+ *     scroll for collaborative screen building
+ *  3. Registers its window-relative bounds with the SDK so touches can
+ *     be auto-classified as "content" (inside ScrollView) or "fixed"
+ *     (outside, e.g. nav bars/headers)
  */
 exports.RepliqoScrollView = react_1.default.forwardRef(({ onScroll, onMomentumScrollEnd, onScrollEndDrag, onLayout, onContentSizeChange, ...props }, ref) => {
     const debounceTimer = (0, react_1.useRef)(null);
     const scrollIntervalTimer = (0, react_1.useRef)(null);
+    const initialLayoutTimer = (0, react_1.useRef)(null);
     const lastCaptureTime = (0, react_1.useRef)(0);
     const lastCaptureY = (0, react_1.useRef)(-999);
+    const lastMeasureTime = (0, react_1.useRef)(0);
     const initialCaptured = (0, react_1.useRef)(false);
     const realContentHeight = (0, react_1.useRef)(0);
+    const scrollViewId = (0, react_1.useRef)(nextScrollViewId());
+    const innerRef = (0, react_1.useRef)(null);
+    const isMounted = (0, react_1.useRef)(true);
     const scrollState = (0, react_1.useRef)(null);
-    // Cleanup timers on unmount
+    // Forward the inner ref to the parent's ref (if provided).
+    // IMPORTANT: do NOT clear innerRef on cleanup — RN sometimes calls the
+    // ref callback with null mid-update, and clearing would break async
+    // measurement callbacks that fire after the ref reattaches.
+    const setRef = (0, react_1.useCallback)((node) => {
+        if (node !== null) {
+            innerRef.current = node;
+        }
+        if (typeof ref === 'function') {
+            ref(node);
+        }
+        else if (ref) {
+            ref.current = node;
+        }
+    }, [ref]);
+    /**
+     * Measure window-relative bounds and register with SDK.
+     * Idempotent + safe to call after unmount (guards via isMounted).
+     */
+    const measureAndRegister = (0, react_1.useCallback)(() => {
+        if (!isMounted.current)
+            return;
+        const node = innerRef.current;
+        if (!node || typeof node.measureInWindow !== 'function')
+            return;
+        node.measureInWindow((x, y, width, height) => {
+            if (!isMounted.current)
+                return;
+            // RN sometimes returns 0/0 dims before the view is positioned —
+            // ignore those, the next onLayout/onScroll will re-measure.
+            if (width <= 0 || height <= 0)
+                return;
+            try {
+                client_1.AppAnalytics.getInstance().registerScrollView(scrollViewId.current, {
+                    x, y, width, height,
+                });
+            }
+            catch { }
+        });
+    }, []);
+    // Cleanup all timers + unregister + listeners on unmount
     (0, react_1.useEffect)(() => {
+        const id = scrollViewId.current;
+        isMounted.current = true;
+        // Re-measure when keyboard appears/disappears (causes layout shift)
+        const showSub = react_native_1.Keyboard.addListener('keyboardDidShow', measureAndRegister);
+        const hideSub = react_native_1.Keyboard.addListener('keyboardDidHide', measureAndRegister);
         return () => {
+            isMounted.current = false;
             if (debounceTimer.current)
                 clearTimeout(debounceTimer.current);
             if (scrollIntervalTimer.current)
                 clearInterval(scrollIntervalTimer.current);
+            if (initialLayoutTimer.current)
+                clearTimeout(initialLayoutTimer.current);
+            showSub.remove();
+            hideSub.remove();
+            try {
+                client_1.AppAnalytics.getInstance().unregisterScrollView(id);
+            }
+            catch { }
         };
-    }, []);
+    }, [measureAndRegister]);
     /**
      * Core tile capture logic. Reads from refs (stable across renders).
      * Checks throttle + delta before capturing.
@@ -81,6 +150,8 @@ exports.RepliqoScrollView = react_1.default.forwardRef(({ onScroll, onMomentumSc
      * @param force Skip throttle check (used for interval captures)
      */
     const doCapture = (force = false) => {
+        if (!isMounted.current)
+            return;
         const state = scrollState.current;
         if (!state || state.viewportHeight <= 0)
             return;
@@ -116,11 +187,20 @@ exports.RepliqoScrollView = react_1.default.forwardRef(({ onScroll, onMomentumSc
     };
     const handleScroll = (0, react_1.useCallback)((event) => {
         const { contentOffset, layoutMeasurement, contentSize } = event.nativeEvent;
-        // Report scroll offset for touch coords
+        // Update SDK with current scroll offset (both legacy + new registry)
         try {
-            client_1.AppAnalytics.getInstance().setScrollOffset(contentOffset.y);
+            const sdk = client_1.AppAnalytics.getInstance();
+            sdk.setScrollOffset(contentOffset.y);
+            sdk.updateScrollViewOffset(scrollViewId.current, contentOffset.y);
         }
         catch { }
+        // Re-measure bounds occasionally during scroll — catches layout
+        // shifts from animations, keyboard, orientation changes, etc.
+        const now = Date.now();
+        if (now - lastMeasureTime.current > REMEASURE_THROTTLE_MS) {
+            lastMeasureTime.current = now;
+            measureAndRegister();
+        }
         // Update scroll state — use realContentHeight if available
         const bestContentHeight = realContentHeight.current > 0
             ? realContentHeight.current
@@ -138,10 +218,12 @@ exports.RepliqoScrollView = react_1.default.forwardRef(({ onScroll, onMomentumSc
         startScrollInterval();
         // Capture initial tile (Y~0) on first scroll event with real dims
         if (!initialCaptured.current && contentOffset.y < 10) {
-            setTimeout(() => doCapture(), 200);
+            if (initialLayoutTimer.current)
+                clearTimeout(initialLayoutTimer.current);
+            initialLayoutTimer.current = setTimeout(() => doCapture(), 200);
         }
         onScroll?.(event);
-    }, [onScroll]);
+    }, [onScroll, measureAndRegister]);
     const handleScrollEndDrag = (0, react_1.useCallback)((event) => {
         // User lifted finger — capture immediately
         stopScrollInterval();
@@ -158,7 +240,6 @@ exports.RepliqoScrollView = react_1.default.forwardRef(({ onScroll, onMomentumSc
         onMomentumScrollEnd?.(event);
     }, [onMomentumScrollEnd]);
     const handleLayout = (0, react_1.useCallback)((event) => {
-        // Capture initial tile after layout (gets real viewportHeight)
         const { height } = event.nativeEvent.layout;
         if (!initialCaptured.current && height > 0) {
             scrollState.current = {
@@ -166,10 +247,17 @@ exports.RepliqoScrollView = react_1.default.forwardRef(({ onScroll, onMomentumSc
                 viewportHeight: height,
                 contentHeight: realContentHeight.current || height,
             };
-            setTimeout(() => doCapture(), 1000);
+            // Clear any prior pending initial-capture timer before scheduling
+            if (initialLayoutTimer.current)
+                clearTimeout(initialLayoutTimer.current);
+            initialLayoutTimer.current = setTimeout(() => doCapture(), 1000);
         }
+        // Register window-relative bounds immediately (no setTimeout).
+        // measureInWindow itself is async; if it returns 0/0 dims, the
+        // next onLayout / onScroll will retry — no race window.
+        measureAndRegister();
         onLayout?.(event);
-    }, [onLayout]);
+    }, [onLayout, measureAndRegister]);
     /**
      * Track the real content height from onContentSizeChange.
      * This is more reliable than the first scroll event and ensures
@@ -183,6 +271,6 @@ exports.RepliqoScrollView = react_1.default.forwardRef(({ onScroll, onMomentumSc
         }
         onContentSizeChange?.(w, h);
     }, [onContentSizeChange]);
-    return (<react_native_1.ScrollView ref={ref} {...props} onScroll={handleScroll} onScrollEndDrag={handleScrollEndDrag} onMomentumScrollEnd={handleMomentumEnd} onLayout={handleLayout} onContentSizeChange={handleContentSizeChange} scrollEventThrottle={props.scrollEventThrottle ?? 16}/>);
+    return (<react_native_1.ScrollView ref={setRef} {...props} onScroll={handleScroll} onScrollEndDrag={handleScrollEndDrag} onMomentumScrollEnd={handleMomentumEnd} onLayout={handleLayout} onContentSizeChange={handleContentSizeChange} scrollEventThrottle={props.scrollEventThrottle ?? 16}/>);
 });
 exports.RepliqoScrollView.displayName = 'RepliqoScrollView';

package/dist/core/client.d.ts

@@ -14,12 +14,38 @@ export declare class AppAnalytics {
     private scrollOffsetY;
     private logger;
     private appStateSubscription;
+    /**
+     * Registry of active ScrollViews on the current screen.
+     * Each RepliqoScrollView registers its window-relative bounds and current
+     * scroll state. Used by trackTouch to auto-detect:
+     *   - If touch is INSIDE a ScrollView → adjust Y by that ScrollView's
+     *     scrollOffset, mark as content touch
+     *   - If touch is OUTSIDE all ScrollViews → mark as fixed UI (no adjust)
+     *
+     * This makes heatmaps render fixed elements (nav bars, headers) at their
+     * viewport position, while still mapping scrollable content correctly.
+     */
+    private scrollViewRegistry;
     private constructor();
     static init(config: SDKConfig): AppAnalytics;
     static getInstance(): AppAnalytics;
     static destroy(): void;
     startSession(deviceId: string, deviceInfo?: DeviceInfo): Promise<string>;
     endSession(): Promise<void>;
+    /**
+     * Track a touch event for heatmap analysis.
+     *
+     * @param x Touch X coordinate, in WINDOW coordinates (must match the
+     *          coordinate system of `measureInWindow` — typically `pageX`
+     *          from a React Native gesture event).
+     * @param y Touch Y coordinate, in WINDOW coordinates (must match the
+     *          coordinate system of `measureInWindow` — typically `pageY`
+     *          from a React Native gesture event). On Android with edge-to-edge
+     *          enabled, ensure `pageY` excludes the status bar to stay
+     *          consistent with `measureInWindow`.
+     * @param screenName Optional screen name (defaults to current screen).
+     * @param extra Optional extra data to attach to the event.
+     */
     trackTouch(x: number, y: number, screenName?: string, extra?: Record<string, any>): void;
     trackNavigation(fromScreen: string, toScreen: string): void;
     trackCustomEvent(eventName: string, data?: Record<string, any>): void;
@@ -29,8 +55,32 @@ export declare class AppAnalytics {
      * or manually from the host app's ScrollView onScroll handler.
      * The offset is added to touch Y coordinates for accurate heatmaps
      * on scrollable screens.
+     *
+     * @deprecated Prefer registerScrollView + updateScrollViewOffset for
+     * auto-detection of fixed vs scrollable touches. Kept for backward compat.
      */
     setScrollOffset(y: number): void;
+    /**
+     * Register a ScrollView's window-relative bounds with the SDK.
+     * Called by RepliqoScrollView on layout. Used to auto-detect whether
+     * a touch is on scrollable content or on fixed UI (nav bars, headers).
+     */
+    registerScrollView(id: string, bounds: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }): void;
+    /**
+     * Update the scroll offset for a previously-registered ScrollView.
+     * Called by RepliqoScrollView on every scroll event.
+     */
+    updateScrollViewOffset(id: string, scrollOffsetY: number): void;
+    /**
+     * Remove a ScrollView from the registry. Called by RepliqoScrollView
+     * on unmount.
+     */
+    unregisterScrollView(id: string): void;
     /**
      * Capture the current viewport as a tile for collaborative screen
      * building. Called by RepliqoScrollView on scroll stops.

package/dist/core/client.js

@@ -18,6 +18,18 @@ class AppAnalytics {
         this.currentScreenEnteredAt = null;
         this.scrollOffsetY = 0;
         this.appStateSubscription = null;
+        /**
+         * Registry of active ScrollViews on the current screen.
+         * Each RepliqoScrollView registers its window-relative bounds and current
+         * scroll state. Used by trackTouch to auto-detect:
+         *   - If touch is INSIDE a ScrollView → adjust Y by that ScrollView's
+         *     scrollOffset, mark as content touch
+         *   - If touch is OUTSIDE all ScrollViews → mark as fixed UI (no adjust)
+         *
+         * This makes heatmaps render fixed elements (nav bars, headers) at their
+         * viewport position, while still mapping scrollable content correctly.
+         */
+        this.scrollViewRegistry = new Map();
         this.config = (0, config_1.resolveConfig)(config);
         this.logger = new logger_1.Logger(this.config.debug);
         this.apiClient = new api_client_1.ApiClient(config_1.REPLIQO_API_URL, this.config.apiKey, this.logger);
@@ -155,6 +167,20 @@ class AppAnalytics {
             this.snapshotCapture.setSessionId(null);
         }
     }
+    /**
+     * Track a touch event for heatmap analysis.
+     *
+     * @param x Touch X coordinate, in WINDOW coordinates (must match the
+     *          coordinate system of `measureInWindow` — typically `pageX`
+     *          from a React Native gesture event).
+     * @param y Touch Y coordinate, in WINDOW coordinates (must match the
+     *          coordinate system of `measureInWindow` — typically `pageY`
+     *          from a React Native gesture event). On Android with edge-to-edge
+     *          enabled, ensure `pageY` excludes the status bar to stay
+     *          consistent with `measureInWindow`.
+     * @param screenName Optional screen name (defaults to current screen).
+     * @param extra Optional extra data to attach to the event.
+     */
     trackTouch(x, y, screenName, extra) {
         if (!this.sessionId) {
             this.logger.warn('Cannot track touch: no active session');
@@ -163,14 +189,60 @@ class AppAnalytics {
         if (!this.config.enableTouchTracking) {
             return;
         }
-        // Adjust Y by the current scroll offset so touches map to content
-        // position, not just viewport position. This makes heatmaps accurate
-        // for scrollable screens.
-        const adjustedY = y + this.scrollOffsetY;
+        // Auto-detect: find which (if any) registered ScrollView contains
+        // this touch. If multiple match (nested ScrollViews, e.g. FlatList
+        // inside ScrollView), pick the SMALLEST by area — the most-nested
+        // one is the actual scroll context for that touch.
+        let bestMatchOffset = 0;
+        let bestMatchArea = Infinity;
+        let foundMatch = false;
+        for (const info of this.scrollViewRegistry.values()) {
+            const { bounds } = info;
+            if (x >= bounds.x &&
+                x <= bounds.x + bounds.width &&
+                y >= bounds.y &&
+                y <= bounds.y + bounds.height) {
+                const area = bounds.width * bounds.height;
+                if (area < bestMatchArea) {
+                    bestMatchArea = area;
+                    bestMatchOffset = info.scrollOffsetY;
+                    foundMatch = true;
+                }
+            }
+        }
+        let activeScrollOffset;
+        let isFixed;
+        if (foundMatch) {
+            // Touch is inside a registered ScrollView → content touch
+            activeScrollOffset = bestMatchOffset;
+            isFixed = false;
+        }
+        else if (this.scrollViewRegistry.size > 0) {
+            // ScrollViews ARE registered, but this touch is outside all of them
+            // → it's on fixed UI (nav bar, header, etc.)
+            activeScrollOffset = 0;
+            isFixed = true;
+        }
+        else {
+            // No ScrollViews registered at all. Two possible cases:
+            //   (a) The screen has no scrollable content → touch is fixed
+            //   (b) RepliqoScrollView hasn't measured yet (first ~1 frame)
+            // Either way, marking as fixed is safer than guessing content
+            // position with stale scrollOffsetY from a previous screen.
+            activeScrollOffset = 0;
+            isFixed = true;
+        }
+        const adjustedY = y + activeScrollOffset;
         const event = {
             type: 'touch',
             screenName: screenName || this.currentScreen || undefined,
-            data: { x, y: adjustedY, scrollOffsetY: this.scrollOffsetY, ...extra },
+            data: {
+                x,
+                y: adjustedY,
+                scrollOffsetY: activeScrollOffset,
+                isFixed,
+                ...extra,
+            },
             timestamp: new Date().toISOString(),
         };
         this.eventQueue.add(event);
@@ -219,10 +291,42 @@ class AppAnalytics {
      * or manually from the host app's ScrollView onScroll handler.
      * The offset is added to touch Y coordinates for accurate heatmaps
      * on scrollable screens.
+     *
+     * @deprecated Prefer registerScrollView + updateScrollViewOffset for
+     * auto-detection of fixed vs scrollable touches. Kept for backward compat.
      */
     setScrollOffset(y) {
         this.scrollOffsetY = y;
     }
+    /**
+     * Register a ScrollView's window-relative bounds with the SDK.
+     * Called by RepliqoScrollView on layout. Used to auto-detect whether
+     * a touch is on scrollable content or on fixed UI (nav bars, headers).
+     */
+    registerScrollView(id, bounds) {
+        const existing = this.scrollViewRegistry.get(id);
+        this.scrollViewRegistry.set(id, {
+            bounds,
+            scrollOffsetY: existing?.scrollOffsetY ?? 0,
+        });
+    }
+    /**
+     * Update the scroll offset for a previously-registered ScrollView.
+     * Called by RepliqoScrollView on every scroll event.
+     */
+    updateScrollViewOffset(id, scrollOffsetY) {
+        const existing = this.scrollViewRegistry.get(id);
+        if (existing) {
+            existing.scrollOffsetY = scrollOffsetY;
+        }
+    }
+    /**
+     * Remove a ScrollView from the registry. Called by RepliqoScrollView
+     * on unmount.
+     */
+    unregisterScrollView(id) {
+        this.scrollViewRegistry.delete(id);
+    }
     /**
      * Capture the current viewport as a tile for collaborative screen
      * building. Called by RepliqoScrollView on scroll stops.
@@ -282,6 +386,8 @@ class AppAnalytics {
         this.currentScreen = screenName;
         this.currentScreenEnteredAt = new Date().toISOString();
         this.scrollOffsetY = 0;
+        // Clear the ScrollView registry — old screen's scrollviews are gone
+        this.scrollViewRegistry.clear();
         this.errorTracker?.setCurrentScreen(screenName);
         this.snapshotCapture?.setCurrentScreen(screenName);
         // NOTE: autoScanScreen (PixelCopy / programmatic scroll) is DISABLED.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repliqo/sdk-react-native",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Session replay & analytics SDK for React Native. Captures screenshots (including modals/alerts), navigation, screen visits, and custom events.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/RepliqoScrollView.tsx

@@ -1,6 +1,7 @@
 import React, { useCallback, useRef, useEffect } from 'react';
 import {
   ScrollView,
+  Keyboard,
   type ScrollViewProps,
   type NativeSyntheticEvent,
   type NativeScrollEvent,
@@ -20,36 +21,102 @@ const THROTTLE_MS = 400;
  * where the user never pauses long enough for the debounce to fire.
  */
 const SCROLL_INTERVAL_MS = 1200;
+/**
+ * During scroll, throttle window-bounds re-measurement to at most once per
+ * this many ms. Bounds rarely change while scrolling, but we still want to
+ * catch orientation changes / keyboard / overlay animations.
+ */
+const REMEASURE_THROTTLE_MS = 500;
+
+let scrollViewIdCounter = 0;
+const nextScrollViewId = () => `repliqo-scroll-${++scrollViewIdCounter}`;
 
 /**
  * Drop-in replacement for React Native's ScrollView that:
  *
  *  1. Reports scroll offset for accurate heatmap touch coords
  *  2. Captures viewport tiles on scroll stops AND during continuous
- *     scroll for collaborative screen building — the backend composites
- *     these into a full-content image over time
+ *     scroll for collaborative screen building
+ *  3. Registers its window-relative bounds with the SDK so touches can
+ *     be auto-classified as "content" (inside ScrollView) or "fixed"
+ *     (outside, e.g. nav bars/headers)
  */
 export const RepliqoScrollView = React.forwardRef<ScrollView, ScrollViewProps>(
   ({ onScroll, onMomentumScrollEnd, onScrollEndDrag, onLayout, onContentSizeChange, ...props }, ref) => {
     const debounceTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
     const scrollIntervalTimer = useRef<ReturnType<typeof setInterval> | null>(null);
+    const initialLayoutTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
     const lastCaptureTime = useRef(0);
     const lastCaptureY = useRef(-999);
+    const lastMeasureTime = useRef(0);
     const initialCaptured = useRef(false);
     const realContentHeight = useRef(0);
+    const scrollViewId = useRef<string>(nextScrollViewId());
+    const innerRef = useRef<ScrollView | null>(null);
+    const isMounted = useRef(true);
     const scrollState = useRef<{
       offsetY: number;
       viewportHeight: number;
       contentHeight: number;
     } | null>(null);
 
-    // Cleanup timers on unmount
+    // Forward the inner ref to the parent's ref (if provided).
+    // IMPORTANT: do NOT clear innerRef on cleanup — RN sometimes calls the
+    // ref callback with null mid-update, and clearing would break async
+    // measurement callbacks that fire after the ref reattaches.
+    const setRef = useCallback((node: ScrollView | null) => {
+      if (node !== null) {
+        innerRef.current = node;
+      }
+      if (typeof ref === 'function') {
+        ref(node);
+      } else if (ref) {
+        (ref as React.MutableRefObject<ScrollView | null>).current = node;
+      }
+    }, [ref]);
+
+    /**
+     * Measure window-relative bounds and register with SDK.
+     * Idempotent + safe to call after unmount (guards via isMounted).
+     */
+    const measureAndRegister = useCallback(() => {
+      if (!isMounted.current) return;
+      const node = innerRef.current as any;
+      if (!node || typeof node.measureInWindow !== 'function') return;
+      node.measureInWindow((x: number, y: number, width: number, height: number) => {
+        if (!isMounted.current) return;
+        // RN sometimes returns 0/0 dims before the view is positioned —
+        // ignore those, the next onLayout/onScroll will re-measure.
+        if (width <= 0 || height <= 0) return;
+        try {
+          AppAnalytics.getInstance().registerScrollView(scrollViewId.current, {
+            x, y, width, height,
+          });
+        } catch {}
+      });
+    }, []);
+
+    // Cleanup all timers + unregister + listeners on unmount
     useEffect(() => {
+      const id = scrollViewId.current;
+      isMounted.current = true;
+
+      // Re-measure when keyboard appears/disappears (causes layout shift)
+      const showSub = Keyboard.addListener('keyboardDidShow', measureAndRegister);
+      const hideSub = Keyboard.addListener('keyboardDidHide', measureAndRegister);
+
       return () => {
+        isMounted.current = false;
         if (debounceTimer.current) clearTimeout(debounceTimer.current);
         if (scrollIntervalTimer.current) clearInterval(scrollIntervalTimer.current);
+        if (initialLayoutTimer.current) clearTimeout(initialLayoutTimer.current);
+        showSub.remove();
+        hideSub.remove();
+        try {
+          AppAnalytics.getInstance().unregisterScrollView(id);
+        } catch {}
       };
-    }, []);
+    }, [measureAndRegister]);
 
     /**
      * Core tile capture logic. Reads from refs (stable across renders).
@@ -58,6 +125,7 @@ export const RepliqoScrollView = React.forwardRef<ScrollView, ScrollViewProps>(
      * @param force Skip throttle check (used for interval captures)
      */
     const doCapture = (force = false) => {
+      if (!isMounted.current) return;
       const state = scrollState.current;
       if (!state || state.viewportHeight <= 0) return;
 
@@ -102,11 +170,21 @@ export const RepliqoScrollView = React.forwardRef<ScrollView, ScrollViewProps>(
         const { contentOffset, layoutMeasurement, contentSize } =
           event.nativeEvent;
 
-        // Report scroll offset for touch coords
+        // Update SDK with current scroll offset (both legacy + new registry)
         try {
-          AppAnalytics.getInstance().setScrollOffset(contentOffset.y);
+          const sdk = AppAnalytics.getInstance();
+          sdk.setScrollOffset(contentOffset.y);
+          sdk.updateScrollViewOffset(scrollViewId.current, contentOffset.y);
         } catch {}
 
+        // Re-measure bounds occasionally during scroll — catches layout
+        // shifts from animations, keyboard, orientation changes, etc.
+        const now = Date.now();
+        if (now - lastMeasureTime.current > REMEASURE_THROTTLE_MS) {
+          lastMeasureTime.current = now;
+          measureAndRegister();
+        }
+
         // Update scroll state — use realContentHeight if available
         const bestContentHeight = realContentHeight.current > 0
           ? realContentHeight.current
@@ -126,12 +204,13 @@ export const RepliqoScrollView = React.forwardRef<ScrollView, ScrollViewProps>(
 
         // Capture initial tile (Y~0) on first scroll event with real dims
         if (!initialCaptured.current && contentOffset.y < 10) {
-          setTimeout(() => doCapture(), 200);
+          if (initialLayoutTimer.current) clearTimeout(initialLayoutTimer.current);
+          initialLayoutTimer.current = setTimeout(() => doCapture(), 200);
         }
 
         onScroll?.(event);
       },
-      [onScroll],
+      [onScroll, measureAndRegister],
     );
 
     const handleScrollEndDrag = useCallback(
@@ -159,7 +238,6 @@ export const RepliqoScrollView = React.forwardRef<ScrollView, ScrollViewProps>(
 
     const handleLayout = useCallback(
       (event: LayoutChangeEvent) => {
-        // Capture initial tile after layout (gets real viewportHeight)
         const { height } = event.nativeEvent.layout;
         if (!initialCaptured.current && height > 0) {
           scrollState.current = {
@@ -167,11 +245,17 @@ export const RepliqoScrollView = React.forwardRef<ScrollView, ScrollViewProps>(
             viewportHeight: height,
             contentHeight: realContentHeight.current || height,
           };
-          setTimeout(() => doCapture(), 1000);
+          // Clear any prior pending initial-capture timer before scheduling
+          if (initialLayoutTimer.current) clearTimeout(initialLayoutTimer.current);
+          initialLayoutTimer.current = setTimeout(() => doCapture(), 1000);
         }
+        // Register window-relative bounds immediately (no setTimeout).
+        // measureInWindow itself is async; if it returns 0/0 dims, the
+        // next onLayout / onScroll will retry — no race window.
+        measureAndRegister();
         onLayout?.(event);
       },
-      [onLayout],
+      [onLayout, measureAndRegister],
     );
 
     /**
@@ -193,7 +277,7 @@ export const RepliqoScrollView = React.forwardRef<ScrollView, ScrollViewProps>(
 
     return (
       <ScrollView
-        ref={ref}
+        ref={setRef}
         {...props}
         onScroll={handleScroll}
         onScrollEndDrag={handleScrollEndDrag}

package/src/core/client.ts

@@ -31,6 +31,25 @@ export class AppAnalytics {
   private logger: Logger;
   private appStateSubscription: { remove: () => void } | null = null;
 
+  /**
+   * Registry of active ScrollViews on the current screen.
+   * Each RepliqoScrollView registers its window-relative bounds and current
+   * scroll state. Used by trackTouch to auto-detect:
+   *   - If touch is INSIDE a ScrollView → adjust Y by that ScrollView's
+   *     scrollOffset, mark as content touch
+   *   - If touch is OUTSIDE all ScrollViews → mark as fixed UI (no adjust)
+   *
+   * This makes heatmaps render fixed elements (nav bars, headers) at their
+   * viewport position, while still mapping scrollable content correctly.
+   */
+  private scrollViewRegistry = new Map<
+    string,
+    {
+      bounds: { x: number; y: number; width: number; height: number };
+      scrollOffsetY: number;
+    }
+  >();
+
   private constructor(config: SDKConfig) {
     this.config = resolveConfig(config);
     this.logger = new Logger(this.config.debug);
@@ -231,6 +250,20 @@ export class AppAnalytics {
     }
   }
 
+  /**
+   * Track a touch event for heatmap analysis.
+   *
+   * @param x Touch X coordinate, in WINDOW coordinates (must match the
+   *          coordinate system of `measureInWindow` — typically `pageX`
+   *          from a React Native gesture event).
+   * @param y Touch Y coordinate, in WINDOW coordinates (must match the
+   *          coordinate system of `measureInWindow` — typically `pageY`
+   *          from a React Native gesture event). On Android with edge-to-edge
+   *          enabled, ensure `pageY` excludes the status bar to stay
+   *          consistent with `measureInWindow`.
+   * @param screenName Optional screen name (defaults to current screen).
+   * @param extra Optional extra data to attach to the event.
+   */
   trackTouch(
     x: number,
     y: number,
@@ -246,15 +279,65 @@ export class AppAnalytics {
       return;
     }
 
-    // Adjust Y by the current scroll offset so touches map to content
-    // position, not just viewport position. This makes heatmaps accurate
-    // for scrollable screens.
-    const adjustedY = y + this.scrollOffsetY;
+    // Auto-detect: find which (if any) registered ScrollView contains
+    // this touch. If multiple match (nested ScrollViews, e.g. FlatList
+    // inside ScrollView), pick the SMALLEST by area — the most-nested
+    // one is the actual scroll context for that touch.
+    let bestMatchOffset = 0;
+    let bestMatchArea = Infinity;
+    let foundMatch = false;
+
+    for (const info of this.scrollViewRegistry.values()) {
+      const { bounds } = info;
+      if (
+        x >= bounds.x &&
+        x <= bounds.x + bounds.width &&
+        y >= bounds.y &&
+        y <= bounds.y + bounds.height
+      ) {
+        const area = bounds.width * bounds.height;
+        if (area < bestMatchArea) {
+          bestMatchArea = area;
+          bestMatchOffset = info.scrollOffsetY;
+          foundMatch = true;
+        }
+      }
+    }
+
+    let activeScrollOffset: number;
+    let isFixed: boolean;
+
+    if (foundMatch) {
+      // Touch is inside a registered ScrollView → content touch
+      activeScrollOffset = bestMatchOffset;
+      isFixed = false;
+    } else if (this.scrollViewRegistry.size > 0) {
+      // ScrollViews ARE registered, but this touch is outside all of them
+      // → it's on fixed UI (nav bar, header, etc.)
+      activeScrollOffset = 0;
+      isFixed = true;
+    } else {
+      // No ScrollViews registered at all. Two possible cases:
+      //   (a) The screen has no scrollable content → touch is fixed
+      //   (b) RepliqoScrollView hasn't measured yet (first ~1 frame)
+      // Either way, marking as fixed is safer than guessing content
+      // position with stale scrollOffsetY from a previous screen.
+      activeScrollOffset = 0;
+      isFixed = true;
+    }
+
+    const adjustedY = y + activeScrollOffset;
 
     const event: AnalyticsEvent = {
       type: 'touch',
       screenName: screenName || this.currentScreen || undefined,
-      data: { x, y: adjustedY, scrollOffsetY: this.scrollOffsetY, ...extra },
+      data: {
+        x,
+        y: adjustedY,
+        scrollOffsetY: activeScrollOffset,
+        isFixed,
+        ...extra,
+      },
       timestamp: new Date().toISOString(),
     };
 
@@ -316,11 +399,49 @@ export class AppAnalytics {
    * or manually from the host app's ScrollView onScroll handler.
    * The offset is added to touch Y coordinates for accurate heatmaps
    * on scrollable screens.
+   *
+   * @deprecated Prefer registerScrollView + updateScrollViewOffset for
+   * auto-detection of fixed vs scrollable touches. Kept for backward compat.
    */
   setScrollOffset(y: number): void {
     this.scrollOffsetY = y;
   }
 
+  /**
+   * Register a ScrollView's window-relative bounds with the SDK.
+   * Called by RepliqoScrollView on layout. Used to auto-detect whether
+   * a touch is on scrollable content or on fixed UI (nav bars, headers).
+   */
+  registerScrollView(
+    id: string,
+    bounds: { x: number; y: number; width: number; height: number },
+  ): void {
+    const existing = this.scrollViewRegistry.get(id);
+    this.scrollViewRegistry.set(id, {
+      bounds,
+      scrollOffsetY: existing?.scrollOffsetY ?? 0,
+    });
+  }
+
+  /**
+   * Update the scroll offset for a previously-registered ScrollView.
+   * Called by RepliqoScrollView on every scroll event.
+   */
+  updateScrollViewOffset(id: string, scrollOffsetY: number): void {
+    const existing = this.scrollViewRegistry.get(id);
+    if (existing) {
+      existing.scrollOffsetY = scrollOffsetY;
+    }
+  }
+
+  /**
+   * Remove a ScrollView from the registry. Called by RepliqoScrollView
+   * on unmount.
+   */
+  unregisterScrollView(id: string): void {
+    this.scrollViewRegistry.delete(id);
+  }
+
   /**
    * Capture the current viewport as a tile for collaborative screen
    * building. Called by RepliqoScrollView on scroll stops.
@@ -414,6 +535,8 @@ export class AppAnalytics {
     this.currentScreen = screenName;
     this.currentScreenEnteredAt = new Date().toISOString();
     this.scrollOffsetY = 0;
+    // Clear the ScrollView registry — old screen's scrollviews are gone
+    this.scrollViewRegistry.clear();
     this.errorTracker?.setCurrentScreen(screenName);
     this.snapshotCapture?.setCurrentScreen(screenName);
     // NOTE: autoScanScreen (PixelCopy / programmatic scroll) is DISABLED.