react-native-webview-bootpay 11.26.18 → 11.26.19

package/android/src/main/java/kr/co/bootpay/webview/BPCWebChromeClient.java

@@ -165,61 +165,132 @@ class BPCWebChromeClient extends WebChromeClient implements LifecycleEventListen
 
   @Override
   public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
-    final BPCWebView newWebView = new BPCWebView((ThemedReactContext) view.getContext());
-    BPCWebChromeClient client = new BPCWebChromeClient(this.mReactContext, view);
-//    client.onCloseWindow();
-    client.setProgressChangedFilter(progressChangedFilter);
-    newWebView.setWebChromeClient(client);
-    setWebSettingCopy(view, newWebView);
-
-    newWebView.setWebViewClient(new BPCWebViewClient() {
-
-      @Override
-      public boolean shouldOverrideUrlLoading(WebView view, String url) {
-        Intent intent = getIntentWithPackage(url);
-        Context context = view.getContext();
-
-        if(isIntent(url)) {
-          if(isInstallApp(intent, context)) return startApp(intent, context);
-          else return startGooglePlay(intent, context);
-        } else if(isMarket(url)) {
-          if(isInstallApp(intent, context)) return startApp(intent, context);
-          else return startGooglePlay(intent, context);
-        } else if(isSpecialCase(url)) {
-          if(isInstallApp(intent, context)) return startApp(intent, context);
-          else return startGooglePlay(intent, context);
+
+    if(isDialog) {
+
+      final BPCWebView newWebView = new BPCWebView((ThemedReactContext) view.getContext());
+      BPCWebChromeClient client = new BPCWebChromeClient(this.mReactContext, view);
+      //    client.onCloseWindow();
+      client.setProgressChangedFilter(progressChangedFilter);
+      newWebView.setWebChromeClient(client);
+      setWebSettingCopy(view, newWebView);
+
+      newWebView.setWebViewClient(new BPCWebViewClient() {
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+          Intent intent = getIntentWithPackage(url);
+          Context context = view.getContext();
+
+          if(isIntent(url)) {
+            if(isInstallApp(intent, context)) return startApp(intent, context);
+            else return startGooglePlay(intent, context);
+          } else if(isMarket(url)) {
+            if(isInstallApp(intent, context)) return startApp(intent, context);
+            else return startGooglePlay(intent, context);
+          } else if(isSpecialCase(url)) {
+            if(isInstallApp(intent, context)) return startApp(intent, context);
+            else return startGooglePlay(intent, context);
+          }
+          return url.contains("vguardend");
         }
-        return url.contains("vguardend");
-      }
-    });
-
-    Dialog popupDialog = new Dialog(view.getContext(), android.R.style.Theme_Black_NoTitleBar_Fullscreen);
-    popupDialog.setContentView(newWebView);
-    ViewGroup.LayoutParams params = popupDialog.getWindow().getAttributes();
-    params.width = ViewGroup.LayoutParams.MATCH_PARENT;
-    params.height = ViewGroup.LayoutParams.MATCH_PARENT;
-    popupDialog.getWindow().setAttributes((WindowManager.LayoutParams) params);
-    popupDialog.setOnDismissListener(dialog -> {
-//      Toast.makeText(view.getContext(), "팝업취소", Toast.LENGTH_SHORT).show();
-      onCloseWindow(view); //rn에선 딱히 동작하지 않음
-    });
-    newWebView.setDialog(popupDialog);
-    popupDialog.show();
-
-    final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
-    transport.setWebView(newWebView);
-    resultMsg.sendToTarget();
+      });
+
+      Dialog popupDialog = new Dialog(view.getContext(), android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+      popupDialog.setContentView(newWebView);
+      ViewGroup.LayoutParams params = popupDialog.getWindow().getAttributes();
+      params.width = ViewGroup.LayoutParams.MATCH_PARENT;
+      params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+      popupDialog.getWindow().setAttributes((WindowManager.LayoutParams) params);
+      popupDialog.setOnDismissListener(dialog -> {
+        //      Toast.makeText(view.getContext(), "팝업취소", Toast.LENGTH_SHORT).show();
+        onCloseWindow(view); //rn에선 딱히 동작하지 않음
+      });
+      newWebView.setDialog(popupDialog);
+      popupDialog.show();
+
+      final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
+      transport.setWebView(newWebView);
+      resultMsg.sendToTarget();
+
+      return true;
+    } else {
+      final WebView newWebView = new WebView(view.getContext());
+      final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
+      transport.setWebView(newWebView);
+      resultMsg.sendToTarget();
+
+      return true;
+    }
+
+
+/*
+
+    String url = resultMsg.getData().getString("url");
+
+    if(url.startsWith("https://gw.bootpay.co.kr") || url.startsWith("http://gw.bootpay.co.kr")) {
+      final BPCWebView newWebView = new BPCWebView((ThemedReactContext) view.getContext());
+      BPCWebChromeClient client = new BPCWebChromeClient(this.mReactContext, view);
+  //    client.onCloseWindow();
+      client.setProgressChangedFilter(progressChangedFilter);
+      newWebView.setWebChromeClient(client);
+      setWebSettingCopy(view, newWebView);
+
+      newWebView.setWebViewClient(new BPCWebViewClient() {
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+          Intent intent = getIntentWithPackage(url);
+          Context context = view.getContext();
+
+          if(isIntent(url)) {
+            if(isInstallApp(intent, context)) return startApp(intent, context);
+            else return startGooglePlay(intent, context);
+          } else if(isMarket(url)) {
+            if(isInstallApp(intent, context)) return startApp(intent, context);
+            else return startGooglePlay(intent, context);
+          } else if(isSpecialCase(url)) {
+            if(isInstallApp(intent, context)) return startApp(intent, context);
+            else return startGooglePlay(intent, context);
+          }
+          return url.contains("vguardend");
+        }
+      });
+
+      Dialog popupDialog = new Dialog(view.getContext(), android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+      popupDialog.setContentView(newWebView);
+      ViewGroup.LayoutParams params = popupDialog.getWindow().getAttributes();
+      params.width = ViewGroup.LayoutParams.MATCH_PARENT;
+      params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+      popupDialog.getWindow().setAttributes((WindowManager.LayoutParams) params);
+      popupDialog.setOnDismissListener(dialog -> {
+  //      Toast.makeText(view.getContext(), "팝업취소", Toast.LENGTH_SHORT).show();
+        onCloseWindow(view); //rn에선 딱히 동작하지 않음
+      });
+      newWebView.setDialog(popupDialog);
+      popupDialog.show();
+
+      final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
+      transport.setWebView(newWebView);
+      resultMsg.sendToTarget();
+
+      return true;
+
+    } else {
+      final WebView newWebView = new WebView(view.getContext());
+      final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
+      transport.setWebView(newWebView);
+      resultMsg.sendToTarget();
+
+      return true;
+
+    }
+
+*/
+    
 
-    return true;
 
-    /*
-    final WebView newWebView = new WebView(view.getContext());
-    final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
-    transport.setWebView(newWebView);
-    resultMsg.sendToTarget();
 
-    return true;
-    */
   }
 
   @Override

package/android/src/main/java/kr/co/bootpay/webview/BPCWebViewManager.java

@@ -889,7 +889,8 @@ public class BPCWebViewManager extends SimpleViewManager<WebView> {
           mReactContext.removeLifecycleEventListener(this);
         }
       };
-      
+
+      // bootpay added //
       webView.setWebChromeClient(mWebChromeClient);
     } else {
       if (mWebChromeClient != null) {

package/apple/BPCWebView.m

@@ -317,16 +317,28 @@ RCTAutoInsetsProtocol>
     [webView loadRequest:navigationAction.request];
   }
   return nil;
-  */
-  WKWebView *popupView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height) configuration:configuration];
+  */ 
+  NSString *url = navigationAction.request.URL.absoluteString;
 
-  [popupView autoresizingMask];
-  popupView.navigationDelegate = self;
-  popupView.UIDelegate = self;
+  if (!navigationAction.targetFrame.isMainFrame) {
+    
+        if ([url hasPrefix:@"https://gw.bootpay.co.kr"] || [url hasPrefix:@"http://gw.bootpay.co.kr"]) {
+            // 팝업(새 창) 뜨는 경우 호출됨 (window.open 또는 target="_blank")
+            WKWebView *popupView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height) configuration:configuration];
+
+            [popupView autoresizingMask];
+            popupView.navigationDelegate = self;
+            popupView.UIDelegate = self;
 
-  [self addSubview:popupView];
+            [self addSubview:popupView];
 
-  return popupView;
+            return popupView;
+        } else {
+            [webView loadRequest:navigationAction.request];
+            return nil;
+        }
+    }
+  return nil;
 }
 
 

package/package.json

@@ -10,7 +10,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "11.26.18",
+  "version": "11.26.19",
   "homepage": "https://github.com/bootpay/react-native-webview-bootpay",
   "scripts": {
     "android": "react-native run-android",