react-native-acoustic-connect-beta 18.0.13 → 18.0.14

package/Examples/SampleUI/src/index.native.tsx

@@ -252,6 +252,7 @@ export default function PaperExample() {
               onStateChange={(state) =>
                 AsyncStorage.setItem(PERSISTENCE_KEY, JSON.stringify(state))
               }
+              onReady={() => console.log('NavigationContainer is ready!')}
             >
               <SafeAreaInsetsContext.Consumer>
                 {(insets) => {

package/android/src/main/assets/ConnectAdvancedConfig.json

@@ -24,7 +24,7 @@
     "IpPlaceholder": "N/A",
     "KillSwitchAsync": true,
     "KillSwitchDelay": 300,
-    "LibraryVersion": "10.4.45",
+    "LibraryVersion": "10.4.59",
     "LogFullRequestResponsePayloads": true,
     "MessageTypeHeader": "WorklightHit",
     "MessageTypes": "4,5",

package/android/src/main/assets/TealeafAdvancedConfig.json

@@ -24,7 +24,7 @@
     "IpPlaceholder": "N/A",
     "KillSwitchAsync": true,
     "KillSwitchDelay": 300,
-    "LibraryVersion": "10.4.14",
+    "LibraryVersion": "10.4.16",
     "LogFullRequestResponsePayloads": true,
     "MessageTypeHeader": "WorklightHit",
     "MessageTypes": "4,5",

package/ios/HybridAcousticConnectRN.swift

@@ -37,10 +37,10 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     func load() {
         DispatchQueue.main.async {
             self.loadConnectConfig()
-            EOApplicationHelper().setConfigItem(kConfigurableItemSetGestureDetector, value: "false", forModuleName: kTLFCoreModule)
-            EOApplicationHelper().setConfigItem(kConfigurableItemLogViewLayoutOnScreenTransition, value: "false", forModuleName: kTLFCoreModule)
+//            EOApplicationHelper().setConfigItem(kConfigurableItemSetGestureDetector, value: "false", forModuleName: kTLFCoreModule)
+//            EOApplicationHelper().setConfigItem(kConfigurableItemLogViewLayoutOnScreenTransition, value: "false", forModuleName: kTLFCoreModule)
+            ConnectApplicationHelper().isReactNative(true, wrapNavigationContainer: true)
             ConnectApplicationHelper().enableFramework()
-            ConnectApplicationHelper().isReactNative(true)
         }
     }
     
@@ -280,7 +280,7 @@ class HybridAcousticConnectRN: HybridAcousticConnectRNSpec {
     /// - Parameter logicalPageName: Page name or title e.g. "Login View Controller"; Must not be empty.
     /// - Returns: Boolean value will return whether it was able to log the screenview event.
     func setCurrentScreenName(logicalPageName: String) throws -> Bool {
-        let result = ConnectApplicationHelper().resume(logicalPageName)
+        let result = ConnectApplicationHelper().setCurrentScreenName(logicalPageName)
         return result
     }
     

package/lib/commonjs/components/Connect.js

@@ -20,59 +20,57 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 * prohibited.
 ********************************************************************************************/
 
-const Connect = /*#__PURE__*/(0, _react.forwardRef)(({
-  children,
-  captureKeyboardEvents,
-  navigationRef
-}, ref) => {
-  const navigation = navigationRef || (0, _react.useRef)(null);
+// Use type-only import for LayoutChangeEvent
 
-  // Handle forwarded ref
-  (0, _react.useEffect)(() => {
-    if (ref && typeof ref === "object" && ref !== null) {
-      navigation.current = ref.current;
-    } else if (typeof ref === "function") {
-      ref(navigation.current);
-    }
-  }, [ref]);
+const Connect = ({
+  children,
+  captureKeyboardEvents
+}) => {
+  const navigation = children.ref; // Type assertion for children with ref
   const currentRoute = (0, _react.useRef)(undefined);
   const initial = (0, _react.useRef)(false);
   (0, _react.useEffect)(() => {
     _TLTRN.default.interceptKeyboardEvents(captureKeyboardEvents);
   }, [captureKeyboardEvents]);
   (0, _react.useEffect)(() => {
-    if (!navigation.current || typeof navigation.current.addListener !== "function" || typeof navigation.current.getCurrentRoute !== "function") {
-      console.warn("Connect: The Connect component's ref must be a NavigationContainer with a ref.");
+    if (!navigation || typeof navigation.current.addListener !== "function" || typeof navigation.current.getCurrentRoute !== "function") {
+      console.warn("Connect: The Connect component's first child must be a NavigationContainer with a ref.");
       return;
     }
-    const unsubscribe = navigation.current.addListener("state", () => {
-      currentRoute.current = extractName(navigation);
+
+    // Listen for the 'state' event to track navigation state changes
+    const unsubscribeState = navigation.current.addListener("state", () => {
+      currentRoute.current = extractName(navigation) || navigation.current.getCurrentRoute()?.name;
       console.log("State change - ", currentRoute.current);
-      if (_reactNative.Platform.OS === "ios" && currentRoute.current) {
+      if (_reactNative.Platform.OS === "ios" && currentRoute && currentRoute.current) {
         _TLTRN.default.logScreenViewPageName(currentRoute.current);
       } else if (_reactNative.Platform.OS === "android") {
         _TLTRN.default.logScreenViewPageName(currentRoute.current);
         _TLTRN.default.logScreenLayout(currentRoute.current);
       }
     });
-    return unsubscribe;
+
+    // Cleanup listeners when the component unmounts or dependencies change
+    return () => {
+      unsubscribeState();
+    };
   }, [navigation]);
   const onStartShouldSetResponderCapture = (0, _react.useCallback)(event => {
-    currentRoute.current = extractName(navigation);
-    if (currentRoute.current) {
+    currentRoute.current = extractName(navigation) || navigation.current.getCurrentRoute()?.name;
+    if (currentRoute && currentRoute.current) {
       _TLTRN.default.logScreenViewPageName(currentRoute.current);
     }
     _TLTRN.default.logClickEvent(event);
-    return false;
-  }, [navigation]);
+    return false; // Must be false; true means this component becomes the touch responder and events don't bubble
+  }, []);
   const onLayout = (0, _react.useCallback)(event => {
     if (initial.current) {
       return false;
     }
     initial.current = true;
     console.log("event - ", event.nativeEvent);
-    currentRoute.current = navigation.current?.getCurrentRoute()?.name;
-    if (_reactNative.Platform.OS === "ios" && currentRoute.current) {
+    currentRoute.current = navigation.current.getCurrentRoute()?.name;
+    if (_reactNative.Platform.OS === "ios" && currentRoute && currentRoute.current) {
       _TLTRN.default.logScreenViewPageName(currentRoute.current);
     } else if (_reactNative.Platform.OS === "android") {
       _TLTRN.default.logScreenLayout(currentRoute.current);
@@ -85,16 +83,16 @@ const Connect = /*#__PURE__*/(0, _react.forwardRef)(({
     onStartShouldSetResponderCapture: onStartShouldSetResponderCapture,
     children: children
   });
-});
+};
 function extractName(navigation) {
-  const routeParams = navigation.current?.getCurrentRoute()?.params;
+  const routeParams = navigation.current.getCurrentRoute()?.params;
   if (routeParams) {
     const {
       name
     } = routeParams;
-    return name || "";
+    return name ? name : navigation.current?.getCurrentRoute()?.name || "";
   }
-  return navigation.current?.getCurrentRoute()?.name || "";
+  return "";
 }
 var _default = exports.default = Connect;
 const styles = _reactNative.StyleSheet.create({

package/lib/commonjs/components/Connect.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_TLTRN","_interopRequireDefault","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","Connect","forwardRef","children","captureKeyboardEvents","navigationRef","ref","navigation","useRef","useEffect","current","currentRoute","undefined","initial","TLTRN","interceptKeyboardEvents","addListener","getCurrentRoute","console","warn","unsubscribe","extractName","log","Platform","OS","logScreenViewPageName","logScreenLayout","onStartShouldSetResponderCapture","useCallback","event","logClickEvent","onLayout","nativeEvent","name","jsx","View","style","styles","connect_main","routeParams","params","_default","exports","StyleSheet","create","flex"],"sourceRoot":"../../../src","sources":["components/Connect.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_TLTRN","_interopRequireDefault","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","Connect","children","captureKeyboardEvents","navigation","ref","currentRoute","useRef","undefined","initial","useEffect","TLTRN","interceptKeyboardEvents","current","addListener","getCurrentRoute","console","warn","unsubscribeState","extractName","name","log","Platform","OS","logScreenViewPageName","logScreenLayout","onStartShouldSetResponderCapture","useCallback","event","logClickEvent","onLayout","nativeEvent","jsx","View","style","styles","connect_main","routeParams","params","_default","exports","StyleSheet","create","flex"],"sourceRoot":"../../../src","sources":["components/Connect.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/Connect.js

@@ -9,63 +9,60 @@
 * Acoustic, L.P. Any unauthorized copying or distribution of content from this file is
 * prohibited.
 ********************************************************************************************/
-import React, { useCallback, useEffect, useRef, forwardRef } from "react";
+import React, { useCallback, useEffect, useRef } from "react";
 import { View, StyleSheet, Platform } from "react-native";
-import TLTRN from "../TLTRN";
+// Use type-only import for LayoutChangeEvent
+import TLTRN from '../TLTRN';
 import { jsx as _jsx } from "react/jsx-runtime";
-const Connect = /*#__PURE__*/forwardRef(({
+const Connect = ({
   children,
-  captureKeyboardEvents,
-  navigationRef
-}, ref) => {
-  const navigation = navigationRef || useRef(null);
-
-  // Handle forwarded ref
-  useEffect(() => {
-    if (ref && typeof ref === "object" && ref !== null) {
-      navigation.current = ref.current;
-    } else if (typeof ref === "function") {
-      ref(navigation.current);
-    }
-  }, [ref]);
+  captureKeyboardEvents
+}) => {
+  const navigation = children.ref; // Type assertion for children with ref
   const currentRoute = useRef(undefined);
   const initial = useRef(false);
   useEffect(() => {
     TLTRN.interceptKeyboardEvents(captureKeyboardEvents);
   }, [captureKeyboardEvents]);
   useEffect(() => {
-    if (!navigation.current || typeof navigation.current.addListener !== "function" || typeof navigation.current.getCurrentRoute !== "function") {
-      console.warn("Connect: The Connect component's ref must be a NavigationContainer with a ref.");
+    if (!navigation || typeof navigation.current.addListener !== "function" || typeof navigation.current.getCurrentRoute !== "function") {
+      console.warn("Connect: The Connect component's first child must be a NavigationContainer with a ref.");
       return;
     }
-    const unsubscribe = navigation.current.addListener("state", () => {
-      currentRoute.current = extractName(navigation);
+
+    // Listen for the 'state' event to track navigation state changes
+    const unsubscribeState = navigation.current.addListener("state", () => {
+      currentRoute.current = extractName(navigation) || navigation.current.getCurrentRoute()?.name;
       console.log("State change - ", currentRoute.current);
-      if (Platform.OS === "ios" && currentRoute.current) {
+      if (Platform.OS === "ios" && currentRoute && currentRoute.current) {
         TLTRN.logScreenViewPageName(currentRoute.current);
       } else if (Platform.OS === "android") {
         TLTRN.logScreenViewPageName(currentRoute.current);
         TLTRN.logScreenLayout(currentRoute.current);
       }
     });
-    return unsubscribe;
+
+    // Cleanup listeners when the component unmounts or dependencies change
+    return () => {
+      unsubscribeState();
+    };
   }, [navigation]);
   const onStartShouldSetResponderCapture = useCallback(event => {
-    currentRoute.current = extractName(navigation);
-    if (currentRoute.current) {
+    currentRoute.current = extractName(navigation) || navigation.current.getCurrentRoute()?.name;
+    if (currentRoute && currentRoute.current) {
       TLTRN.logScreenViewPageName(currentRoute.current);
     }
     TLTRN.logClickEvent(event);
-    return false;
-  }, [navigation]);
+    return false; // Must be false; true means this component becomes the touch responder and events don't bubble
+  }, []);
   const onLayout = useCallback(event => {
     if (initial.current) {
       return false;
     }
     initial.current = true;
     console.log("event - ", event.nativeEvent);
-    currentRoute.current = navigation.current?.getCurrentRoute()?.name;
-    if (Platform.OS === "ios" && currentRoute.current) {
+    currentRoute.current = navigation.current.getCurrentRoute()?.name;
+    if (Platform.OS === "ios" && currentRoute && currentRoute.current) {
       TLTRN.logScreenViewPageName(currentRoute.current);
     } else if (Platform.OS === "android") {
       TLTRN.logScreenLayout(currentRoute.current);
@@ -78,16 +75,16 @@ const Connect = /*#__PURE__*/forwardRef(({
     onStartShouldSetResponderCapture: onStartShouldSetResponderCapture,
     children: children
   });
-});
+};
 function extractName(navigation) {
-  const routeParams = navigation.current?.getCurrentRoute()?.params;
+  const routeParams = navigation.current.getCurrentRoute()?.params;
   if (routeParams) {
     const {
       name
     } = routeParams;
-    return name || "";
+    return name ? name : navigation.current?.getCurrentRoute()?.name || "";
   }
-  return navigation.current?.getCurrentRoute()?.name || "";
+  return "";
 }
 export default Connect;
 const styles = StyleSheet.create({

package/lib/module/components/Connect.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useEffect","useRef","forwardRef","View","StyleSheet","Platform","TLTRN","jsx","_jsx","Connect","children","captureKeyboardEvents","navigationRef","ref","navigation","current","currentRoute","undefined","initial","interceptKeyboardEvents","addListener","getCurrentRoute","console","warn","unsubscribe","extractName","log","OS","logScreenViewPageName","logScreenLayout","onStartShouldSetResponderCapture","event","logClickEvent","onLayout","nativeEvent","name","style","styles","connect_main","routeParams","params","create","flex"],"sourceRoot":"../../../src","sources":["components/Connect.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,SAAS,EAAEC,MAAM,EAAEC,UAAU,QAAQ,OAAO;AACzE,SAASC,IAAI,EAAEC,UAAU,EAAEC,QAAQ,QAAuC,cAAc;AAExF,OAAOC,KAAK,MAAM,UAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAQ7B,MAAMC,OAAO,gBAAGP,UAAU,CACtB,CAAC;EAAEQ,QAAQ;EAAEC,qBAAqB;EAAEC;AAAc,CAAC,EAAEC,GAAG,KAAK;EAC3D,MAAMC,UAAU,GAAGF,aAAa,IAAIX,MAAM,CAAC,IAAI,CAAC;;EAEpD;EACAD,SAAS,CAAC,MAAM;IACd,IAAIa,GAAG,IAAI,OAAOA,GAAG,KAAK,QAAQ,IAAIA,GAAG,KAAK,IAAI,EAAE;MAClDC,UAAU,CAACC,OAAO,GAAGF,GAAG,CAACE,OAAO;IAClC,CAAC,MAAM,IAAI,OAAOF,GAAG,KAAK,UAAU,EAAE;MACpCA,GAAG,CAACC,UAAU,CAACC,OAAO,CAAC;IACzB;EACF,CAAC,EAAE,CAACF,GAAG,CAAC,CAAC;EAET,MAAMG,YAAY,GAAGf,MAAM,CAAqBgB,SAAS,CAAC;EAC1D,MAAMC,OAAO,GAAGjB,MAAM,CAAU,KAAK,CAAC;EAEtCD,SAAS,CAAC,MAAM;IACdM,KAAK,CAACa,uBAAuB,CAACR,qBAAqB,CAAC;EACtD,CAAC,EAAE,CAACA,qBAAqB,CAAC,CAAC;EAE3BX,SAAS,CAAC,MAAM;IACd,IACE,CAACc,UAAU,CAACC,OAAO,IACnB,OAAOD,UAAU,CAACC,OAAO,CAACK,WAAW,KAAK,UAAU,IACpD,OAAON,UAAU,CAACC,OAAO,CAACM,eAAe,KAAK,UAAU,EACxD;MACAC,OAAO,CAACC,IAAI,CACV,gFACF,CAAC;MACD;IACF;IAEA,MAAMC,WAAW,GAAGV,UAAU,CAACC,OAAO,CAACK,WAAW,CAAC,OAAO,EAAE,MAAM;MAChEJ,YAAY,CAACD,OAAO,GAAGU,WAAW,CAACX,UAAU,CAAC;MAC9CQ,OAAO,CAACI,GAAG,CAAC,iBAAiB,EAAEV,YAAY,CAACD,OAAO,CAAC;MAEpD,IAAIV,QAAQ,CAACsB,EAAE,KAAK,KAAK,IAAIX,YAAY,CAACD,OAAO,EAAE;QACjDT,KAAK,CAACsB,qBAAqB,CAACZ,YAAY,CAACD,OAAO,CAAC;MACnD,CAAC,MAAM,IAAIV,QAAQ,CAACsB,EAAE,KAAK,SAAS,EAAE;QACpCrB,KAAK,CAACsB,qBAAqB,CAACZ,YAAY,CAACD,OAAO,CAAC;QACjDT,KAAK,CAACuB,eAAe,CAACb,YAAY,CAACD,OAAO,CAAC;MAC7C;IACF,CAAC,CAAC;IAEF,OAAOS,WAAW;EACpB,CAAC,EAAE,CAACV,UAAU,CAAC,CAAC;EAEhB,MAAMgB,gCAAgC,GAAG/B,WAAW,CACjDgC,KAAU,IAAK;IACdf,YAAY,CAACD,OAAO,GAAGU,WAAW,CAACX,UAAU,CAAC;IAC9C,IAAIE,YAAY,CAACD,OAAO,EAAE;MACxBT,KAAK,CAACsB,qBAAqB,CAACZ,YAAY,CAACD,OAAO,CAAC;IACnD;IACAT,KAAK,CAAC0B,aAAa,CAACD,KAAK,CAAC;IAC1B,OAAO,KAAK;EACd,CAAC,EACD,CAACjB,UAAU,CACb,CAAC;EAED,MAAMmB,QAAQ,GAAGlC,WAAW,CACzBgC,KAAwB,IAAK;IAC5B,IAAIb,OAAO,CAACH,OAAO,EAAE;MACnB,OAAO,KAAK;IACd;IACAG,OAAO,CAACH,OAAO,GAAG,IAAI;IAEtBO,OAAO,CAACI,GAAG,CAAC,UAAU,EAAEK,KAAK,CAACG,WAAW,CAAC;IAE1ClB,YAAY,CAACD,OAAO,GAAGD,UAAU,CAACC,OAAO,EAAEM,eAAe,CAAC,CAAC,EAAEc,IAAI;IAClE,IAAI9B,QAAQ,CAACsB,EAAE,KAAK,KAAK,IAAIX,YAAY,CAACD,OAAO,EAAE;MACjDT,KAAK,CAACsB,qBAAqB,CAACZ,YAAY,CAACD,OAAO,CAAC;IACnD,CAAC,MAAM,IAAIV,QAAQ,CAACsB,EAAE,KAAK,SAAS,EAAE;MACpCrB,KAAK,CAACuB,eAAe,CAACb,YAAY,CAACD,OAAO,CAAC;IAC7C;IACA,OAAO,IAAI;EACb,CAAC,EACD,CAACD,UAAU,CACb,CAAC;EAED,oBACEN,IAAA,CAACL,IAAI;IACHiC,KAAK,EAAEC,MAAM,CAACC,YAAa;IAC3BL,QAAQ,EAAEA,QAAS;IACnBH,gCAAgC,EAAEA,gCAAiC;IAAApB,QAAA,EAElEA;EAAQ,CACL,CAAC;AAEX,CAAC,CAAC;AAEF,SAASe,WAAWA,CAACX,UAAe,EAAU;EAC5C,MAAMyB,WAAW,GAAGzB,UAAU,CAACC,OAAO,EAAEM,eAAe,CAAC,CAAC,EAAEmB,MAAM;EACjE,IAAID,WAAW,EAAE;IACf,MAAM;MAAEJ;IAAK,CAAC,GAAGI,WAAW;IAC5B,OAAOJ,IAAI,IAAI,EAAE;EACnB;EACA,OAAOrB,UAAU,CAACC,OAAO,EAAEM,eAAe,CAAC,CAAC,EAAEc,IAAI,IAAI,EAAE;AAC1D;AAEA,eAAe1B,OAAO;AAEtB,MAAM4B,MAAM,GAAGjC,UAAU,CAACqC,MAAM,CAAC;EAC/BH,YAAY,EAAE;IACZI,IAAI,EAAE;EACR;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useEffect","useRef","View","StyleSheet","Platform","TLTRN","jsx","_jsx","Connect","children","captureKeyboardEvents","navigation","ref","currentRoute","undefined","initial","interceptKeyboardEvents","current","addListener","getCurrentRoute","console","warn","unsubscribeState","extractName","name","log","OS","logScreenViewPageName","logScreenLayout","onStartShouldSetResponderCapture","event","logClickEvent","onLayout","nativeEvent","style","styles","connect_main","routeParams","params","create","flex"],"sourceRoot":"../../../src","sources":["components/Connect.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/components/Connect.d.ts

@@ -11,8 +11,7 @@ import React from "react";
 interface ConnectProps {
     children: React.ReactNode;
     captureKeyboardEvents: boolean;
-    navigationRef?: React.RefObject<any>;
 }
-declare const Connect: React.ForwardRefExoticComponent<ConnectProps & React.RefAttributes<any>>;
+declare const Connect: React.FC<ConnectProps>;
 export default Connect;
 //# sourceMappingURL=Connect.d.ts.map

package/lib/typescript/src/components/Connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Connect.d.ts","sourceRoot":"","sources":["../../../../src/components/Connect.tsx"],"names":[],"mappings":"AAAA;;;;;;;;6FAQ6F;AAC7F,OAAO,KAAqD,MAAM,OAAO,CAAC;AAK1E,UAAU,YAAY;IAClB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;CACxC;AAED,QAAA,MAAM,OAAO,0EAwFX,CAAC;AAWH,eAAe,OAAO,CAAC"}
+{"version":3,"file":"Connect.d.ts","sourceRoot":"","sources":["../../../../src/components/Connect.tsx"],"names":[],"mappings":"AAAA;;;;;;;;6FAQ6F;AAC7F,OAAO,KAAqD,MAAM,OAAO,CAAC;AAK1E,UAAU,YAAY;IAClB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;CAClC;AAED,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CA2EnC,CAAC;AAWF,eAAe,OAAO,CAAC"}

package/package.json

@@ -192,7 +192,7 @@
     "source": "src/index",
     "summary": "react-native ios android tealeaf connect cxa wxca er enhanced-replay",
     "types": "./lib/typescript/src/index.d.ts",
-    "version": "18.0.13",
+    "version": "18.0.14",
     "workspaces": [
         "example"
     ]

package/scripts/ConnectConfig.json

@@ -1,6 +1,6 @@
 {
     "Connect": {
-        "AndroidVersion": "10.4.45",
+        "AndroidVersion": "10.4.59",
         "AppKey": "b6c3709b7a4c479bb4b5a9fb8fec324c",
         "KillSwitchUrl": "https://lib-us-2.brilliantcollector.com/collector/switch/b6c3709b7a4c479bb4b5a9fb8fec324c",
         "PostMessageUrl": "https://lib-us-2.brilliantcollector.com/collector/collectorPost",

package/src/components/Connect.tsx

@@ -9,118 +9,104 @@
 ********************************************************************************************/
 import React, { useCallback, useEffect, useRef, forwardRef } from "react";
 import { View, StyleSheet, Platform, NativeModules, findNodeHandle } from "react-native";
-import type { LayoutChangeEvent } from "react-native";
-import TLTRN from "../TLTRN";
+import type { LayoutChangeEvent } from "react-native"; // Use type-only import for LayoutChangeEvent
+import TLTRN from '../TLTRN';
 
 interface ConnectProps {
     children: React.ReactNode;
     captureKeyboardEvents: boolean;
-    navigationRef?: React.RefObject<any>;
 }
 
-const Connect = forwardRef<any, ConnectProps>(
-    ({ children, captureKeyboardEvents, navigationRef }, ref) => {
-      const navigation = navigationRef || useRef(null);
-  
-  // Handle forwarded ref
-  useEffect(() => {
-    if (ref && typeof ref === "object" && ref !== null) {
-      navigation.current = ref.current;
-    } else if (typeof ref === "function") {
-      ref(navigation.current);
-    }
-  }, [ref]);
-
-  const currentRoute = useRef<string | undefined>(undefined);
-  const initial = useRef<boolean>(false);
-
-  useEffect(() => {
-    TLTRN.interceptKeyboardEvents(captureKeyboardEvents);
-  }, [captureKeyboardEvents]);
-
-  useEffect(() => {
-    if (
-      !navigation.current ||
-      typeof navigation.current.addListener !== "function" ||
-      typeof navigation.current.getCurrentRoute !== "function"
-    ) {
-      console.warn(
-        "Connect: The Connect component's ref must be a NavigationContainer with a ref."
-      );
-      return;
-    }
-
-    const unsubscribe = navigation.current.addListener("state", () => {
-      currentRoute.current = extractName(navigation);
-      console.log("State change - ", currentRoute.current);
-
-      if (Platform.OS === "ios" && currentRoute.current) {
-        TLTRN.logScreenViewPageName(currentRoute.current);
-      } else if (Platform.OS === "android") {
-        TLTRN.logScreenViewPageName(currentRoute.current);
-        TLTRN.logScreenLayout(currentRoute.current);
-      }
-    });
-
-    return unsubscribe;
-  }, [navigation]);
-
-  const onStartShouldSetResponderCapture = useCallback(
-    (event: any) => {
-      currentRoute.current = extractName(navigation);
-      if (currentRoute.current) {
-        TLTRN.logScreenViewPageName(currentRoute.current);
-      }
-      TLTRN.logClickEvent(event);
-      return false;
-    },
-    [navigation]
-  );
-
-  const onLayout = useCallback(
-    (event: LayoutChangeEvent) => {
-      if (initial.current) {
-        return false;
-      }
-      initial.current = true;
-
-      console.log("event - ", event.nativeEvent);
-
-      currentRoute.current = navigation.current?.getCurrentRoute()?.name;
-      if (Platform.OS === "ios" && currentRoute.current) {
-        TLTRN.logScreenViewPageName(currentRoute.current);
-      } else if (Platform.OS === "android") {
-        TLTRN.logScreenLayout(currentRoute.current);
-      }
-      return true;
-    },
-    [navigation]
-  );
-
-  return (
-    <View
-      style={styles.connect_main}
-      onLayout={onLayout}
-      onStartShouldSetResponderCapture={onStartShouldSetResponderCapture}
-    >
-      {children}
-    </View>
-  );
-});
+const Connect: React.FC<ConnectProps> = ({ children, captureKeyboardEvents }) => {
+    const navigation = (children as any).ref; // Type assertion for children with ref
+    const currentRoute = useRef<string | undefined>(undefined);
+    const initial = useRef<boolean>(false);
+
+    useEffect(() => {
+        TLTRN.interceptKeyboardEvents(captureKeyboardEvents);
+    }, [captureKeyboardEvents]);
+
+    useEffect(() => {
+        if (
+            !navigation ||
+            typeof navigation.current.addListener !== "function" ||
+            typeof navigation.current.getCurrentRoute !== "function"
+        ) {
+            console.warn(
+                "Connect: The Connect component's first child must be a NavigationContainer with a ref."
+            );
+            return;
+        }
+
+        // Listen for the 'state' event to track navigation state changes
+        const unsubscribeState = navigation.current.addListener("state", () => {
+            currentRoute.current = extractName(navigation) || navigation.current.getCurrentRoute()?.name;
+            console.log("State change - ", currentRoute.current);
+            
+            if (Platform.OS === "ios" && currentRoute && currentRoute.current) {
+                TLTRN.logScreenViewPageName(currentRoute.current);
+            } else if (Platform.OS === "android") {
+                TLTRN.logScreenViewPageName(currentRoute.current);
+                TLTRN.logScreenLayout(currentRoute.current);
+            }
+        });
+
+        // Cleanup listeners when the component unmounts or dependencies change
+        return () => {
+            unsubscribeState();
+        };
+    }, [navigation]);
+
+    const onStartShouldSetResponderCapture = useCallback((event: any) => {
+        currentRoute.current = extractName(navigation) || navigation.current.getCurrentRoute()?.name;
+        if (currentRoute && currentRoute.current) {
+            TLTRN.logScreenViewPageName(currentRoute.current);
+        }
+        TLTRN.logClickEvent(event);
+        return false; // Must be false; true means this component becomes the touch responder and events don't bubble
+    }, []);
+
+    const onLayout = useCallback((event: LayoutChangeEvent) => {
+        if (initial.current) {
+            return false;
+        }
+        initial.current = true;
+
+        console.log("event - ", event.nativeEvent);
+
+        currentRoute.current = navigation.current.getCurrentRoute()?.name;
+        if (Platform.OS === "ios" && currentRoute && currentRoute.current) {
+            TLTRN.logScreenViewPageName(currentRoute.current);
+        } else if (Platform.OS === "android") {
+            TLTRN.logScreenLayout(currentRoute.current);
+        }
+        return true
+    }, [navigation]);
+
+    return (
+        <View
+            style={styles.connect_main}
+            onLayout={onLayout}
+            onStartShouldSetResponderCapture={onStartShouldSetResponderCapture}
+        >
+            {children}
+        </View>
+    );
+};
 
 function extractName(navigation: any): string {
-  const routeParams = navigation.current?.getCurrentRoute()?.params;
-  if (routeParams) {
-    const { name } = routeParams;
-    return name || "";
-  }
-  return navigation.current?.getCurrentRoute()?.name || "";
+    const routeParams = navigation.current.getCurrentRoute()?.params;
+    if (routeParams) {
+        const { name } = routeParams;
+        return name ? name : navigation.current?.getCurrentRoute()?.name || "";
+    }
+    return "";
 }
 
 export default Connect;
 
 const styles = StyleSheet.create({
-  connect_main: {
-    flex: 1,
-  },
+    connect_main: {
+        flex: 1,
+    },
 });