BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16989 from KDSBrowne/bbb-br-manage-access

Browse Source 
fix(access): Presentation Interference With Keyboard Access in Breakout Management
This commit is contained in:
Anton Georgiev 2023-03-23 16:56:52 -04:00 committed by GitHub
commit f7efedf1a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
View File

@ -9,7 +9,7 @@ import Modal from '/imports/ui/components/common/modal/fullscreen/component';
import { withModalMounter } from '/imports/ui/components/common/modal/service';
import SortList from './sort-user-list/component';
import Styled from './styles';
import Icon from '/imports/ui/components/common/icon/component.jsx';
import Icon from '/imports/ui/components/common/icon/component';
import { isImportSharedNotesFromBreakoutRoomsEnabled, isImportPresentationWithAnnotationsFromBreakoutRoomsEnabled } from '/imports/ui/services/features';
import { addNewAlert } from '/imports/ui/components/screenreader-alert/service';
import PresentationUploaderService from '/imports/ui/components/presentation/presentation-uploader/service';
@ -195,6 +195,13 @@ const propTypes = {
isBreakoutRecordable: PropTypes.bool,
};
const setPresentationVisibility = (state) => {
const presentationInnerWrapper = document.getElementById('presentationInnerWrapper');
if (presentationInnerWrapper) {
presentationInnerWrapper.style.display = state;
}
}
class BreakoutRoom extends PureComponent {
constructor(props) {
super(props);
@ -263,6 +270,7 @@ class BreakoutRoom extends PureComponent {
allowUserChooseRoomByDefault, captureSharedNotesByDefault,
captureWhiteboardByDefault,
} = this.props;
setPresentationVisibility('none');
this.setRoomUsers();
if (isUpdate) {
const usersToMerge = []
@ -403,7 +411,7 @@ class BreakoutRoom extends PureComponent {
handleDismiss() {
const { mountModal } = this.props;
setPresentationVisibility('block');
return new Promise((resolve) => {
mountModal(null);
@ -414,6 +422,7 @@ class BreakoutRoom extends PureComponent {
}
onCreateBreakouts() {
setPresentationVisibility('block');
const {
createBreakoutRoom,
} = this.props;
@ -505,6 +514,7 @@ class BreakoutRoom extends PureComponent {
}
onUpdateBreakouts() {
setPresentationVisibility('block');
const { users } = this.state;
const leastOneUserIsValid = users.some((user) => user.from !== user.room);

5
bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/styles.js
View File

@ -241,6 +241,11 @@ const RoomUserItem = styled.p`
font-size: ${fontSizeSmaller};
}
&:focus {
background-color: ${colorPrimary};
color: ${colorWhite};
}
${({ selected }) => selected && `
background-color: ${colorPrimary};
color: ${colorWhite};

1
bigbluebutton-html5/imports/ui/components/presentation/component.jsx
View File

@ -713,6 +713,7 @@ class Presentation extends PureComponent {
textAlign: 'center',
display: !presentationIsOpen ? 'none' : 'block',
}}
id={"presentationInnerWrapper"}
>
<Styled.VisuallyHidden id="currentSlideText">{slideContent}</Styled.VisuallyHidden>
{!tldrawIsMounting && currentSlide && this.renderPresentationMenu()}