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

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/TouchEventHandler.cpp

@@ -127,9 +127,6 @@ void TouchEventHandler::OnPointerPressed(
     assert(!tagsForBranch.empty());
     const auto tag = tagsForBranch.front();
 
-    // Pointer pressing updates the enter/leave state
-    UpdatePointersInViews(args, sourceElement, std::move(tagsForBranch));
-
     size_t pointerIndex = AddReactPointer(args, tag, sourceElement);
 
     // For now, when using the mouse we only want to send click events for the left button.
@@ -189,10 +186,11 @@ void TouchEventHandler::OnPointerMoved(
   if (optPointerIndex) {
     UpdateReactPointer(m_pointers[*optPointerIndex], args, sourceElement);
     DispatchTouchEvent(eventType, *optPointerIndex);
-  } else {
-    // Move with no buttons pressed
-    UpdatePointersInViews(args, sourceElement, std::move(tagsForBranch));
   }
+
+  // If we re-introduce onMouseMove to react-native-windows, we should add an
+  // argument to ensure we do not emit these events while the pointer is down.
+  UpdatePointersInViews(args, sourceElement, std::move(tagsForBranch));
 }
 
 void TouchEventHandler::OnPointerConcluded(TouchEventType eventType, const winrt::PointerRoutedEventArgs &args) {
@@ -227,9 +225,6 @@ void TouchEventHandler::OnPointerConcluded(TouchEventType eventType, const winrt
     m_touchId = 0;
 
   m_xamlView.as<xaml::FrameworkElement>().ReleasePointerCapture(args.Pointer());
-
-  // Updates the enter/leave state when pointer was being tracked
-  UpdatePointersInViews(args, sourceElement, std::move(tagsForBranch));
 }
 
 size_t TouchEventHandler::AddReactPointer(

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.451</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/Scripts/rnw-dependencies.ps1

@@ -123,7 +123,7 @@ function InstallVS {
 function CheckNode {
     try {
         $v = (Get-Command node -ErrorAction Stop).Version.Major
-        return ($v -ge 12) -and (($v % 2) -eq 0);
+        return ($v -ge 14) -and (($v % 2) -eq 0);
     } catch {
         return $false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.447",
+  "version": "0.0.0-canary.451",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "@react-native-community/cli": "^6.0.0",
     "@react-native-community/cli-platform-android": "^6.0.0",
     "@react-native-community/cli-platform-ios": "^6.0.0",
-    "@react-native-windows/cli": "0.0.0-canary.111",
-    "@react-native-windows/virtualized-list": "0.0.0-canary.27",
+    "@react-native-windows/cli": "0.0.0-canary.113",
+    "@react-native-windows/virtualized-list": "0.0.0-canary.28",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -58,9 +58,9 @@
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.0.0-canary.23",
-    "@rnw-scripts/eslint-config": "1.1.10",
-    "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.4",
+    "@react-native-windows/codegen": "0.0.0-canary.25",
+    "@rnw-scripts/eslint-config": "1.1.11",
+    "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.5",
     "@rnx-kit/jest-preset": "^0.1.0",
     "@types/node": "^14.14.22",
     "@types/react": "^17.0.21",
@@ -74,7 +74,7 @@
     "prettier": "^2.4.1",
     "react": "17.0.2",
     "react-native": "0.0.0-20220127-2008-20b9ed91c",
-    "react-native-platform-override": "^1.6.4",
+    "react-native-platform-override": "^1.6.5",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
     "typescript": "^4.4.4"
@@ -139,6 +139,6 @@
   ],
   "promoteRelease": true,
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 14"
   }
 }