fix: make status bar area not show when it is undefined
e.g. when user is in call, and there are search results
This commit is contained in:
@@ -1841,6 +1841,17 @@ export default class RoomView extends React.Component<IProps, IState> {
|
|||||||
/>;
|
/>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const statusBarAreaClass = classNames("mx_RoomView_statusArea", {
|
||||||
|
"mx_RoomView_statusArea_expanded": isStatusAreaExpanded,
|
||||||
|
});
|
||||||
|
|
||||||
|
const statusBarArea = statusBar && <div className={statusBarAreaClass}>
|
||||||
|
<div className="mx_RoomView_statusAreaBox">
|
||||||
|
<div className="mx_RoomView_statusAreaBox_line" />
|
||||||
|
{statusBar}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
const roomVersionRecommendation = this.state.upgradeRecommendation;
|
const roomVersionRecommendation = this.state.upgradeRecommendation;
|
||||||
const showRoomUpgradeBar = (
|
const showRoomUpgradeBar = (
|
||||||
roomVersionRecommendation &&
|
roomVersionRecommendation &&
|
||||||
@@ -2052,10 +2063,6 @@ export default class RoomView extends React.Component<IProps, IState> {
|
|||||||
/>);
|
/>);
|
||||||
}
|
}
|
||||||
|
|
||||||
const statusBarAreaClass = classNames("mx_RoomView_statusArea", {
|
|
||||||
"mx_RoomView_statusArea_expanded": isStatusAreaExpanded,
|
|
||||||
});
|
|
||||||
|
|
||||||
const showRightPanel = this.state.room && this.state.showRightPanel;
|
const showRightPanel = this.state.room && this.state.showRightPanel;
|
||||||
const rightPanel = showRightPanel
|
const rightPanel = showRightPanel
|
||||||
? <RightPanel room={this.state.room} resizeNotifier={this.props.resizeNotifier} />
|
? <RightPanel room={this.state.room} resizeNotifier={this.props.resizeNotifier} />
|
||||||
@@ -2104,12 +2111,7 @@ export default class RoomView extends React.Component<IProps, IState> {
|
|||||||
{messagePanel}
|
{messagePanel}
|
||||||
{searchResultsPanel}
|
{searchResultsPanel}
|
||||||
</div>
|
</div>
|
||||||
<div className={statusBarAreaClass}>
|
{statusBarArea}
|
||||||
<div className="mx_RoomView_statusAreaBox">
|
|
||||||
<div className="mx_RoomView_statusAreaBox_line" />
|
|
||||||
{statusBar}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{previewBar}
|
{previewBar}
|
||||||
{messageComposer}
|
{messageComposer}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user