OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

MessageContextMenu: update once the message is sent (#10950) 

Fixes a flaky cypress test where the "Remove" option was not appearing
pull/28788/head^2
Richard van der Hoff 2023-05-19 15:11:40 +01:00 committed by GitHub
parent 3623643248
commit 60e1349eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/context_menus/MessageContextMenu.tsx
View File

@ -17,7 +17,7 @@ limitations under the License.
*/ */
import React, { createRef, useContext } from "react"; import React, { createRef, useContext } from "react";
import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event"; import { EventStatus, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
import { EventType, RelationType } from "matrix-js-sdk/src/@types/event"; import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
import { Relations } from "matrix-js-sdk/src/models/relations"; import { Relations } from "matrix-js-sdk/src/models/relations";
import { RoomMemberEvent } from "matrix-js-sdk/src/models/room-member"; import { RoomMemberEvent } from "matrix-js-sdk/src/models/room-member";
@ -145,6 +145,11 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
public componentDidMount(): void { public componentDidMount(): void {
MatrixClientPeg.get().on(RoomMemberEvent.PowerLevel, this.checkPermissions); MatrixClientPeg.get().on(RoomMemberEvent.PowerLevel, this.checkPermissions);
// re-check the permissions on send progress (`maySendRedactionForEvent` only returns true for events that have
// been fully sent and echoed back, and we want to ensure the "Remove" option is added once that happens.)
this.props.mxEvent.on(MatrixEventEvent.Status, this.checkPermissions);
this.checkPermissions(); this.checkPermissions();
} }
@ -153,6 +158,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
if (cli) { if (cli) {
cli.removeListener(RoomMemberEvent.PowerLevel, this.checkPermissions); cli.removeListener(RoomMemberEvent.PowerLevel, this.checkPermissions);
} }
this.props.mxEvent.removeListener(MatrixEventEvent.Status, this.checkPermissions);
} }
private checkPermissions = (): void => { private checkPermissions = (): void => {