IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: updates highlighter passed style prop from string to object (#23112)

Browse Source
This commit is contained in:
Lukas Siatka 2020-03-26 15:18:39 +01:00 committed by GitHub
parent 936594f5d0
commit 107a0d86f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/grafana-ui/src/components/Logs/LogRowMessage.tsx
View File

@ -52,10 +52,6 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => {
.setAlpha(0.7) .setAlpha(0.7)
.toRgbString()}; .toRgbString()};
`, `,
whiteSpacePreWrap: css`
label: whiteSpacePreWrap;
white-space: pre-wrap;
`,
horizontalScroll: css` horizontalScroll: css`
label: verticalScroll; label: verticalScroll;
white-space: nowrap; white-space: nowrap;
@ -93,6 +89,11 @@ class UnThemedLogRowMessage extends PureComponent<Props> {
? cx([style.logsRowMatchHighLight, style.logsRowMatchHighLightPreview]) ? cx([style.logsRowMatchHighLight, style.logsRowMatchHighLightPreview])
: cx([style.logsRowMatchHighLight]); : cx([style.logsRowMatchHighLight]);
const styles = getStyles(theme); const styles = getStyles(theme);
const whiteSpacePreWrap = {
label: 'white-space-pre-wrap',
whiteSpace: 'pre-wrap',
};
return ( return (
<td className={style.logsRowMessage}> <td className={style.logsRowMessage}>
<div className={cx(styles.positionRelative, { [styles.horizontalScroll]: !wrapLogMessage })}> <div className={cx(styles.positionRelative, { [styles.horizontalScroll]: !wrapLogMessage })}>
@ -113,7 +114,7 @@ class UnThemedLogRowMessage extends PureComponent<Props> {
<span className={cx(styles.positionRelative, { [styles.rowWithContext]: showContext })}> <span className={cx(styles.positionRelative, { [styles.rowWithContext]: showContext })}>
{needsHighlighter ? ( {needsHighlighter ? (
<Highlighter <Highlighter
style={styles.whiteSpacePreWrap} style={whiteSpacePreWrap}
textToHighlight={entry} textToHighlight={entry}
searchWords={highlights} searchWords={highlights}
findChunks={findHighlightChunksInText} findChunks={findHighlightChunksInText}