react-native-webview-bootpay 13.8.42 → 13.13.4-6.alpha.1

package/windows/ReactNativeWebView/ReactWebView.cpp

@@ -2,6 +2,9 @@
 // Licensed under the MIT License.
 
 #include "pch.h"
+
+#ifndef USE_WINUI3
+
 #include "JSValueXaml.h"
 #include "ReactWebView.h"
 #include "ReactWebView.g.cpp"
@@ -41,7 +44,7 @@ namespace winrt::ReactNativeWebView::implementation {
                 if (auto self = ref.get()) {
                     self->OnNavigationStarting(sender, args);
                 }
-                
+
             });
 
         m_navigationCompletedRevoker = m_webView.NavigationCompleted(
@@ -57,6 +60,14 @@ namespace winrt::ReactNativeWebView::implementation {
                     self->OnNavigationFailed(sender, args);
                 }
             });
+
+        m_domContentLoadedRevoker = m_webView.DOMContentLoaded(
+            winrt::auto_revoke, [ref = get_weak()](auto const& sender, auto const& args) {
+                if (auto self = ref.get())
+                {
+                    self->OnDOMContentLoaded(sender, args);
+                }
+            });
     }
 
     bool ReactWebView::Is17763OrHigher() {
@@ -118,9 +129,16 @@ namespace winrt::ReactNativeWebView::implementation {
             });
 
         if (m_messagingEnabled) {
-          winrt::hstring message = LR"(window.alert = function(msg) { __REACT_WEB_VIEW_BRIDGE.postMessage(`{"type":"__alert", "message" : "${msg}" }`) }; 
-            window.ReactNativeWebView = {postMessage: function(data) { __REACT_WEB_VIEW_BRIDGE.postMessage(String(data)) }};)";
-          webView.InvokeScriptAsync(L"eval", { message });
+            winrt::hstring windowAlert =
+                L"window.alert = function (msg) "
+                L"{__REACT_WEB_VIEW_BRIDGE.postMessage(`{\"type\":\"__alert\",\"message\":\"${msg}\"}`)};";
+            winrt::hstring postMessage =
+                L"window.postMessage = function (data) "
+                L"{__REACT_WEB_VIEW_BRIDGE.postMessage(typeof data == 'string' ? data : JSON.stringify(data))};";
+            winrt::hstring reactNativeWebviewPostMessage =
+                L"window.ReactNativeWebView = {postMessage: function (data) "
+                L"{__REACT_WEB_VIEW_BRIDGE.postMessage(typeof data == 'string' ? data : JSON.stringify(data))}};";
+            webView.InvokeScriptAsync(L"eval", {windowAlert + postMessage + reactNativeWebviewPostMessage});
         }
     }
 
@@ -152,7 +170,7 @@ namespace winrt::ReactNativeWebView::implementation {
                 }
             }
           }
-      
+
           m_reactContext.DispatchEvent(
                 *this,
                 L"topMessage",
@@ -165,6 +183,53 @@ namespace winrt::ReactNativeWebView::implementation {
                 });
     }
 
+    void ReactWebView::PostMessage(winrt::hstring const& message) {
+        if (m_messagingEnabled) {
+            HandleMessageFromJS(message);
+        }
+    }
+
+    void ReactWebView::OnDOMContentLoaded(winrt::WebView const& webView, winrt::WebViewDOMContentLoadedEventArgs const& /*args*/)
+    {
+        m_reactContext.DispatchEvent(
+            *this,
+            L"topDOMContentLoaded",
+            [&](winrt::IJSValueWriter const& eventDataWriter) noexcept
+            {
+                eventDataWriter.WriteObjectBegin();
+                WriteWebViewNavigationEventArg(webView, eventDataWriter);
+                eventDataWriter.WriteObjectEnd();
+            });
+        // Polyfill for missing globalThis:
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis
+        webView.InvokeScriptAsync(
+            L"eval", {L"if(typeof globalThis === 'undefined') { var globalThis = Function('return this')(); }"});
+        // Polyfill for missing BigInt:
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt
+        webView.InvokeScriptAsync(L"eval", {L"window.BigInt = function (data) { return Number(parseFloat(data)); }"});
+        // Polyfill for missing DOMRect: https://developer.mozilla.org/en-US/docs/Web/API/DOMRect
+        webView.InvokeScriptAsync(
+            L"eval",
+            {L"window.DOMRect = function (x = 0, y = 0, width = 0, height = 0) { return Object.assign({ x: x, y: y, "
+             L"height: height, width: width, top: ((y > 0) ? y : (y + height)), right: ((x > 0) ? (x + width) : x), "
+             L"bottom: ((y > 0) ? (y + height) : y), left: ((x > 0) ? x : (x + width)) }); }"});
+        if (!m_injectedJavascript.empty())
+        {
+            webView.InvokeScriptAsync(L"eval", {m_injectedJavascript});
+        }
+    }
+
+    void ReactWebView::SetInjectedJavascript(winrt::hstring const& payload)
+    {
+        m_injectedJavascript = payload;
+    }
+
+    void ReactWebView::RequestFocus()
+    {
+        FocusManager::TryFocusAsync(m_webView, FocusState::Programmatic);
+    }
+
+
     void ReactWebView::MessagingEnabled(bool enabled) noexcept{
       m_messagingEnabled = enabled;
     }
@@ -172,4 +237,6 @@ namespace winrt::ReactNativeWebView::implementation {
     bool ReactWebView::MessagingEnabled() const noexcept{
         return m_messagingEnabled;
     }
-} // namespace winrt::ReactNativeWebView::implementation
+} // namespace winrt::ReactNativeWebView::implementation
+
+#endif // USE_WINUI3

package/windows/ReactNativeWebView/ReactWebView.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#ifndef USE_WINUI3
+
 #include "winrt/Microsoft.ReactNative.h"
 #include "NativeModules.h"
 #include "ReactWebView.g.h"
@@ -18,6 +20,9 @@ namespace winrt::ReactNativeWebView::implementation {
         ReactWebView(Microsoft::ReactNative::IReactContext const& reactContext);
         void MessagingEnabled(bool enabled) noexcept;
         bool MessagingEnabled() const noexcept;
+        void SetInjectedJavascript(winrt::hstring const& payload);
+        void RequestFocus();
+        void PostMessage(winrt::hstring const& message);
         ~ReactWebView();
 
     private:
@@ -26,13 +31,16 @@ namespace winrt::ReactNativeWebView::implementation {
         Microsoft::ReactNative::IReactContext m_reactContext{ nullptr };
         WebBridge m_webBridge{ nullptr };
         winrt::event_token m_messageToken;
+        winrt::hstring m_injectedJavascript;
         winrt::Windows::UI::Xaml::Controls::WebView::NavigationStarting_revoker m_navigationStartingRevoker{};
         winrt::Windows::UI::Xaml::Controls::WebView::NavigationCompleted_revoker m_navigationCompletedRevoker{};
         winrt::Windows::UI::Xaml::Controls::WebView::NavigationFailed_revoker m_navigationFailedRevoker{};
+        winrt::Windows::UI::Xaml::Controls::WebView::DOMContentLoaded_revoker m_domContentLoadedRevoker{};
 
         void HandleMessageFromJS(winrt::hstring const& message);
         void RegisterEvents();
         void WriteWebViewNavigationEventArg(winrt::Windows::UI::Xaml::Controls::WebView const& sender, winrt::Microsoft::ReactNative::IJSValueWriter const& eventDataWriter);
+        void OnDOMContentLoaded(winrt::Windows::UI::Xaml::Controls::WebView const& sender, winrt::Windows::UI::Xaml::Controls::WebViewDOMContentLoadedEventArgs const& args);
         void OnNavigationStarting(winrt::Windows::UI::Xaml::Controls::WebView const& sender, winrt::Windows::UI::Xaml::Controls::WebViewNavigationStartingEventArgs const& args);
         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);
@@ -43,4 +51,6 @@ namespace winrt::ReactNativeWebView::implementation {
 
 namespace winrt::ReactNativeWebView::factory_implementation {
     struct ReactWebView : ReactWebViewT<ReactWebView, implementation::ReactWebView> {};
-} // namespace winrt::ReactNativeWebView::factory_implementation
+} // namespace winrt::ReactNativeWebView::factory_implementation
+
+#endif // USE_WINUI3

package/windows/ReactNativeWebView/ReactWebView.idl

@@ -1,22 +1,31 @@
+#include <NamespaceRedirect.h>
+
 namespace ReactNativeWebView{
+#if !defined(USE_WINUI3)
     [default_interface]
     runtimeclass ReactWebView : Windows.UI.Xaml.Controls.ContentPresenter{
         ReactWebView(Microsoft.ReactNative.IReactContext context);
         Boolean MessagingEnabled;
+        void SetInjectedJavascript(String payload);
+        void RequestFocus();
+        void PostMessage(String message);
     };
+#endif
 #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)
+#if RNW_VERSION_AT_LEAST(0,68,0) && (defined(WINUI2_HAS_WEBVIEW2) || defined(USE_WINUI3))
     [default_interface]
-    runtimeclass ReactWebView2 : Windows.UI.Xaml.Controls.ContentPresenter{
+    runtimeclass ReactWebView2 : XAML_NAMESPACE.Controls.ContentPresenter{
         ReactWebView2(Microsoft.ReactNative.IReactContext context);
         void NavigateToHtml(String html);
-        void NavigateWithHeaders(String uri, Windows.Foundation.Collections.IMapView<String, String> headers);
+        void NavigateWithWebResourceRequest(Microsoft.ReactNative.IJSValueReader request);
+        String InjectedJavascript;
         Boolean MessagingEnabled;
+        Boolean LinkHandlingEnabled;
     };
 #endif
 } // namespace ReactNativeWebView