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

fix(menu): main content is not scrollable while swiping #26976

Merged
merged 4 commits into from
Mar 17, 2023
Merged

fix(menu): main content is not scrollable while swiping #26976

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d36914
fix(menu): main content is not scrollable while swiping
liamdebeasi Mar 16, 2023
ab22fc7
clean up
liamdebeasi Mar 16, 2023
5b2ffd9
Merge branch 'main' into FW-3752
liamdebeasi Mar 17, 2023
8634bac
Merge branch 'main' into FW-3752
liamdebeasi Mar 17, 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
34 changes: 19 additions & 15 deletions core/src/components/menu/menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,25 @@ export class Menu implements ComponentInterface, MenuI {
if (this.backdropEl) {
this.backdropEl.classList.add(SHOW_BACKDROP);
}

// add css class and hide content behind menu from screen readers
if (this.contentEl) {
this.contentEl.classList.add(MENU_CONTENT_OPEN);

/**
* When the menu is open and overlaying the main
* content, the main content should not be announced
* by the screenreader as the menu is the main
* focus. This is useful with screenreaders that have
* "read from top" gestures that read the entire
* page from top to bottom when activated.
* This should be done before the animation starts
* so that users cannot accidentally scroll
* the content while dragging a menu open.
*/
this.contentEl.setAttribute('aria-hidden', 'true');
}

this.blocker.block();
this.isAnimating = true;
if (shouldOpen) {
Expand All @@ -601,21 +620,6 @@ export class Menu implements ComponentInterface, MenuI {
}

if (isOpen) {
// add css class and hide content behind menu from screen readers
if (this.contentEl) {
this.contentEl.classList.add(MENU_CONTENT_OPEN);

/**
* When the menu is open and overlaying the main
* content, the main content should not be announced
* by the screenreader as the menu is the main
* focus. This is useful with screenreaders that have
* "read from top" gestures that read the entire
* page from top to bottom when activated.
*/
this.contentEl.setAttribute('aria-hidden', 'true');
}

// emit open event
this.ionDidOpen.emit();

Expand Down