e3feae32e1
Switch to using a normal <a href="..."> link for search result clickthrough. Apart from generally giving a better experience, this means that it also works on html messages. The problem there was that we were attaching onClick handlers to <span>s which we were then flattening into HTML with ReactDOMServer (which meant the onClick handlers were never attached to React's list of listeners). To make this work without jumping through React hoops, the highlighter now returns either a list of strings or a list of nodes, depending on whether we are dealing with an HTML event or a text one. We therefore have a separate HtmlHighlighter and TextHighlighter.
93 lines
3.2 KiB
JavaScript
93 lines
3.2 KiB
JavaScript
/*
|
|
Copyright 2015, 2016 OpenMarket Ltd
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
var React = require('react');
|
|
var ReactDOM = require('react-dom');
|
|
var HtmlUtils = require('../../../HtmlUtils');
|
|
var linkify = require('linkifyjs');
|
|
var linkifyElement = require('linkifyjs/element');
|
|
var linkifyMatrix = require('../../../linkify-matrix');
|
|
|
|
linkifyMatrix(linkify);
|
|
|
|
module.exports = React.createClass({
|
|
displayName: 'TextualBody',
|
|
|
|
propTypes: {
|
|
/* the MatrixEvent to show */
|
|
mxEvent: React.PropTypes.object.isRequired,
|
|
|
|
/* a list of words to highlight */
|
|
highlights: React.PropTypes.array,
|
|
|
|
/* link URL for the highlights */
|
|
highlightLink: React.PropTypes.string,
|
|
},
|
|
|
|
componentDidMount: function() {
|
|
linkifyElement(this.refs.content, linkifyMatrix.options);
|
|
|
|
if (this.props.mxEvent.getContent().format === "org.matrix.custom.html")
|
|
HtmlUtils.highlightDom(ReactDOM.findDOMNode(this));
|
|
},
|
|
|
|
componentDidUpdate: function() {
|
|
// XXX: why don't we linkify here?
|
|
// XXX: why do we bother doing this on update at all, given events are immutable?
|
|
|
|
if (this.props.mxEvent.getContent().format === "org.matrix.custom.html")
|
|
HtmlUtils.highlightDom(ReactDOM.findDOMNode(this));
|
|
},
|
|
|
|
shouldComponentUpdate: function(nextProps) {
|
|
// exploit that events are immutable :)
|
|
return (nextProps.mxEvent.getId() !== this.props.mxEvent.getId() ||
|
|
nextProps.highlights !== this.props.highlights ||
|
|
nextProps.highlightLink !== this.props.highlightLink);
|
|
},
|
|
|
|
render: function() {
|
|
var mxEvent = this.props.mxEvent;
|
|
var content = mxEvent.getContent();
|
|
var body = HtmlUtils.bodyToHtml(content, this.props.highlights,
|
|
{highlightLink: this.props.highlightLink});
|
|
|
|
switch (content.msgtype) {
|
|
case "m.emote":
|
|
var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
|
|
return (
|
|
<span ref="content" className="mx_MEmoteBody mx_EventTile_content">
|
|
* { name } { body }
|
|
</span>
|
|
);
|
|
case "m.notice":
|
|
return (
|
|
<span ref="content" className="mx_MNoticeBody mx_EventTile_content">
|
|
{ body }
|
|
</span>
|
|
);
|
|
default: // including "m.text"
|
|
return (
|
|
<span ref="content" className="mx_MTextBody mx_EventTile_content">
|
|
{ body }
|
|
</span>
|
|
);
|
|
}
|
|
},
|
|
});
|
|
|