react-native-webview-bootpay 11.6.511 → 11.18.1

package/lib/WebViewTypes.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

package/lib/index.d.ts

@@ -0,0 +1,4 @@
+import WebView from './WebView';
+export { WebView };
+export default WebView;
+//# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,OAAO,EAAE,OAAO,EAAE,CAAC;AACnB,eAAe,OAAO,CAAC"}

package/lib/index.js

@@ -0,0 +1,3 @@
+import WebView from './WebView';
+export { WebView };
+export default WebView;

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "react-native-webview-bootpay",
-  "description": "React Native WebView component for iOS, Android, macOS, and Windows",
+  "description": "한국 PG 결제를 지원하는 React Native WebView 입니다. iOS, Android, macOS, Windows 를 지원합니다.",
   "main": "index.js",
+  "main-internal": "src/index.ts",
   "typings": "index.d.ts",
-  "author": "Jamon Holmgren <jamon@infinite.red>",
+  "author": "bootpay <bootpay.co.kr@gmail.com>",
   "contributors": [
-    "Thibault Malbranche <malbranche.thibault@gmail.com>"
+    "Thibault Malbranche <malbranche.thibault@gmail.com>",
+    "Jamon Holmgren <jamon@infinite.red>"
   ],
   "license": "MIT",
-  "version": "11.6.511",
-  "homepage": "https://github.com/react-native-webview/react-native-webview#readme",
+  "version": "11.18.1",
+  "homepage": "https://github.com/bootpay/react-native-webview-bootpay",
   "scripts": {
-    "start": "node node_modules/react-native/local-cli/cli.js start",
-    "start:android": "react-native run-android",
-    "start:ios": "react-native run-ios",
-    "start:macos": "node node_modules/react-native-macos/local-cli/cli.js start --use-react-native-macos",
-    "start:windows": "react-native start --use-react-native-windows",
-    "run:windows": "react-native run-windows --root ./example --no-packager",
+    "android": "react-native run-android",
+    "ios": "react-native run-ios --project-path example/ios",
+    "macos": "react-native run-macos --scheme WebviewExample --project-path example/macos",
+    "start": "cd example && react-native start",
+    "windows": "install-windows-test-app --project-directory example/windows && react-native run-windows --root example --arch x64",
     "ci": "CI=true && yarn lint",
     "ci:publish": "yarn semantic-release",
     "lint": "yarn tsc --noEmit && yarn eslint ./src --ext .ts,.tsx",
@@ -30,30 +31,28 @@
     "type": "Component"
   },
   "peerDependencies": {
-    "react-native": ">=0.60 <=0.64"
+    "react": "*",
+    "react-native": "*"
   },
   "dependencies": {
     "escape-string-regexp": "2.0.0",
     "invariant": "2.2.4"
   },
   "devDependencies": {
-    "@babel/core": "7.4.5",
-    "@babel/runtime": "7.4.5",
-    "@react-native-community/cli": "^4.8.0",
-    "@react-native-community/cli-platform-android": "^4.8.0",
-    "@react-native-community/cli-platform-ios": "^4.8.0",
+    "@babel/core": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
+    "@react-native-community/cli": "^6.0.0",
+    "@react-native-community/cli-platform-android": "^6.0.0",
+    "@react-native-community/cli-platform-ios": "^6.0.0",
     "@semantic-release/git": "7.0.16",
     "@types/invariant": "^2.2.30",
-    "@types/jest": "24.0.18",
-    "@types/react": "16.9.34",
-    "@types/react-native": "0.62.5",
+    "@types/jest": "^26.0.0",
+    "@types/react": "^17.0.0",
+    "@types/react-native": "^0.64.0",
     "@types/selenium-webdriver": "4.0.9",
     "@typescript-eslint/eslint-plugin": "2.1.0",
     "@typescript-eslint/parser": "2.1.0",
     "appium": "1.17.0",
-    "babel-eslint": "10.0.3",
-    "babel-jest": "24.8.0",
-    "babel-plugin-module-resolver": "3.1.3",
     "eslint": "6.3.0",
     "eslint-config-airbnb": "18.0.1",
     "eslint-config-prettier": "6.2.0",
@@ -61,22 +60,22 @@
     "eslint-plugin-jsx-a11y": "6.2.3",
     "eslint-plugin-react": "7.14.3",
     "eslint-plugin-react-native": "3.7.0",
-    "jest": "24.9.0",
-    "metro": "0.56.4",
-    "metro-react-native-babel-preset": "^0.59.0",
-    "react": "16.11.0",
-    "react-native": "0.62.2",
-    "react-native-macos": "0.60.0-microsoft.73",
-    "react-native-windows": "0.62.17",
+    "jest": "^26.6.3",
+    "metro-react-native-babel-preset": "^0.66.2",
+    "react": "17.0.2",
+    "react-native": "^0.66.0-0",
+    "react-native-macos": "^0.66.0-0",
+    "react-native-test-app": "^1.3.2",
+    "react-native-windows": "^0.66.0-0",
     "selenium-appium": "1.0.2",
     "selenium-webdriver": "4.0.0-alpha.7",
     "semantic-release": "15.13.24",
-    "typescript": "3.8.3",
+    "typescript": "^4.0.0",
     "winappdriver": "^0.0.7"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/react-native-webview/react-native-webview.git"
+    "url": "https://github.com/bootpay/react-native-webview-bootpay"
   },
   "files": [
     "android",

package/react-native-webview-bootpay.podspec

@@ -3,7 +3,6 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name         = "react-native-webview-bootpay"
   s.name         = package['name']
   s.version      = package['version']
   s.summary      = package['description']
@@ -13,8 +12,7 @@ Pod::Spec.new do |s|
   s.homepage     = package['homepage']
   s.platforms    = { :ios => "9.0", :osx => "10.13" }
 
-  # s.source       = { :git => "https://github.com/react-native-webview/react-native-webview.git", :tag => "v#{s.version}" }
-  s.source       = { :git => "https://github.com/bootpay/react-native-webview-bootpay.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/react-native-webview/react-native-webview.git", :tag => "v#{s.version}" }
   s.source_files  = "apple/**/*.{h,m}"
 
   s.dependency 'React-Core'

package/react-native.config.js

@@ -1,67 +1,53 @@
-/**
- * This cli config is needed for the coexistance of react-native and other
- * out-of-tree implementations such react-native-macos.
- * The following issue is tracked by
- * https://github.com/react-native-community/discussions-and-proposals/issues/182
- *
- * The work-around involves having a metro.config.js for each out-of-tree
- * platform, i.e. metro.config.js for react-native and 
- * metro.config.macos.js for react-native-macos.
- * This react-native.config.js looks for a --use-react-native-macos
- * switch and when present pushes --config=metro.config.macos.js 
- * and specifies reactNativePath: 'node_modules/react-native-macos'.
- * The metro.config.js has to blacklist 'node_modules/react-native-macos', 
- * and conversely metro.config.macos.js has to blacklist 'node_modules/react-native'.
- */
-'use strict';
-
-const path = require('path');
-
-const macSwitch = '--use-react-native-macos';
-const windowsSwitch = '--use-react-native-windows';
-
-if (process.argv.includes(macSwitch)) {
-  process.argv = process.argv.filter(arg => arg !== macSwitch);
-  process.argv.push('--config=metro.config.macos.js');
-  module.exports = {
-    reactNativePath: 'node_modules/react-native-macos',
-  };
-}
-else if (process.argv.includes(windowsSwitch)) {
-  process.argv = process.argv.filter(arg => arg !== windowsSwitch);
-  process.argv.push('--config=metro.config.windows.js');
-  module.exports = {
-    reactNativePath: 'node_modules/react-native-windows',
-  };
-}
-else {
-  module.exports = {
-    project: {
+const project = (() => {
+  const fs = require('fs');
+  const path = require('path');
+  try {
+    const {
+      androidManifestPath,
+      iosProjectPath,
+      windowsProjectPath,
+    } = require('react-native-test-app');
+    return {
+      android: {
+        sourceDir: path.join('example', 'android'),
+        manifestPath: androidManifestPath(
+          path.join(__dirname, 'example', 'android'),
+        ),
+      },
       ios: {
-        project: 'example/ios/',
+        project: iosProjectPath('example/ios'),
       },
-      android: {
-        sourceDir: 'example/android',
+      windows: fs.existsSync('example/windows/WebviewExample.sln') && {
+        sourceDir: path.join('example', 'windows'),
+        solutionFile: 'WebviewExample.sln',
+        project: windowsProjectPath(path.join(__dirname, 'example', 'windows')),
       },
-    },
-  };
-}
+    };
+  } catch (_) {
+    return undefined;
+  }
+})();
 
-module.exports.dependency = {
-  platforms: {
-    windows: {
-      sourceDir: 'windows',
-      solutionFile: 'ReactNativeWebView.sln',
-      projects: [
-        {
-          projectFile: 'ReactNativeWebView/ReactNativeWebView.vcxproj',
-          directDependency: true,
-        },
-        {
-          projectFile: 'WebViewBridgeComponent/WebViewBridgeComponent.vcxproj',
-          directDependency: false,
-        }
-      ],
+module.exports = {
+  dependencies: {
+    // Help rn-cli find and autolink this library
+    'react-native-webview': {
+      root: __dirname,
+    },
+  },
+  dependency: {
+    platforms: {
+      windows: {
+        sourceDir: 'windows',
+        solutionFile: 'ReactNativeWebView.sln',
+        projects: [
+          {
+            projectFile: 'ReactNativeWebView/ReactNativeWebView.vcxproj',
+            directDependency: true,
+          },
+        ],
+      },
     },
   },
-};
+  ...(project ? { project } : undefined),
+};

package/windows/ExperimentalFeatures.props

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Flags can be added here to effect the compilation of Microsoft.ReactNative -->
+  <PropertyGroup Label="Microsoft.ReactNative Build Flags">
+    <UseWinUI3>false</UseWinUI3>
+    <UseHermes>false</UseHermes>
+    <WinUI2xVersion>2.8.0-prerelease.210927001</WinUI2xVersion>
+    <WebView2Version>1.0.1020.30</WebView2Version>
+  </PropertyGroup>
+
+</Project>

package/windows/ReactNativeWebView/ReactNativeWebView.vcxproj

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
   <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
     <MinimalCoreWin>true</MinimalCoreWin>
-    <ProjectGuid>{729d9af8-cd9e-4427-9f6c-fb757e287729}</ProjectGuid>
+    <ProjectGuid>{00AA3765-C6A0-4713-B3F9-BFE47B9C83F5}</ProjectGuid>
     <ProjectName>ReactNativeWebView</ProjectName>
     <RootNamespace>ReactNativeWebView</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -18,10 +19,6 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
@@ -34,10 +31,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|ARM64">
       <Configuration>Release</Configuration>
       <Platform>ARM64</Platform>
@@ -56,6 +49,7 @@
     <PlatformToolset>v140</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
@@ -83,6 +77,10 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="PropertySheet.props" />
   </ImportGroup>
+  <ImportGroup Label="ReactNativeWindowsPropertySheets">
+    <Import Project="$(ReactNativeWindowsDir)\PropertySheets\external\Microsoft.ReactNative.Uwp.CppLib.props" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.props')" />
+    <Import Project="$(SolutionDir)\packages\$(WinUIPackageProps)" Condition="'$(WinUIPackageProps)'!='' And Exists('$(SolutionDir)\packages\$(WinUIPackageProps)')" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup>
@@ -116,20 +114,20 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="ReactWebView.h">
-      <DependentUpon>ReactWebView.idl</DependentUpon>
-    </ClInclude>
-    <ClInclude Include="ReactWebViewManager.h" />
+    <ClInclude Include="ReactWebView.h" />
+    <ClInclude Include="ReactWebView2.h" />
+    <ClInclude Include="ReactWebView2Manager.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="ReactPackageProvider.h">
       <DependentUpon>ReactPackageProvider.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="ReactWebViewManager.h" />
+    <ClInclude Include="WebBridge.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ReactWebView.cpp">
-      <DependentUpon>ReactWebView.idl</DependentUpon>
-    </ClCompile>
-    <ClCompile Include="ReactWebViewManager.cpp" />
+    <ClCompile Include="ReactWebView.cpp" />
+    <ClCompile Include="ReactWebView2.cpp" />
+    <ClCompile Include="ReactWebView2Manager.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
@@ -137,15 +135,19 @@
       <DependentUpon>ReactPackageProvider.idl</DependentUpon>
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+    <ClCompile Include="ReactWebViewManager.cpp" />
+    <ClCompile Include="WebBridge.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="ReactWebView.idl" />
     <Midl Include="ReactPackageProvider.idl" />
+    <Midl Include="WebBridge.idl" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="ReactNativeWebView.def" />
   </ItemGroup>
+
   <ItemGroup>
     <None Include="PropertySheet.props" />
   </ItemGroup>
@@ -154,13 +156,24 @@
       <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
       <Private>false</Private>
     </ProjectReference>
-    <ProjectReference Include="..\WebViewBridgeComponent\WebViewBridgeComponent.vcxproj">
-      <Project>{176323cd-97ce-4b0f-9d11-a2b77bda829b}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ReactNativeWindowsTargets">
+    <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureReactNativeWindowsTargets" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references targets in your node_modules\react-native-windows folder that are missing. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.props'))" />
+    <Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets'))" />
+  </Target>
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1020.30\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1020.30\build\native\Microsoft.Web.WebView2.targets')" />
+    <Import Project="$(SolutionDir)packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets" Condition="Exists('$(SolutionDir)packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets')" />
+    <Import Project="$(SolutionDir)\packages\Microsoft.ReactNative.$(ReactNativeWindowsVersion)\build\native\Microsoft.ReactNative.targets" Condition="'$(UseExperimentalNuget)'=='true' And Exists('$(SolutionDir)\packages\Microsoft.ReactNative.Cxx.$(ReactNativeWindowsVersion)\build\native\Microsoft.ReactNative.Cxx.targets')" />
+    <Import Project="$(SolutionDir)\packages\Microsoft.ReactNative.Cxx.$(ReactNativeWindowsVersion)\build\native\Microsoft.ReactNative.Cxx.targets" Condition="'$(UseExperimentalNuget)'=='true' And Exists('$(SolutionDir)\packages\Microsoft.ReactNative.Cxx.$(ReactNativeWindowsVersion)\build\native\Microsoft.ReactNative.Cxx.targets')" />
   </ImportGroup>
   <Target Name="Deploy" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -169,5 +182,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1020.30\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.1020.30\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets'))" />
+    <Error Condition="'$(UseExperimentalNuget)'=='true' And !Exists('$(SolutionDir)\packages\Microsoft.ReactNative.Cxx.$(ReactNativeWindowsVersion)\build\native\Microsoft.ReactNative.Cxx.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.ReactNative.Cxx.$(ReactNativeWindowsVersion)\build\native\Microsoft.ReactNative.Cxx.targets'))" />
+    <Error Condition="'$(UseExperimentalNuget)'=='true' And !Exists('$(SolutionDir)\packages\Microsoft.ReactNative.$(ReactNativeWindowsVersion)\build\native\Microsoft.ReactNative.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.ReactNative.$(ReactNativeWindowsVersion)\build\native\Microsoft.ReactNative.targets'))" />
   </Target>
 </Project>

package/windows/ReactNativeWebView/ReactPackageProvider.cpp

@@ -4,6 +4,7 @@
 #include "ReactPackageProvider.g.cpp"
 #endif
 
+#include "ReactWebView2Manager.h"
 #include "ReactWebViewManager.h"
 
 using namespace winrt::Microsoft::ReactNative;
@@ -12,6 +13,9 @@ namespace winrt::ReactNativeWebView::implementation {
 
 void ReactPackageProvider::CreatePackage(IReactPackageBuilder const &packageBuilder) noexcept {
   packageBuilder.AddViewManager(L"ReactWebViewManager", []() { return winrt::make<ReactWebViewManager>(); });
+#if RNW_VERSION_AT_LEAST(0,68,0)
+  packageBuilder.AddViewManager(L"ReactWebView2Manager", []() { return winrt::make<ReactWebView2Manager>(); });
+#endif
 }
 
-} // namespace winrt::ReactNativeWebView::implementation
+} // namespace winrt::ReactNativeWebView::implementation

package/windows/ReactNativeWebView/ReactWebView.cpp

@@ -23,11 +23,7 @@ namespace winrt {
 namespace winrt::ReactNativeWebView::implementation {
 
     ReactWebView::ReactWebView(winrt::IReactContext const& reactContext) : m_reactContext(reactContext) {
-#ifdef CHAKRACORE_UWP
-        m_webView = winrt::WebView(winrt::WebViewExecutionMode::SeparateProcess);
-#else
         m_webView = winrt::WebView();
-#endif
         this->Content(m_webView);
         RegisterEvents();
     }
@@ -63,7 +59,7 @@ namespace winrt::ReactNativeWebView::implementation {
             });
     }
 
-    bool Is17763OrHigher() {
+    bool ReactWebView::Is17763OrHigher() {
       static std::optional<bool> hasUniversalAPIContract_v7;
 
       if (!hasUniversalAPIContract_v7.has_value()) {
@@ -123,7 +119,7 @@ namespace winrt::ReactNativeWebView::implementation {
 
         if (m_messagingEnabled) {
           winrt::hstring windowAlert = L"window.alert = function (msg) {__REACT_WEB_VIEW_BRIDGE.postMessage(`{\"type\":\"__alert\",\"message\":\"${msg}\"}`)};";
-          winrt::hstring postMessage = L"window.BootpayRNWebView = {postMessage: function (data) {__REACT_WEB_VIEW_BRIDGE.postMessage(String(data))}};";
+          winrt::hstring postMessage = L"window.ReactNativeWebView = {postMessage: function (data) {__REACT_WEB_VIEW_BRIDGE.postMessage(String(data))}};";
           webView.InvokeScriptAsync(L"eval", { windowAlert + postMessage });
         }
     }

package/windows/ReactNativeWebView/ReactWebView.h

@@ -7,9 +7,9 @@
 #include "NativeModules.h"
 #include "ReactWebView.g.h"
 
-#include "winrt/WebViewBridgeComponent.h"
+#include "winrt/ReactNativeWebView.h"
 
-using namespace winrt::WebViewBridgeComponent;
+using namespace winrt::ReactNativeWebView;
 
 namespace winrt::ReactNativeWebView::implementation {
 
@@ -36,6 +36,7 @@ namespace winrt::ReactNativeWebView::implementation {
         void OnNavigationCompleted(winrt::Windows::UI::Xaml::Controls::WebView const& sender, winrt::Windows::UI::Xaml::Controls::WebViewNavigationCompletedEventArgs const& args);
         void OnNavigationFailed(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Controls::WebViewNavigationFailedEventArgs const& args);
         void OnMessagePosted(hstring const& message);
+        bool Is17763OrHigher();
     };
 } // namespace winrt::ReactNativeWebView::implementation
 

package/windows/ReactNativeWebView/ReactWebView.idl

@@ -1,7 +1,19 @@
 namespace ReactNativeWebView{
     [default_interface]
-    runtimeclass ReactWebView : Windows.UI.Xaml.Controls.UserControl{
+    runtimeclass ReactWebView : Windows.UI.Xaml.Controls.ContentPresenter{
         ReactWebView(Microsoft.ReactNative.IReactContext context);
         void SetMessagingEnabled(Boolean enabled);
     };
+#if __has_include(<VersionMacros.h>)
+#include <VersionMacros.h>
+#else
+#define RNW_VERSION_AT_LEAST(x,y,z) false
+#endif
+#if RNW_VERSION_AT_LEAST(0,68,0)
+    [default_interface]
+    runtimeclass ReactWebView2 : Windows.UI.Xaml.Controls.ContentPresenter{
+        ReactWebView2(Microsoft.ReactNative.IReactContext context);
+        void NavigateToHtml(String html);
+    };
+#endif
 } // namespace ReactNativeWebView

package/windows/ReactNativeWebView/ReactWebView2.cpp

@@ -0,0 +1,119 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#if RNW_VERSION_AT_LEAST(0,68,0)
+#include "JSValueXaml.h"
+#include "ReactWebView2.h"
+#include "ReactWebView2.g.cpp"
+#include <winrt/Windows.Foundation.Metadata.h>
+#include <optional>
+
+namespace winrt {
+    using namespace Microsoft::ReactNative;
+    using namespace Windows::Foundation;
+    using namespace Windows::UI;
+    using namespace Windows::UI::Xaml;
+    using namespace Windows::UI::Xaml::Controls;
+    using namespace Microsoft::UI::Xaml::Controls;
+    using namespace Microsoft::Web::WebView2::Core;
+} // namespace winrt
+
+namespace winrt::ReactNativeWebView::implementation {
+
+    ReactWebView2::ReactWebView2(winrt::IReactContext const& reactContext) : m_reactContext(reactContext) {
+        m_webView = winrt::WebView2();
+        this->Content(m_webView);
+        RegisterEvents();
+    }
+
+    ReactWebView2::~ReactWebView2(){}
+
+    void ReactWebView2::RegisterEvents() {
+        m_navigationStartingRevoker = m_webView.NavigationStarting(
+            winrt::auto_revoke, [ref = get_weak()](auto const& sender, auto const& args) {
+                if (auto self = ref.get()) {
+                    self->OnNavigationStarting(sender, args);
+                }
+                    
+            });
+
+        m_navigationCompletedRevoker = m_webView.NavigationCompleted(
+            winrt::auto_revoke, [ref = get_weak()](auto const& sender, auto const& args) {
+                if (auto self = ref.get()) {
+                    self->OnNavigationCompleted(sender, args);
+                }
+            });
+
+        m_CoreWebView2InitializedRevoker = m_webView.CoreWebView2Initialized(
+            winrt::auto_revoke, [ref = get_weak()](auto const& sender, auto const& args){
+            if (auto self = ref.get()) {
+                self->OnCoreWebView2Initialized(sender, args);
+            }
+        });
+    }  
+
+    bool ReactWebView2::Is17763OrHigher() {
+        static std::optional<bool> hasUniversalAPIContract_v7;
+
+        if (!hasUniversalAPIContract_v7.has_value()) {
+        hasUniversalAPIContract_v7 = winrt::Windows::Foundation::Metadata::ApiInformation::IsApiContractPresent(L"Windows.Foundation.UniversalApiContract", 7);
+        }
+        return hasUniversalAPIContract_v7.value();
+    }
+
+    void ReactWebView2::WriteWebViewNavigationEventArg(winrt::WebView2 const& sender, winrt::IJSValueWriter const& eventDataWriter) {
+        auto tag = this->GetValue(winrt::FrameworkElement::TagProperty()).as<winrt::IPropertyValue>().GetInt64();
+        WriteProperty(eventDataWriter, L"canGoBack", sender.CanGoBack());
+        WriteProperty(eventDataWriter, L"canGoForward", sender.CanGoForward());
+        if (Is17763OrHigher()) {
+        WriteProperty(eventDataWriter, L"loading", !sender.IsLoaded());
+        }
+        WriteProperty(eventDataWriter, L"target", tag);
+        if (auto uri = sender.Source()) {
+        WriteProperty(eventDataWriter, L"url", uri.AbsoluteCanonicalUri());
+        }
+    }
+
+    void ReactWebView2::OnNavigationStarting(winrt::WebView2 const& webView, winrt::CoreWebView2NavigationStartingEventArgs const& args) {
+        m_reactContext.DispatchEvent(
+            *this,
+            L"topLoadingStart",
+            [&](winrt::IJSValueWriter const& eventDataWriter) noexcept {
+                eventDataWriter.WriteObjectBegin();
+                WriteWebViewNavigationEventArg(webView, eventDataWriter);
+                eventDataWriter.WriteObjectEnd();
+            });
+    }
+
+    void ReactWebView2::OnNavigationCompleted(winrt::WebView2 const& webView, winrt::CoreWebView2NavigationCompletedEventArgs const& args) {
+        m_reactContext.DispatchEvent(
+            *this,
+            L"topLoadingFinish",
+            [&](winrt::IJSValueWriter const& eventDataWriter) noexcept {
+                eventDataWriter.WriteObjectBegin();
+                WriteWebViewNavigationEventArg(webView, eventDataWriter);
+                eventDataWriter.WriteObjectEnd();
+            });
+    }
+
+    void ReactWebView2::OnCoreWebView2Initialized(winrt::Microsoft::UI::Xaml::Controls::WebView2 const& sender, winrt::Microsoft::UI::Xaml::Controls::CoreWebView2InitializedEventArgs const& args) {
+        assert(sender.CoreWebView2());
+        if (m_navigateToHtml != L"") {
+            m_webView.NavigateToString(m_navigateToHtml);
+            m_navigateToHtml = L"";
+        }
+    }
+
+    void ReactWebView2::NavigateToHtml(winrt::hstring html) {
+        if (m_webView.CoreWebView2()) {
+            m_webView.NavigateToString(html);
+        }
+        else {
+            m_webView.EnsureCoreWebView2Async();
+            m_navigateToHtml = html;
+        }
+    }
+
+} // namespace winrt::ReactNativeWebView::implementation
+#endif