OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Respect the roomState right container request for the Jitsi widget (#7033)

pull/21833/head
Timo 2021-10-26 12:36:42 -04:00 committed by GitHub
parent a4e20c7b41
commit 82c2102ccb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/stores/widgets/WidgetLayoutStore.ts
View File

@ -207,15 +207,14 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
const isLegacyPinned = !!legacyPinned?.[widget.id]; const isLegacyPinned = !!legacyPinned?.[widget.id];
const defaultContainer = WidgetType.JITSI.matches(widget.type) ? Container.Top : Container.Right; const defaultContainer = WidgetType.JITSI.matches(widget.type) ? Container.Top : Container.Right;
if (manualContainer === Container.Right) { let targetContainer = defaultContainer;
rightWidgets.push(widget); if (!!manualContainer || !!stateContainer) {
} else if (manualContainer === Container.Top || stateContainer === Container.Top) { targetContainer = (manualContainer) ? manualContainer : stateContainer;
topWidgets.push(widget);
} else if (isLegacyPinned && !stateContainer) { } else if (isLegacyPinned && !stateContainer) {
topWidgets.push(widget); // Special legacy case
} else { targetContainer = Container.Top;
(defaultContainer === Container.Top ? topWidgets : rightWidgets).push(widget);
} }
(targetContainer === Container.Top ? topWidgets : rightWidgets).push(widget);
} }
// Trim to MAX_PINNED // Trim to MAX_PINNED
@ -423,7 +422,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
public moveToContainer(room: Room, widget: IApp, toContainer: Container) { public moveToContainer(room: Room, widget: IApp, toContainer: Container) {
const allWidgets = this.getAllWidgets(room); const allWidgets = this.getAllWidgets(room);
if (!allWidgets.some(([w])=> w.id === widget.id)) return; // invalid if (!allWidgets.some(([w]) => w.id === widget.id)) return; // invalid
this.updateUserLayout(room, { this.updateUserLayout(room, {
[widget.id]: { container: toContainer }, [widget.id]: { container: toContainer },
}); });