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

fix sidebar content when presentation is hidden

Browse Source
This commit is contained in:
Ramon Souza 2021-07-22 17:37:46 -03:00
parent 3065597635
commit 0f2ae0425c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigbluebutton-html5/imports/ui/components/layout/layout-manager/customLayout.jsx
View File

@ -350,12 +350,15 @@ class CustomLayout extends Component {
calculatesSidebarContentHeight(cameraDockHeight) {
const { newLayoutContextState } = this.props;
const { deviceType, input } = newLayoutContextState;
const { presentation } = input;
const { isOpen } = presentation;
let sidebarContentHeight = 0;
if (input.sidebarContent.isOpen) {
if (deviceType === DEVICE_TYPE.MOBILE) {
sidebarContentHeight = this.mainHeight() - DEFAULT_VALUES.navBarHeight;
} else if (input.cameraDock.numCameras > 0
&& input.cameraDock.position === CAMERADOCK_POSITION.SIDEBAR_CONTENT_BOTTOM) {
&& input.cameraDock.position === CAMERADOCK_POSITION.SIDEBAR_CONTENT_BOTTOM
&& isOpen) {
sidebarContentHeight = this.mainHeight() - cameraDockHeight;
} else {
sidebarContentHeight = this.mainHeight();

5
bigbluebutton-html5/imports/ui/components/layout/layout-manager/videoFocusLayout.jsx
View File

@ -289,8 +289,9 @@ class VideoFocusLayout extends Component {
const { newLayoutContextState } = this.props;
const { deviceType, input, output } = newLayoutContextState;
const { sidebarContentMinHeight } = DEFAULT_VALUES;
const { sidebarContent: inputContent } = input;
const { sidebarContent: inputContent, presentation } = input;
const { sidebarContent: outputContent } = output;
const { isOpen } = presentation;
let minHeight = 0;
let height = 0;
let maxHeight = 0;
@ -300,7 +301,7 @@ class VideoFocusLayout extends Component {
minHeight = this.mainHeight() - this.bannerAreaHeight();
maxHeight = this.mainHeight() - this.bannerAreaHeight();
} else {
if (input.cameraDock.numCameras > 0) {
if (input.cameraDock.numCameras > 0 && isOpen) {
if (inputContent.height > 0 && inputContent.height < this.mainHeight()) {
height = inputContent.height - this.bannerAreaHeight();
maxHeight = this.mainHeight() - this.bannerAreaHeight();