react-native-webview-bootpay 11.18.16 → 11.22.7

package/windows/ReactNativeWebView/ReactWebView2Manager.cpp

@@ -0,0 +1,155 @@
+#include "pch.h"
+#include "ReactWebView2Manager.h"
+
+#if HAS_WEBVIEW2
+#include "NativeModules.h"
+#include "ReactWebView2.h"
+#include "JSValueXaml.h"
+
+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;
+}
+
+namespace winrt::ReactNativeWebView::implementation {
+
+    ReactWebView2Manager::ReactWebView2Manager() {}
+
+    // IViewManager
+    winrt::hstring ReactWebView2Manager::Name() noexcept {
+        return L"RCTWebView2";
+    }
+
+    winrt::FrameworkElement ReactWebView2Manager::CreateView() noexcept {
+      auto view = winrt::ReactNativeWebView::ReactWebView2(m_reactContext);
+      return view;
+    }
+
+    // IViewManagerWithReactContext
+    winrt::IReactContext ReactWebView2Manager::ReactContext() noexcept {
+        return m_reactContext;
+    }
+
+    void ReactWebView2Manager::ReactContext(IReactContext reactContext) noexcept {
+        m_reactContext = reactContext;
+    }
+
+    // IViewManagerWithNativeProperties
+    IMapView<hstring, ViewManagerPropertyType> ReactWebView2Manager::NativeProps() noexcept {
+        auto nativeProps = winrt::single_threaded_map<hstring, ViewManagerPropertyType>();
+        nativeProps.Insert(L"source", ViewManagerPropertyType::Map);
+        nativeProps.Insert(L"messagingEnabled", ViewManagerPropertyType::Boolean);
+        return nativeProps.GetView();
+    }
+
+    void ReactWebView2Manager::UpdateProperties(
+        FrameworkElement const& view,
+        IJSValueReader const& propertyMapReader) noexcept {
+        auto control = view.as<winrt::ContentPresenter>();
+        auto content = control.Content();
+        auto webView = content.as<winrt::WebView2>();
+        const JSValueObject& propertyMap = JSValueObject::ReadFrom(propertyMapReader);
+
+        for (auto const& pair : propertyMap) {
+            auto const& propertyName = pair.first;
+            auto const& propertyValue = pair.second;
+            if (propertyValue.IsNull()) continue;
+
+            if (propertyName == "source") {
+                auto const& srcMap = propertyValue.AsObject();
+                std::string file = "file://";
+                if (srcMap.find("uri") != srcMap.end()) {
+                    auto uriString = srcMap.at("uri").AsString();
+                    if (uriString.length() == 0) {
+                        continue;
+                    }
+
+                    bool isPackagerAsset = false;
+                    if (srcMap.find("__packager_asset") != srcMap.end()) {
+                        isPackagerAsset = srcMap.at("__packager_asset").AsBoolean();
+                    }
+                    if (isPackagerAsset && uriString.find(file) == 0) {
+                        auto bundleRootPath = winrt::to_string(ReactNativeHost().InstanceSettings().BundleRootPath());
+                        uriString.replace(0, std::size(file), bundleRootPath.empty() ? "ms-appx-web:///Bundle/" : bundleRootPath);
+                    }
+                    webView.Source(winrt::Uri(to_hstring(uriString)));
+                }
+                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));
+                }
+            }
+            else if (propertyName == "messagingEnabled") {
+                auto messagingEnabled = propertyValue.To<bool>();
+                auto reactWebView2 = view.as<ReactNativeWebView::ReactWebView2>();
+                reactWebView2.MessagingEnabled(messagingEnabled);
+            }
+        }        
+    }
+
+    // IViewManagerWithExportedEventTypeConstants
+    ConstantProviderDelegate ReactWebView2Manager::ExportedCustomBubblingEventTypeConstants() noexcept {
+        return nullptr;
+    }
+
+    ConstantProviderDelegate ReactWebView2Manager::ExportedCustomDirectEventTypeConstants() noexcept {
+        return [](winrt::IJSValueWriter const& constantWriter) {
+            WriteCustomDirectEventTypeConstant(constantWriter, "LoadingStart");
+            WriteCustomDirectEventTypeConstant(constantWriter, "LoadingFinish");
+            WriteCustomDirectEventTypeConstant(constantWriter, "LoadingError");
+            WriteCustomDirectEventTypeConstant(constantWriter, "Message");
+        };
+    }
+
+    // IViewManagerWithCommands
+    IVectorView<hstring> ReactWebView2Manager::Commands() noexcept {
+        auto commands = winrt::single_threaded_vector<hstring>();
+        commands.Append(L"goForward");
+        commands.Append(L"goBack");
+        commands.Append(L"reload");
+        commands.Append(L"stopLoading");
+        commands.Append(L"injectJavaScript");
+        return commands.GetView();
+    }
+
+    void ReactWebView2Manager::DispatchCommand(
+        FrameworkElement const& view,
+        winrt::hstring const& commandId,
+        winrt::IJSValueReader const& commandArgsReader) noexcept {
+        auto control = view.as<winrt::ContentPresenter>();
+        auto content = control.Content();
+        auto webView = content.as<winrt::WebView2>();
+        auto commandArgs = JSValue::ReadArrayFrom(commandArgsReader);
+
+        if (commandId == L"goForward") {
+            if (webView.CanGoForward()) {
+                webView.GoForward();
+            }
+        }
+        else if (commandId == L"goBack") {
+            if (webView.CanGoBack()) {
+                webView.GoBack();
+            }
+        }
+        else if (commandId == L"reload") {
+            webView.Reload();
+        }
+        else if (commandId == L"stopLoading") {
+            webView.CoreWebView2().Stop();
+        }
+        else if (commandId == L"injectJavaScript") {
+            webView.ExecuteScriptAsync(winrt::to_hstring(commandArgs[0].AsString()));
+        } 
+    }
+
+} // namespace winrt::ReactNativeWebView::implementation
+
+#endif // HAS_WEBVIEW2

package/windows/ReactNativeWebView/ReactWebView2Manager.h

@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "ReactWebView2.h"
+
+#if HAS_WEBVIEW2
+#include "winrt/Microsoft.ReactNative.h"
+#include "NativeModules.h"
+
+namespace winrt::ReactNativeWebView::implementation {
+    
+    class ReactWebView2Manager : public winrt::implements<
+        ReactWebView2Manager,
+        winrt::Microsoft::ReactNative::IViewManager,
+        winrt::Microsoft::ReactNative::IViewManagerWithReactContext,
+        winrt::Microsoft::ReactNative::IViewManagerWithNativeProperties,
+        winrt::Microsoft::ReactNative::IViewManagerWithExportedEventTypeConstants,
+        winrt::Microsoft::ReactNative::IViewManagerWithCommands> {
+    public:
+        ReactWebView2Manager();
+        // IViewManager
+        winrt::hstring Name() noexcept;
+        winrt::Windows::UI::Xaml::FrameworkElement CreateView() noexcept;
+
+        // IViewManagerWithReactContext
+        winrt::Microsoft::ReactNative::IReactContext ReactContext() noexcept;
+        void ReactContext(winrt::Microsoft::ReactNative::IReactContext reactContext) noexcept;
+
+        // IViewManagerWithNativeProperties
+        winrt::Windows::Foundation::Collections::
+            IMapView<winrt::hstring, winrt::Microsoft::ReactNative::ViewManagerPropertyType>
+            NativeProps() noexcept;
+
+        void UpdateProperties(
+            winrt::Windows::UI::Xaml::FrameworkElement const& view,
+            winrt::Microsoft::ReactNative::IJSValueReader const& propertyMapReader) noexcept;
+
+        // IViewManagerWithExportedEventTypeConstants
+        winrt::Microsoft::ReactNative::ConstantProviderDelegate ExportedCustomBubblingEventTypeConstants() noexcept;
+        winrt::Microsoft::ReactNative::ConstantProviderDelegate ExportedCustomDirectEventTypeConstants() noexcept;
+
+        // IViewManagerWithCommands
+        winrt::Windows::Foundation::Collections::IVectorView<winrt::hstring> Commands() noexcept;
+
+        void DispatchCommand(
+            winrt::Windows::UI::Xaml::FrameworkElement const& view,
+            winrt::hstring const& commandId,
+            winrt::Microsoft::ReactNative::IJSValueReader const& commandArgsReader) noexcept;
+
+    private:
+        winrt::Microsoft::ReactNative::IReactContext m_reactContext{ nullptr };
+
+    };
+} // namespace winrt::ReactNativeWebView::implementation
+#endif // HAS_WEBVIEW2

package/windows/ReactNativeWebView/ReactWebViewManager.cpp

@@ -22,7 +22,7 @@ namespace winrt::ReactNativeWebView::implementation {
 
     // IViewManager
     winrt::hstring ReactWebViewManager::Name() noexcept {
-        return L"RCTWebViewBootpay";
+        return L"RCTWebView";
     }
 
     winrt::FrameworkElement ReactWebViewManager::CreateView() noexcept {
@@ -51,7 +51,7 @@ namespace winrt::ReactNativeWebView::implementation {
     void ReactWebViewManager::UpdateProperties(
         FrameworkElement const& view,
         IJSValueReader const& propertyMapReader) noexcept {
-        auto control = view.as<winrt::UserControl>();
+        auto control = view.as<winrt::ContentPresenter>();
         auto content = control.Content();
         auto webView = content.as<winrt::WebView>();
         const JSValueObject& propertyMap = JSValueObject::ReadFrom(propertyMapReader);
@@ -78,52 +78,57 @@ namespace winrt::ReactNativeWebView::implementation {
                         uriString.replace(0, 7, bundleRootPath.empty() ? "ms-appx-web:///Bundle/" : bundleRootPath);
                     }
 
-                    bool hasHeaders = srcMap.find("headers") != srcMap.end();
-                    auto httpRequest = winrt::HttpRequestMessage();
-                    httpRequest.RequestUri(winrt::Uri(to_hstring(uriString)));
-                    if (srcMap.find("method") != srcMap.end() && srcMap.at("method").AsString() == "POST")
-                    {
-                        httpRequest.Method(winrt::HttpMethod::Post());
-                        auto formBody = srcMap.at("body").AsString();
-                        bool isUrlEncodedForm = hasHeaders &&
+                    if (uriString.find("ms-appdata://") == 0 || uriString.find("ms-appx-web://") == 0) {
+                        webView.Navigate(winrt::Uri(to_hstring(uriString)));
+                    }
+                    else {
+                        bool hasHeaders = srcMap.find("headers") != srcMap.end();
+                        auto httpRequest = winrt::HttpRequestMessage();
+                        httpRequest.RequestUri(winrt::Uri(to_hstring(uriString)));
+                        if (srcMap.find("method") != srcMap.end() && srcMap.at("method").AsString() == "POST")
+                        {
+                          httpRequest.Method(winrt::HttpMethod::Post());
+                          auto formBody = srcMap.at("body").AsString();
+                          bool isUrlEncodedForm = hasHeaders &&
                             srcMap.at("headers").AsObject().find("content-type") !=
                             srcMap.at("headers").AsObject().end() &&
                             srcMap.at("headers").AsObject().at("content-type") == "application/x-www-form-urlencoded";
-                        if (isUrlEncodedForm)
-                        {
+                          if (isUrlEncodedForm)
+                          {
                             auto formContent = winrt::single_threaded_observable_map<winrt::hstring, winrt::hstring>();
-                            auto counter = 0;
+                            size_t counter = 0u;
                             auto current = formBody.find_first_of("&");
                             while (counter <= formBody.find_last_of("&"))
                             {
-                                auto keyValueSeparator = formBody.substr(counter, counter + current).find('=');
-                                if (keyValueSeparator <= current)
-                                {
-                                    auto key = winrt::to_hstring(formBody.substr(counter, keyValueSeparator));
-                                    auto value = winrt::to_hstring(formBody.substr(
-                                        keyValueSeparator + counter + 1, current - keyValueSeparator - 1));
-                                    formContent.Insert(key, value);
-                                }
-                                counter += current + 1;
-                                current = formBody.substr(counter, formBody.size() - counter).find_first_of("&");
+                              auto keyValueSeparator = formBody.substr(counter, counter + current).find('=');
+                              if (keyValueSeparator <= current)
+                              {
+                                auto key = winrt::to_hstring(formBody.substr(counter, keyValueSeparator));
+                                auto value = winrt::to_hstring(formBody.substr(
+                                  keyValueSeparator + counter + 1, current - keyValueSeparator - 1));
+                                formContent.Insert(key, value);
+                              }
+                              counter += current + 1;
+                              current = formBody.substr(counter, formBody.size() - counter).find_first_of("&");
                             }
                             httpRequest.Content(winrt::HttpFormUrlEncodedContent(formContent));
                             httpRequest.Headers().Accept().TryParseAdd(L"application/x-www-form-urlencoded");
-                        }
-                        else
-                        {
+                          }
+                          else
+                          {
                             httpRequest.Content(winrt::HttpStringContent(to_hstring(formBody)));
+                          }
                         }
-                    }
-                    if (hasHeaders) {
-                        for (auto const& header : srcMap.at("headers").AsObject()) {
+                        if (hasHeaders) {
+                          for (auto const& header : srcMap.at("headers").AsObject()) {
                             auto const& headerKey = header.first;
                             auto const& headerValue = header.second;
                             if (headerValue.IsNull()) continue;
                             httpRequest.Headers().TryAppendWithoutValidation(winrt::to_hstring(headerKey), winrt::to_hstring(headerValue.AsString()));
+                          }
                         }
+                        webView.NavigateWithHttpRequestMessage(httpRequest);
                     }
-                    webView.NavigateWithHttpRequestMessage(httpRequest);
                 }
                 else if (srcMap.find("html") != srcMap.end()) {
                     auto htmlString = srcMap.at("html").AsString();
@@ -137,7 +142,7 @@ namespace winrt::ReactNativeWebView::implementation {
             else if (propertyName == "messagingEnabled") {
               auto messagingEnabled = propertyValue.To<bool>();
               auto reactWebView = view.as<ReactNativeWebView::ReactWebView>();
-              reactWebView.SetMessagingEnabled(messagingEnabled);
+              reactWebView.MessagingEnabled(messagingEnabled);
             }
         }        
     }
@@ -171,7 +176,7 @@ namespace winrt::ReactNativeWebView::implementation {
         FrameworkElement const& view,
         winrt::hstring const& commandId,
         winrt::IJSValueReader const& commandArgsReader) noexcept {
-        auto control = view.as<winrt::UserControl>();
+        auto control = view.as<winrt::ContentPresenter>();
         auto content = control.Content();
         auto webView = content.as<winrt::WebView>();
         auto commandArgs = JSValue::ReadArrayFrom(commandArgsReader);

package/windows/{WebViewBridgeComponent → ReactNativeWebView}/WebBridge.cpp

@@ -2,7 +2,7 @@
 #include "WebBridge.h"
 #include "WebBridge.g.cpp"
 
-namespace winrt::WebViewBridgeComponent::implementation
+namespace winrt::ReactNativeWebView::implementation
 {
     void WebBridge::PostMessage(hstring const& message)
     {

package/windows/{WebViewBridgeComponent → ReactNativeWebView}/WebBridge.h

@@ -2,7 +2,7 @@
 #include "WebBridge.g.h"
 
 
-namespace winrt::WebViewBridgeComponent::implementation
+namespace winrt::ReactNativeWebView::implementation
 {
     struct WebBridge : WebBridgeT<WebBridge>
     {
@@ -16,7 +16,7 @@ namespace winrt::WebViewBridgeComponent::implementation
       winrt::event<Windows::Foundation::EventHandler<winrt::hstring>> m_messageEvent;
     };
 }
-namespace winrt::WebViewBridgeComponent::factory_implementation
+namespace winrt::ReactNativeWebView::factory_implementation
 {
     struct WebBridge : WebBridgeT<WebBridge, implementation::WebBridge>
     {

package/windows/{WebViewBridgeComponent → ReactNativeWebView}/WebBridge.idl

@@ -1,4 +1,4 @@
-namespace WebViewBridgeComponent
+namespace ReactNativeWebView
 {
     [default_interface]
     [allowforweb]

package/windows/ReactNativeWebView/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.UI.Xaml" version="2.8.0-prerelease.210927001" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.200316.3" targetFramework="native" />
 </packages>

package/windows/ReactNativeWebView/pch.h

@@ -1,6 +1,19 @@
 #pragma once
 
 #define NOMINMAX
+
+#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) && defined(WINUI2_HAS_WEBVIEW2)
+#define HAS_WEBVIEW2 1
+#else
+#define HAS_WEBVIEW2 0
+#endif
+
 #include <unknwn.h>
 #include <winrt/Windows.Data.Json.h>
 #include <winrt/Windows.Foundation.h>
@@ -13,3 +26,7 @@
 #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>
+#if HAS_WEBVIEW2
+#include <winrt/Microsoft.Web.WebView2.Core.h>
+#endif