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

MenuBar Keyboard Accessibility Fixes #6953

Merged
merged 6 commits into from
Apr 12, 2022
Merged

MenuBar Keyboard Accessibility Fixes #6953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed2e401
Fixes Bug 36685596: [WinUI3] [Notepad] Users is unable to navigate to…
bkudiess Apr 7, 2022
8a3dfe2
Fixes Bug 36629906: [WinUI2] [Notepad]Focus is not visible on 'View' …
bkudiess Apr 8, 2022
2a06221
Fixes Bug 38190286: [WinUI2] [Notepad>Home]: Keyboard focus is not mo…
bkudiess Apr 8, 2022
55e7d37
Add comment
bkudiess Apr 9, 2022
c39ef78
Add tests
bkudiess Apr 9, 2022
b4b568c
update handled of key press
bkudiess Apr 12, 2022
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
52 changes: 51 additions & 1 deletion dev/MenuBar/MenuBarItem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,43 @@ void MenuBarItem::OnMenuBarItemKeyDown( winrt::IInspectable const& sender, winrt
{
ShowMenuFlyout();
}
else if (key == winrt::VirtualKey::Right)
{
if (FlowDirection() == winrt::FlowDirection::RightToLeft)
{
MoveFocusTo(FlyoutLocation::Left);
}
else
{
MoveFocusTo(FlyoutLocation::Right);
}
args.Handled(TRUE);
}
else if (key == winrt::VirtualKey::Left)
{
if (FlowDirection() == winrt::FlowDirection::RightToLeft)
{
MoveFocusTo(FlyoutLocation::Right);
}
else
{
MoveFocusTo(FlyoutLocation::Left);
}
args.Handled(TRUE);
}
}

void MenuBarItem::OnPresenterKeyDown( winrt::IInspectable const& sender, winrt::KeyRoutedEventArgs const& args)
{
// If the event came from a MenuFlyoutSubItem it means right/left arrow will open it, so we should not handle them to not override default behaviour
if (auto const& subitem = args.OriginalSource().try_as<winrt::MenuFlyoutSubItem>())
bkudiess marked this conversation as resolved.
Show resolved Hide resolved
{
if (subitem.Items().GetAt(0))
{
return;
}
}

const auto key = args.Key();
if (key == winrt::VirtualKey::Right)
{
Expand Down Expand Up @@ -269,6 +302,23 @@ void MenuBarItem::OpenFlyoutFrom(FlyoutLocation location)
}
}

void MenuBarItem::MoveFocusTo(FlyoutLocation location)
{
if (auto menuBar = m_menuBar.get())
{
uint32_t index = 0;
menuBar.Items().IndexOf(*this, index);
if (location == FlyoutLocation::Left)
{
winrt::get_self<MenuBarItem>(menuBar.Items().GetAt(((index - 1) + menuBar.Items().Size()) % menuBar.Items().Size()))->Focus(winrt::FocusState::Programmatic);
}
else
{
winrt::get_self<MenuBarItem>(menuBar.Items().GetAt((index + 1) % menuBar.Items().Size()))->Focus(winrt::FocusState::Programmatic);
}
}
}

void MenuBarItem::AddPassThroughElement(const winrt::DependencyObject& element)
{
m_passThroughElement = winrt::make_weak(element);
Expand Down Expand Up @@ -306,7 +356,7 @@ void MenuBarItem::OnFlyoutClosed( winrt::IInspectable const& sender, winrt::IIns

void MenuBarItem::OnFlyoutOpening( winrt::IInspectable const& sender, winrt::IInspectable const& args)
{
Focus(winrt::FocusState::Pointer);
Focus(winrt::FocusState::Programmatic);

m_isFlyoutOpen = true;

Expand Down
1 change: 1 addition & 0 deletions dev/MenuBar/MenuBarItem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class MenuBarItem :
void AttachEventHandlers();
void DetachEventHandlers(bool useSafeGet = false);
void OpenFlyoutFrom(FlyoutLocation location);
void MoveFocusTo(FlyoutLocation location);

void OnVisualPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args);
void UpdateVisualStates();
Expand Down
20 changes: 20 additions & 0 deletions dev/MenuBar/MenuBar_InteractionTests/MenuBarTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,31 @@ public void KeyboardNavigationWithArrowKeysTest()

if (ApiInformation.IsTypePresent("Windows.UI.Xaml.IUIElement5")) // XYFocusNavigation is only availabe from IUElement5 foward
{
KeyboardHelper.PressKey(Key.Left);
VerifyElement.NotFound("Word Wrap", FindBy.Name);

KeyboardHelper.PressKey(Key.Enter);
VerifyElement.Found("Word Wrap", FindBy.Name);

KeyboardHelper.PressKey(Key.Escape);
KeyboardHelper.PressKey(Key.Right);

KeyboardHelper.PressKey(Key.Right);
VerifyElement.NotFound("Undo", FindBy.Name);

KeyboardHelper.PressKey(Key.Enter);
VerifyElement.Found("Undo", FindBy.Name);

KeyboardHelper.PressKey(Key.Down);
KeyboardHelper.PressKey(Key.Down);
KeyboardHelper.PressKey(Key.Down);
KeyboardHelper.PressKey(Key.Down);
KeyboardHelper.PressKey(Key.Down);
VerifyElement.NotFound("Item 1", FindBy.Name);

KeyboardHelper.PressKey(Key.Right);
VerifyElement.Found("Item 1", FindBy.Name);

}
}
}
Expand Down