conflict fixed

Author: rupy1014

apple/BPCWebView.mm

@@ -12,7 +12,7 @@
 
 using namespace facebook::react;
 
-auto stringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string value) {
+auto BPStringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string value) {
     if (value == "click") return BPCWebViewEventEmitter::OnShouldStartLoadWithRequestNavigationType::Click;
     if (value == "formsubmit") return BPCWebViewEventEmitter::OnShouldStartLoadWithRequestNavigationType::Formsubmit;
     if (value == "backforward") return BPCWebViewEventEmitter::OnShouldStartLoadWithRequestNavigationType::Backforward;
@@ -21,7 +21,7 @@ auto stringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string value) {
     return BPCWebViewEventEmitter::OnShouldStartLoadWithRequestNavigationType::Other;
 }
 
-auto stringToOnLoadingStartNavigationTypeEnum(std::string value) {
+auto BPStringToOnLoadingStartNavigationTypeEnum(std::string value) {
     if (value == "click") return BPCWebViewEventEmitter::OnLoadingStartNavigationType::Click;
     if (value == "formsubmit") return BPCWebViewEventEmitter::OnLoadingStartNavigationType::Formsubmit;
     if (value == "backforward") return BPCWebViewEventEmitter::OnLoadingStartNavigationType::Backforward;
@@ -30,7 +30,7 @@ auto stringToOnLoadingStartNavigationTypeEnum(std::string value) {
     return BPCWebViewEventEmitter::OnLoadingStartNavigationType::Other;
 }
 
-auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
+auto BPStringToOnLoadingFinishNavigationTypeEnum(std::string value) {
     if (value == "click") return BPCWebViewEventEmitter::OnLoadingFinishNavigationType::Click;
     if (value == "formsubmit") return BPCWebViewEventEmitter::OnLoadingFinishNavigationType::Formsubmit;
     if (value == "backforward") return BPCWebViewEventEmitter::OnLoadingFinishNavigationType::Backforward;
@@ -81,7 +81,7 @@ - (instancetype)initWithFrame:(CGRect)frame
                     .url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
                     .lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
-                    .navigationType = stringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String])),
+                    .navigationType = BPStringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String])),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
                     .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .isTopFrame = static_cast<bool>([[dictionary valueForKey:@"isTopFrame"] boolValue]),
@@ -98,7 +98,7 @@ - (instancetype)initWithFrame:(CGRect)frame
                     .url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
                     .lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
-                    .navigationType = stringToOnLoadingStartNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String])),
+                    .navigationType = BPStringToOnLoadingStartNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String])),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
                     .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
@@ -146,7 +146,7 @@ - (instancetype)initWithFrame:(CGRect)frame
                     .url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
                     .lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
-                    .navigationType = stringToOnLoadingFinishNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String], [[dictionary valueForKey:@"navigationType"] lengthOfBytesUsingEncoding:NSUTF8StringEncoding])),
+                    .navigationType = BPStringToOnLoadingFinishNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String], [[dictionary valueForKey:@"navigationType"] lengthOfBytesUsingEncoding:NSUTF8StringEncoding])),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
                     .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),

example/App.tsx

@@ -2,7 +2,6 @@ import React, { useCallback } from 'react';
 import { SafeAreaView, StyleSheet, Dimensions, Linking } from 'react-native';
 import { WebView } from 'react-native-webview-bootpay';
 
-
 const { width: deviceWidth, height: deviceHeight } = Dimensions.get('window');
 
 export default function App() {
@@ -17,7 +16,7 @@ export default function App() {
   const shouldStartLoadWithRequest = useCallback((event) => {
     console.log('Request URL:', event.url);
 
-    if (event.url.includes("smartstore.naver")) {
+    if (event.url.includes('smartstore.naver')) {
       Linking.openURL(event.url);
       return false;
     }

example/index.js

@@ -2,8 +2,8 @@
  * @format
  */
 
-import {AppRegistry} from 'react-native';
+import { AppRegistry } from 'react-native';
 import App from './App';
-import {name as appName} from './app.json';
+import { name as appName } from './app.json';
 
 AppRegistry.registerComponent(appName, () => App);

index.d.ts

@@ -2,64 +2,70 @@ import { Component } from 'react';
 // eslint-disable-next-line
 import { IOSWebViewProps, AndroidWebViewProps, WindowsWebViewProps } from './lib/WebViewTypes';
 
-export { FileDownload, WebViewMessageEvent, WebViewNavigation } from "./lib/WebViewTypes";
+export {
+  FileDownload,
+  WebViewMessageEvent,
+  WebViewNavigation,
+} from './lib/WebViewTypes';
 
-export type WebViewProps = IOSWebViewProps & AndroidWebViewProps & WindowsWebViewProps;
+export type WebViewProps = IOSWebViewProps &
+  AndroidWebViewProps &
+  WindowsWebViewProps;
 
 declare class WebView<P = {}> extends Component<WebViewProps & P> {
-    /**
-     * Go back one page in the webview's history.
-     */
-    goBack: () => void;
+  /**
+   * Go back one page in the webview's history.
+   */
+  goBack: () => void;
 
-    /**
-     * Go forward one page in the webview's history.
-     */
-    goForward: () => void;
+  /**
+   * Go forward one page in the webview's history.
+   */
+  goForward: () => void;
 
-    /**
-     * Reloads the current page.
-     */
-    reload: () => void;
+  /**
+   * Reloads the current page.
+   */
+  reload: () => void;
 
-    /**
-     * Stop loading the current page.
-     */
-    stopLoading(): void;
+  /**
+   * Stop loading the current page.
+   */
+  stopLoading(): void;
 
-    /**
-     * Executes the JavaScript string.
-     */
-    injectJavaScript: (script: string) => void;
+  /**
+   * Executes the JavaScript string.
+   */
+  injectJavaScript: (script: string) => void;
 
-    /**
-     * Focuses on WebView redered page.
-     */
-    requestFocus: () => void;
-    
-     /**
-     * Posts a message to WebView.
-     */
-    postMessage: (message: string) => void;
-    
-     /**
-     * (Android only)
-     * Removes the autocomplete popup from the currently focused form field, if present.
-     */
-    clearFormData?: () => void;
+  /**
+   * Focuses on WebView redered page.
+   */
+  requestFocus: () => void;
 
-     /**
-     * (Android only)
-     * Clears the resource cache. Note that the cache is per-application, so this will clear the cache for all WebViews used.
-     */
-    clearCache?: (clear: boolean) => void;
+  /**
+   * Posts a message to WebView.
+   */
+  postMessage: (message: string) => void;
 
-     /**
-     * (Android only)
-     * Tells this WebView to clear its internal back/forward list.
-     */
-    clearHistory?: () => void;
+  /**
+   * (Android only)
+   * Removes the autocomplete popup from the currently focused form field, if present.
+   */
+  clearFormData?: () => void;
+
+  /**
+   * (Android only)
+   * Clears the resource cache. Note that the cache is per-application, so this will clear the cache for all WebViews used.
+   */
+  clearCache?: (clear: boolean) => void;
+
+  /**
+   * (Android only)
+   * Tells this WebView to clear its internal back/forward list.
+   */
+  clearHistory?: () => void;
 }
 
-export {WebView};
+export { WebView };
 export default WebView;

package.json

@@ -10,7 +10,7 @@
     "Thibault Malbranche <[email protected]>"
   ],
   "license": "MIT",
-  "version": "13.13.423",
+  "version": "13.13.44",
   "homepage": "https://github.com/react-native-webview/react-native-webview#readme",
   "scripts": {
     "android": "react-native run-android",