Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug when blur command received on node without XamlRoot #12051

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Fix bug when blur command received on node without XamlRoot #12051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a9d2a4
Fix bug when blur command received on node without XamlRoot
rozele Aug 21, 2023
3d2b48f
Change files
rozele Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-3adee0f5-93e2-4451-bc8a-967121f90520.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Fix bug when blur command received on node without XamlRoot",
"packageName": "react-native-windows",
"email": "erozell@outlook.com",
"dependentChangeType": "patch"
}
4 changes: 3 additions & 1 deletion vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,9 @@ void NativeUIManager::blur(int64_t reactTag) {
if (auto shadowNode = static_cast<ShadowNodeBase *>(m_host->FindShadowNodeForTag(reactTag))) {
// Only blur if current UI is focused to avoid problem described in PR #2687
const auto xamlRoot = tryGetXamlRoot(shadowNode->m_rootTag);
if (shadowNode->GetView() == xaml::Input::FocusManager::GetFocusedElement(xamlRoot)) {
const auto focusedElement = xamlRoot ? xaml::Input::FocusManager::GetFocusedElement(xamlRoot)
: xaml::Input::FocusManager::GetFocusedElement();
if (shadowNode->GetView() == focusedElement) {
if (auto reactControl = GetParentXamlReactControl(reactTag).get()) {
reactControl.as<winrt::Microsoft::ReactNative::implementation::ReactRootView>()->blur(shadowNode->GetView());
} else {
Expand Down