script.notify() usage removed

windows/ReactNativeWebView/ReactWebView.cpp

@@ -61,13 +61,6 @@ namespace winrt::ReactNativeWebView::implementation {
                     self->OnNavigationFailed(sender, args);
                 }
             });
-
-        m_scriptNotifyRevoker = m_webView.ScriptNotify(
-            winrt::auto_revoke, [ref = get_weak()](auto const& sender, auto const& args) {
-                if (auto self = ref.get()) {
-                    self->OnScriptNotify(sender, args);
-                }
-            });
     }
 
     void ReactWebView::WriteWebViewNavigationEventArg(winrt::WebView const& sender, winrt::IJSValueWriter const& eventDataWriter) {
@@ -118,15 +111,11 @@ namespace winrt::ReactNativeWebView::implementation {
                 eventDataWriter.WriteObjectEnd();
             });
 
-        winrt::hstring windowAlert = L"window.alert = function (msg) {window.external.notify(`{\"type\":\"__alert\",\"message\":\"${msg}\"}`)};";
         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.ReactNativeWebView = {postMessage: function (data) {__REACT_WEB_VIEW_BRIDGE.postMessage(String(data))}};";
           webView.InvokeScriptAsync(L"eval", { windowAlert + postMessage });
         }
-        else {
-          winrt::hstring postMessage = L"window.ReactNativeWebView = {postMessage: function (data) {window.external.notify(String(data))}};";
-          webView.InvokeScriptAsync(L"eval", { windowAlert + postMessage });
-        }
     }
 
     void ReactWebView::OnNavigationFailed(winrt::IInspectable const& /*sender*/, winrt::WebViewNavigationFailedEventArgs const& args) {
@@ -144,36 +133,32 @@ namespace winrt::ReactNativeWebView::implementation {
             });
     }
 
-    void ReactWebView::OnScriptNotify(winrt::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::Controls::NotifyEventArgs const& args) {
-        winrt::JsonObject jsonObject;
-        if (winrt::JsonObject::TryParse(args.Value(), jsonObject) && jsonObject.HasKey(L"type")) {
-            auto type = jsonObject.GetNamedString(L"type");
-            if (type == L"__alert") {
-                auto dialog = winrt::MessageDialog(jsonObject.GetNamedString(L"message"));
-                dialog.Commands().Append(winrt::UICommand(L"OK"));
-                dialog.ShowAsync();
-                return;
-            }
-        }
-        
-        PostMessage(winrt::hstring(args.Value()));
-    }
-
     void ReactWebView::PostMessage(winrt::hstring const& message) {
+      winrt::JsonObject jsonObject;
+      if (winrt::JsonObject::TryParse(message, jsonObject) && jsonObject.HasKey(L"type")) {
+          auto type = jsonObject.GetNamedString(L"type");
+          if (type == L"__alert") {
+            auto dialog = winrt::MessageDialog(jsonObject.GetNamedString(L"message"));
+            dialog.Commands().Append(winrt::UICommand(L"OK"));
+            dialog.ShowAsync();
+            return;
+          }
+        }
+      
         m_reactContext.DispatchEvent(
-            *this,
-            L"topMessage",
-            [&](winrt::Microsoft::ReactNative::IJSValueWriter const& eventDataWriter) noexcept {
-                eventDataWriter.WriteObjectBegin();
-                {
-                    WriteProperty(eventDataWriter, L"data", message);
-                }
-                eventDataWriter.WriteObjectEnd();
-            });
+              *this,
+              L"topMessage",
+              [&](winrt::Microsoft::ReactNative::IJSValueWriter const& eventDataWriter) noexcept {
+                  eventDataWriter.WriteObjectBegin();
+                  {
+                      WriteProperty(eventDataWriter, L"data", message);
+                  }
+                  eventDataWriter.WriteObjectEnd();
+              });
     }
 
     void ReactWebView::SetMessagingEnabled(bool enabled) {
-      this->m_messagingEnabled = enabled;
+      m_messagingEnabled = enabled;
     }
 
 } // namespace winrt::ReactNativeWebView::implementation

windows/ReactNativeWebView/ReactWebView.h

@@ -19,7 +19,7 @@ namespace winrt::ReactNativeWebView::implementation {
         ~ReactWebView();
 
     private:
-        bool m_messagingEnabled{ false };
+        bool m_messagingEnabled{ true };
         winrt::Windows::UI::Xaml::Controls::WebView m_webView{ nullptr };
         Microsoft::ReactNative::IReactContext m_reactContext{ nullptr };
         WebViewBridge::WebBridge m_webBridge{ nullptr };
@@ -27,14 +27,12 @@ namespace winrt::ReactNativeWebView::implementation {
         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::ScriptNotify_revoker m_scriptNotifyRevoker{};
 
         void RegisterEvents();
         void WriteWebViewNavigationEventArg(winrt::Windows::UI::Xaml::Controls::WebView const& sender, winrt::Microsoft::ReactNative::IJSValueWriter const& eventDataWriter);
         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);
-        void OnScriptNotify(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::UI::Xaml::Controls::NotifyEventArgs const& args);
         void OnMessagePosted(hstring const& message);
     };
 } // namespace winrt::ReactNativeWebView::implementation

windows/ReactNativeWebView/ReactWebViewManager.cpp

@@ -40,7 +40,7 @@ namespace winrt::ReactNativeWebView::implementation {
     IMapView<hstring, ViewManagerPropertyType> ReactWebViewManager::NativeProps() noexcept {
         auto nativeProps = winrt::single_threaded_map<hstring, ViewManagerPropertyType>();
         nativeProps.Insert(L"source", ViewManagerPropertyType::Map);
-        nativeProps.Insert(L"backgroundColor", ViewManagerPropertyType::Color); // Does this really work?
+        nativeProps.Insert(L"backgroundColor", ViewManagerPropertyType::Color);
         nativeProps.Insert(L"messagingEnabled", ViewManagerPropertyType::Boolean);
         return nativeProps.GetView();
     }