Skip to content

Chore: add aria hidden if modal is open #26826

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

Merged
kodiakhq merged 2 commits into from
Sep 8, 2022
Merged

Chore: add aria hidden if modal is open #26826

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
3a76ae1
Chore: add aria hidden if modal is opened
ggazzo Sep 6, 2022
8840409
Merge branch 'develop' into chore/autofocus
kodiakhq[bot] Sep 8, 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
7 changes: 6 additions & 1 deletion apps/meteor/client/views/modal/ModalRegion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useModal, useCurrentModal } from '@rocket.chat/ui-contexts';
import React, { useCallback, ReactElement } from 'react';
import { FocusScope } from 'react-aria';

import ModalBackdrop from '../../components/modal/ModalBackdrop';
import ModalPortal from '../../components/modal/ModalPortal';
Expand All @@ -15,7 +16,11 @@ const ModalRegion = (): ReactElement | null => {

return (
<ModalPortal>
<ModalBackdrop onDismiss={handleDismiss}>{currentModal}</ModalBackdrop>
<ModalBackdrop onDismiss={handleDismiss}>
<FocusScope contain restoreFocus autoFocus>
{currentModal}
</FocusScope>
</ModalBackdrop>
</ModalPortal>
);
};
Expand Down
10 changes: 8 additions & 2 deletions apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useLayout, useCurrentRoute, useRoutePath, useSetting } from '@rocket.chat/ui-contexts';
import { useLayout, useCurrentRoute, useRoutePath, useSetting, useCurrentModal } from '@rocket.chat/ui-contexts';
import React, { ReactElement, ReactNode, useCallback } from 'react';

import { useReactiveValue } from '../../../hooks/useReactiveValue';
Expand All @@ -7,14 +7,20 @@ import BlazeTemplate from '../BlazeTemplate';
const LayoutWithSidebar = ({ children }: { children: ReactNode }): ReactElement => {
const { isEmbedded: embeddedLayout } = useLayout();
const [currentRouteName = '', currentParameters = {}] = useCurrentRoute();

const modal = useCurrentModal();
const currentRoutePath = useRoutePath(currentRouteName, currentParameters);
const removeSidenav = useReactiveValue(
useCallback(() => embeddedLayout && !currentRoutePath?.startsWith('/admin'), [currentRoutePath, embeddedLayout]),
);
const readReceiptsEnabled = useSetting('Message_Read_Receipt_Store_Users');

return (
<div id='rocket-chat' className={[embeddedLayout ? 'embedded-view' : undefined, 'menu-nav'].filter(Boolean).join(' ')}>
<div
id='rocket-chat'
className={[embeddedLayout ? 'embedded-view' : undefined, 'menu-nav'].filter(Boolean).join(' ')}
aria-hidden={Boolean(modal)}
>
{!removeSidenav ? <BlazeTemplate template='sideNav' /> : null}
<div
className={['rc-old', 'main-content', 'content-background-color', readReceiptsEnabled ? 'read-receipts-enabled' : undefined]
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
"queue-fifo": "^0.2.6",
"rc-scrollbars": "^1.1.5",
"react": "~17.0.2",
"react-aria": "^3.19.0",
"react-dom": "~17.0.2",
"react-error-boundary": "^3.1.4",
"react-hook-form": "^7.30.0",
Expand Down
Loading