2417482667
* Fix viewing source of redacted events Clicking 'View Source' in the context menu of a redacted event causes an error, and the user gets no visible result. This fixes <ViewSource /> to indicate that the source is unavailable when a message has been redacted. The original source remains available. <SyntaxHighlight /> requires a non-null string for its `content` prop, and, in the case of redacted events, <ViewSource /> was passing `undefined`. This is ultimately because redacting an event causes `MatrixEvent.clearEvent` to be `undefined`, which <ViewSource /> wasn't checking. Fixes https://github.com/vector-im/element-web/issues/24165 Signed-off-by: Clark Fischer <clark.fischer@gmail.com> * Use correct highlight.js call Previous call signature was deprecated. See https://github.com/highlightjs/highlight.js/issues/2277 Signed-off-by: Clark Fischer <clark.fischer@gmail.com> Signed-off-by: Clark Fischer <clark.fischer@gmail.com>
38 lines
1.2 KiB
TypeScript
38 lines
1.2 KiB
TypeScript
/*
|
|
Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
|
|
Copyright 2023 The Matrix.org Foundation C.I.C.
|
|
|
|
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.
|
|
*/
|
|
|
|
import React from "react";
|
|
import hljs from "highlight.js";
|
|
|
|
interface IProps {
|
|
language?: string;
|
|
children: string;
|
|
}
|
|
|
|
export default class SyntaxHighlight extends React.PureComponent<IProps> {
|
|
public render(): JSX.Element {
|
|
const { children: content, language } = this.props;
|
|
const highlighted = language ? hljs.highlight(content, { language }) : hljs.highlightAuto(content);
|
|
|
|
return (
|
|
<pre className={`mx_SyntaxHighlight hljs language-${highlighted.language}`}>
|
|
<code dangerouslySetInnerHTML={{ __html: highlighted.value }} />
|
|
</pre>
|
|
);
|
|
}
|
|
}
|