react-native-windows 0.0.0-canary.447 → 0.0.0-canary.448

package/Microsoft.ReactNative/ABIViewManager.cpp

@@ -41,7 +41,8 @@ ABIViewManager::ABIViewManager(
       m_viewManagerWithExportedEventTypeConstants{viewManager.try_as<IViewManagerWithExportedEventTypeConstants>()},
       m_viewManagerRequiresNativeLayout{viewManager.try_as<IViewManagerRequiresNativeLayout>()},
       m_viewManagerWithChildren{viewManager.try_as<IViewManagerWithChildren>()},
-      m_viewManagerWithPointerEvents{viewManager.try_as<IViewManagerWithPointerEvents>()} {
+      m_viewManagerWithPointerEvents{viewManager.try_as<IViewManagerWithPointerEvents>()},
+      m_viewManagerWithDropViewInstance{viewManager.try_as<IViewManagerWithDropViewInstance>()} {
   if (m_viewManagerWithReactContext) {
     m_viewManagerWithReactContext.ReactContext(winrt::make<implementation::ReactContext>(Mso::Copy(reactContext)));
   }
@@ -228,6 +229,14 @@ void ABIViewManager::OnPointerEvent(::Microsoft::ReactNative::ShadowNodeBase *no
   Super::OnPointerEvent(node, args);
 }
 
+void ABIViewManager::OnDropViewInstance(const ::Microsoft::ReactNative::XamlView &view) {
+  if (m_viewManagerWithDropViewInstance) {
+    m_viewManagerWithDropViewInstance.OnDropViewInstance(view.try_as<xaml::FrameworkElement>());
+  } else {
+    Super::OnDropViewInstance(view);
+  }
+}
+
 ::Microsoft::ReactNative::ShadowNode *ABIViewManager::createShadow() const {
   return new ABIShadowNode(
       m_viewManagerRequiresNativeLayout && m_viewManagerRequiresNativeLayout.RequiresNativeLayout());

package/Microsoft.ReactNative/ABIViewManager.h

@@ -13,6 +13,7 @@
 
 #include <Views/FrameworkElementViewManager.h>
 #include <Views/ShadowNodeBase.h>
+#include <XamlView.h>
 #include "ReactHost/React.h"
 
 #include "winrt/Microsoft.ReactNative.h"
@@ -67,6 +68,8 @@ class ABIViewManager : public ::Microsoft::ReactNative::FrameworkElementViewMana
 
   void OnPointerEvent(::Microsoft::ReactNative::ShadowNodeBase *node, const ReactPointerEventArgs &args) override;
 
+  void OnDropViewInstance(const ::Microsoft::ReactNative::XamlView &view);
+
  protected:
   xaml::DependencyObject CreateViewCore(int64_t, const winrt::Microsoft::ReactNative::JSValueObject &props) override;
 
@@ -80,6 +83,7 @@ class ABIViewManager : public ::Microsoft::ReactNative::FrameworkElementViewMana
   IViewManagerWithChildren m_viewManagerWithChildren;
   IViewManagerRequiresNativeLayout m_viewManagerRequiresNativeLayout;
   IViewManagerWithPointerEvents m_viewManagerWithPointerEvents;
+  IViewManagerWithDropViewInstance m_viewManagerWithDropViewInstance;
 
   winrt::Windows::Foundation::Collections::IMapView<winrt::hstring, ViewManagerPropertyType> m_nativeProps;
 };

package/Microsoft.ReactNative/IViewManager.idl

@@ -88,4 +88,11 @@ namespace Microsoft.ReactNative
     )
     void OnPointerEvent(Object view, ReactPointerEventArgs args);
   };
+  interface IViewManagerWithDropViewInstance {
+    DOC_STRING(
+        "Enables the view manager to track when the view is "
+        "being removed from the visual tree. "
+    )
+    void OnDropViewInstance(XAML_NAMESPACE.FrameworkElement view);
+  };
 } // namespace Microsoft.ReactNative

package/Microsoft.ReactNative/Views/ShadowNodeBase.cpp

@@ -65,6 +65,7 @@ void ShadowNodeBase::RemoveChildAt(int64_t indexToRemove) {
 }
 
 void ShadowNodeBase::onDropViewInstance() {
+  GetViewManager()->OnDropViewInstance(m_view);
   m_handledKeyboardEventHandler = nullptr;
 }
 

package/Microsoft.ReactNative/Views/ViewManagerBase.h

@@ -93,6 +93,8 @@ class REACTWINDOWS_EXPORT ViewManagerBase : public IViewManager {
 
   virtual void TransferProperties(const XamlView &oldView, const XamlView &newView);
 
+  virtual void OnDropViewInstance(const XamlView &view) {}
+
  protected:
   virtual XamlView CreateViewCore(int64_t tag, const winrt::Microsoft::ReactNative::JSValueObject &props) = 0;
   virtual void OnViewCreated(XamlView view) {}

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -301,7 +301,7 @@ constexpr void ValidateCoroutineArg() noexcept {
     static_assert(
         !std::is_reference_v<TArg> && !std::is_pointer_v<TArg>,
         "Coroutine parameter must be passed by value for safe access"
-#ifndef __APPLE__
+#ifndef __clang__
         ": " __FUNCSIG__
 #endif
     );

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.447</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.448</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.447",
+  "version": "0.0.0-canary.448",
   "license": "MIT",
   "repository": {
     "type": "git",