diff --git a/res/css/views/messages/_MPollBody.scss b/res/css/views/messages/_MPollBody.scss index e56fc8993a..a03fd46be7 100644 --- a/res/css/views/messages/_MPollBody.scss +++ b/res/css/views/messages/_MPollBody.scss @@ -139,3 +139,8 @@ limitations under the License. font-size: $font-12px; } } + +// Prevent clicking a poll within a reply +.mx_ReplyTile .mx_MPollBody { + pointer-events: none; +} diff --git a/src/utils/EventUtils.ts b/src/utils/EventUtils.ts index 7ad323ea1d..e85ccde228 100644 --- a/src/utils/EventUtils.ts +++ b/src/utils/EventUtils.ts @@ -46,7 +46,10 @@ export function isContentActionable(mxEvent: MatrixEvent): boolean { if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) { return true; } - } else if (mxEvent.getType() === 'm.sticker') { + } else if ( + mxEvent.getType() === 'm.sticker' || + POLL_START_EVENT_TYPE.matches(mxEvent.getType()) + ) { return true; } }