Tidy up

Author: Half-Shot

apps/web/src/components/structures/RoomView.tsx

@@ -1296,11 +1296,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 const composerInsertPayload = payload as ComposerInsertPayload;
                 if (composerInsertPayload.composerType) break;
 
-                // If the dispatchee didn't request a timeline rendering type, use the current one.
-                let timelineRenderingType: TimelineRenderingType =
-                    composerInsertPayload.timelineRenderingType ?? this.state.timelineRenderingType;
+                let timelineRenderingType: TimelineRenderingType | undefined;
                 // ThreadView handles Action.ComposerInsert itself due to it having its own editState
-                if (timelineRenderingType === TimelineRenderingType.Thread) break;
+                if (composerInsertPayload.timelineRenderingType === TimelineRenderingType.Thread) break;
                 if (
                     this.state.timelineRenderingType === TimelineRenderingType.Search &&
                     composerInsertPayload.timelineRenderingType === TimelineRenderingType.Search
@@ -1310,6 +1308,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     timelineRenderingType = TimelineRenderingType.Room;
                 }
 
+                // If the dispatchee didn't request a timeline rendering type, use the current one.
+                timelineRenderingType =
+                    timelineRenderingType ??
+                    composerInsertPayload.timelineRenderingType ??
+                    this.state.timelineRenderingType;
+
                 // re-dispatch to the correct composer
                 defaultDispatcher.dispatch<ComposerInsertPayload>({
                     ...composerInsertPayload,

apps/web/src/dispatcher/payloads/ComposerInsertPayload.ts

@@ -15,32 +15,18 @@ export enum ComposerType {
     Edit = "edit",
 }
 
-/**
- * Explicit composer insert to target
- */
-interface IBaseComposerInsertPayloadExplicit extends ActionPayload {
+interface IBaseComposerInsertPayload extends ActionPayload {
     action: Action.ComposerInsert;
-    timelineRenderingType: TimelineRenderingType;
-    composerType: ComposerType;
-}
-
-/**
- * Explicit composer insert to current target.
- */
-interface IBaseComposerInsertPayloadImplicit extends ActionPayload {
-    action: Action.ComposerInsert;
-    composerType?: undefined; // undefined if this should be re-dispatched to the correct composer
     timelineRenderingType?: TimelineRenderingType; // undefined if this should just use the current in-focus type.
+    composerType?: ComposerType; // falsy if should be re-dispatched to the correct composer
 }
 
-type IBaseComposerInsertPayload = IBaseComposerInsertPayloadExplicit | IBaseComposerInsertPayloadImplicit;
-
-type IComposerInsertMentionPayload = IBaseComposerInsertPayload & {
+interface IComposerInsertMentionPayload extends IBaseComposerInsertPayload {
     userId: string;
-};
+}
 
-type IComposerInsertPlaintextPayload = IBaseComposerInsertPayload & {
+interface IComposerInsertPlaintextPayload extends IBaseComposerInsertPayload {
     text: string;
-};
+}
 
 export type ComposerInsertPayload = IComposerInsertMentionPayload | IComposerInsertPlaintextPayload;