mirror of https://github.com/vector-im/riot-web
Merge pull request #5563 from matrix-org/travis/fosdem/layout-fixes
Update AuxPanel and related buttons when widgets change or on reloadpull/21833/head
commit
2af14cde42
|
@ -282,6 +282,7 @@ export default class RoomView extends React.Component<IProps, IState> {
|
||||||
private checkWidgets = (room) => {
|
private checkWidgets = (room) => {
|
||||||
this.setState({
|
this.setState({
|
||||||
hasPinnedWidgets: WidgetLayoutStore.instance.getContainerWidgets(room, Container.Top).length > 0,
|
hasPinnedWidgets: WidgetLayoutStore.instance.getContainerWidgets(room, Container.Top).length > 0,
|
||||||
|
showApps: this.shouldShowApps(room),
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -419,11 +420,17 @@ export default class RoomView extends React.Component<IProps, IState> {
|
||||||
}
|
}
|
||||||
|
|
||||||
private onWidgetEchoStoreUpdate = () => {
|
private onWidgetEchoStoreUpdate = () => {
|
||||||
|
if (!this.state.room) return;
|
||||||
this.setState({
|
this.setState({
|
||||||
|
hasPinnedWidgets: WidgetLayoutStore.instance.getContainerWidgets(this.state.room, Container.Top).length > 0,
|
||||||
showApps: this.shouldShowApps(this.state.room),
|
showApps: this.shouldShowApps(this.state.room),
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private onWidgetLayoutChange = () => {
|
||||||
|
this.onWidgetEchoStoreUpdate(); // we cheat here by calling the thing that matters
|
||||||
|
};
|
||||||
|
|
||||||
private setupRoom(room: Room, roomId: string, joining: boolean, shouldPeek: boolean) {
|
private setupRoom(room: Room, roomId: string, joining: boolean, shouldPeek: boolean) {
|
||||||
// if this is an unknown room then we're in one of three states:
|
// if this is an unknown room then we're in one of three states:
|
||||||
// - This is a room we can peek into (search engine) (we can /peek)
|
// - This is a room we can peek into (search engine) (we can /peek)
|
||||||
|
@ -489,7 +496,7 @@ export default class RoomView extends React.Component<IProps, IState> {
|
||||||
}
|
}
|
||||||
|
|
||||||
private shouldShowApps(room: Room) {
|
private shouldShowApps(room: Room) {
|
||||||
if (!BROWSER_SUPPORTS_SANDBOX) return false;
|
if (!BROWSER_SUPPORTS_SANDBOX || !room) return false;
|
||||||
|
|
||||||
// Check if user has previously chosen to hide the app drawer for this
|
// Check if user has previously chosen to hide the app drawer for this
|
||||||
// room. If so, do not show apps
|
// room. If so, do not show apps
|
||||||
|
@ -498,7 +505,10 @@ export default class RoomView extends React.Component<IProps, IState> {
|
||||||
|
|
||||||
// This is confusing, but it means to say that we default to the tray being
|
// This is confusing, but it means to say that we default to the tray being
|
||||||
// hidden unless the user clicked to open it.
|
// hidden unless the user clicked to open it.
|
||||||
return hideWidgetDrawer === "false";
|
const isManuallyShown = hideWidgetDrawer === "false";
|
||||||
|
|
||||||
|
const widgets = WidgetLayoutStore.instance.getContainerWidgets(room, Container.Top);
|
||||||
|
return widgets.length > 0 || isManuallyShown;
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
@ -609,6 +619,13 @@ export default class RoomView extends React.Component<IProps, IState> {
|
||||||
WidgetEchoStore.removeListener(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
|
WidgetEchoStore.removeListener(UPDATE_EVENT, this.onWidgetEchoStoreUpdate);
|
||||||
WidgetStore.instance.removeListener(UPDATE_EVENT, this.onWidgetStoreUpdate);
|
WidgetStore.instance.removeListener(UPDATE_EVENT, this.onWidgetStoreUpdate);
|
||||||
|
|
||||||
|
if (this.state.room) {
|
||||||
|
WidgetLayoutStore.instance.off(
|
||||||
|
WidgetLayoutStore.emissionForRoom(this.state.room),
|
||||||
|
this.onWidgetLayoutChange,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (this.showReadReceiptsWatchRef) {
|
if (this.showReadReceiptsWatchRef) {
|
||||||
SettingsStore.unwatchSetting(this.showReadReceiptsWatchRef);
|
SettingsStore.unwatchSetting(this.showReadReceiptsWatchRef);
|
||||||
}
|
}
|
||||||
|
@ -836,6 +853,10 @@ export default class RoomView extends React.Component<IProps, IState> {
|
||||||
// called when state.room is first initialised (either at initial load,
|
// called when state.room is first initialised (either at initial load,
|
||||||
// after a successful peek, or after we join the room).
|
// after a successful peek, or after we join the room).
|
||||||
private onRoomLoaded = (room: Room) => {
|
private onRoomLoaded = (room: Room) => {
|
||||||
|
// Attach a widget store listener only when we get a room
|
||||||
|
WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(room), this.onWidgetLayoutChange);
|
||||||
|
this.onWidgetLayoutChange(); // provoke an update
|
||||||
|
|
||||||
this.calculatePeekRules(room);
|
this.calculatePeekRules(room);
|
||||||
this.updatePreviewUrlVisibility(room);
|
this.updatePreviewUrlVisibility(room);
|
||||||
this.loadMembersIfJoined(room);
|
this.loadMembersIfJoined(room);
|
||||||
|
@ -898,6 +919,15 @@ export default class RoomView extends React.Component<IProps, IState> {
|
||||||
if (!room || room.roomId !== this.state.roomId) {
|
if (!room || room.roomId !== this.state.roomId) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Detach the listener if the room is changing for some reason
|
||||||
|
if (this.state.room) {
|
||||||
|
WidgetLayoutStore.instance.off(
|
||||||
|
WidgetLayoutStore.emissionForRoom(this.state.room),
|
||||||
|
this.onWidgetLayoutChange,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
room: room,
|
room: room,
|
||||||
}, () => {
|
}, () => {
|
||||||
|
|
Loading…
Reference in New Issue