react-native-webview-bootpay 13.8.41 → 13.13.4-4.alpha.1

package/windows/ReactNativeWebView/ReactWebView2Manager.cpp

@@ -6,18 +6,19 @@
 #include "ReactWebView2.h"
 #include "JSValueXaml.h"
 
+namespace mux {
+    using namespace winrt::Microsoft::UI::Xaml::Controls;
+}
+
 namespace winrt {
     using namespace Microsoft::ReactNative;
     using namespace Windows::Foundation;
     using namespace Windows::Foundation::Collections;
-    using namespace Windows::UI;
-    using namespace Windows::UI::Xaml;
-    using namespace Windows::UI::Xaml::Controls;
-    using namespace Microsoft::UI::Xaml::Controls;
     using namespace Windows::Web::Http;
     using namespace Windows::Web::Http::Headers;
-    using namespace Microsoft::Web::WebView2::Core;
-    using namespace Windows::Storage::Streams;
+    using namespace xaml;
+    using namespace xaml::Controls;
+    using namespace xaml::Input;
 }
 
 namespace winrt::ReactNativeWebView::implementation {
@@ -48,6 +49,8 @@ namespace winrt::ReactNativeWebView::implementation {
         auto nativeProps = winrt::single_threaded_map<hstring, ViewManagerPropertyType>();
         nativeProps.Insert(L"source", ViewManagerPropertyType::Map);
         nativeProps.Insert(L"messagingEnabled", ViewManagerPropertyType::Boolean);
+        nativeProps.Insert(L"injectedJavaScript", ViewManagerPropertyType::String);
+        nativeProps.Insert(L"linkHandlingEnabled", ViewManagerPropertyType::String);
         return nativeProps.GetView();
     }
 
@@ -56,7 +59,7 @@ namespace winrt::ReactNativeWebView::implementation {
         IJSValueReader const& propertyMapReader) noexcept {
         auto control = view.as<winrt::ContentPresenter>();
         auto content = control.Content();
-        auto webView = content.as<winrt::WebView2>();
+        auto webView = content.as<mux::WebView2>();
         const JSValueObject& propertyMap = JSValueObject::ReadFrom(propertyMapReader);
 
         for (auto const& pair : propertyMap) {
@@ -66,7 +69,8 @@ namespace winrt::ReactNativeWebView::implementation {
 
             if (propertyName == "source") {
                 auto const& srcMap = propertyValue.AsObject();
-                std::string file = "file://";
+                auto reactWebView2 = view.as<winrt::ReactNativeWebView::ReactWebView2>();
+                std::string const fileScheme = "file://";
                 if (srcMap.find("uri") != srcMap.end()) {
                     auto uriString = srcMap.at("uri").AsString();
                     if (uriString.length() == 0) {
@@ -77,37 +81,18 @@ namespace winrt::ReactNativeWebView::implementation {
                     if (srcMap.find("__packager_asset") != srcMap.end()) {
                         isPackagerAsset = srcMap.at("__packager_asset").AsBoolean();
                     }
-                    if (isPackagerAsset && uriString.find(file) == 0) {
+                    if (isPackagerAsset && uriString.find(fileScheme) == 0) {
                         auto bundleRootPath = winrt::to_string(ReactNativeHost().InstanceSettings().BundleRootPath());
-                        uriString.replace(0, std::size(file), bundleRootPath.empty() ? "ms-appx-web:///Bundle/" : bundleRootPath);
+                        uriString.replace(0, std::size(fileScheme), bundleRootPath.empty() ? "ms-appx-web:///Bundle/" : bundleRootPath);
                     }
-
                     if (uriString.find("ms-appdata://") == 0 || uriString.find("ms-appx-web://") == 0) {
-                        webView.Source(winrt::Uri(to_hstring(uriString)));
-                    }
-                    else {
-                        const auto hasHeaders = srcMap.find("headers") != srcMap.end();
-
-                        if (hasHeaders) {
-                            auto headers = winrt::single_threaded_map<winrt::hstring, winrt::hstring>();
-
-                            for (auto const& header : srcMap.at("headers").AsObject()) {
-                                auto const& headerKey = header.first;
-                                auto const& headerValue = header.second;
-                                headers.Insert(winrt::to_hstring(headerKey), winrt::to_hstring(headerValue.AsString()));
-                            }
-
-                            const auto reactWebView2 = view.as<ReactNativeWebView::ReactWebView2>();
-                            reactWebView2.NavigateWithHeaders(to_hstring(uriString), headers.GetView());
-                        }
-                        else {
-                            webView.Source(winrt::Uri(to_hstring(uriString)));
-                        }
+                        reactWebView2.NavigateToHtml(to_hstring(uriString));
+                    } else {
+                        reactWebView2.NavigateWithWebResourceRequest(MakeJSValueTreeReader(JSValue(srcMap.Copy())));
                     }
                 }
                 else if (srcMap.find("html") != srcMap.end()) {
                     auto htmlString = srcMap.at("html").AsString();
-                    auto reactWebView2 = view.as<winrt::ReactNativeWebView::ReactWebView2>();
                     reactWebView2.NavigateToHtml(to_hstring(htmlString));
                 }
             }
@@ -116,6 +101,17 @@ namespace winrt::ReactNativeWebView::implementation {
                 auto reactWebView2 = view.as<ReactNativeWebView::ReactWebView2>();
                 reactWebView2.MessagingEnabled(messagingEnabled);
             }
+            else if (propertyName == "injectedJavaScript")
+            {
+                auto injectedJavascript = propertyValue.AsString();
+                auto reactWebView2 = view.as<ReactNativeWebView::ReactWebView2>();
+                reactWebView2.InjectedJavascript(to_hstring(injectedJavascript));
+            }
+            else if (propertyName == "linkHandlingEnabled") {
+                auto linkHandlingEnabled = propertyValue.To<bool>();
+                auto reactWebView2 = view.as<ReactNativeWebView::ReactWebView2>();
+                reactWebView2.LinkHandlingEnabled(linkHandlingEnabled);
+            }
         }
     }
 
@@ -126,10 +122,15 @@ namespace winrt::ReactNativeWebView::implementation {
 
     ConstantProviderDelegate ReactWebView2Manager::ExportedCustomDirectEventTypeConstants() noexcept {
         return [](winrt::IJSValueWriter const& constantWriter) {
+            WriteCustomDirectEventTypeConstant(constantWriter, "DOMContentLoaded");
             WriteCustomDirectEventTypeConstant(constantWriter, "LoadingStart");
             WriteCustomDirectEventTypeConstant(constantWriter, "LoadingFinish");
             WriteCustomDirectEventTypeConstant(constantWriter, "LoadingError");
             WriteCustomDirectEventTypeConstant(constantWriter, "Message");
+            WriteCustomDirectEventTypeConstant(constantWriter, "FrameNavigationStart");
+            WriteCustomDirectEventTypeConstant(constantWriter, "FrameNavigationFinish");
+            WriteCustomDirectEventTypeConstant(constantWriter, "OpenWindow");
+            WriteCustomDirectEventTypeConstant(constantWriter, "SourceChanged");
         };
     }
 
@@ -141,6 +142,10 @@ namespace winrt::ReactNativeWebView::implementation {
         commands.Append(L"reload");
         commands.Append(L"stopLoading");
         commands.Append(L"injectJavaScript");
+        commands.Append(L"requestFocus");
+        commands.Append(L"clearCache");
+        commands.Append(L"postMessage");
+        commands.Append(L"loadUrl");
         return commands.GetView();
     }
 
@@ -150,7 +155,7 @@ namespace winrt::ReactNativeWebView::implementation {
         winrt::IJSValueReader const& commandArgsReader) noexcept {
         auto control = view.as<winrt::ContentPresenter>();
         auto content = control.Content();
-        auto webView = content.as<winrt::WebView2>();
+        auto webView = content.as<mux::WebView2>();
         auto commandArgs = JSValue::ReadArrayFrom(commandArgsReader);
 
         if (commandId == L"goForward") {
@@ -167,11 +172,32 @@ namespace winrt::ReactNativeWebView::implementation {
             webView.Reload();
         }
         else if (commandId == L"stopLoading") {
-            webView.CoreWebView2().Stop();
+            if (webView.CoreWebView2() != nullptr) {
+                webView.CoreWebView2().Stop();
+            }
         }
         else if (commandId == L"injectJavaScript") {
             webView.ExecuteScriptAsync(winrt::to_hstring(commandArgs[0].AsString()));
         }
+        else if (commandId == L"requestFocus") {
+            FocusManager::TryFocusAsync(webView, FocusState::Programmatic);
+        }
+        else if (commandId == L"clearCache") {
+            // There is no way to clear the cache in WebView2 because it is shared with Edge.
+            // The best we can do is clear the cookies, because we cannot access history or local storage.
+            auto cookieManager = webView.CoreWebView2().CookieManager();
+            cookieManager.DeleteAllCookies();
+        }
+        else if (commandId == L"loadUrl") {
+            auto uri = winrt::Uri(to_hstring(commandArgs[0].AsString()));
+            webView.Source(uri);
+        }
+        else if (commandId == L"postMessage") {
+            if (webView.CoreWebView2() != nullptr) {
+                auto message = commandArgs[0].AsString();
+                webView.CoreWebView2().PostWebMessageAsString(to_hstring(message));
+            }
+        }
     }
 
 } // namespace winrt::ReactNativeWebView::implementation

package/windows/ReactNativeWebView/ReactWebView2Manager.h

@@ -10,7 +10,7 @@
 #include "NativeModules.h"
 
 namespace winrt::ReactNativeWebView::implementation {
-    
+
     class ReactWebView2Manager : public winrt::implements<
         ReactWebView2Manager,
         winrt::Microsoft::ReactNative::IViewManager,
@@ -22,7 +22,7 @@ namespace winrt::ReactNativeWebView::implementation {
         ReactWebView2Manager();
         // IViewManager
         winrt::hstring Name() noexcept;
-        winrt::Windows::UI::Xaml::FrameworkElement CreateView() noexcept;
+        xaml::FrameworkElement CreateView() noexcept;
 
         // IViewManagerWithReactContext
         winrt::Microsoft::ReactNative::IReactContext ReactContext() noexcept;
@@ -34,7 +34,7 @@ namespace winrt::ReactNativeWebView::implementation {
             NativeProps() noexcept;
 
         void UpdateProperties(
-            winrt::Windows::UI::Xaml::FrameworkElement const& view,
+            xaml::FrameworkElement const& view,
             winrt::Microsoft::ReactNative::IJSValueReader const& propertyMapReader) noexcept;
 
         // IViewManagerWithExportedEventTypeConstants
@@ -45,7 +45,7 @@ namespace winrt::ReactNativeWebView::implementation {
         winrt::Windows::Foundation::Collections::IVectorView<winrt::hstring> Commands() noexcept;
 
         void DispatchCommand(
-            winrt::Windows::UI::Xaml::FrameworkElement const& view,
+            xaml::FrameworkElement const& view,
             winrt::hstring const& commandId,
             winrt::Microsoft::ReactNative::IJSValueReader const& commandArgsReader) noexcept;
 

package/windows/ReactNativeWebView/ReactWebViewHelpers.cpp

@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once 
+
+#include "pch.h"
+#include "winrt/ReactNativeWebView.h"
+
+using namespace winrt::ReactNativeWebView;
+
+namespace winrt::ReactNativeWebView::implementation {
+    namespace ReactWebViewHelpers {
+        std::string TrimString(const std::string& str) {
+            std::string trimmedString = str;
+
+            // Trim from start
+            trimmedString.erase(0, trimmedString.find_first_not_of(" \t\n\r\f\v"));
+
+            // Trim from end
+            trimmedString.erase(trimmedString.find_last_not_of(" \t\n\r\f\v") + 1);
+
+            return trimmedString;
+        }
+        
+        std::vector<std::string> SplitString(
+            const std::string& str,
+            const std::string& delim) {
+            std::vector<std::string> tokens;
+            auto startPos = 0;
+            auto endPos = str.find(delim);
+
+            while (endPos != std::string::npos) {
+                auto token = str.substr(startPos, endPos - startPos);
+                tokens.push_back(TrimString(token));
+
+                startPos = endPos + delim.length();
+                endPos = str.find(delim, startPos);
+            }
+
+            auto lastToken = str.substr(startPos);
+            tokens.push_back(TrimString(lastToken));
+
+            return tokens;
+        }
+
+        std::map<std::string, std::string> ParseSetCookieHeader(
+            const std::string& setCookieHeader) {
+            std::map<std::string, std::string> cookie;
+
+            // Split the header into individual cookie strings
+            auto cookieStrings = SplitString(setCookieHeader, ";");
+
+            // Extract the cookie name and value from the first string
+            auto nameValuePair = SplitString(cookieStrings[0], "=");
+            cookie["Name"] = TrimString(nameValuePair[0]);
+            cookie["Value"] = TrimString(nameValuePair[1]);
+
+            // Extract the attributes from the remaining strings
+            for (std::size_t i = 1; i < cookieStrings.size(); ++i) {
+                auto attributeValuePair = SplitString(cookieStrings[i], "=");
+                auto attributeName = attributeValuePair[0];
+                auto attributeValue =
+                    attributeValuePair.size() > 1 ? attributeValuePair[1] : "";
+                cookie[attributeName] = TrimString(attributeValue);
+            }
+
+            return cookie;
+        }
+    }
+} // namespace winrt::ReactNativeWebView::implementation

package/windows/ReactNativeWebView/ReactWebViewHelpers.h

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once 
+
+#include "winrt/ReactNativeWebView.h"
+
+using namespace winrt::ReactNativeWebView;
+
+namespace winrt::ReactNativeWebView::implementation {
+    namespace ReactWebViewHelpers {
+        std::string TrimString(const std::string& str);
+        std::vector<std::string> SplitString(const std::string& str, const std::string& delim);
+        std::map<std::string, std::string> ParseSetCookieHeader(const std::string& setCookieHeader);
+    }
+} // namespace winrt::ReactNativeWebView::implementation

package/windows/ReactNativeWebView/ReactWebViewManager.cpp

@@ -1,4 +1,10 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "pch.h"
+
+#ifndef USE_WINUI3
+
 #include "ReactWebViewManager.h"
 #include "NativeModules.h"
 #include "ReactWebView.h"
@@ -144,7 +150,7 @@ namespace winrt::ReactNativeWebView::implementation {
               auto reactWebView = view.as<ReactNativeWebView::ReactWebView>();
               reactWebView.MessagingEnabled(messagingEnabled);
             }
-        }        
+        }
     }
 
     // IViewManagerWithExportedEventTypeConstants
@@ -158,6 +164,8 @@ namespace winrt::ReactNativeWebView::implementation {
             WriteCustomDirectEventTypeConstant(constantWriter, "LoadingFinish");
             WriteCustomDirectEventTypeConstant(constantWriter, "LoadingError");
             WriteCustomDirectEventTypeConstant(constantWriter, "Message");
+            WriteCustomDirectEventTypeConstant(constantWriter, "DOMContentLoaded");
+            WriteCustomDirectEventTypeConstant(constantWriter, "Message");
         };
     }
 
@@ -169,6 +177,8 @@ namespace winrt::ReactNativeWebView::implementation {
         commands.Append(L"reload");
         commands.Append(L"stopLoading");
         commands.Append(L"injectJavaScript");
+        commands.Append(L"postMessage");
+        commands.Append(L"loadUrl");
         return commands.GetView();
     }
 
@@ -199,7 +209,16 @@ namespace winrt::ReactNativeWebView::implementation {
         }
         else if (commandId == L"injectJavaScript") {
             webView.InvokeScriptAsync(L"eval", { winrt::to_hstring(commandArgs[0].AsString()) });
-        } 
+        }
+        else if (commandId == L"postMessage") {
+            auto reactWebView = view.as<ReactNativeWebView::ReactWebView>();
+            reactWebView.PostMessage(to_hstring(commandArgs[0].AsString()));
+        }
+        else if (commandId == L"loadUrl") {
+            webView.Navigate(winrt::Uri(to_hstring(commandArgs[0].AsString())));
+        }
     }
 
-} // namespace winrt::ReactWebView::implementation
+} // namespace winrt::ReactWebView::implementation
+
+#endif // USE_WINUI3

package/windows/ReactNativeWebView/ReactWebViewManager.h

@@ -2,12 +2,15 @@
 // Licensed under the MIT License.
 
 #pragma once
+
+#ifndef USE_WINUI3
+
 #include "winrt/Microsoft.ReactNative.h"
 #include "NativeModules.h"
 #include "ReactWebView.h"
 
 namespace winrt::ReactNativeWebView::implementation {
-    
+
     class ReactWebViewManager : public winrt::implements<
         ReactWebViewManager,
         winrt::Microsoft::ReactNative::IViewManager,
@@ -51,3 +54,5 @@ namespace winrt::ReactNativeWebView::implementation {
 
     };
 } // namespace winrt::ReactWebView::implementation
+
+#endif  // USE_WINUI3

package/windows/ReactNativeWebView/pch.h

@@ -8,26 +8,30 @@
 #define RNW_VERSION_AT_LEAST(x,y,z) false
 #endif
 
-#if RNW_VERSION_AT_LEAST(0,68,0) && defined(WINUI2_HAS_WEBVIEW2)
+#if RNW_VERSION_AT_LEAST(0,68,0) && (defined(WINUI2_HAS_WEBVIEW2) || defined(USE_WINUI3))
 #define HAS_WEBVIEW2 1
 #else
 #define HAS_WEBVIEW2 0
 #endif
 
 #include <unknwn.h>
+
+#include <CppWinRTIncludes.h>
+#include <UI.Xaml.Controls.h>
+#include <UI.Xaml.Input.h>
+#include <UI.Xaml.Markup.h>
+#include <UI.Xaml.Navigation.h>
+
 #include <winrt/Windows.Data.Json.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.UI.Popups.h>
-#include <winrt/Windows.UI.Xaml.h>
-#include <winrt/Windows.UI.Xaml.Controls.h>
-#include <winrt/Windows.UI.Xaml.Markup.h>
-#include <winrt/Windows.UI.Xaml.Navigation.h>
 #include <winrt/Windows.Web.Http.h>
 #include <winrt/Windows.Web.Http.Headers.h>
 #include <winrt/Microsoft.ReactNative.h>
 #include <winrt/Microsoft.UI.Xaml.Controls.h>
+#include <winrt/Windows.Security.Cryptography.h>
+#include <winrt/Windows.Storage.Streams.h>
 #if HAS_WEBVIEW2
 #include <winrt/Microsoft.Web.WebView2.Core.h>
-#include <winrt/Windows.Storage.Streams.h>
-#endif
+#endif

package/windows/ReactNativeWebView.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29609.76
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33815.320
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{6030669C-4F4D-4889-B38E-0299826D8C01}"
 EndProject
@@ -32,18 +32,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeWebView", "ReactNativeWebView\ReactNativeWebView.vcxproj", "{00AA3765-C6A0-4713-B3F9-BFE47B9C83F5}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{00aa3765-c6a0-4713-b3f9-bfe47b9c83f5}*SharedItemsImports = 4
-		..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
-		..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
-		..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
-		..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
-		..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
-		..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
-		..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
-		..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
-		..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
@@ -182,4 +170,16 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D1E18B0A-0D27-4F39-8A8B-7E3D784A99FC}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{00aa3765-c6a0-4713-b3f9-bfe47b9c83f5}*SharedItemsImports = 4
+		..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
+		..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
+		..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
+		..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
+		..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
+		..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
+		..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
+		..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
+		..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
+	EndGlobalSection
 EndGlobal