From b34012f289cf4972be461600233b8b29a55c9b14 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 22 Nov 2023 05:58:08 +0000 Subject: [PATCH] Remove Quote from MessageContextMenu as it is unsupported by WYSIWYG (#11914) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../context_menus/MessageContextMenu.tsx | 23 ------------------- .../payloads/ComposerInsertPayload.ts | 11 +-------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx index dec2c097fa..e0fca0a4c0 100644 --- a/src/components/views/context_menus/MessageContextMenu.tsx +++ b/src/components/views/context_menus/MessageContextMenu.tsx @@ -49,7 +49,6 @@ import ViewSource from "../../structures/ViewSource"; import { createRedactEventDialog } from "../dialogs/ConfirmRedactDialog"; import ShareDialog from "../dialogs/ShareDialog"; import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext"; -import { ComposerInsertPayload } from "../../../dispatcher/payloads/ComposerInsertPayload"; import EndPollDialog from "../dialogs/EndPollDialog"; import { isPollEnded } from "../messages/MPollBody"; import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload"; @@ -286,15 +285,6 @@ export default class MessageContextMenu extends React.Component this.closeMenu(); }; - private onQuoteClick = (): void => { - dis.dispatch({ - action: Action.ComposerInsert, - event: this.props.mxEvent, - timelineRenderingType: this.context.timelineRenderingType, - }); - this.closeMenu(); - }; - private onShareClick = (e: ButtonEvent): void => { e.preventDefault(); Modal.createDialog(ShareDialog, { @@ -524,18 +514,6 @@ export default class MessageContextMenu extends React.Component ); } - let quoteButton: JSX.Element | undefined; - if (eventTileOps && canSendMessages) { - // this event is rendered using TextualBody - quoteButton = ( - - ); - } - // Bridges can provide a 'external_url' to link back to the source. let externalURLButton: JSX.Element | undefined; if ( @@ -709,7 +687,6 @@ export default class MessageContextMenu extends React.Component {viewInRoomButton} {openInMapSiteButton} {endPollButton} - {quoteButton} {forwardButton} {pinButton} {permalinkButton} diff --git a/src/dispatcher/payloads/ComposerInsertPayload.ts b/src/dispatcher/payloads/ComposerInsertPayload.ts index 1adcdae05c..760cd561d4 100644 --- a/src/dispatcher/payloads/ComposerInsertPayload.ts +++ b/src/dispatcher/payloads/ComposerInsertPayload.ts @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { MatrixEvent } from "matrix-js-sdk/src/matrix"; - import { ActionPayload } from "../payloads"; import { Action } from "../actions"; import { TimelineRenderingType } from "../../contexts/RoomContext"; @@ -35,15 +33,8 @@ interface IComposerInsertMentionPayload extends IBaseComposerInsertPayload { userId: string; } -interface IComposerInsertQuotePayload extends IBaseComposerInsertPayload { - event: MatrixEvent; -} - interface IComposerInsertPlaintextPayload extends IBaseComposerInsertPayload { text: string; } -export type ComposerInsertPayload = - | IComposerInsertMentionPayload - | IComposerInsertQuotePayload - | IComposerInsertPlaintextPayload; +export type ComposerInsertPayload = IComposerInsertMentionPayload | IComposerInsertPlaintextPayload;