imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show right panel tabs inside panel instead of room header in grid mode

Browse source
This commit is contained in:
Bruno Windels 2018-11-22 17:03:23 +00:00
parent ec070ea782
commit f593bff3c3
5 changed files with 47 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/structures/GroupGridView.js
View file

@ -23,6 +23,7 @@ import RoomView from './RoomView';
import classNames from 'classnames';
import MainSplit from './MainSplit';
import RightPanel from './RightPanel';
import RoomHeaderButtons from '../views/right_panel/RoomHeaderButtons';
export default class RoomGridView extends React.Component {
@ -93,7 +94,15 @@ export default class RoomGridView extends React.Component {
roomStores = roomStores.concat(emptyTiles);
}
const activeRoomId = this.state.activeRoomStore && this.state.activeRoomStore.getRoomId();
const rightPanel = activeRoomId ? <RightPanel roomId={activeRoomId} /> : undefined;
let rightPanel;
if (activeRoomId) {
rightPanel = (
<div className="mx_GroupGridView_rightPanel">
<div className="mx_GroupGridView_tabs"><RoomHeaderButtons /></div>
<RightPanel roomId={activeRoomId} />
</div>
);
}
return (<main className="mx_GroupGridView">
<MainSplit panel={rightPanel}>
@ -107,7 +116,7 @@ export default class RoomGridView extends React.Component {
});
return (<section onClick={() => {this._setActive(i)}} key={roomStore.getRoomId()} className={tileClasses}>
<RoomView
collapsedRhs={true}
isGrid={true}
roomViewStore={roomStore}
isActive={isActive}
/>