Fixes bug introduced by pointerEvents change (#10498)

* Fixes bug introduced by pointerEvents change The handling for pointerEvents moved from ViewViewManager to ViewManagerBase so all views could participate in pointerEvents handling (including Text, etc.). During this move, the code introduced a bug where updates to pointerEvents after pointerEvents is set to `none` are not respected. This adds an else clause to ensure we reset the `IsHitTestVisible` property when a the `pointerEvents` value is not `none`, but still valid. Resolves #10493 * Change files
microsoft · Sep 6, 2022 · cdf3ee1 · cdf3ee1
1 parent 6703c83
commit cdf3ee1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/change/react-native-windows-6319c12d-1bae-496d-a970-f863834d0d05.json b/change/react-native-windows-6319c12d-1bae-496d-a970-f863834d0d05.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Fixes bug introduced by pointerEvents change",
+  "packageName": "react-native-windows",
+  "email": "ericroz@fb.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/Views/ViewManagerBase.cpp b/vnext/Microsoft.ReactNative/Views/ViewManagerBase.cpp
@@ -271,9 +271,11 @@ bool ViewManagerBase::UpdateProperty(
     const auto iter = pointerEventsMap.find(propertyValue.AsString());
     if (iter != pointerEventsMap.end()) {
       nodeToUpdate->m_pointerEvents = iter->second;
-      if (nodeToUpdate->m_pointerEvents == PointerEventsKind::None) {
-        if (const auto uiElement = nodeToUpdate->GetView().try_as<xaml::UIElement>()) {
+      if (const auto uiElement = nodeToUpdate->GetView().try_as<xaml::UIElement>()) {
+        if (nodeToUpdate->m_pointerEvents == PointerEventsKind::None) {
           uiElement.IsHitTestVisible(false);
+        } else {
+          uiElement.ClearValue(xaml::UIElement::IsHitTestVisibleProperty());
         }
       }
     } else {