Skip to content

Commit bc23ee4

Browse files
author
Dan Ziv
authored
fix(FEC-8778): no watermark is shown in pre-play presentation (#319)
Move the watermark and the playlist-countdown outside the player gui and set the css on the playlist countdown which is applied automatically while it was under the player gui.
1 parent fcd1fc2 commit bc23ee4

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/components/playlist-countdown/_playlist-countdown.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.player {
22

33
.playlist-countdown {
4+
font-family: $font-family;
45
height: 72px;
56
position: absolute;
67
bottom: 0;
@@ -12,6 +13,7 @@
1213

1314
&.hidden {
1415
right: -160px;
16+
pointer-events: none;
1517
opacity: 0;
1618
.playlist-countdown-content-placeholder {
1719
.playlist-countdown-content-background {

src/ui-presets/live.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export function liveUI(props: any): React$Element<any> {
3939
<UnmuteIndication />
4040
<OverlayAction player={props.player} />
4141
<PlaybackControls player={props.player} />
42-
{Watermark.shouldRender(props) ? <Watermark player={props.player} /> : undefined}
4342
<BottomBar>
4443
<SeekBarLivePlaybackContainer showFramePreview showTimeBubble player={props.player} playerContainer={props.playerContainer} />
4544
<div className={style.leftControls}>
@@ -57,6 +56,7 @@ export function liveUI(props: any): React$Element<any> {
5756
</div>
5857
</BottomBar>
5958
</div>
59+
{Watermark.shouldRender(props) ? <Watermark player={props.player} /> : undefined}
6060
<PrePlaybackPlayOverlay player={props.player} />
6161
<CastBeforePlay player={props.player} />
6262
<Backdrop />

src/ui-presets/playback.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export function playbackUI(props: any): React$Element<any> {
4343
<OverlayAction player={props.player} />
4444
<PlaybackControls player={props.player} />
4545
{PlaylistNextScreen.shouldRender(props) ? <PlaylistNextScreen player={props.player} /> : undefined}
46-
{Watermark.shouldRender(props) ? <Watermark player={props.player} /> : undefined}
4746
<BottomBar>
4847
<SeekBarPlaybackContainer showFramePreview showTimeBubble player={props.player} playerContainer={props.playerContainer} />
4948
<div className={style.leftControls}>
@@ -61,8 +60,9 @@ export function playbackUI(props: any): React$Element<any> {
6160
<FullscreenControl player={props.player} />
6261
</div>
6362
</BottomBar>
64-
{PlaylistCountdown.shouldRender(props) ? <PlaylistCountdown player={props.player} /> : undefined}
6563
</div>
64+
{Watermark.shouldRender(props) ? <Watermark player={props.player} /> : undefined}
65+
{PlaylistCountdown.shouldRender(props) ? <PlaylistCountdown player={props.player} /> : undefined}
6666
<PrePlaybackPlayOverlay player={props.player} />
6767
<CastBeforePlay player={props.player} />
6868
<Backdrop />

0 commit comments

Comments
 (0)