plotline-engage 4.1.6 → 4.1.7

package/index.d.ts

@@ -1,6 +1,5 @@
-import { ScrollViewProps } from 'react-native';
-import { FlatListProps } from 'react-native';
 import React from 'react';
+import { NavigationContainerProps } from '@react-navigation/native';
 
 declare class plotline {
     track(eventName: string, properties: {[key: string]: string}): void;
@@ -16,10 +15,8 @@ declare class plotline {
     setPlotlineRedirectListener(listener: (keyValuePairs: {[key: string]: any}) => void): void;
     logout(): void;
 }
-declare class ScrollView extends React.Component<ScrollViewProps> {
-}
 
-declare class FlatList<T> extends React.Component<FlatListProps<T>> {
+declare class NavigationContainer extends React.Component<NavigationContainerProps> {
 }
 
 interface PlotlineWidgetProps extends ViewProps {
@@ -30,5 +27,5 @@ declare class PlotlineWidget extends React.Component<PlotlineWidgetProps> {
 }
 
 declare const Plotline: plotline;
-export { ScrollView, FlatList, PlotlineWidget };
+export { NavigationContainer, PlotlineWidget };
 export default Plotline;

package/index.js

@@ -1,8 +1,20 @@
 
 import { NativeModules, DeviceEventEmitter, Platform, NativeEventEmitter, requireNativeComponent } from 'react-native';
-import { View, ScrollView as RNScrollView, FlatList as RNFlatList} from 'react-native';
+import { View } from 'react-native';
 import React, { useEffect, useState } from 'react';
 const { RNPlotline } = NativeModules;
+import { NavigationContainer as RNNavigationContainer, useNavigationContainerRef } from '@react-navigation/native';
+
+function getRouteName(state) {
+  if (!state || !state.routes || state.index === undefined || state.index === null) {
+    return 'unrecognized-path'
+  }
+  const route = state.routes[state.index]
+  if (route.state) {
+    return getRouteName(route.state)
+  }
+  return route.name
+}
 
 function convertToStringValues(obj) {
     const convertedObj = {};
@@ -141,36 +153,6 @@ class plotline {
 
 const Plotline = new plotline();
 
-const ScrollView = (props) => {
-    const handleScroll = (event) => {
-        Plotline.notifyScroll();
-        if (props.onScroll) {
-            props.onScroll(event);
-        }
-    };
-
-    return (
-        <RNScrollView {...props} onScroll={handleScroll} scrollEventThrottle={16}>
-            {props.children}
-        </RNScrollView>
-    );
-};
-
-const FlatList = (props) => {
-    const handleScroll = (event) => {
-        Plotline.notifyScroll();
-        if (props.onScroll) {
-            props.onScroll(event);
-        }
-    };
-
-    return (
-        <RNFlatList {...props} onScroll={handleScroll} scrollEventThrottle={16}>
-            {props.children}
-        </RNFlatList>
-    );
-};
-
 const { PlotlineWidgetEventEmitter } = NativeModules;
 const plotlineEvents = new NativeEventEmitter(PlotlineWidgetEventEmitter);
 const PlotlineView = requireNativeComponent('PlotlineView');
@@ -217,5 +199,36 @@ const PlotlineWidget = ({ testID }) => {
   return null;
 };
 
+const NavigationContainer = ({children, ...others}) => {
+  const containerRef = useNavigationContainerRef()
+
+  useEffect(() => {
+    if (containerRef.current) {
+      const currentRoute = containerRef.current.getCurrentRoute()
+      if (currentRoute) {
+        Plotline.trackPage(currentRoute.name);
+      }
+    }
+  }, [containerRef])
+
+  const handleStateChange = (state) => {
+    if (others?.onStateChange != null) {
+      others.onStateChange(state)
+    }
+    const routeName = getRouteName(state)
+    Plotline.trackPage(routeName);
+  }
+
+  return (
+    <RNNavigationContainer
+      onStateChange={handleStateChange}  
+      {...others}
+      ref={containerRef}
+    >
+      {children}
+    </RNNavigationContainer>
+  )
+}
+
 export default Plotline;
-export {ScrollView, FlatList, PlotlineWidget};
+export {PlotlineWidget, NavigationContainer};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plotline-engage",
-  "version": "4.1.6",
+  "version": "4.1.7",
   "description": "React Native plugin for Plotline",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"