merged from remote

Pingou · Oct 6, 2023 · 83a7fe5 · 83a7fe5
2 parents a6bb593 + 8a2c2aa
commit 83a7fe5
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/android/src/newarch/com/reactnativecommunity/webview/RNCWebViewManager.java b/android/src/newarch/com/reactnativecommunity/webview/RNCWebViewManager.java
@@ -36,6 +36,13 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.HashMap;
+<<<<<<< HEAD
+=======
+
+@ReactModule(name = RNCWebViewManagerImpl.NAME)
+public class RNCWebViewManager extends SimpleViewManager<RNCWebView>
+        implements RNCWebViewManagerInterface<RNCWebView> {
+>>>>>>> 8a2c2aa93ed15a9dc5cd88e74ab7cb384c9308b5
 
 @ReactModule(name = RNCWebViewManagerImpl.NAME)
 public class RNCWebViewManager extends ViewGroupManager<RNCWebViewWrapper>
@@ -539,6 +546,7 @@ public void clearHistory(RNCWebViewWrapper view) {
   // !These will never be called
 
   @Override
+
     protected void addEventEmitters(@NonNull ThemedReactContext reactContext, RNCWebViewWrapper view) {
         // Do not register default touch emitter and let WebView implementation handle touches
         RNCWebViewClient rncWebViewClient = new RNCWebViewClient();