Fix SHIFT+F10 keyboard shortcut for context menu in TextInput#15621
Fix SHIFT+F10 keyboard shortcut for context menu in TextInput#15621Nitin-100 wants to merge 4 commits intomicrosoft:mainfrom
Conversation
28194ac to
8c0bda7
Compare
8c0bda7 to
525ebd2
Compare
vnext/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h
Outdated
Show resolved
Hide resolved
1153457 to
b47add3
Compare
- Add ContextMenuRoutedEventArgs interface to Composition.Input.idl - Add ContextMenu event to ComponentView.idl - Implement ContextMenuRoutedEventArgs in Composition.Input.h/cpp - Add ContextMenu event handlers in ComponentView.h/cpp - Subscribe to InputKeyboardSource.ContextMenuKey for ContentIsland hosting - Handle WM_CONTEXTMENU for HWND hosting - Implement OnContextMenu in WindowsTextInputComponentView
b47add3 to
13de5f2
Compare
| args.Handled(true); | ||
| } else if (msg == WM_RBUTTONUP && windowsTextInputProps().contextMenuHidden) { | ||
| // Context menu is hidden, just mark as handled | ||
| args.Handled(true); |
There was a problem hiding this comment.
Why mark it as handled if contextMenu is disabled? Why not allow apps to add their own right click behaviors?
|
|
||
| void WindowsTextInputComponentView::OnContextMenu( | ||
| const winrt::Microsoft::ReactNative::Composition::Input::ContextMenuRoutedEventArgs &args) noexcept { | ||
| // Handle context menu event (generated for SHIFT+F10, Context Menu key, or right-click) |
There was a problem hiding this comment.
If this event is generated on right-click, do we still need the WM_RBUTTONUP handlers? -- Or is this comment incorrect?
| DOC_STRING("Used to handle key up events when this component is focused, or if a child component did not handle the key up") | ||
| event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.KeyRoutedEventArgs> KeyUp; | ||
| event Windows.Foundation.EventHandler<Microsoft.ReactNative.Composition.Input.CharacterReceivedRoutedEventArgs> CharacterReceived; | ||
| DOC_STRING("Used to handle context menu events (SHIFT+F10, Context Menu key, or right-click) when this component is focused") |
There was a problem hiding this comment.
Given that this event is basically the InputKeyboardSource.ContextMenuKey event, which is a keyboard event. I dont think it would get fired on right-click as the comment here suggests. Also we should call the event ContextMenuKey to be consistent with the event it actually corresponds to.
| DOC_STRING("Gets or sets whether the event was handled. Set to true to prevent default behavior.") | ||
| Boolean Handled { get; set; }; | ||
| DOC_STRING("Gets the position where the context menu was requested, in local coordinates.") | ||
| Windows.Foundation.Point Position { get; }; |
There was a problem hiding this comment.
A keyboard event wouldn't really have a position associated with it. The upstream InputKeyboardSource.ContextMenuKey has no position associated with it.
| UpdateCursor(); | ||
| return 1; | ||
| } | ||
| case WM_CONTEXTMENU: { |
There was a problem hiding this comment.
We dont need to maintain the CompositionEventHandler::SendMessage code path any more. That was for driving a react root view without a ContentIsland. But that is no longer a supported scenario.
Description
This PR fixes the SHIFT+F10 keyboard shortcut not working to show the context menu in TextInput components. Previously, pressing SHIFT+F10 would cause the application's File menu to blink instead of showing the TextInput context menu.
Type of Change
Why
The SHIFT+F10 keyboard shortcut is a standard Windows accessibility feature for opening context menus. Users expect this shortcut to work in TextInput fields to access cut/copy/paste operations via keyboard.
Root Cause: Windows intercepts SHIFT+F10 at the system level. For ContentIsland hosting, the
InputKeyboardSource.ContextMenuKeyevent wasn't being handled, so the event would fall through and activate the application's menu bar instead.What
The following changes were made to fix the issue:
Added
ContextMenuRoutedEventArgsinterface toComposition.Input.idl- New args class withHandled,Position, andIsKeyboardTriggeredproperties. This follows the same pattern asKeyRoutedEventArgs/CharacterReceivedRoutedEventArgsfor easy future extension without breaking API changes.Added
ContextMenupublic event toComponentView.idl- Allows native components to customize context menu behavior by subscribing to this event.Added
OnContextMenuvirtual method toComponentView- Base class method that derived components can override to handle context menu requests.Added
ContextMenuKeyevent handler inCompositionEventHandler- For ContentIsland hosting, this subscribes toInputKeyboardSource.ContextMenuKeyand routes the event to the focused component'sOnContextMenumethod.Added
WM_CONTEXTMENUhandling inCompositionEventHandler::SendMessage- For HWND hosting (CompositionHwndHost), this routes the WM_CONTEXTMENU message to the focused component.Implemented
OnContextMenuinWindowsTextInputComponentView- CallsShowContextMenu()when the context menu is not hidden via props.Screenshots
N/A - This is a keyboard interaction fix. Testing requires:
Testing
Manual Testing Performed:
contextMenuHiddenprop still prevents context menu from appearingTest Scenarios:
contextMenuHidden={true}+ SHIFT+F10 → No context menuChangelog
Should this change be included in the release notes: yes
Fixed SHIFT+F10 keyboard shortcut not showing context menu in TextInput components.