Merge pull request #43 from saaltech/ft/toggle-film-strips

Hide filmstrip when screen sharing
saal-core · Jul 13, 2020 · 420e9be · 420e9be
2 parents 67a9887 + 51d9a0a
commit 420e9be
Show file tree

Hide file tree

Showing 5 changed files with 20,247 additions and 10 deletions.
diff --git a/conference.js b/conference.js
@@ -3,6 +3,7 @@
 import EventEmitter from 'events';
 import Logger from 'jitsi-meet-logger';
 
+
 import * as JitsiMeetConferenceEvents from './ConferenceEvents';
 import { openConnection } from './connection';
 import { ENDPOINT_TEXT_MESSAGE_NAME } from './modules/API/constants';
@@ -114,6 +115,7 @@ import {
     maybeOpenFeedbackDialog,
     submitFeedback
 } from './react/features/feedback';
+import { setFilmStripCollapsed } from './react/features/filmstrip';
 import { showNotification } from './react/features/notifications';
 import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay';
 import { suspendDetected } from './react/features/power-monitor';
@@ -310,22 +312,23 @@ class ConferenceConnector {
 
 
             function isHostPrejoinError() {
-                let { pageErrorMessageKey } = APP.store.getState()['features/prejoin']
-                pageErrorMessageKey = "submitting" === pageErrorMessageKey ? null : pageErrorMessageKey;
-                if(pageErrorMessageKey ) {
+                let { pageErrorMessageKey } = APP.store.getState()['features/prejoin'];
+
+                pageErrorMessageKey = pageErrorMessageKey === 'submitting' ? null : pageErrorMessageKey;
+                if (pageErrorMessageKey) {
                     return true;
                 }
-                else {
-                    return false
-                }
+
+                return false;
+
             }
 
-            if(isHostPrejoinError()) {
+            if (isHostPrejoinError()) {
                 return;
             }
 
             this.reconnectTimeout = setTimeout(() => {
-                if(isHostPrejoinError()) {
+                if (isHostPrejoinError()) {
                     return;
                 }
                 APP.store.dispatch(conferenceWillJoin(room));
@@ -775,7 +778,8 @@ export default {
             startWithVideoMuted: config.startWithVideoMuted
                 || isUserInteractionRequiredForUnmute(APP.store.getState())
         };
-        if(refreshTracksOnly) {
+
+        if (refreshTracksOnly) {
             try {
                 // Initialize the device list first. This way, when creating tracks
                 // based on preferred devices, loose label matching can be done in
@@ -1980,6 +1984,7 @@ export default {
                     APP.store.dispatch(toggleScreenshotCaptureEffect(true));
                 }
                 sendAnalytics(createScreenSharingEvent('started'));
+                APP.store.dispatch(setFilmStripCollapsed(true));
                 logger.log('Screen sharing started');
             })
             .catch(error => {

diff --git a/css/filmstrip/_horizontal_filmstrip.scss b/css/filmstrip/_horizontal_filmstrip.scss
@@ -17,6 +17,7 @@
     width: 100%;
     position: fixed;
     flex-direction: column;
+    transform: translateY(-40px);
 
     /*
      * Firefox sets flex items to min-height: auto and min-width: auto,
@@ -32,6 +33,8 @@
 
     &.reduce-height {
         // top: calc(#{$newToolbarSizeWithPadding} + #{$scrollHeight});
+        // top: -40px;
+        transform: translateY(0px);
     }
 
     &__videos-container {