PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix video call persisting when widget removed

Browse source 
Fixes https://github.com/vector-im/element-web/issues/15703
Type: defect
This commit is contained in:
David Baker 2021-08-12 18:36:57 +01:00
parent fbc5729daf
commit 657dcaf989
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/stores/WidgetStore.ts
View file

@ -137,6 +137,26 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
if (edited && !this.roomMap.has(room.roomId)) {
this.roomMap.set(room.roomId, roomInfo);
}
// If a persistent widget is active, check to see if it's just been removed.
// If it has, it needs to destroyed otherwise unmounting the node won't kill it
const persistentWidgetId = ActiveWidgetStore.getPersistentWidgetId();
if (persistentWidgetId) {
if (
ActiveWidgetStore.getRoomId(persistentWidgetId) === room.roomId &&
!roomInfo.widgets.some(w => w.id === persistentWidgetId)
) {
console.log(`Persistent widget ${persistentWidgetId} removed from room ${room.roomId}: destroying.`);
ActiveWidgetStore.destroyPersistentWidget(persistentWidgetId);
}
}
/*if (
oldWidgetIds.includes(ActiveWidgetStore.getPersistentWidgetId()) &&
!roomInfo.widgets.map(w => w.id).includes(ActiveWidgetStore.getPersistentWidgetId())) {
ActiveWidgetStore.destroyPersistentWidget(ActiveWidgetStore.getPersistentWidgetId());
}*/
this.emit(room.roomId);
}