matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Support reactions, replies and forwards of polls (#7318)

Browse Source
This commit is contained in:
Andy Balaam
2021-12-09 12:54:31 +00:00
committed by GitHub
parent 3c1ee204a0
commit 68ac578577
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/css/views/messages/_MPollBody.scss
View File

@ -139,3 +139,8 @@ limitations under the License.
font-size: $font-12px; font-size: $font-12px;
} }
} }
// Prevent clicking a poll within a reply
.mx_ReplyTile .mx_MPollBody {
pointer-events: none;
}

5
src/utils/EventUtils.ts
View File

@ -46,7 +46,10 @@ export function isContentActionable(mxEvent: MatrixEvent): boolean {
if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) { if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {
return true; return true;
} }
} else if (mxEvent.getType() === 'm.sticker') { } else if (
mxEvent.getType() === 'm.sticker' ||
POLL_START_EVENT_TYPE.matches(mxEvent.getType())
) {
return true; return true;
} }
} }