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

fix: connection status modal "adjusting your settings" button not working as expected #18024

Merged
merged 2 commits into from May 31, 2023
Merged

fix: connection status modal "adjusting your settings" button not working as expected #18024

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
31add17
fix adjust settings button
ramonlsouza May 26, 2023
7fed378
do not return focus after closing modal
ramonlsouza May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions bigbluebutton-html5/imports/ui/components/common/modal/base/component.jsx
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@ const BaseModal = (props) => {
onRequestClose={onRequestClose}
className={className}
overlayClassName={overlayClassName}
shouldReturnFocusAfterClose={false}
>
{children}
</Styled.BaseModal>
Expand Down
4 changes: 2 additions & 2 deletions bigbluebutton-html5/imports/ui/components/connection-status/status-helper/component.jsx
View file
Open in desktop
Expand Up @@ -81,7 +81,7 @@ class ConnectionStatusIcon extends PureComponent {
<Styled.Label>
{intl.formatMessage(intlMessages.label)}
</Styled.Label>
{(level === 'critical' || level === 'danger') || true
{(level === 'critical' || level === 'danger') || isSettingsMenuModalOpen
? (
<div>
<Styled.Settings
Expand All @@ -94,7 +94,7 @@ class ConnectionStatusIcon extends PureComponent {
selectedTab={2}
{...{
onRequestClose: () => this.setSettingsMenuModalIsOpen(false),
priority: "low",
priority: "medium",
setIsOpen: this.setSettingsMenuModalIsOpen,
isOpen: isSettingsMenuModalOpen,
}}
Expand Down