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

Commit 4629d1e

Browse files
authored
Fix emoji insertion in thread composer going to the main composer (#7895)
1 parent 85dc58a commit 4629d1e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/components/structures/RoomView.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -899,17 +899,19 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
899899
case Action.ComposerInsert: {
900900
if (payload.composerType) break;
901901

902+
let timelineRenderingType: TimelineRenderingType = payload.timelineRenderingType;
902903
if (this.state.timelineRenderingType === TimelineRenderingType.Search &&
903904
payload.timelineRenderingType === TimelineRenderingType.Search
904905
) {
905906
// we don't have the composer rendered in this state, so bring it back first
906907
await this.onCancelSearchClick();
908+
timelineRenderingType = TimelineRenderingType.Room;
907909
}
908910

909911
// re-dispatch to the correct composer
910912
dis.dispatch<ComposerInsertPayload>({
911913
...(payload as ComposerInsertPayload),
912-
timelineRenderingType: TimelineRenderingType.Room,
914+
timelineRenderingType,
913915
composerType: this.state.editState ? ComposerType.Edit : ComposerType.Send,
914916
});
915917
break;

0 commit comments

Comments
 (0)