react-native-netmera 2.1.0-beta01 → 2.1.0-beta03

package/README.md

@@ -555,13 +555,20 @@ Netmera Autotracking automatically captures screen transitions via **React Navig
 
 ### NetmeraAnalyticProvider
 
-Wrap your `NavigationContainer` (or your root component) with `NetmeraAnalyticProvider`. The provider handles both screen tracking and tap tracking based on the configuration received from the Netmera dashboard.
+Wrap your app with `NetmeraAnalyticProvider` and pass a `navigationRef` so the provider can subscribe to screen changes. The provider handles both screen tracking and tap tracking based on the configuration received from the Netmera dashboard.
+
+**Dynamic API** (React Navigation v6 / v7):
 
 ```tsx
+import { useNavigationContainerRef, NavigationContainer } from '@react-navigation/native';
+import { NetmeraAnalyticProvider } from 'react-native-netmera';
+
 export default function App() {
+  const navigationRef = useNavigationContainerRef();
+
   return (
-    <NetmeraAnalyticProvider>
-      <NavigationContainer>
+    <NetmeraAnalyticProvider navigationRef={navigationRef}>
+      <NavigationContainer ref={navigationRef}>
         {/* your navigators */}
       </NavigationContainer>
     </NetmeraAnalyticProvider>
@@ -569,29 +576,27 @@ export default function App() {
 }
 ```
 
-### React Navigation v6 and below
-
-On **React Navigation v7+** the provider locates the navigation container automatically via the React fiber tree (no extra configuration needed).
-
-On **React Navigation v6 and below** the fiber-based detection is not available. Pass an explicit `navigationRef` prop so the provider can subscribe to screen changes:
+**Static API** (React Navigation v7):
 
 ```tsx
-import { useNavigationContainerRef, NavigationContainer } from '@react-navigation/native';
+import { useNavigationContainerRef, createStaticNavigation } from '@react-navigation/native';
 import { NetmeraAnalyticProvider } from 'react-native-netmera';
 
+const Navigation = createStaticNavigation(RootStack);
+
 export default function App() {
   const navigationRef = useNavigationContainerRef();
 
   return (
     <NetmeraAnalyticProvider navigationRef={navigationRef}>
-      <NavigationContainer ref={navigationRef}>
-        {/* your navigators */}
-      </NavigationContainer>
+      <Navigation ref={navigationRef} />
     </NetmeraAnalyticProvider>
   );
 }
 ```
 
+> **Note:** Use a single `NetmeraAnalyticProvider` per application. The current screen name is stored in a module-level singleton — mounting multiple providers simultaneously will cause them to overwrite each other's screen state.
+
 ### Manual action tracking with `Netmera.trackAction`
 
 For components that do not fire standard `onPress` or `onValueChange` events (e.g. third-party dropdowns, custom pickers, gesture-only views), call `Netmera.trackAction` to record the interaction manually.
@@ -614,7 +619,7 @@ When a tap is detected, Netmera resolves an identifier for the tapped component
 1. **`accessibilityLabel`** — the preferred identifier; human-readable and stable.
 2. **`testID`** — used when `accessibilityLabel` is absent.
 3. **`placeholder`** — for `TextInput` components with no label or testID.
-4. **Child text content** — the text of the first `<Text>` descendant, trimmed to 50 characters.
+4. **Child text content** — the text of the first `<Text>` descendant.
 
 If none of the above resolves to a non-empty string the tap is not recorded.
 

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraModule.kt

@@ -63,7 +63,7 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   fun checkNotificationPermission(): String {
-    val activity: Activity? = reactContext.currentActivity
+    val activity: Activity? = reactContext?.currentActivity
     return if (activity != null) {
       Netmera.checkNotificationPermission(activity).toString()
     } else {
@@ -74,7 +74,7 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun requestPushNotificationAuthorization(promise: Promise) {
-    val activity: Activity? = reactContext.currentActivity
+    val activity: Activity? = reactContext?.currentActivity
     if (activity == null) {
       promise.reject(
         ERROR_CODE_INVALID_ACTIVITY,
@@ -702,18 +702,18 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
     const val ERROR_MESSAGE_NOTIFICATION_PERMISSION =
       "Error occurred while requesting notification permission. "
 
-    private lateinit var reactContext: ReactApplicationContext
+    var reactContext: ReactApplicationContext? = null
 
     fun emitEvent(eventName: String, eventData: String) {
       reactContext
-        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-        .emit(eventName, eventData)
+        ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+        ?.emit(eventName, eventData)
     }
 
     fun emitEvent(eventName: String, eventData: WritableMap) {
       reactContext
-        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-        .emit(eventName, eventData)
+        ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+        ?.emit(eventName, eventData)
     }
 
     private fun hasKey(map: MutableMap<*, *>, key: String?): Boolean {

package/ios/RNNetmeraRCTEventEmitter.swift

@@ -154,6 +154,8 @@ public class RNNetmeraRCTEventEmitter: RCTEventEmitter {
 
   static func onAutoTrackConfigUpdate(_ body: [String: Bool]) {
     guard let emitter = emitterInstance else { return }
-    emitter.sendEvent(withName: EventName.onAutoTrackConfigUpdate, body: body)
+    DispatchQueue.main.async {
+      emitter.sendEvent(withName: EventName.onAutoTrackConfigUpdate, body: body)
+    }
   }
 }

package/lib/module/NetmeraAnalyticProvider.js

@@ -5,58 +5,63 @@
  */
 
 import React, { useEffect, useRef, useState } from 'react';
-import { NativeEventEmitter, NativeModules, StyleSheet, View } from 'react-native';
+import { NativeModules, StyleSheet, View } from 'react-native';
+import { netmeraRCTEventEmitter } from "./utils/RNNetmera.js";
 import { useNavigationTracking } from "./autotracking/useNavigationTracking.js";
 import { useTapTracking } from "./autotracking/useTapTracking.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Wraps your app to enable automatic screen tracking and tap tracking.
- *
- *   <NetmeraAnalyticProvider>
- *     <NavigationContainer>…</NavigationContainer>
- *   </NetmeraAnalyticProvider>
+ * Place it outside your NavigationContainer (or Static Navigation component).
  */
 export function NetmeraAnalyticProvider({
   children,
   navigationRef
 }) {
-  const viewRef = useRef(null);
   const [config, setConfig] = useState(null);
   const appliedConfigRef = useRef(null);
-  const applyConfig = cfg => {
-    const prev = appliedConfigRef.current;
-    if (prev?.isScreenFlowEnabled === cfg.isScreenFlowEnabled && prev?.isInputActionEnabled === cfg.isInputActionEnabled && prev?.shouldCollectValues === cfg.shouldCollectValues) return;
-    appliedConfigRef.current = cfg;
-    setConfig(cfg);
-    console.log('[NMAutotrack] screen tracking ', cfg.isScreenFlowEnabled ? 'enabled' : 'disabled');
-    console.log('[NMAutotrack] input action tracking ', cfg.isInputActionEnabled ? 'enabled' : 'disabled');
+  const applyConfig = incomingConfig => {
+    const currentConfig = appliedConfigRef.current;
+    if (currentConfig?.isScreenFlowEnabled === incomingConfig.isScreenFlowEnabled && currentConfig?.isInputActionEnabled === incomingConfig.isInputActionEnabled && currentConfig?.shouldCollectValues === incomingConfig.shouldCollectValues) {
+      return;
+    }
+    appliedConfigRef.current = incomingConfig;
+    setConfig(incomingConfig);
+    if (__DEV__) {
+      console.log('[NMAutotrack] screen tracking', incomingConfig.isScreenFlowEnabled ? 'enabled' : 'disabled');
+      console.log('[NMAutotrack] input action tracking', incomingConfig.isInputActionEnabled ? `enabled ${incomingConfig.shouldCollectValues ? 'with' : 'without'} collection values` : 'disabled');
+    }
   };
   useEffect(() => {
-    NativeModules.RNNetmera?.getAutoTrackConfig?.()?.then(cfg => {
-      if (cfg) applyConfig(cfg);
+    NativeModules.RNNetmera?.getAutoTrackConfig?.()?.then(fetchedConfig => {
+      if (fetchedConfig) {
+        applyConfig(fetchedConfig);
+      }
     })?.catch(_err => {});
   }, []);
   useEffect(() => {
-    const emitter = new NativeEventEmitter(NativeModules.RNNetmeraRCTEventEmitter);
-    const subscription = emitter.addListener('onAutoTrackConfigUpdate', cfg => {
-      if (cfg) applyConfig(cfg);
+    const subscription = netmeraRCTEventEmitter.addListener('onAutoTrackConfigUpdate', updatedConfig => {
+      if (updatedConfig) {
+        applyConfig(updatedConfig);
+      }
     });
     return () => subscription.remove();
   }, []);
   const screenFlowEnabled = config?.isScreenFlowEnabled ?? false;
   const inputActionEnabled = config?.isInputActionEnabled ?? false;
   const shouldCollectValues = config?.shouldCollectValues ?? false;
-  const navigationEnabled = screenFlowEnabled || inputActionEnabled;
-  useNavigationTracking(viewRef, navigationRef, navigationEnabled, screenFlowEnabled);
+
+  // Navigation tracking is needed whenever either flag is on: screen events
+  // need it for trackView, action events need it for the screen-name prefix.
+  useNavigationTracking(navigationRef, screenFlowEnabled || inputActionEnabled, screenFlowEnabled);
   const {
     onTouchStart,
     onTouchEnd
   } = useTapTracking(inputActionEnabled, shouldCollectValues);
   return /*#__PURE__*/_jsx(View, {
-    ref: navigationEnabled ? viewRef : undefined,
     style: styles.container,
-    onTouchStart: onTouchStart,
-    onTouchEnd: onTouchEnd,
+    onTouchStart: inputActionEnabled ? onTouchStart : undefined,
+    onTouchEnd: inputActionEnabled ? onTouchEnd : undefined,
     children: children
   });
 }

package/lib/module/NetmeraAnalyticProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useRef","useState","NativeEventEmitter","NativeModules","StyleSheet","View","useNavigationTracking","useTapTracking","jsx","_jsx","NetmeraAnalyticProvider","children","navigationRef","viewRef","config","setConfig","appliedConfigRef","applyConfig","cfg","prev","current","isScreenFlowEnabled","isInputActionEnabled","shouldCollectValues","console","log","RNNetmera","getAutoTrackConfig","then","catch","_err","emitter","RNNetmeraRCTEventEmitter","subscription","addListener","remove","screenFlowEnabled","inputActionEnabled","navigationEnabled","onTouchStart","onTouchEnd","ref","undefined","style","styles","container","create","flex"],"sourceRoot":"../../src","sources":["NetmeraAnalyticProvider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useRef","useState","NativeModules","StyleSheet","View","netmeraRCTEventEmitter","useNavigationTracking","useTapTracking","jsx","_jsx","NetmeraAnalyticProvider","children","navigationRef","config","setConfig","appliedConfigRef","applyConfig","incomingConfig","currentConfig","current","isScreenFlowEnabled","isInputActionEnabled","shouldCollectValues","__DEV__","console","log","RNNetmera","getAutoTrackConfig","then","fetchedConfig","catch","_err","subscription","addListener","updatedConfig","remove","screenFlowEnabled","inputActionEnabled","onTouchStart","onTouchEnd","style","styles","container","undefined","create","flex"],"sourceRoot":"../../src","sources":["NetmeraAnalyticProvider.tsx"],"mappings":";;AAAA;AACA;AACA;;AAEA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AAC1D,SAASC,aAAa,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC9D,SAASC,sBAAsB,QAAQ,sBAAmB;AAC1D,SAASC,qBAAqB,QAAQ,yCAAsC;AAC5E,SAASC,cAAc,QAAQ,kCAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAiC/D;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAAC;EACtCC,QAAQ;EACRC;AAC4B,CAAC,EAAE;EAC/B,MAAM,CAACC,MAAM,EAAEC,SAAS,CAAC,GAAGb,QAAQ,CAAyB,IAAI,CAAC;EAClE,MAAMc,gBAAgB,GAAGf,MAAM,CAAyB,IAAI,CAAC;EAE7D,MAAMgB,WAAW,GAAIC,cAA+B,IAAK;IACvD,MAAMC,aAAa,GAAGH,gBAAgB,CAACI,OAAO;IAC9C,IACED,aAAa,EAAEE,mBAAmB,KAChCH,cAAc,CAACG,mBAAmB,IACpCF,aAAa,EAAEG,oBAAoB,KACjCJ,cAAc,CAACI,oBAAoB,IACrCH,aAAa,EAAEI,mBAAmB,KAAKL,cAAc,CAACK,mBAAmB,EACzE;MACA;IACF;IACAP,gBAAgB,CAACI,OAAO,GAAGF,cAAc;IACzCH,SAAS,CAACG,cAAc,CAAC;IACzB,IAAIM,OAAO,EAAE;MACXC,OAAO,CAACC,GAAG,CACT,+BAA+B,EAC/BR,cAAc,CAACG,mBAAmB,GAAG,SAAS,GAAG,UACnD,CAAC;MACDI,OAAO,CAACC,GAAG,CACT,qCAAqC,EACrCR,cAAc,CAACI,oBAAoB,GAC/B,WAAWJ,cAAc,CAACK,mBAAmB,GAAG,MAAM,GAAG,SAAS,oBAAoB,GACtF,UACN,CAAC;IACH;EACF,CAAC;EAEDvB,SAAS,CAAC,MAAM;IACdG,aAAa,CAACwB,SAAS,EAAEC,kBAAkB,GAAG,CAAC,EAC3CC,IAAI,CAAEC,aAAqC,IAAK;MAChD,IAAIA,aAAa,EAAE;QACjBb,WAAW,CAACa,aAAa,CAAC;MAC5B;IACF,CAAC,CAAC,EACAC,KAAK,CAAEC,IAAa,IAAK,CAAC,CAAC,CAAC;EAClC,CAAC,EAAE,EAAE,CAAC;EAENhC,SAAS,CAAC,MAAM;IACd,MAAMiC,YAAY,GAAG3B,sBAAsB,CAAC4B,WAAW,CACrD,yBAAyB,EACxBC,aAA8B,IAAK;MAClC,IAAIA,aAAa,EAAE;QACjBlB,WAAW,CAACkB,aAAa,CAAC;MAC5B;IACF,CACF,CAAC;IACD,OAAO,MAAMF,YAAY,CAACG,MAAM,CAAC,CAAC;EACpC,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,iBAAiB,GAAGvB,MAAM,EAAEO,mBAAmB,IAAI,KAAK;EAC9D,MAAMiB,kBAAkB,GAAGxB,MAAM,EAAEQ,oBAAoB,IAAI,KAAK;EAChE,MAAMC,mBAAmB,GAAGT,MAAM,EAAES,mBAAmB,IAAI,KAAK;;EAEhE;EACA;EACAhB,qBAAqB,CACnBM,aAAa,EACbwB,iBAAiB,IAAIC,kBAAkB,EACvCD,iBACF,CAAC;EACD,MAAM;IAAEE,YAAY;IAAEC;EAAW,CAAC,GAAGhC,cAAc,CACjD8B,kBAAkB,EAClBf,mBACF,CAAC;EAED,oBACEb,IAAA,CAACL,IAAI;IACHoC,KAAK,EAAEC,MAAM,CAACC,SAAU;IACxBJ,YAAY,EAAED,kBAAkB,GAAGC,YAAY,GAAGK,SAAU;IAC5DJ,UAAU,EAAEF,kBAAkB,GAAGE,UAAU,GAAGI,SAAU;IAAAhC,QAAA,EAEvDA;EAAQ,CACL,CAAC;AAEX;AAEA,MAAM8B,MAAM,GAAGtC,UAAU,CAACyC,MAAM,CAAC;EAC/BF,SAAS,EAAE;IAAEG,IAAI,EAAE;EAAE;AACvB,CAAC,CAAC","ignoreList":[]}

package/lib/module/autotracking/useNavigationTracking.js

@@ -4,75 +4,42 @@
  * Copyright (c) 2026 Netmera Research.
  */
 
-import React, { useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 import { setCurrentScreen } from "./NetmeraNavigationState.js";
 import { RNNetmera } from "../utils/RNNetmera.js";
 
-// ContextProvider fiber tag — stable React internal constant since React 16.
-const CONTEXT_PROVIDER_TAG = 10;
-const NAV_SEARCH_DEPTH = 25;
-
-// Duck-type check: React Navigation v5/v6/v7 all expose this surface on the container ref.
+// Duck-type check: React Navigation v5/v6/v7 all expose this surface.
 function isNavContainerRef(value) {
   return value != null && typeof value.addListener === 'function' && typeof value.getCurrentRoute === 'function' && typeof value.isReady === 'function';
 }
 
-// DFS through child fibers to find NavigationContainerRefContext.Provider.
-// Siblings walk at the same depth — they sit at the same level in the tree.
-function findNavContainerRef(fiber, depth = 0) {
-  if (!fiber || depth > NAV_SEARCH_DEPTH) return null;
-  if (fiber.tag === CONTEXT_PROVIDER_TAG && isNavContainerRef(fiber.memoizedProps?.value)) {
-    return fiber.memoizedProps.value;
-  }
-  return findNavContainerRef(fiber.child, depth + 1) ?? findNavContainerRef(fiber.sibling, depth);
-}
-
 /**
  * Subscribes to React Navigation screen changes and keeps NetmeraNavigationState
- * up to date. Resolves the navigation container ref via two paths:
+ * up to date.
  *
- * - New Arch (Fabric): auto-detected through the fiber tree via viewRef.
- * - Old Arch (Paper):  caller passes navigationRef prop explicitly.
+ * Requires a valid navigation container ref — pass the same ref to both
+ * NetmeraAnalyticProvider and NavigationContainer (or the component created
+ * by createStaticNavigation).
  *
- * Silently no-ops if neither path yields a valid ref.
- * Respects the isScreenFlowEnabled flag — screen changes are ignored when disabled.
+ * Silently no-ops when navigationRef is absent or not yet populated.
+ * Respects the enabled flag — screen changes are ignored when disabled.
  */
-export function useNavigationTracking(viewRef, navigationRef, enabled, screenLogEnabled) {
-  // React 18: capture own fiber during render via ReactCurrentOwner.
-  // React 19 removed ReactCurrentOwner — this silently yields null, which is fine
-  // because the Fabric path (viewRef.__internalInstanceHandle) covers React 19.
+export function useNavigationTracking(navigationRef, enabled, screenLogEnabled) {
   const screenLogEnabledRef = useRef(screenLogEnabled);
+  const lastEmittedRouteRef = useRef(null);
   useEffect(() => {
     screenLogEnabledRef.current = screenLogEnabled;
   }, [screenLogEnabled]);
-  const selfFiberRef = useRef(null);
-  if (selfFiberRef.current === null) {
-    try {
-      const R = React;
-      selfFiberRef.current = R.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED?.ReactCurrentOwner?.current ?? null;
-    } catch (_) {}
-  }
   useEffect(() => {
-    if (!enabled) return;
-    let navRef = null;
-
-    // Path 1 — New Arch: ReactNativeElement exposes its fiber via __internalInstanceHandle.
-    // Guard with 'child' in candidate to confirm it's a fiber, not another host object.
-    const candidate = viewRef.current?.__internalInstanceHandle;
-    const viewFiber = candidate != null && 'child' in candidate ? candidate : selfFiberRef.current?.child ?? null;
-    if (viewFiber) {
-      navRef = findNavContainerRef(viewFiber);
-    }
-
-    // Path 2 — Old Arch: use the ref passed explicitly via prop.
-    if (!navRef && isNavContainerRef(navigationRef?.current)) {
-      navRef = navigationRef.current;
+    if (!enabled || !isNavContainerRef(navigationRef?.current)) {
+      return;
     }
-    if (!navRef) return;
+    const navRef = navigationRef.current;
     const handleChange = () => {
       try {
         const route = navRef.getCurrentRoute();
-        if (route?.name) {
+        if (route?.name && route.name !== lastEmittedRouteRef.current) {
+          lastEmittedRouteRef.current = route.name;
           setCurrentScreen(route.name);
           if (screenLogEnabledRef.current) {
             RNNetmera.trackView(route.name);
@@ -82,9 +49,8 @@ export function useNavigationTracking(viewRef, navigationRef, enabled, screenLog
     };
     const unsubState = navRef.addListener('state', handleChange);
 
-    // NavigationContainer's effects run before ours (child-first), so 'ready' has
-    // already fired. isReady() captures the initial screen synchronously; the 'ready'
-    // listener is a safety net for async startup (deferred auth, deep links, etc.).
+    // NavigationContainer's effects (child) run before ours (parent), so the ref
+    // is already populated and isReady() reflects the real mount state.
     let unsubReady;
     if (navRef.isReady()) {
       handleChange();
@@ -99,6 +65,6 @@ export function useNavigationTracking(viewRef, navigationRef, enabled, screenLog
       unsubState?.();
       unsubReady?.();
     };
-  }, [enabled]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [enabled, navigationRef]);
 }
 //# sourceMappingURL=useNavigationTracking.js.map

package/lib/module/autotracking/useNavigationTracking.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useRef","setCurrentScreen","RNNetmera","CONTEXT_PROVIDER_TAG","NAV_SEARCH_DEPTH","isNavContainerRef","value","addListener","getCurrentRoute","isReady","findNavContainerRef","fiber","depth","tag","memoizedProps","child","sibling","useNavigationTracking","viewRef","navigationRef","enabled","screenLogEnabled","screenLogEnabledRef","current","selfFiberRef","R","__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED","ReactCurrentOwner","_","navRef","candidate","__internalInstanceHandle","viewFiber","handleChange","route","name","trackView","unsubState","unsubReady","undefined"],"sourceRoot":"../../../src","sources":["autotracking/useNavigationTracking.ts"],"mappings":";;AAAA;AACA;AACA;;AAEA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAChD,SAASC,gBAAgB,QAAQ,6BAA0B;AAC3D,SAASC,SAAS,QAAQ,uBAAoB;;AAE9C;AACA,MAAMC,oBAAoB,GAAG,EAAE;AAC/B,MAAMC,gBAAgB,GAAG,EAAE;;AAE3B;AACA,SAASC,iBAAiBA,CAACC,KAAU,EAAW;EAC9C,OACEA,KAAK,IAAI,IAAI,IACb,OAAOA,KAAK,CAACC,WAAW,KAAK,UAAU,IACvC,OAAOD,KAAK,CAACE,eAAe,KAAK,UAAU,IAC3C,OAAOF,KAAK,CAACG,OAAO,KAAK,UAAU;AAEvC;;AAEA;AACA;AACA,SAASC,mBAAmBA,CAACC,KAAU,EAAEC,KAAK,GAAG,CAAC,EAAO;EACvD,IAAI,CAACD,KAAK,IAAIC,KAAK,GAAGR,gBAAgB,EAAE,OAAO,IAAI;EACnD,IACEO,KAAK,CAACE,GAAG,KAAKV,oBAAoB,IAClCE,iBAAiB,CAACM,KAAK,CAACG,aAAa,EAAER,KAAK,CAAC,EAC7C;IACA,OAAOK,KAAK,CAACG,aAAa,CAACR,KAAK;EAClC;EACA,OACEI,mBAAmB,CAACC,KAAK,CAACI,KAAK,EAAEH,KAAK,GAAG,CAAC,CAAC,IAC3CF,mBAAmB,CAACC,KAAK,CAACK,OAAO,EAAEJ,KAAK,CAAC;AAE7C;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASK,qBAAqBA,CACnCC,OAA6B,EAC7BC,aAA+C,EAC/CC,OAAgB,EAChBC,gBAAyB,EACnB;EACN;EACA;EACA;EACA,MAAMC,mBAAmB,GAAGtB,MAAM,CAACqB,gBAAgB,CAAC;EAEpDtB,SAAS,CAAC,MAAM;IACduB,mBAAmB,CAACC,OAAO,GAAGF,gBAAgB;EAChD,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEtB,MAAMG,YAAY,GAAGxB,MAAM,CAAM,IAAI,CAAC;EACtC,IAAIwB,YAAY,CAACD,OAAO,KAAK,IAAI,EAAE;IACjC,IAAI;MACF,MAAME,CAAC,GAAG3B,KAAY;MACtB0B,YAAY,CAACD,OAAO,GAClBE,CAAC,CAACC,kDAAkD,EAAEC,iBAAiB,EACnEJ,OAAO,IAAI,IAAI;IACvB,CAAC,CAAC,OAAOK,CAAC,EAAE,CAAC;EACf;EAEA7B,SAAS,CAAC,MAAM;IACd,IAAI,CAACqB,OAAO,EAAE;IACd,IAAIS,MAAW,GAAG,IAAI;;IAEtB;IACA;IACA,MAAMC,SAAS,GAAGZ,OAAO,CAACK,OAAO,EAAEQ,wBAAwB;IAC3D,MAAMC,SAAc,GAClBF,SAAS,IAAI,IAAI,IAAI,OAAO,IAAIA,SAAS,GACrCA,SAAS,GACRN,YAAY,CAACD,OAAO,EAAER,KAAK,IAAI,IAAK;IAE3C,IAAIiB,SAAS,EAAE;MACbH,MAAM,GAAGnB,mBAAmB,CAACsB,SAAS,CAAC;IACzC;;IAEA;IACA,IAAI,CAACH,MAAM,IAAIxB,iBAAiB,CAACc,aAAa,EAAEI,OAAO,CAAC,EAAE;MACxDM,MAAM,GAAGV,aAAa,CAAEI,OAAO;IACjC;IAEA,IAAI,CAACM,MAAM,EAAE;IAEb,MAAMI,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAI;QACF,MAAMC,KAAK,GAAGL,MAAM,CAACrB,eAAe,CAAC,CAAC;QACtC,IAAI0B,KAAK,EAAEC,IAAI,EAAE;UACflC,gBAAgB,CAACiC,KAAK,CAACC,IAAI,CAAC;UAC5B,IAAIb,mBAAmB,CAACC,OAAO,EAAE;YAC/BrB,SAAS,CAACkC,SAAS,CAACF,KAAK,CAACC,IAAI,CAAC;UACjC;QACF;MACF,CAAC,CAAC,OAAOP,CAAC,EAAE,CAAC;IACf,CAAC;IAED,MAAMS,UAAU,GAAGR,MAAM,CAACtB,WAAW,CAAC,OAAO,EAAE0B,YAAY,CAAC;;IAE5D;IACA;IACA;IACA,IAAIK,UAAoC;IACxC,IAAIT,MAAM,CAACpB,OAAO,CAAC,CAAC,EAAE;MACpBwB,YAAY,CAAC,CAAC;IAChB,CAAC,MAAM;MACLK,UAAU,GAAGT,MAAM,CAACtB,WAAW,CAAC,OAAO,EAAE,MAAM;QAC7C0B,YAAY,CAAC,CAAC;QACdK,UAAU,GAAG,CAAC;QACdA,UAAU,GAAGC,SAAS;MACxB,CAAC,CAAC;IACJ;IAEA,OAAO,MAAM;MACXF,UAAU,GAAG,CAAC;MACdC,UAAU,GAAG,CAAC;IAChB,CAAC;EACH,CAAC,EAAE,CAAClB,OAAO,CAAC,CAAC,CAAC,CAAC;AACjB","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","setCurrentScreen","RNNetmera","isNavContainerRef","value","addListener","getCurrentRoute","isReady","useNavigationTracking","navigationRef","enabled","screenLogEnabled","screenLogEnabledRef","lastEmittedRouteRef","current","navRef","handleChange","route","name","trackView","_","unsubState","unsubReady","undefined"],"sourceRoot":"../../../src","sources":["autotracking/useNavigationTracking.ts"],"mappings":";;AAAA;AACA;AACA;;AAEA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAEzC,SAASC,gBAAgB,QAAQ,6BAA0B;AAC3D,SAASC,SAAS,QAAQ,uBAAoB;;AAE9C;AACA,SAASC,iBAAiBA,CAACC,KAAU,EAAW;EAC9C,OACEA,KAAK,IAAI,IAAI,IACb,OAAOA,KAAK,CAACC,WAAW,KAAK,UAAU,IACvC,OAAOD,KAAK,CAACE,eAAe,KAAK,UAAU,IAC3C,OAAOF,KAAK,CAACG,OAAO,KAAK,UAAU;AAEvC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,qBAAqBA,CACnCC,aAA+C,EAC/CC,OAAgB,EAChBC,gBAAyB,EACnB;EACN,MAAMC,mBAAmB,GAAGZ,MAAM,CAACW,gBAAgB,CAAC;EACpD,MAAME,mBAAmB,GAAGb,MAAM,CAAgB,IAAI,CAAC;EAEvDD,SAAS,CAAC,MAAM;IACda,mBAAmB,CAACE,OAAO,GAAGH,gBAAgB;EAChD,CAAC,EAAE,CAACA,gBAAgB,CAAC,CAAC;EAEtBZ,SAAS,CAAC,MAAM;IACd,IAAI,CAACW,OAAO,IAAI,CAACP,iBAAiB,CAACM,aAAa,EAAEK,OAAO,CAAC,EAAE;MAC1D;IACF;IAEA,MAAMC,MAAM,GAAGN,aAAa,CAAEK,OAAO;IAErC,MAAME,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAI;QACF,MAAMC,KAAK,GAAGF,MAAM,CAACT,eAAe,CAAC,CAAC;QACtC,IAAIW,KAAK,EAAEC,IAAI,IAAID,KAAK,CAACC,IAAI,KAAKL,mBAAmB,CAACC,OAAO,EAAE;UAC7DD,mBAAmB,CAACC,OAAO,GAAGG,KAAK,CAACC,IAAI;UACxCjB,gBAAgB,CAACgB,KAAK,CAACC,IAAI,CAAC;UAC5B,IAAIN,mBAAmB,CAACE,OAAO,EAAE;YAC/BZ,SAAS,CAACiB,SAAS,CAACF,KAAK,CAACC,IAAI,CAAC;UACjC;QACF;MACF,CAAC,CAAC,OAAOE,CAAC,EAAE,CAAC;IACf,CAAC;IAED,MAAMC,UAAU,GAAGN,MAAM,CAACV,WAAW,CAAC,OAAO,EAAEW,YAAY,CAAC;;IAE5D;IACA;IACA,IAAIM,UAAoC;IACxC,IAAIP,MAAM,CAACR,OAAO,CAAC,CAAC,EAAE;MACpBS,YAAY,CAAC,CAAC;IAChB,CAAC,MAAM;MACLM,UAAU,GAAGP,MAAM,CAACV,WAAW,CAAC,OAAO,EAAE,MAAM;QAC7CW,YAAY,CAAC,CAAC;QACdM,UAAU,GAAG,CAAC;QACdA,UAAU,GAAGC,SAAS;MACxB,CAAC,CAAC;IACJ;IAEA,OAAO,MAAM;MACXF,UAAU,GAAG,CAAC;MACdC,UAAU,GAAG,CAAC;IAChB,CAAC;EACH,CAAC,EAAE,CAACZ,OAAO,EAAED,aAAa,CAAC,CAAC;AAC9B","ignoreList":[]}

package/lib/module/autotracking/useTapTracking.js

@@ -27,8 +27,10 @@ function isSwitch(props) {
 // Tapping them only opens the picker UI — the real select event fires separately.
 function isInsideSelectionControl(fiber) {
   let node = fiber?.return;
-  for (let d = 0; d < 5 && node; d++, node = node.return) {
-    if (node?.memoizedProps?.onSelect != null) return true;
+  for (let d = 0; d < 3 && node; d++, node = node.return) {
+    if (node?.memoizedProps?.onSelect != null) {
+      return true;
+    }
   }
   return false;
 }
@@ -36,16 +38,22 @@ function isInsideSelectionControl(fiber) {
 // ── Identifier resolution ─────────────────────────────────────────────────────
 
 function textFromChildren(children, depth = 0) {
-  if (depth > MAX_TEXT_DEPTH) return undefined;
+  if (depth > MAX_TEXT_DEPTH) {
+    return undefined;
+  }
   if (typeof children === 'string') {
     const t = children.trim();
     return t.length > 0 ? t : undefined;
   }
-  if (typeof children === 'number') return String(children);
+  if (typeof children === 'number') {
+    return String(children);
+  }
   if (Array.isArray(children)) {
     for (const child of children) {
       const t = textFromChildren(child, depth + 1);
-      if (t) return t;
+      if (t) {
+        return t;
+      }
     }
     return undefined;
   }
@@ -57,7 +65,9 @@ function textFromChildren(children, depth = 0) {
 
 // Priority: accessibilityLabel → testID → placeholder (TextInput) → first child text.
 function resolveIdentifier(props) {
-  if (!props) return undefined;
+  if (!props) {
+    return undefined;
+  }
   if (typeof props.accessibilityLabel === 'string' && props.accessibilityLabel.trim()) {
     return props.accessibilityLabel.trim();
   }
@@ -96,7 +106,9 @@ function resolveListIndex(startFiber) {
       }
     }
     if (sections) {
-      if (cellKey.endsWith(':header') || cellKey.endsWith(':footer')) return undefined;
+      if (cellKey.endsWith(':header') || cellKey.endsWith(':footer')) {
+        return undefined;
+      }
 
       // Mirrors VirtualizedSectionList._getItem offset arithmetic:
       //   flatIndex 0       → section 0 header
@@ -106,12 +118,16 @@ function resolveListIndex(startFiber) {
       let idx = flatIndex - 1;
       for (let si = 0; si < sections.length; si++) {
         const count = sections[si].data?.length ?? 0;
-        if (idx === -1 || idx === count) return undefined;
-        if (idx < count) return {
-          type: 'sectionlist',
-          sectionIndex: si,
-          itemIndex: idx
-        };
+        if (idx === -1 || idx === count) {
+          return undefined;
+        }
+        if (idx < count) {
+          return {
+            type: 'sectionlist',
+            sectionIndex: si,
+            itemIndex: idx
+          };
+        }
         idx -= count + 2;
       }
       return undefined;
@@ -126,9 +142,10 @@ function resolveListIndex(startFiber) {
 
 // ── Log path ──────────────────────────────────────────────────────────────────
 
-function buildPath(screen, listType, identifier, indexSuffix, value) {
-  const base = listType ? `${screen}|${listType}|${identifier}` : `${screen}|${identifier}`;
-  return value !== undefined ? `${base}|${value}${indexSuffix}` : `${base}${indexSuffix}`;
+function buildPath(screen, listType, identifier, indexSuffix, switchValue) {
+  const screenName = screen ?? 'unknown';
+  const base = listType ? `${screenName}|${listType}|${identifier}` : `${screenName}|${identifier}`;
+  return switchValue !== undefined ? `${base}|${switchValue}${indexSuffix}` : `${base}${indexSuffix}`;
 }
 
 // ── Hook ──────────────────────────────────────────────────────────────────────
@@ -156,7 +173,9 @@ export function useTapTracking(enabled, shouldCollectValues) {
     shouldCollectValuesRef.current = shouldCollectValues;
   }, [shouldCollectValues]);
   const onTouchStart = useCallback(e => {
-    if (!enabledRef.current) return;
+    if (!enabledRef.current) {
+      return;
+    }
     let switchValue;
     try {
       let fiber = e._targetInst;
@@ -171,20 +190,29 @@ export function useTapTracking(enabled, shouldCollectValues) {
     touchStartRef.current = {
       x: e.nativeEvent.pageX,
       y: e.nativeEvent.pageY,
-      switchValue
+      switchValue,
+      isSwitch: switchValue !== undefined
     };
   }, []);
   const onTouchEnd = useCallback(e => {
-    if (!enabledRef.current) return;
+    if (!enabledRef.current) {
+      return;
+    }
     const start = touchStartRef.current;
-    if (start) {
-      const dx = Math.abs(e.nativeEvent.pageX - start.x);
-      const dy = Math.abs(e.nativeEvent.pageY - start.y);
-      if (dx > TAP_THRESHOLD || dy > TAP_THRESHOLD) return;
+    if (!start) {
+      return;
+    }
+    const dx = Math.abs(e.nativeEvent.pageX - start.x);
+    const dy = Math.abs(e.nativeEvent.pageY - start.y);
+    const isScrollGesture = dx > TAP_THRESHOLD || dy > TAP_THRESHOLD;
+    if (isScrollGesture && !start.isSwitch) {
+      return;
     }
     try {
       let node = e._targetInst;
-      if (!node) return;
+      if (!node) {
+        return;
+      }
 
       // Pass 1: walk up to find the first interactive ancestor.
       // e.g. tapping a <Text> inside a <Pressable> yields the Pressable.
@@ -198,7 +226,9 @@ export function useTapTracking(enabled, shouldCollectValues) {
         node = node.return;
         depth++;
       }
-      if (!interactiveNode) return;
+      if (!interactiveNode) {
+        return;
+      }
 
       // Pass 2: resolve identifier from the interactive fiber and up to 2 ancestors.
       // The look-ahead handles TouchableOpacity, where the inner Animated.View fiber
@@ -207,12 +237,18 @@ export function useTapTracking(enabled, shouldCollectValues) {
       let identifier;
       for (let i = 0; i < 3 && identifierNode; i++) {
         identifier = resolveIdentifier(identifierNode.memoizedProps);
-        if (identifier) break;
+        if (identifier) {
+          break;
+        }
         identifierNode = identifierNode.return;
       }
-      if (!identifier) return;
+      if (!identifier) {
+        return;
+      }
       const isSwitchNode = isSwitch(interactiveNode.memoizedProps);
-      if (!isSwitchNode && isInsideSelectionControl(interactiveNode)) return;
+      if (!isSwitchNode && isInsideSelectionControl(interactiveNode)) {
+        return;
+      }
       const screen = getCurrentScreen();
       if (screen !== lastScreenRef.current) {
         switchLastLoggedRef.current.clear();
@@ -231,7 +267,7 @@ export function useTapTracking(enabled, shouldCollectValues) {
           newValue = preTapValue !== undefined ? !preTapValue : !interactiveNode.memoizedProps.value;
         }
         switchLastLoggedRef.current.set(identifier, newValue);
-        const switchPath = buildPath(screen, listType, identifier, indexSuffix, newValue);
+        const switchPath = buildPath(screen, listType, identifier, indexSuffix, shouldCollectValuesRef.current ? newValue : undefined);
         RNNetmera.trackAction(switchPath);
       } else {
         const tapPath = buildPath(screen, listType, identifier, indexSuffix);

package/lib/module/autotracking/useTapTracking.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useEffect","useRef","getCurrentScreen","RNNetmera","MAX_FIBER_DEPTH","MAX_TEXT_DEPTH","TAP_THRESHOLD","isInteractive","props","onPress","onClick","onValueChange","isSwitch","value","isInsideSelectionControl","fiber","node","return","d","memoizedProps","onSelect","textFromChildren","children","depth","undefined","t","trim","length","String","Array","isArray","child","resolveIdentifier","accessibilityLabel","testID","placeholder","resolveListIndex","startFiber","p","index","cellKey","onUnmount","flatIndex","stateNode","sections","up","i","upProps","endsWith","idx","si","count","data","type","sectionIndex","itemIndex","buildPath","screen","listType","identifier","indexSuffix","base","useTapTracking","enabled","shouldCollectValues","enabledRef","shouldCollectValuesRef","touchStartRef","lastScreenRef","switchLastLoggedRef","Map","current","clear","onTouchStart","e","switchValue","_targetInst","_","x","nativeEvent","pageX","y","pageY","onTouchEnd","start","dx","Math","abs","dy","interactiveNode","identifierNode","isSwitchNode","listIndex","lastLogged","get","newValue","preTapValue","set","switchPath","trackAction","tapPath"],"sourceRoot":"../../../src","sources":["autotracking/useTapTracking.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useEffect","useRef","getCurrentScreen","RNNetmera","MAX_FIBER_DEPTH","MAX_TEXT_DEPTH","TAP_THRESHOLD","isInteractive","props","onPress","onClick","onValueChange","isSwitch","value","isInsideSelectionControl","fiber","node","return","d","memoizedProps","onSelect","textFromChildren","children","depth","undefined","t","trim","length","String","Array","isArray","child","resolveIdentifier","accessibilityLabel","testID","placeholder","resolveListIndex","startFiber","p","index","cellKey","onUnmount","flatIndex","stateNode","sections","up","i","upProps","endsWith","idx","si","count","data","type","sectionIndex","itemIndex","buildPath","screen","listType","identifier","indexSuffix","switchValue","screenName","base","useTapTracking","enabled","shouldCollectValues","enabledRef","shouldCollectValuesRef","touchStartRef","lastScreenRef","switchLastLoggedRef","Map","current","clear","onTouchStart","e","_targetInst","_","x","nativeEvent","pageX","y","pageY","onTouchEnd","start","dx","Math","abs","dy","isScrollGesture","interactiveNode","identifierNode","isSwitchNode","listIndex","lastLogged","get","newValue","preTapValue","set","switchPath","trackAction","tapPath"],"sourceRoot":"../../../src","sources":["autotracking/useTapTracking.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/NetmeraAnalyticProvider.d.ts

@@ -2,25 +2,30 @@ import React from 'react';
 export interface NetmeraAnalyticProviderProps {
     children: React.ReactNode;
     /**
-     * Required on Old Architecture (newArchEnabled=false). Pass your NavigationContainer
-     * ref so the provider can subscribe to screen changes.
+     * Pass the navigation container ref so the provider can subscribe to screen
+     * changes. Required for screen tracking and for correct action event prefixes.
      *
-     * On New Architecture the provider detects the navigation context automatically
-     * through the fiber tree — this prop is not needed.
+     * Use the same ref for both this prop and your NavigationContainer (or the
+     * component returned by createStaticNavigation).
      *
-     *   const navRef = useRef(null);
+     * React Navigation v7 Dynamic API:
+     *   const navRef = useNavigationContainerRef();
      *   <NetmeraAnalyticProvider navigationRef={navRef}>
      *     <NavigationContainer ref={navRef}>…</NavigationContainer>
      *   </NetmeraAnalyticProvider>
+     *
+     * React Navigation v7 Static API:
+     *   const navRef = useNavigationContainerRef();
+     *   const Navigation = createStaticNavigation(RootStack);
+     *   <NetmeraAnalyticProvider navigationRef={navRef}>
+     *     <Navigation ref={navRef} />
+     *   </NetmeraAnalyticProvider>
      */
     navigationRef?: React.RefObject<any>;
 }
 /**
  * Wraps your app to enable automatic screen tracking and tap tracking.
- *
- *   <NetmeraAnalyticProvider>
- *     <NavigationContainer>…</NavigationContainer>
- *   </NetmeraAnalyticProvider>
+ * Place it outside your NavigationContainer (or Static Navigation component).
  */
 export declare function NetmeraAnalyticProvider({ children, navigationRef, }: NetmeraAnalyticProviderProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=NetmeraAnalyticProvider.d.ts.map

package/lib/typescript/src/NetmeraAnalyticProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NetmeraAnalyticProvider.d.ts","sourceRoot":"","sources":["../../../src/NetmeraAnalyticProvider.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAU3D,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;CACtC;AAQD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,aAAa,GACd,EAAE,4BAA4B,2CAwE9B"}
+{"version":3,"file":"NetmeraAnalyticProvider.d.ts","sourceRoot":"","sources":["../../../src/NetmeraAnalyticProvider.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAM3D,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B;;;;;;;;;;;;;;;;;;;OAmBG;IACH,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;CACtC;AAQD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,QAAQ,EACR,aAAa,GACd,EAAE,4BAA4B,2CA8E9B"}

package/lib/typescript/src/autotracking/useNavigationTracking.d.ts

@@ -1,13 +1,14 @@
-import React from 'react';
+import type React from 'react';
 /**
  * Subscribes to React Navigation screen changes and keeps NetmeraNavigationState
- * up to date. Resolves the navigation container ref via two paths:
+ * up to date.
  *
- * - New Arch (Fabric): auto-detected through the fiber tree via viewRef.
- * - Old Arch (Paper):  caller passes navigationRef prop explicitly.
+ * Requires a valid navigation container ref — pass the same ref to both
+ * NetmeraAnalyticProvider and NavigationContainer (or the component created
+ * by createStaticNavigation).
  *
- * Silently no-ops if neither path yields a valid ref.
- * Respects the isScreenFlowEnabled flag — screen changes are ignored when disabled.
+ * Silently no-ops when navigationRef is absent or not yet populated.
+ * Respects the enabled flag — screen changes are ignored when disabled.
  */
-export declare function useNavigationTracking(viewRef: React.RefObject<any>, navigationRef: React.RefObject<any> | undefined, enabled: boolean, screenLogEnabled: boolean): void;
+export declare function useNavigationTracking(navigationRef: React.RefObject<any> | undefined, enabled: boolean, screenLogEnabled: boolean): void;
 //# sourceMappingURL=useNavigationTracking.d.ts.map

package/lib/typescript/src/autotracking/useNavigationTracking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNavigationTracking.d.ts","sourceRoot":"","sources":["../../../../src/autotracking/useNavigationTracking.ts"],"names":[],"mappings":"AAIA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAkCjD;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAC7B,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,EAC/C,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,GACxB,IAAI,CA4EN"}
+{"version":3,"file":"useNavigationTracking.d.ts","sourceRoot":"","sources":["../../../../src/autotracking/useNavigationTracking.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAc/B;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,EAC/C,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,GACxB,IAAI,CAgDN"}

package/lib/typescript/src/autotracking/useTapTracking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTapTracking.d.ts","sourceRoot":"","sources":["../../../../src/autotracking/useTapTracking.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AA6J1D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,OAAO;sBA6BtC,qBAAqB;oBAoBvB,qBAAqB;EA8FzD"}
+{"version":3,"file":"useTapTracking.d.ts","sourceRoot":"","sources":["../../../../src/autotracking/useTapTracking.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AA4K1D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,OAAO;sBA8BtC,qBAAqB;oBAuBvB,qBAAqB;EA8GzD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-netmera",
-  "version": "2.1.0-beta01",
+  "version": "2.1.0-beta03",
   "description": "Netmera React Native SDK",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",

package/src/NetmeraAnalyticProvider.tsx

@@ -3,28 +3,32 @@
  */
 
 import React, { useEffect, useRef, useState } from 'react';
-import {
-  NativeEventEmitter,
-  NativeModules,
-  StyleSheet,
-  View,
-} from 'react-native';
+import { NativeModules, StyleSheet, View } from 'react-native';
+import { netmeraRCTEventEmitter } from './utils/RNNetmera';
 import { useNavigationTracking } from './autotracking/useNavigationTracking';
 import { useTapTracking } from './autotracking/useTapTracking';
 
 export interface NetmeraAnalyticProviderProps {
   children: React.ReactNode;
   /**
-   * Required on Old Architecture (newArchEnabled=false). Pass your NavigationContainer
-   * ref so the provider can subscribe to screen changes.
+   * Pass the navigation container ref so the provider can subscribe to screen
+   * changes. Required for screen tracking and for correct action event prefixes.
    *
-   * On New Architecture the provider detects the navigation context automatically
-   * through the fiber tree — this prop is not needed.
+   * Use the same ref for both this prop and your NavigationContainer (or the
+   * component returned by createStaticNavigation).
    *
-   *   const navRef = useRef(null);
+   * React Navigation v7 Dynamic API:
+   *   const navRef = useNavigationContainerRef();
    *   <NetmeraAnalyticProvider navigationRef={navRef}>
    *     <NavigationContainer ref={navRef}>…</NavigationContainer>
    *   </NetmeraAnalyticProvider>
+   *
+   * React Navigation v7 Static API:
+   *   const navRef = useNavigationContainerRef();
+   *   const Navigation = createStaticNavigation(RootStack);
+   *   <NetmeraAnalyticProvider navigationRef={navRef}>
+   *     <Navigation ref={navRef} />
+   *   </NetmeraAnalyticProvider>
    */
   navigationRef?: React.RefObject<any>;
 }
@@ -37,55 +41,59 @@ type AutoTrackConfig = {
 
 /**
  * Wraps your app to enable automatic screen tracking and tap tracking.
- *
- *   <NetmeraAnalyticProvider>
- *     <NavigationContainer>…</NavigationContainer>
- *   </NetmeraAnalyticProvider>
+ * Place it outside your NavigationContainer (or Static Navigation component).
  */
 export function NetmeraAnalyticProvider({
   children,
   navigationRef,
 }: NetmeraAnalyticProviderProps) {
-  const viewRef = useRef<any>(null);
   const [config, setConfig] = useState<AutoTrackConfig | null>(null);
   const appliedConfigRef = useRef<AutoTrackConfig | null>(null);
 
-  const applyConfig = (cfg: AutoTrackConfig) => {
-    const prev = appliedConfigRef.current;
+  const applyConfig = (incomingConfig: AutoTrackConfig) => {
+    const currentConfig = appliedConfigRef.current;
     if (
-      prev?.isScreenFlowEnabled === cfg.isScreenFlowEnabled &&
-      prev?.isInputActionEnabled === cfg.isInputActionEnabled &&
-      prev?.shouldCollectValues === cfg.shouldCollectValues
-    )
+      currentConfig?.isScreenFlowEnabled ===
+        incomingConfig.isScreenFlowEnabled &&
+      currentConfig?.isInputActionEnabled ===
+        incomingConfig.isInputActionEnabled &&
+      currentConfig?.shouldCollectValues === incomingConfig.shouldCollectValues
+    ) {
       return;
-    appliedConfigRef.current = cfg;
-    setConfig(cfg);
-    console.log(
-      '[NMAutotrack] screen tracking ',
-      cfg.isScreenFlowEnabled ? 'enabled' : 'disabled'
-    );
-    console.log(
-      '[NMAutotrack] input action tracking ',
-      cfg.isInputActionEnabled ? 'enabled' : 'disabled'
-    );
+    }
+    appliedConfigRef.current = incomingConfig;
+    setConfig(incomingConfig);
+    if (__DEV__) {
+      console.log(
+        '[NMAutotrack] screen tracking',
+        incomingConfig.isScreenFlowEnabled ? 'enabled' : 'disabled'
+      );
+      console.log(
+        '[NMAutotrack] input action tracking',
+        incomingConfig.isInputActionEnabled
+          ? `enabled ${incomingConfig.shouldCollectValues ? 'with' : 'without'} collection values`
+          : 'disabled'
+      );
+    }
   };
 
   useEffect(() => {
     NativeModules.RNNetmera?.getAutoTrackConfig?.()
-      ?.then((cfg: AutoTrackConfig | null) => {
-        if (cfg) applyConfig(cfg);
+      ?.then((fetchedConfig: AutoTrackConfig | null) => {
+        if (fetchedConfig) {
+          applyConfig(fetchedConfig);
+        }
       })
       ?.catch((_err: unknown) => {});
   }, []);
 
   useEffect(() => {
-    const emitter = new NativeEventEmitter(
-      NativeModules.RNNetmeraRCTEventEmitter
-    );
-    const subscription = emitter.addListener(
+    const subscription = netmeraRCTEventEmitter.addListener(
       'onAutoTrackConfigUpdate',
-      (cfg: AutoTrackConfig) => {
-        if (cfg) applyConfig(cfg);
+      (updatedConfig: AutoTrackConfig) => {
+        if (updatedConfig) {
+          applyConfig(updatedConfig);
+        }
       }
     );
     return () => subscription.remove();
@@ -95,11 +103,11 @@ export function NetmeraAnalyticProvider({
   const inputActionEnabled = config?.isInputActionEnabled ?? false;
   const shouldCollectValues = config?.shouldCollectValues ?? false;
 
-  const navigationEnabled = screenFlowEnabled || inputActionEnabled;
+  // Navigation tracking is needed whenever either flag is on: screen events
+  // need it for trackView, action events need it for the screen-name prefix.
   useNavigationTracking(
-    viewRef,
     navigationRef,
-    navigationEnabled,
+    screenFlowEnabled || inputActionEnabled,
     screenFlowEnabled
   );
   const { onTouchStart, onTouchEnd } = useTapTracking(
@@ -109,10 +117,9 @@ export function NetmeraAnalyticProvider({
 
   return (
     <View
-      ref={navigationEnabled ? viewRef : undefined}
       style={styles.container}
-      onTouchStart={onTouchStart}
-      onTouchEnd={onTouchEnd}
+      onTouchStart={inputActionEnabled ? onTouchStart : undefined}
+      onTouchEnd={inputActionEnabled ? onTouchEnd : undefined}
     >
       {children}
     </View>

package/src/autotracking/useNavigationTracking.ts

@@ -2,15 +2,12 @@
  * Copyright (c) 2026 Netmera Research.
  */
 
-import React, { useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
+import type React from 'react';
 import { setCurrentScreen } from './NetmeraNavigationState';
 import { RNNetmera } from '../utils/RNNetmera';
 
-// ContextProvider fiber tag — stable React internal constant since React 16.
-const CONTEXT_PROVIDER_TAG = 10;
-const NAV_SEARCH_DEPTH = 25;
-
-// Duck-type check: React Navigation v5/v6/v7 all expose this surface on the container ref.
+// Duck-type check: React Navigation v5/v6/v7 all expose this surface.
 function isNavContainerRef(value: any): boolean {
   return (
     value != null &&
@@ -20,84 +17,41 @@ function isNavContainerRef(value: any): boolean {
   );
 }
 
-// DFS through child fibers to find NavigationContainerRefContext.Provider.
-// Siblings walk at the same depth — they sit at the same level in the tree.
-function findNavContainerRef(fiber: any, depth = 0): any {
-  if (!fiber || depth > NAV_SEARCH_DEPTH) return null;
-  if (
-    fiber.tag === CONTEXT_PROVIDER_TAG &&
-    isNavContainerRef(fiber.memoizedProps?.value)
-  ) {
-    return fiber.memoizedProps.value;
-  }
-  return (
-    findNavContainerRef(fiber.child, depth + 1) ??
-    findNavContainerRef(fiber.sibling, depth)
-  );
-}
-
 /**
  * Subscribes to React Navigation screen changes and keeps NetmeraNavigationState
- * up to date. Resolves the navigation container ref via two paths:
+ * up to date.
  *
- * - New Arch (Fabric): auto-detected through the fiber tree via viewRef.
- * - Old Arch (Paper):  caller passes navigationRef prop explicitly.
+ * Requires a valid navigation container ref — pass the same ref to both
+ * NetmeraAnalyticProvider and NavigationContainer (or the component created
+ * by createStaticNavigation).
  *
- * Silently no-ops if neither path yields a valid ref.
- * Respects the isScreenFlowEnabled flag — screen changes are ignored when disabled.
+ * Silently no-ops when navigationRef is absent or not yet populated.
+ * Respects the enabled flag — screen changes are ignored when disabled.
  */
 export function useNavigationTracking(
-  viewRef: React.RefObject<any>,
   navigationRef: React.RefObject<any> | undefined,
   enabled: boolean,
   screenLogEnabled: boolean
 ): void {
-  // React 18: capture own fiber during render via ReactCurrentOwner.
-  // React 19 removed ReactCurrentOwner — this silently yields null, which is fine
-  // because the Fabric path (viewRef.__internalInstanceHandle) covers React 19.
   const screenLogEnabledRef = useRef(screenLogEnabled);
+  const lastEmittedRouteRef = useRef<string | null>(null);
 
   useEffect(() => {
     screenLogEnabledRef.current = screenLogEnabled;
   }, [screenLogEnabled]);
 
-  const selfFiberRef = useRef<any>(null);
-  if (selfFiberRef.current === null) {
-    try {
-      const R = React as any;
-      selfFiberRef.current =
-        R.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED?.ReactCurrentOwner
-          ?.current ?? null;
-    } catch (_) {}
-  }
-
   useEffect(() => {
-    if (!enabled) return;
-    let navRef: any = null;
-
-    // Path 1 — New Arch: ReactNativeElement exposes its fiber via __internalInstanceHandle.
-    // Guard with 'child' in candidate to confirm it's a fiber, not another host object.
-    const candidate = viewRef.current?.__internalInstanceHandle;
-    const viewFiber: any =
-      candidate != null && 'child' in candidate
-        ? candidate
-        : (selfFiberRef.current?.child ?? null);
-
-    if (viewFiber) {
-      navRef = findNavContainerRef(viewFiber);
-    }
-
-    // Path 2 — Old Arch: use the ref passed explicitly via prop.
-    if (!navRef && isNavContainerRef(navigationRef?.current)) {
-      navRef = navigationRef!.current;
+    if (!enabled || !isNavContainerRef(navigationRef?.current)) {
+      return;
     }
 
-    if (!navRef) return;
+    const navRef = navigationRef!.current;
 
     const handleChange = () => {
       try {
         const route = navRef.getCurrentRoute();
-        if (route?.name) {
+        if (route?.name && route.name !== lastEmittedRouteRef.current) {
+          lastEmittedRouteRef.current = route.name;
           setCurrentScreen(route.name);
           if (screenLogEnabledRef.current) {
             RNNetmera.trackView(route.name);
@@ -108,9 +62,8 @@ export function useNavigationTracking(
 
     const unsubState = navRef.addListener('state', handleChange);
 
-    // NavigationContainer's effects run before ours (child-first), so 'ready' has
-    // already fired. isReady() captures the initial screen synchronously; the 'ready'
-    // listener is a safety net for async startup (deferred auth, deep links, etc.).
+    // NavigationContainer's effects (child) run before ours (parent), so the ref
+    // is already populated and isReady() reflects the real mount state.
     let unsubReady: (() => void) | undefined;
     if (navRef.isReady()) {
       handleChange();
@@ -126,5 +79,5 @@ export function useNavigationTracking(
       unsubState?.();
       unsubReady?.();
     };
-  }, [enabled]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [enabled, navigationRef]);
 }

package/src/autotracking/useTapTracking.ts

@@ -31,8 +31,10 @@ function isSwitch(props: any): boolean {
 // Tapping them only opens the picker UI — the real select event fires separately.
 function isInsideSelectionControl(fiber: any): boolean {
   let node: any = fiber?.return;
-  for (let d = 0; d < 5 && node; d++, node = node.return) {
-    if (node?.memoizedProps?.onSelect != null) return true;
+  for (let d = 0; d < 3 && node; d++, node = node.return) {
+    if (node?.memoizedProps?.onSelect != null) {
+      return true;
+    }
   }
   return false;
 }
@@ -40,16 +42,22 @@ function isInsideSelectionControl(fiber: any): boolean {
 // ── Identifier resolution ─────────────────────────────────────────────────────
 
 function textFromChildren(children: any, depth = 0): string | undefined {
-  if (depth > MAX_TEXT_DEPTH) return undefined;
+  if (depth > MAX_TEXT_DEPTH) {
+    return undefined;
+  }
   if (typeof children === 'string') {
     const t = children.trim();
     return t.length > 0 ? t : undefined;
   }
-  if (typeof children === 'number') return String(children);
+  if (typeof children === 'number') {
+    return String(children);
+  }
   if (Array.isArray(children)) {
     for (const child of children) {
       const t = textFromChildren(child, depth + 1);
-      if (t) return t;
+      if (t) {
+        return t;
+      }
     }
     return undefined;
   }
@@ -61,7 +69,9 @@ function textFromChildren(children: any, depth = 0): string | undefined {
 
 // Priority: accessibilityLabel → testID → placeholder (TextInput) → first child text.
 function resolveIdentifier(props: any): string | undefined {
-  if (!props) return undefined;
+  if (!props) {
+    return undefined;
+  }
   if (
     typeof props.accessibilityLabel === 'string' &&
     props.accessibilityLabel.trim()
@@ -117,8 +127,9 @@ function resolveListIndex(startFiber: any): ListIndex | undefined {
     }
 
     if (sections) {
-      if (cellKey.endsWith(':header') || cellKey.endsWith(':footer'))
+      if (cellKey.endsWith(':header') || cellKey.endsWith(':footer')) {
         return undefined;
+      }
 
       // Mirrors VirtualizedSectionList._getItem offset arithmetic:
       //   flatIndex 0       → section 0 header
@@ -128,9 +139,12 @@ function resolveListIndex(startFiber: any): ListIndex | undefined {
       let idx = flatIndex - 1;
       for (let si = 0; si < sections.length; si++) {
         const count = sections[si].data?.length ?? 0;
-        if (idx === -1 || idx === count) return undefined;
-        if (idx < count)
+        if (idx === -1 || idx === count) {
+          return undefined;
+        }
+        if (idx < count) {
           return { type: 'sectionlist', sectionIndex: si, itemIndex: idx };
+        }
         idx -= count + 2;
       }
       return undefined;
@@ -148,13 +162,14 @@ function buildPath(
   listType: string | null,
   identifier: string,
   indexSuffix: string,
-  value?: boolean
+  switchValue?: boolean
 ): string {
+  const screenName = screen ?? 'unknown';
   const base = listType
-    ? `${screen}|${listType}|${identifier}`
-    : `${screen}|${identifier}`;
-  return value !== undefined
-    ? `${base}|${value}${indexSuffix}`
+    ? `${screenName}|${listType}|${identifier}`
+    : `${screenName}|${identifier}`;
+  return switchValue !== undefined
+    ? `${base}|${switchValue}${indexSuffix}`
     : `${base}${indexSuffix}`;
 }
 
@@ -167,6 +182,7 @@ export function useTapTracking(enabled: boolean, shouldCollectValues: boolean) {
     x: number;
     y: number;
     switchValue?: boolean;
+    isSwitch?: boolean;
   } | null>(null);
   const lastScreenRef = useRef<string | null | undefined>(undefined);
 
@@ -190,7 +206,9 @@ export function useTapTracking(enabled: boolean, shouldCollectValues: boolean) {
   }, [shouldCollectValues]);
 
   const onTouchStart = useCallback((e: GestureResponderEvent) => {
-    if (!enabledRef.current) return;
+    if (!enabledRef.current) {
+      return;
+    }
     let switchValue: boolean | undefined;
     try {
       let fiber: any = (e as any)._targetInst;
@@ -206,21 +224,30 @@ export function useTapTracking(enabled: boolean, shouldCollectValues: boolean) {
       x: e.nativeEvent.pageX,
       y: e.nativeEvent.pageY,
       switchValue,
+      isSwitch: switchValue !== undefined,
     };
   }, []);
 
   const onTouchEnd = useCallback((e: GestureResponderEvent) => {
-    if (!enabledRef.current) return;
+    if (!enabledRef.current) {
+      return;
+    }
     const start = touchStartRef.current;
-    if (start) {
-      const dx = Math.abs(e.nativeEvent.pageX - start.x);
-      const dy = Math.abs(e.nativeEvent.pageY - start.y);
-      if (dx > TAP_THRESHOLD || dy > TAP_THRESHOLD) return;
+    if (!start) {
+      return;
+    }
+    const dx = Math.abs(e.nativeEvent.pageX - start.x);
+    const dy = Math.abs(e.nativeEvent.pageY - start.y);
+    const isScrollGesture = dx > TAP_THRESHOLD || dy > TAP_THRESHOLD;
+    if (isScrollGesture && !start.isSwitch) {
+      return;
     }
 
     try {
       let node: any = (e as any)._targetInst;
-      if (!node) return;
+      if (!node) {
+        return;
+      }
 
       // Pass 1: walk up to find the first interactive ancestor.
       // e.g. tapping a <Text> inside a <Pressable> yields the Pressable.
@@ -234,7 +261,9 @@ export function useTapTracking(enabled: boolean, shouldCollectValues: boolean) {
         node = node.return;
         depth++;
       }
-      if (!interactiveNode) return;
+      if (!interactiveNode) {
+        return;
+      }
 
       // Pass 2: resolve identifier from the interactive fiber and up to 2 ancestors.
       // The look-ahead handles TouchableOpacity, where the inner Animated.View fiber
@@ -243,14 +272,20 @@ export function useTapTracking(enabled: boolean, shouldCollectValues: boolean) {
       let identifier: string | undefined;
       for (let i = 0; i < 3 && identifierNode; i++) {
         identifier = resolveIdentifier(identifierNode.memoizedProps);
-        if (identifier) break;
+        if (identifier) {
+          break;
+        }
         identifierNode = identifierNode.return;
       }
 
-      if (!identifier) return;
+      if (!identifier) {
+        return;
+      }
 
       const isSwitchNode = isSwitch(interactiveNode.memoizedProps);
-      if (!isSwitchNode && isInsideSelectionControl(interactiveNode)) return;
+      if (!isSwitchNode && isInsideSelectionControl(interactiveNode)) {
+        return;
+      }
 
       const screen = getCurrentScreen();
       if (screen !== lastScreenRef.current) {
@@ -290,7 +325,7 @@ export function useTapTracking(enabled: boolean, shouldCollectValues: boolean) {
           listType,
           identifier,
           indexSuffix,
-          newValue
+          shouldCollectValuesRef.current ? newValue : undefined
         );
         RNNetmera.trackAction(switchPath);
       } else {