react-native-mytatva-rn-sdk 1.2.1 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mytatva-rn-sdk",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "a package to inject data into visit health pwa",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/MainWebView.tsx

@@ -12,6 +12,7 @@ const MainWebView = (props) => {
     webviewRef,
     handleMessage,
     runBeforeFirst,
+    platform,
     setCanGoBack,
   } = props; // Get the URL and other parameters from the route
 
@@ -24,11 +25,13 @@ const MainWebView = (props) => {
           source={{
             uri: source,
             headers: {
-              platform: 'ANDROID',
+              platform: platform,
             },
           }}
           onMessage={handleMessage}
-          injectedJavaScriptBeforeContentLoaded={runBeforeFirst}
+          {...(runBeforeFirst && {
+            injectedJavaScriptBeforeContentLoaded: runBeforeFirst,
+          })}
           javaScriptEnabled={true}
           onLoadProgress={(event) => setCanGoBack(event.nativeEvent.canGoBack)}
           onError={(errorMessage) => {

package/src/ProgressWebView.tsx

@@ -40,6 +40,7 @@ const ProgressWebView = (props) => {
     mobileNumber,
     uuid,
     clientSource,
+    platform,
     moduleName,
   } = props;
   const [activeGoodflipTab, setActiveGoodflipTab] = useState(
@@ -337,11 +338,13 @@ const ProgressWebView = (props) => {
           source={{
             uri: url,
             headers: {
-              platform: 'ANDROID',
+              platform: platform,
             },
           }}
           onMessage={handleMessage}
-          injectedJavaScriptBeforeContentLoaded={runBeforeFirst}
+          {...(runBeforeFirst && {
+            injectedJavaScriptBeforeContentLoaded: runBeforeFirst,
+          })}
           javaScriptEnabled={true}
           // onLoadProgress={(event) => setCanGoBack(event.nativeEvent.canGoBack)}
           onError={(errorMessage) => {

package/src/index.android.js

@@ -256,6 +256,7 @@ const MyTatvaRnSdkView = ({
           runBeforeFirst={runBeforeFirst}
           setCanGoBack={setCanGoBack}
           mobileNumber={mobileNumber}
+          platform={'ANDROID'}
           moduleName={moduleName}
           uuid={uuid}
           clientSource={clientSource}
@@ -266,6 +267,7 @@ const MyTatvaRnSdkView = ({
           environment={environment}
           source={source}
           loading={loading}
+          platform={'ANDROID'}
           isError={isError}
           webviewRef={webviewRef}
           handleMessage={handleMessage}

package/src/index.ios.js

@@ -11,8 +11,10 @@ import {
   NativeModules,
   NativeEventEmitter,
   Linking,
+  BackHandler,
   Platform,
   ActivityIndicator,
+  BackHandler,
   Dimensions,
 } from 'react-native';
 import { EventRegister } from 'react-native-event-listeners';
@@ -219,6 +221,23 @@ const MyTatvaRnSdkView = ({
         break;
     }
   };
+  const [canGoBack, setCanGoBack] = useState(false);
+
+  const handleBack = useCallback(() => {
+    if (canGoBack && webviewRef.current) {
+      webviewRef.current?.goBack();
+      return true;
+    }
+    return false;
+  }, [canGoBack]);
+
+  useEffect(() => {
+    BackHandler.addEventListener('hardwareBackPress', handleBack);
+    return () => {
+      BackHandler.removeEventListener('hardwareBackPress', handleBack);
+      // gpsListener.remove();
+    };
+  }, [handleBack]);
 
   const { height, width } = Dimensions.get('screen');
   return (
@@ -234,10 +253,11 @@ const MyTatvaRnSdkView = ({
           loading={loading}
           isError={isError}
           webviewRef={webviewRef}
-          runBeforeFirst={runBeforeFirst}
+          // runBeforeFirst={runBeforeFirst}
           setCanGoBack={setCanGoBack}
           mobileNumber={mobileNumber}
           moduleName={moduleName}
+          platform={'IOS'}
           uuid={uuid}
           clientSource={clientSource}
         />
@@ -247,10 +267,11 @@ const MyTatvaRnSdkView = ({
           environment={environment}
           source={source}
           loading={loading}
+          platform={'IOS'}
           isError={isError}
           webviewRef={webviewRef}
           handleMessage={handleMessage}
-          runBeforeFirst={runBeforeFirst}
+          // runBeforeFirst={runBeforeFirst}
           setCanGoBack={setCanGoBack}
           clientSource={clientSource}
           moduleName={moduleName}