diff --git a/frontend/app/components/Session/WebPlayer.js b/frontend/app/components/Session/WebPlayer.js index 99c423e6d..30a0926c0 100644 --- a/frontend/app/components/Session/WebPlayer.js +++ b/frontend/app/components/Session/WebPlayer.js @@ -27,10 +27,10 @@ const PlayerContentConnected = connectPlayer(state => ({ }))(PlayerContent); -function PlayerContent({ live, fullscreen }) { +function PlayerContent({ live, fullscreen, activeTab }) { return (
- +
) } @@ -73,7 +73,7 @@ function WebPlayer (props) {
-
+
{activeTab !== '' && }
diff --git a/frontend/app/components/Session_/Player/Player.js b/frontend/app/components/Session_/Player/Player.js index 084542902..d8db7a819 100644 --- a/frontend/app/components/Session_/Player/Player.js +++ b/frontend/app/components/Session_/Player/Player.js @@ -85,8 +85,10 @@ export default class Player extends React.PureComponent { live, closedLive, bottomBlock, + activeTab } = this.props; + const maxWidth = activeTab ? 'calc(100vw - 270px)' : '100vw' return (
{ !fullscreen && !!bottomBlock && -
+
{ bottomBlock === CONSOLE && } diff --git a/frontend/app/components/Session_/PlayerBlock.js b/frontend/app/components/Session_/PlayerBlock.js index af7143c64..9884bafbc 100644 --- a/frontend/app/components/Session_/PlayerBlock.js +++ b/frontend/app/components/Session_/PlayerBlock.js @@ -18,7 +18,7 @@ import styles from './playerBlock.css'; })) export default class PlayerBlock extends React.PureComponent { render() { - const { fullscreen, bottomBlock, sessionId, disabled, previousId, nextId, setAutoplayValues } = this.props; + const { fullscreen, bottomBlock, sessionId, disabled, previousId, nextId, setAutoplayValues, activeTab } = this.props; return (
@@ -31,6 +31,7 @@ export default class PlayerBlock extends React.PureComponent { bottomBlockIsActive={ !fullscreen && bottomBlock !== NONE } bottomBlock={bottomBlock} fullscreen={fullscreen} + activeTab={activeTab} />
); diff --git a/frontend/app/components/Session_/PlayerBlockHeader.js b/frontend/app/components/Session_/PlayerBlockHeader.js index 252df59d5..ef91909b6 100644 --- a/frontend/app/components/Session_/PlayerBlockHeader.js +++ b/frontend/app/components/Session_/PlayerBlockHeader.js @@ -104,9 +104,11 @@ export default class PlayerBlockHeader extends React.PureComponent { const TABS = [ this.props.tabs.EVENTS, this.props.tabs.HEATMAPS ].map(tab => ({ text: tab, key: tab })); return (
-
+
+
-
+
+