react-native-webview-bootpay 13.8.42 → 13.13.4

package/README.md

@@ -1,73 +1,56 @@
-# react-native-webview-bootpay 라이브러리
+# React Native WebView
 
-react-native-webview를 부트페이가 Fork 떠서 만든 웹뷰입니다. 이미 결제모듈이 동작하는 웹사이트에 webview로 링크만 연결하여 사용하실 웹앱 flutter 개발자분께서는 해당 모듈의 웹뷰를 사용하시면 쉽게 결제 진행이 가능하십니다.
+![star this repo](https://img.shields.io/github/stars/react-native-webview/react-native-webview?style=flat-square)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
+[![NPM Version](https://img.shields.io/npm/v/react-native-webview.svg?style=flat-square)](https://www.npmjs.com/package/react-native-webview)
+![Npm Downloads](https://img.shields.io/npm/dm/react-native-webview.svg)
 
-## 1-1. 설치하기
+**React Native WebView** is a community-maintained WebView component for React Native. It is intended to be a replacement for the built-in WebView (which was [removed from core](https://github.com/react-native-community/discussions-and-proposals/pull/3)).
 
-### npm으로 설치하기
-```sh
-npm install react-native-webview-bootpay
-```
+### Maintainers
 
-### yarn으로 설치하기
-```sh
-yarn add react-native-webview-bootpay
-```
+**Many thanks to these companies** for providing us with time to work on open source.  
+Please note that maintainers spend a lot of free time working on this too so feel free to sponsor them, **it really makes a difference.**
 
-또는 package.json 파일의 dependencies에 추가 후 yarn install을 합니다.
+- [Thibault Malbranche](https://github.com/Titozzz) ([Twitter @titozzz](https://twitter.com/titozzz)) from [Brigad](https://www.brigad.co/en-gb/about-us)  
+[*Sponsor me* ❤️ !](https://github.com/sponsors/Titozzz)
 
-```sh
-"dependencies": {
-    "react-native-webview-bootpay": last_version
- }
 
-```
+Windows and macOS are managed by Microsoft, notably:
+- [Alexander Sklar](https://github.com/asklar) ([Twitter @alexsklar](https://twitter.com/alexsklar)) from [React Native for Windows](https://microsoft.github.io/react-native-windows/)
+- [Chiara Mooney](https://github.com/chiaramooney) from [React Native for Windows @ Microsoft](https://microsoft.github.io/react-native-windows/)
 
-## 설정하기
-
-### Android
-따로 설정하실 것이 없습니다.
-
-### iOS
-** {your project root}/ios/Runner/Info.plist **
-``CFBundleURLName``과 ``CFBundleURLSchemes``의 값은 개발사에서 고유값으로 지정해주셔야 합니다. 외부앱(카드사앱)에서 다시 기존 앱으로 앱투앱 호출시 필요한 스키마 값입니다.
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    ...
-
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>
-    <key>CFBundleURLTypes</key>
-    <array>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLName</key>
-            <string>kr.co.bootpaySample</string> 
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>bootpaySample</string> 
-            </array>
-        </dict>
-    </array>
-
-    ...
-</dict>
-</plist>
-```
+Shout-out to [Jamon Holmgren](https://github.com/jamonholmgren) from [Infinite Red](https://infinite.red) for helping a lot with the repo when he had more available time.
+
+### Disclaimer
+
+Maintaining WebView is very complex because it is often used for many different use cases (rendering SVGs, PDFs, login flows, and much more). We also support many platforms and both architectures of react-native.
+
+Since WebView was extracted from the React Native core, nearly 500 pull requests have been merged.  
+Considering that we have limited time, issues will mostly serve as a discussion place for the community, while **we will prioritize reviewing and merging pull requests.** 
+
+### Platform compatibility
+
+This project is compatible with **iOS**,  **Android**, **Windows** and **macOS**.  
+This project supports both **the old** (paper) **and the new architecture** (fabric).  
+This project is compatible with [expo](https://docs.expo.dev/versions/latest/sdk/webview/).
 
-## 사용예제
+### Getting Started
+
+Read our [Getting Started Guide](docs/Getting-Started.md). If any step seems unclear, please create a pull request.
+
+### Versioning
+
+This project follows [semantic versioning](https://semver.org/). We do not hesitate to release breaking changes but they will be in a major version.
+
+### Usage
+
+Import the `WebView` component from `react-native-webview` and use it like so:
 
 ```tsx
 import React, { Component } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
-import { WebView } from 'react-native-webview-bootpay';
+import { WebView } from 'react-native-webview';
 
 // ...
 const MyWebComponent = () => {
@@ -75,24 +58,25 @@ const MyWebComponent = () => {
 }
 ```
 
-## onMessage 사용시
-```
-window.BootpayRNWebView.postMessage("test data"); //부트페이 웹뷰 
-```
-사용 방법은 react-native-webview와 동일하며 javascript interface 이름이 ReactNativeWebView 가 아닌 BootpayRNWebView 값으로 보내주시면 되겠습니다.
-
-## Documentation
+For more, read the [API Reference](./docs/Reference.md) and [Guide](./docs/Guide.md). If you're interested in contributing, check out the [Contributing Guide](./docs/Contributing.md).
 
-[부트페이 개발매뉴얼](https://bootpay.gitbook.io/docs/)을 참조해주세요
+### Common issues
 
-## 기술문의
+- If you're getting `Invariant Violation: Native component for "RNCWebView does not exist"` it likely means you forgot to run `react-native link` or there was some error with the linking process
+- If you encounter a build error during the task `:app:mergeDexRelease`, you need to enable multidex support in `android/app/build.gradle` as discussed in [this issue](https://github.com/react-native-webview/react-native-webview/issues/1344#issuecomment-650544648)
 
-[채팅](https://bootpay.channel.io/)으로 문의
+#### Contributing
 
-## License
+Contributions are welcome, see [Contributing.md](https://github.com/react-native-webview/react-native-webview/blob/master/docs/Contributing.md)
 
-[MIT License](https://opensource.org/licenses/MIT).
+### License
 
+MIT
 
+### Translations
 
+This readme is available in:
 
+- [Brazilian portuguese](docs/README.portuguese.md)
+- [French](docs/README.french.md)
+- [Italian](docs/README.italian.md)

package/android/build.gradle

@@ -64,7 +64,7 @@ android {
 
         sourceSets {
             main {
-                manifest.srcFile "src/main/AndroidManifest.xml"
+                manifest.srcFile "src/main/AndroidManifestNew.xml"
             }
         }
     }
@@ -108,13 +108,3 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion')}"
     implementation "androidx.webkit:webkit:${safeExtGet('webkitVersion')}"
 }
-
-// if (isNewArchitectureEnabled()) {
-//     react {
-//         jsRootDir = file("../src/")
-//         libraryName = "BPCWebView"
-//         codegenJavaPackageName = "kr.co.bootpay.webview"
-//         codegenDir = new File(codegenPath)
-//         reactNativeDir = new File(reactNativePath)
-//     }
-// }

package/android/gradle.properties

@@ -3,45 +3,3 @@ ReactNativeWebViewBootpay_webkitVersion=1.4.0
 ReactNativeWebViewBootpay_compileSdkVersion=31
 ReactNativeWebViewBootpay_targetSdkVersion=31
 ReactNativeWebViewBootpay_minSdkVersion=21
-
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-
-# Use this property to specify which architecture you want to build.
-# You can also override it from the CLI using
-# ./gradlew <task> -PreactNativeArchitectures=x86_64
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
-
-# Use this property to enable support to the new architecture.
-# This will allow you to use TurboModules and the Fabric render in
-# your application. You should enable this flag either if you want
-# to write custom TurboModules/Fabric components OR use libraries that
-# are providing them.
-newArchEnabled=false
-
-# Use this property to enable or disable the Hermes JS engine.
-# If set to false, you will be using JSC instead.
-hermesEnabled=true

package/android/src/main/AndroidManifest.xml

@@ -11,7 +11,9 @@
         android:name="android.support.FILE_PROVIDER_PATHS"
         android:resource="@xml/file_provider_paths" />
     </provider>
-  </application><!-- android 11 모든 앱 접근 권한 사용  (Google Play 가이드라인 참고 - 2021-02-19 기준 못찾았음) -->
+  </application>
+
+  <!-- android 11 모든 앱 접근 권한 사용  (Google Play 가이드라인 참고 - 2021-02-19 기준 못찾았음) -->
   <!-- <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission" />-->
   <!-- android 11 Package Visibility 설정 (compileSdkVersion, targetSdkVersion 30 이상 설정시 필수) -->
   <!-- 2021-02-19 -->

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+    <provider
+      android:name=".BPCWebViewFileProvider"
+      android:authorities="${applicationId}.fileprovider"
+      android:exported="false"
+      android:grantUriPermissions="true">
+      <meta-data
+        android:name="android.support.FILE_PROVIDER_PATHS"
+        android:resource="@xml/file_provider_paths" />
+    </provider>
+  </application>
+</manifest>

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

@@ -24,8 +24,7 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
-
-import android.app.AlertDialog;
+ 
 import android.content.Intent;
 import android.annotation.SuppressLint;
 import android.net.http.SslError;
@@ -35,12 +34,14 @@ import androidx.core.content.ContextCompat;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.ReactNoCrashSoftException;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 
 
 import kr.co.bootpay.webview.events.TopLoadingProgressEvent;
@@ -58,6 +59,7 @@ import android.widget.Toast;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import android.content.DialogInterface;
 
 public class BPCWebChromeClient extends WebChromeClient implements LifecycleEventListener {
     protected static final FrameLayout.LayoutParams FULLSCREEN_LAYOUT_PARAMS = new FrameLayout.LayoutParams(
@@ -102,21 +104,27 @@ public class BPCWebChromeClient extends WebChromeClient implements LifecycleEven
     protected BPCWebView.ProgressChangedFilter progressChangedFilter = null;
     protected boolean mAllowsProtectedMedia = false;
 
-    protected boolean mHasOnOpenWindowEvent = false;
+    protected boolean mHasOnOpenWindowEvent = false; 
 
     public BPCWebChromeClient(BPCWebView webView) {
         this.mWebView = webView;
     }
+  
 
+    boolean isPopupWebView = false;
     @Override
     public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
 
-        final BPCWebView newWebView = new BPCWebView((ThemedReactContext) view.getContext());
+        ThemedReactContext reactContext = (ThemedReactContext) view.getContext();
+        final BPCWebView newWebView = new BPCWebView(reactContext);
 
         BPCWebChromeClient client = new BPCWebChromeClient(newWebView);
         client.setProgressChangedFilter(progressChangedFilter);
         newWebView.setWebChromeClient(client);
 
+        Log.d("BPCWebChromeClient", "onCreateWindow");
+        isPopupWebView = true;
+
         setWebSettingCopy(view, newWebView);
 
 
@@ -159,6 +167,22 @@ public class BPCWebChromeClient extends WebChromeClient implements LifecycleEven
         final WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
         transport.setWebView(newWebView);
         resultMsg.sendToTarget();
+
+        // 🔹 팝업을 위한 FrameLayout을 React Native UI 트리에 추가
+        // Activity activity = reactContext.getCurrentActivity();
+        // if (activity != null) {
+        //     activity.runOnUiThread(() -> {
+        //         FrameLayout popupContainer = new FrameLayout(activity);
+        //         popupContainer.setLayoutParams(new FrameLayout.LayoutParams(
+        //                 ViewGroup.LayoutParams.MATCH_PARENT,
+        //                 ViewGroup.LayoutParams.MATCH_PARENT
+        //         ));
+        //         popupContainer.addView(newWebView);
+        //         ((ViewGroup) activity.findViewById(android.R.id.content)).addView(popupContainer);
+        //     });
+        // } else {
+        //     Log.e("BPCWebChromeClient", "Activity is null, cannot add popup WebView.");
+        // }
  
 
         return true;
@@ -169,6 +193,10 @@ public class BPCWebChromeClient extends WebChromeClient implements LifecycleEven
     public void onCloseWindow(WebView window) {
         super.onCloseWindow(window);
         ((BPCWebView) window).dissmissDialog();
+
+        Log.d("BPCWebChromeClient", "onCloseWindow");
+
+        isPopupWebView = false;
     //    if(mainView != null) {
     //      mainView.removeView(window);
     //    }
@@ -176,9 +204,11 @@ public class BPCWebChromeClient extends WebChromeClient implements LifecycleEven
     }
 
 
+ 
+
     void setWebSettingCopy(WebView view, WebView newWebView) {
          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-        newWebView.getSettings().setMediaPlaybackRequiresUserGesture( view.getSettings().getMediaPlaybackRequiresUserGesture() );
+            newWebView.getSettings().setMediaPlaybackRequiresUserGesture( view.getSettings().getMediaPlaybackRequiresUserGesture() );
         }
 
         newWebView.getSettings().setBuiltInZoomControls(view.getSettings().getBuiltInZoomControls());
@@ -216,17 +246,17 @@ public class BPCWebChromeClient extends WebChromeClient implements LifecycleEven
         newWebView.getSettings().setCacheMode(view.getSettings().getCacheMode());
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        newWebView.getSettings().setMixedContentMode(view.getSettings().getMixedContentMode());
+            newWebView.getSettings().setMixedContentMode(view.getSettings().getMixedContentMode());
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        newWebView.getSettings().setSafeBrowsingEnabled(view.getSettings().getSafeBrowsingEnabled());
+            newWebView.getSettings().setSafeBrowsingEnabled(view.getSettings().getSafeBrowsingEnabled());
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        newWebView.getSettings().setForceDark(view.getSettings().getForceDark());
+            newWebView.getSettings().setForceDark(view.getSettings().getForceDark());
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        newWebView.getSettings().setDisabledActionModeMenuItems(view.getSettings().getDisabledActionModeMenuItems());
+            newWebView.getSettings().setDisabledActionModeMenuItems(view.getSettings().getDisabledActionModeMenuItems());
         }
     }
 
@@ -246,6 +276,19 @@ public class BPCWebChromeClient extends WebChromeClient implements LifecycleEven
         if (progressChangedFilter.isWaitingForCommandLoadUrl()) {
             return;
         }
+
+        if(isPopupWebView) {
+            return;
+        }
+
+      Log.e("BPCWebChromeClient", "" + isPopupWebView);
+//        if(this.mWebView == null || this.mWebView.getThemedReactContext() == null) return;
+//      UIManagerModule uiManager = (this.mWebView.getThemedReactContext()).getNativeModule(UIManagerModule.class);
+//      if (uiManager == null) {
+//        Log.e("BPCWebChromeClient", "UIManagerModule is null, skipping event dispatch.");
+//        return;
+//      }
+
         int reactTag = BPCWebViewWrapper.getReactTagFromWebView(webView);
         WritableMap event = Arguments.createMap();
         event.putDouble("target", reactTag);
@@ -255,7 +298,8 @@ public class BPCWebChromeClient extends WebChromeClient implements LifecycleEven
         event.putBoolean("canGoForward", webView.canGoForward());
         event.putDouble("progress", (float) newProgress / 100);
 
-        UIManagerHelper.getEventDispatcherForReactTag(this.mWebView.getThemedReactContext(), reactTag).dispatchEvent(new TopLoadingProgressEvent(reactTag, event));
+      UIManagerHelper.getEventDispatcherForReactTag(this.mWebView.getThemedReactContext(), reactTag).dispatchEvent(new TopLoadingProgressEvent(reactTag, event));
+
     }
 
     @Override