DRY EditMessageComposer

Author: t3chguy

src/components/views/rooms/EditMessageComposer.tsx

@@ -202,23 +202,27 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
                         timelineRenderingType: this.context.timelineRenderingType,
                     });
                 } else {
-                    this.clearStoredEditorState();
-                    dis.dispatch({
-                        action: Action.EditEvent,
-                        event: null,
-                        timelineRenderingType: this.context.timelineRenderingType,
-                    });
-                    dis.dispatch({
-                        action: Action.FocusSendMessageComposer,
-                        context: this.context.timelineRenderingType,
-                    });
+                    this.cancelEdit();
                 }
                 event.preventDefault();
                 break;
             }
         }
     };
 
+    private endEdit(): void {
+        // close the event editing and focus composer
+        dis.dispatch({
+            action: Action.EditEvent,
+            event: null,
+            timelineRenderingType: this.context.timelineRenderingType,
+        });
+        dis.dispatch({
+            action: Action.FocusSendMessageComposer,
+            context: this.context.timelineRenderingType,
+        });
+    }
+
     private get editorRoomKey(): string {
         return `mx_edit_room_${this.getRoom().roomId}_${this.context.timelineRenderingType}`;
     }
@@ -236,15 +240,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
 
     private cancelEdit = (): void => {
         this.clearStoredEditorState();
-        dis.dispatch({
-            action: Action.EditEvent,
-            event: null,
-            timelineRenderingType: this.context.timelineRenderingType,
-        });
-        dis.dispatch({
-            action: Action.FocusSendMessageComposer,
-            context: this.context.timelineRenderingType,
-        });
+        this.endEdit();
     };
 
     private get shouldSaveStoredEditorState(): boolean {
@@ -357,16 +353,7 @@ class EditMessageComposer extends React.Component<IEditMessageComposerProps, ISt
             }
         }
 
-        // close the event editing and focus composer
-        dis.dispatch({
-            action: Action.EditEvent,
-            event: null,
-            timelineRenderingType: this.context.timelineRenderingType,
-        });
-        dis.dispatch({
-            action: Action.FocusSendMessageComposer,
-            context: this.context.timelineRenderingType,
-        });
+        this.endEdit();
     };
 
     private cancelPreviousPendingEdit(): void {