Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Fix quoting messages from the search view (#7466)
Browse files Browse the repository at this point in the history
  • Loading branch information
t3chguy authored Jan 5, 2022
1 parent 76839ec commit 6f89267
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions src/components/structures/RoomView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ import { fetchInitialEvent } from "../../utils/EventUtils";
import { ComposerType } from "../../dispatcher/payloads/ComposerInsertPayload";
import AppsDrawer from '../views/rooms/AppsDrawer';
import { RightPanelPhases } from '../../stores/right-panel/RightPanelStorePhases';
import { ActionPayload } from "../../dispatcher/payloads";

const DEBUG = false;
let debuglog = function(msg: string) {};
Expand Down Expand Up @@ -818,7 +819,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
this.setState({ callState: call ? call.state : null });
};

private onAction = payload => {
private onAction = async (payload: ActionPayload): Promise<void> => {
switch (payload.action) {
case 'message_sent':
this.checkDesktopNotifications();
Expand Down Expand Up @@ -897,6 +898,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {

case Action.ComposerInsert: {
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
dis.dispatch({
...payload,
Expand Down Expand Up @@ -1612,10 +1619,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
});
};

private onCancelSearchClick = () => {
this.setState({
searching: false,
searchResults: null,
private onCancelSearchClick = (): Promise<void> => {
return new Promise<void>(resolve => {
this.setState({
searching: false,
searchResults: null,
}, resolve);
});
};

Expand Down

0 comments on commit 6f89267

Please sign in to comment.