Free event delegate

windows/ReactNativeWebView/ReactWebView.cpp

@@ -32,6 +32,13 @@ namespace winrt::ReactNativeWebView::implementation {
         RegisterEvents();
     }
 
+    ReactWebView::~ReactWebView()
+    {
+      if (m_messagingEnabled) {
+        m_webBridge.MessagePostedEvent(m_message_token);
+      }
+    }
+
     void ReactWebView::RegisterEvents() {
         m_navigationStartingRevoker = m_webView.NavigationStarting(
             winrt::auto_revoke, [ref = get_weak()](auto const& sender, auto const& args) {
@@ -88,11 +95,8 @@ namespace winrt::ReactNativeWebView::implementation {
         if (m_messagingEnabled) {
           auto tag = this->GetValue(winrt::FrameworkElement::TagProperty()).as<winrt::IPropertyValue>().GetInt64();
           m_webBridge = WebViewBridge::WebBridge(tag);
-          m_webBridge.MessagePostedEvent(winrt::auto_revoke, [ref = get_weak()](const int32_t& message) {
-            OutputDebugStringW(L"> ReactWebView:MessagePostedEvent");
-            if (auto self = ref.get()) {
-              self->OnMessagePosted(message);
-            }
+          m_message_token = m_webBridge.MessagePostedEvent([this](const int32_t& message) {
+            this->OnMessagePosted(message);
           });
           webView.AddWebAllowedObject(L"__RN_WEBVIEW_JS_BRIDGE", m_webBridge);
         }
@@ -100,9 +104,10 @@ namespace winrt::ReactNativeWebView::implementation {
 
     void ReactWebView::OnMessagePosted(const int32_t& message)
     {
+      OutputDebugStringW(L"> ReactWebView:OnMessagePosted received \n");
+
       // TODO: send to RN
       // PostMessage(winrt::hstring(args.Value()));
-      OutputDebugStringW(L"> ReactWebView:OnMessagePosted received");
     }
 
     void ReactWebView::OnNavigationCompleted(winrt::WebView const& webView, winrt::WebViewNavigationCompletedEventArgs const& /*args*/) {

windows/ReactNativeWebView/ReactWebView.h

@@ -16,12 +16,14 @@ namespace winrt::ReactNativeWebView::implementation {
         ReactWebView(Microsoft::ReactNative::IReactContext const& reactContext);
         void PostMessage(winrt::hstring const& message);
         void SetMessagingEnabled(bool enabled);
+        ~ReactWebView();
 
     private:
         bool m_messagingEnabled{ false };
         winrt::Windows::UI::Xaml::Controls::WebView m_webView{ nullptr };
         Microsoft::ReactNative::IReactContext m_reactContext{ nullptr };
         WebViewBridge::WebBridge m_webBridge{ nullptr };
+        winrt::event_token m_message_token;
         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{};

windows/WebViewBridge/WebBridge.cpp

@@ -8,10 +8,6 @@ using namespace Platform;
 
 using namespace Windows::UI::Core;
 
-// https://docs.microsoft.com/en-us/windows/uwp/winrt-components/create-a-windows-runtime-component-in-cppwinrt
-// https://github.com/microsoft/react-native-windows/blob/0.59-legacy/current/ReactWindows/ReactNativeWebViewBridge/WebViewBridge.cs
-// https://github.com/MicrosoftEdge/JSBrowser/blob/master/NativeListener
-
 WebBridge::WebBridge(int64 tag)
 {
   m_tag = tag;
@@ -24,7 +20,7 @@ void WebBridge::PostMessage(int message) {
     CoreDispatcherPriority::Normal,
     ref new DispatchedHandler([this, message]
       {
-        OutputDebugStringW(L"> WebBridge sending MessagePostedEvent");
+        OutputDebugStringW(L"> WebBridge sending MessagePostedEvent \n");
         MessagePostedEvent(message);
       }));
 }