OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Added expanding based on the option 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-01-18 17:49:09 +01:00
parent 7f727be4f6
commit 49dce58027
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/css/views/rooms/_EventTile.scss
View File

@ -493,7 +493,6 @@ $left-gutter: 64px;
// https://github.com/vector-im/vector-web/issues/754
overflow-x: overlay;
overflow-y: visible;
max-height: 30vh;
}
code {
@ -502,6 +501,12 @@ $left-gutter: 64px;
}
}
.mx_EventTile_content_collapsedCode {
pre {
max-height: 30vh;
}
}
.mx_EventTile:hover .mx_EventTile_body pre,
.mx_EventTile.focus-visible:focus-within .mx_EventTile_body pre {
border: 1px solid #e5e5e5; // deliberate constant as we're behind an invert filter

10
src/components/views/messages/TextualBody.js
View File

@ -35,6 +35,7 @@ import {isPermalinkHost} from "../../../utils/permalinks/Permalinks";
import {toRightOf} from "../../structures/ContextMenu";
import {copyPlaintext} from "../../../utils/strings";
import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
import classNames from "classnames";
export default class TextualBody extends React.Component {
static propTypes = {
@ -69,6 +70,7 @@ export default class TextualBody extends React.Component {
// track whether the preview widget is hidden
widgetHidden: false,
codeBlockExpanded: SettingsStore.getValue("expandCodeByDefault"),
};
}
@ -434,6 +436,12 @@ export default class TextualBody extends React.Component {
});
}
const defaultCaseClasses = classNames({
mx_MTextBody: true,
mx_EventTile_content: true,
mx_EventTile_content_collapsedCode: !this.state.codeBlockExpanded,
});
switch (content.msgtype) {
case "m.emote":
return (
@ -459,7 +467,7 @@ export default class TextualBody extends React.Component {
);
default: // including "m.text"
return (
<span className="mx_MTextBody mx_EventTile_content">
<span className={defaultCaseClasses}>
{ body }
{ widgets }
</span>