Merge pull request #11319 from ramonlsouza/fullscreen-polling-buttons

Display polling buttons on fullscreen presentation
bigbluebutton · Feb 9, 2021 · 74d34e1 · 74d34e1
2 parents 7ba2422 + 319a620
commit 74d34e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -343,7 +343,7 @@ class App extends Component {
 
   render() {
     const {
-      customStyle, customStyleUrl, openPanel,
+      customStyle, customStyleUrl, openPanel, layoutContextState
     } = this.props;
     return (
       <main className={styles.main}>
@@ -362,7 +362,7 @@ class App extends Component {
         </section>
         <UploaderContainer />
         <BreakoutRoomInvitation />
-        <PollingContainer />
+        {!layoutContextState.presentationIsFullscreen && <PollingContainer />}
         <ModalContainer />
         <AudioContainer />
         <ToastContainer rtl />

diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -20,6 +20,7 @@ import FullscreenButtonContainer from '../fullscreen-button/container';
 import { withDraggableConsumer } from '../media/webcam-draggable-overlay/context';
 import Icon from '/imports/ui/components/icon/component';
 import { withLayoutConsumer } from '/imports/ui/components/layout/context';
+import PollingContainer from '/imports/ui/components/polling/container';
 
 const intlMessages = defineMessages({
   presentationLabel: {
@@ -781,6 +782,7 @@ class PresentationArea extends PureComponent {
       showSlide,
       // fitToWidth,
       // presentationAreaWidth,
+      isFullscreen,
       localPosition,
     } = this.state;
 
@@ -819,6 +821,8 @@ class PresentationArea extends PureComponent {
         ref={(ref) => { this.refPresentationContainer = ref; }}
         className={styles.presentationContainer}
       >
+        {isFullscreen && <PollingContainer />}
+
         <div
           ref={(ref) => { this.refPresentationArea = ref; }}
           className={styles.presentationArea}