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

Explore: Handle newlines in LogRow Highlighter (#17425)

Browse Source
This commit is contained in:
rrFeng
2019-06-06 19:55:04 +08:00
committed by Torkel Ödegaard
parent e06abb30aa
commit c31b939e10
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/explore/LogRow.tsx
View File

@@ -284,6 +284,7 @@ export class LogRow extends PureComponent<Props, State> {
<span className={styles}> <span className={styles}>
{parsed && ( {parsed && (
<Highlighter <Highlighter
style={{ whiteSpace: 'pre-wrap' }}
autoEscape autoEscape
highlightTag={FieldHighlight(this.onClickHighlight)} highlightTag={FieldHighlight(this.onClickHighlight)}
textToHighlight={entry} textToHighlight={entry}
@@ -293,6 +294,7 @@ export class LogRow extends PureComponent<Props, State> {
)} )}
{!parsed && needsHighlighter && ( {!parsed && needsHighlighter && (
<Highlighter <Highlighter
style={{ whiteSpace: 'pre-wrap' }}
textToHighlight={entry} textToHighlight={entry}
searchWords={highlights} searchWords={highlights}
findChunks={findHighlightChunksInText} findChunks={findHighlightChunksInText}