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

Fix quoting messages from the search view (#7466)

pull/21833/head
Michael Telatynski 2022-01-05 15:59:19 +00:00 committed by GitHub
parent 76839ec42e
commit 6f89267a31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/structures/RoomView.tsx
View File

@ -99,6 +99,7 @@ import { fetchInitialEvent } from "../../utils/EventUtils";
import { ComposerType } from "../../dispatcher/payloads/ComposerInsertPayload"; import { ComposerType } from "../../dispatcher/payloads/ComposerInsertPayload";
import AppsDrawer from '../views/rooms/AppsDrawer'; import AppsDrawer from '../views/rooms/AppsDrawer';
import { RightPanelPhases } from '../../stores/right-panel/RightPanelStorePhases'; import { RightPanelPhases } from '../../stores/right-panel/RightPanelStorePhases';
import { ActionPayload } from "../../dispatcher/payloads";
const DEBUG = false; const DEBUG = false;
let debuglog = function(msg: string) {}; let debuglog = function(msg: string) {};
@ -818,7 +819,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
this.setState({ callState: call ? call.state : null }); this.setState({ callState: call ? call.state : null });
}; };
private onAction = payload => { private onAction = async (payload: ActionPayload): Promise<void> => {
switch (payload.action) { switch (payload.action) {
case 'message_sent': case 'message_sent':
this.checkDesktopNotifications(); this.checkDesktopNotifications();
@ -897,6 +898,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
case Action.ComposerInsert: { case Action.ComposerInsert: {
if (payload.composerType) break; if (payload.composerType) break;
if (this.state.searching && payload.timelineRenderingType === TimelineRenderingType.Room) {
// we don't have the composer rendered in this state, so bring it back first
await this.onCancelSearchClick();
}
// re-dispatch to the correct composer // re-dispatch to the correct composer
dis.dispatch({ dis.dispatch({
...payload, ...payload,
@ -1612,10 +1619,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
}); });
}; };
private onCancelSearchClick = () => { private onCancelSearchClick = (): Promise<void> => {
this.setState({ return new Promise<void>(resolve => {
searching: false, this.setState({
searchResults: null, searching: false,
searchResults: null,
}, resolve);
}); });
}; };