fixing wrong types components

Author: facostaembrace

plugins/node/instrumentation-react-native-navigation/package.json

@@ -62,6 +62,7 @@
     "@types/sinon": "10.0.18",
     "amqplib": "0.8.0",
     "babel-plugin-react-native-web": "^0.19.12",
+    "expo-router": "^3.5.23",
     "jsdom": "^15.2.1",
     "jsdom-global": "^3.0.2",
     "lodash": "4.17.21",
@@ -71,6 +72,7 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "react-native": "^0.74.0",
+    "react-native-navigation": "^7.40.3",
     "react-native-web": "^0.19.12",
     "sinon": "15.2.0",
     "test-all-versions": "6.1.0",

plugins/node/instrumentation-react-native-navigation/src/components/NavigationTracker.tsx

@@ -40,6 +40,7 @@ const NavigationTracker = forwardRef<
 
   return <>{children}</>;
 });
+
 NavigationTracker.displayName = 'NavigationTracker';
 
 export default NavigationTracker;

plugins/node/instrumentation-react-native-navigation/src/types/navigation.ts

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 import { Attributes, TracerOptions } from '@opentelemetry/api';
+import { useNavigationContainerRef as useReactNativeNavigationContainerRef } from '@react-navigation/native';
+import { useNavigationContainerRef as useReactNativeNavigationExpoContainerRef } from 'expo-router';
+import { Navigation } from 'react-native-navigation';
 
 /*
  * Copyright The OpenTelemetry Authors
@@ -30,22 +33,12 @@ import { Attributes, TracerOptions } from '@opentelemetry/api';
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export interface INavigationContainer {
-  addListener: (
-    event: 'state',
-    callback: (args: { name: string }) => void
-  ) => void;
-  getCurrentRoute: () => { name: string };
-}
 
-export interface INativeNavigationContainer {
-  registerComponentDidAppearListener: (
-    cb: (args: { componentName: string }) => void
-  ) => void;
-  registerComponentDidDisappearListener: (
-    cb: (args: { componentName: string }) => void
-  ) => void;
-}
+export type INativeNavigationContainer = ReturnType<typeof Navigation.events>;
+
+export type INavigationContainer =
+  | ReturnType<typeof useReactNativeNavigationContainerRef>
+  | ReturnType<typeof useReactNativeNavigationExpoContainerRef>['current'];
 
 export interface NavigationTrackerConfig {
   attributes?: Attributes;

plugins/node/instrumentation-react-native-navigation/test/NativeNavigationTracker.test.tsx

@@ -22,7 +22,10 @@ import { NativeNavigationTracker } from '../src';
 import useProvider from './helpers/hooks/useProvider';
 import api from '@opentelemetry/api';
 import * as rnn from './helpers/react-native-navigation';
-import { NavigationTrackerConfig } from '../src/types/navigation';
+import {
+  INativeNavigationContainer,
+  NavigationTrackerConfig,
+} from '../src/types/navigation';
 
 const AppWithProvider: FC<{
   shouldPassProvider: boolean;
@@ -60,7 +63,7 @@ describe('NativeNavigationTracker.tsx', function () {
     sandbox.stub(Navigation, 'events').returns({
       registerComponentDidAppearListener: mockDidAppearListener,
       registerComponentDidDisappearListener: mockDidDisappearListener,
-    });
+    } as unknown as INativeNavigationContainer);
 
     mockAddEventListener = sandbox.spy(AppState, 'addEventListener');
     mockConsoleDir = sandbox.spy(console, 'dir');

plugins/node/instrumentation-react-native-navigation/test/helpers/react-native-navigation.ts

@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
-// referencing to `wix/react-native-navigation` package
+import { Navigation as WixNavigation } from 'react-native-navigation';
+
+// referencing to `react-native-navigation` package.
+// hacky trick to mock implementation in order to be able to stub the methods in tests
 export const Navigation = {
-  events: () => ({
-    registerComponentDidAppearListener: () => {},
-    registerComponentDidDisappearListener: () => {},
-  }),
+  events: () =>
+    ({
+      registerComponentDidAppearListener: () => {},
+      registerComponentDidDisappearListener: () => {},
+    } as unknown as ReturnType<typeof WixNavigation.events>),
 };