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

Fix Ctrl+F shortcut not working with minimised room summary card (#28223) 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/28119/merge
Michael Telatynski 2024-10-17 16:02:38 +01:00 committed by GitHub
parent 1fc0122523
commit a9bea774f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/stores/right-panel/RightPanelStore.ts
View File

@ -80,6 +80,7 @@ export default class RightPanelStore extends ReadyWatchingStore {
if (this.currentCard.phase !== RightPanelPhases.RoomSummary) { if (this.currentCard.phase !== RightPanelPhases.RoomSummary) {
this.setCard({ phase: RightPanelPhases.RoomSummary, state: { focusRoomSearch: true } }); this.setCard({ phase: RightPanelPhases.RoomSummary, state: { focusRoomSearch: true } });
} }
this.show(null);
} }
} }
} }

4
src/stores/right-panel/RightPanelStoreIPanelState.ts
View File

@ -40,6 +40,8 @@ export interface IRightPanelCardStateStored {
initialEventId?: string; initialEventId?: string;
isInitialEventHighlighted?: boolean; isInitialEventHighlighted?: boolean;
initialEventScrollIntoView?: boolean; initialEventScrollIntoView?: boolean;
// room summary card
focusRoomSearch?: boolean;
} }
export interface IRightPanelCard { export interface IRightPanelCard {
@ -85,6 +87,7 @@ export function convertCardToStore(panelState: IRightPanelCard): IRightPanelCard
memberInfoEventId: !!state?.memberInfoEvent?.getId() ? state.memberInfoEvent.getId() : undefined, memberInfoEventId: !!state?.memberInfoEvent?.getId() ? state.memberInfoEvent.getId() : undefined,
initialEventId: !!state?.initialEvent?.getId() ? state.initialEvent.getId() : undefined, initialEventId: !!state?.initialEvent?.getId() ? state.initialEvent.getId() : undefined,
memberId: !!state?.member?.userId ? state.member.userId : undefined, memberId: !!state?.member?.userId ? state.member.userId : undefined,
focusRoomSearch: state.focusRoomSearch,
}; };
return { state: stateStored, phase: panelState.phase }; return { state: stateStored, phase: panelState.phase };
@ -105,6 +108,7 @@ function convertStoreToCard(panelStateStore: IRightPanelCardStored, room: Room):
: undefined, : undefined,
initialEvent: !!stateStored?.initialEventId ? room.findEventById(stateStored.initialEventId) : undefined, initialEvent: !!stateStored?.initialEventId ? room.findEventById(stateStored.initialEventId) : undefined,
member: (!!stateStored?.memberId && room.getMember(stateStored.memberId)) || undefined, member: (!!stateStored?.memberId && room.getMember(stateStored.memberId)) || undefined,
focusRoomSearch: stateStored?.focusRoomSearch,
}; };
return { state: state, phase: panelStateStore.phase }; return { state: state, phase: panelStateStore.phase };