From bd5efc7ceb0d1d56ef4b87e8a77ec12b1cc2c11b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Wed, 24 Feb 2021 19:11:08 +0100 Subject: [PATCH] Pass permallinkCreator to ImageView MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/components/views/elements/ImageView.js | 1 + src/components/views/messages/MImageBody.js | 3 +++ src/components/views/messages/MessageEvent.js | 3 +++ src/components/views/rooms/EventTile.js | 1 + 4 files changed, 8 insertions(+) diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js index c00b62ecc8..ede4cc9623 100644 --- a/src/components/views/elements/ImageView.js +++ b/src/components/views/elements/ImageView.js @@ -42,6 +42,7 @@ export default class ImageView extends React.Component { // properties above, which let us use lightboxes to display images which aren't associated // with events. mxEvent: PropTypes.object, + permalinkCreator: PropTypes.object, }; constructor(props) { diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 8456a5bd09..616f2b1cc8 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -38,6 +38,8 @@ export default class MImageBody extends React.Component { /* the maximum image height to use */ maxImageHeight: PropTypes.number, + + permalinkCreator: PropTypes.object, }; static contextType = MatrixClientContext; @@ -103,6 +105,7 @@ export default class MImageBody extends React.Component { src: httpUrl, name: content.body && content.body.length > 0 ? content.body : _t('Attachment'), mxEvent: this.props.mxEvent, + permalinkCreator: this.props.permalinkCreator, }; if (content.info) { diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js index f93813fe79..daee6558c9 100644 --- a/src/components/views/messages/MessageEvent.js +++ b/src/components/views/messages/MessageEvent.js @@ -44,6 +44,8 @@ export default class MessageEvent extends React.Component { /* the maximum image height to use, if the event is an image */ maxImageHeight: PropTypes.number, + + permalinkCreator: PropTypes.object, }; constructor(props) { @@ -120,6 +122,7 @@ export default class MessageEvent extends React.Component { editState={this.props.editState} onHeightChanged={this.props.onHeightChanged} onMessageAllowed={this.onTileUpdate} + permalinkCreator={this.props.permalinkCreator} />; } } diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index c856919f5a..fb0fa7d6d2 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -968,6 +968,7 @@ export default class EventTile extends React.Component { highlights={this.props.highlights} highlightLink={this.props.highlightLink} showUrlPreview={this.props.showUrlPreview} + permalinkCreator={this.props.permalinkCreator} onHeightChanged={this.props.onHeightChanged} /> { keyRequestInfo } { reactionsRow }