fix(watermark): conditionally exclude watermarks on prejoin and lobby

view Signed-off-by: Joshua Irmer <[email protected]>
jitsi · Oct 22, 2024 · 2a3ebf5 · 2a3ebf5
1 parent 24ae693
commit 2a3ebf5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/react/features/large-video/components/LargeVideo.web.tsx b/react/features/large-video/components/LargeVideo.web.tsx
@@ -19,7 +19,7 @@ import { setTileView } from '../../video-layout/actions.web';
 import Whiteboard from '../../whiteboard/components/web/Whiteboard';
 import { isWhiteboardEnabled } from '../../whiteboard/functions';
 import { setSeeWhatIsBeingShared } from '../actions.web';
-import { getLargeVideoParticipant } from '../functions';
+import { getLargeVideoParticipant, isWatermarksEnabled } from '../functions';
 
 import ScreenSharePlaceholder from './ScreenSharePlaceholder.web';
 
@@ -109,6 +109,11 @@ interface IProps {
      */
     _visibleFilmstrip: boolean;
 
+    /**
+     * Whether or not the watermarks are visible.
+     */
+    _watermarksEnabled: boolean;
+
     /**
      * Whether or not the whiteboard is ready to be used.
      */
@@ -193,6 +198,7 @@ class LargeVideo extends Component<IProps> {
             _isChatOpen,
             _noAutoPlayVideo,
             _showDominantSpeakerBadge,
+            _watermarksEnabled,
             _whiteboardEnabled
         } = this.props;
         const style = this._getCustomStyles();
@@ -208,7 +214,7 @@ class LargeVideo extends Component<IProps> {
                 {_whiteboardEnabled && <Whiteboard />}
                 <div id = 'etherpad' />
 
-                <Watermarks />
+                { _watermarksEnabled ? <Watermarks /> : <></> }
 
                 <div
                     id = 'dominantSpeaker'
@@ -378,6 +384,7 @@ function _mapStateToProps(state: IReduxState) {
         _verticalFilmstripWidth: verticalFilmstripWidth.current,
         _verticalViewMaxWidth: getVerticalViewMaxWidth(state),
         _visibleFilmstrip: visible,
+        _watermarksEnabled: isWatermarksEnabled(state),
         _whiteboardEnabled: isWhiteboardEnabled(state)
     };
 }

diff --git a/react/features/large-video/functions.ts b/react/features/large-video/functions.ts
@@ -1,5 +1,8 @@
 import { IReduxState } from '../app/types';
 import { getParticipantById } from '../base/participants/functions';
+import { getIsLobbyVisible } from '../lobby/functions';
+import { isPrejoinPageVisible } from '../prejoin/functions';
+
 
 /**
  * Selector for the participant currently displaying on the large video.
@@ -12,3 +15,13 @@ export function getLargeVideoParticipant(state: IReduxState) {
 
     return getParticipantById(state, participantId ?? '');
 }
+
+/**
+ * Determines the necessity for watermarks.
+ *
+ * @param {IReduxState} state - The redux state.
+ * @returns {boolean}
+ */
+export function isWatermarksEnabled(state: IReduxState): boolean {
+    return !isPrejoinPageVisible(state) && !getIsLobbyVisible(state);
+}