Fix keyboard event unsubscribe (#11057)

* Fix keyboard event unsubscribe Boolean check was flipped for keyboard event handler. Likely no behavior change, since often ReactRootView is destroyed (along with the shared_ptr for keyboard event handler) shortly after UninitRootView is called. * Change files
microsoft · Jan 9, 2023 · 5b40a3d · 5b40a3d
1 parent 39d70cf
commit 5b40a3d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/change/react-native-windows-18f820d3-b455-4e76-b4a9-7d8a7f5b4584.json b/change/react-native-windows-18f820d3-b455-4e76-b4a9-7d8a7f5b4584.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Fix keyboard event unsubscribe",
+  "packageName": "react-native-windows",
+  "email": "erozell@outlook.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/ReactRootView.cpp b/vnext/Microsoft.ReactNative/ReactRootView.cpp
@@ -206,11 +206,11 @@ void ReactRootView::UninitRootView() noexcept {
     }
   }
 
-  if (m_touchEventHandler != nullptr) {
+  if (m_touchEventHandler) {
     m_touchEventHandler->RemoveTouchHandlers();
   }
 
-  if (!m_previewKeyboardEventHandlerOnRoot) {
+  if (m_previewKeyboardEventHandlerOnRoot) {
     m_previewKeyboardEventHandlerOnRoot->unhook();
   }