Fix automatic composer focus, regressed by threads work (#7167)

src/dispatcher/actions.ts

@@ -56,12 +56,12 @@ export enum Action {
     CheckUpdates = "check_updates",
 
     /**
-     * Focuses the user's cursor to the send message composer. No additional payload information required.
+     * Focuses the user's cursor to the send message composer. Should be used with a FocusComposerPayload.
      */
     FocusSendMessageComposer = "focus_send_message_composer",
 
     /**
-     * Focuses the user's cursor to the edit message composer. No additional payload information required.
+     * Focuses the user's cursor to the edit message composer. Should be used with a FocusComposerPayload.
      */
     FocusEditMessageComposer = "focus_edit_message_composer",
 

src/dispatcher/payloads/FocusComposerPayload.ts

@@ -0,0 +1,25 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+import { TimelineRenderingType } from "../../contexts/RoomContext";
+
+export interface FocusComposerPayload extends ActionPayload {
+    action: Action.FocusEditMessageComposer | Action.FocusSendMessageComposer | "reply_to_event";
+
+    context?: TimelineRenderingType; // defaults to Room type for backwards compatibility
+}