diff --git a/source/appModules/explorer.py b/source/appModules/explorer.py index 7f716078ebc..aef427a9095 100644 --- a/source/appModules/explorer.py +++ b/source/appModules/explorer.py @@ -45,6 +45,12 @@ def _get_container(self): return super(MultitaskingViewFrameListItem, self).container +class SearchBoxClient(IAccessible): + # #20021: File Explorer can fire a redundant MSAA focus event on the search band pane + # immediately after the UIA SearchEditBox gains focus. + shouldAllowIAccessibleFocusEvent = False + + # Class for menu items for Windows Places and Frequently used Programs (in start menu) # Also used for desktop items class SysListView32EmittingDuplicateFocusEvents(IAccessible): @@ -213,6 +219,14 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList): # NOQA: C901 windowClass = obj.windowClassName role = obj.role + if ( + windowClass in ("Search Box", "UniversalSearchBand") + and role == controlTypes.Role.PANE + and isinstance(obj, IAccessible) + ): + clsList.insert(0, SearchBoxClient) + return # Optimization: return early to avoid comparing class names and roles that will never match. + if windowClass == "ToolbarWindow32": if role != controlTypes.Role.POPUPMENU: try: diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md index e277a3ab5f2..d7c660c3ae4 100644 --- a/user_docs/en/changes.md +++ b/user_docs/en/changes.md @@ -3,6 +3,7 @@ ## 2026.1.1 This is a patch release to fix a security issue. +A bug fix is also included for an issue introduced in 2026.1 with how `ctrl+f` is handled in File Explorer. A change introduced in 2026.1 with how NVDA handles connection issues with Remote Access was removed. ### Security fixes @@ -12,6 +13,10 @@ Please responsibly disclose security issues following NVDA's [security policy](h * Fixed an issue which could cause NVDA to connect to an untrusted Remote Access server. ([GHSA-m268-mc77-j2cr](https://github.com/nvaccess/nvda/security/advisories/GHSA-m268-mc77-j2cr)) * Prevents a situation which could cause unselected add-ons to be copied to the system-wide configuration. ([GHSA-669f-7gpr-5vqm](https://github.com/nvaccess/nvda/security/advisories/GHSA-669f-7gpr-5vqm)) +### Bug Fixes + +* In File Explorer, pressing `ctrl+f` once again focuses the search box without subsequently reporting a pane. (#20021, @Cary-rowen) + ### Changes * Remote Access once again attempts automatic reconnection after a failed initial connection as the controlled computer, rather than failing immediately.