Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
ae3c2853
Unverified
Commit
ae3c2853
authored
Jul 27, 2020
by
Torkel Ödegaard
Committed by
GitHub
Jul 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TextPanel: Fix content overflow issue (#26612)
parent
f4ec9221
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
public/app/plugins/panel/text/TextPanel.tsx
+6
-2
No files found.
public/app/plugins/panel/text/TextPanel.tsx
View file @
ae3c2853
...
@@ -6,7 +6,7 @@ import { PanelProps, renderMarkdown, textUtil } from '@grafana/data';
...
@@ -6,7 +6,7 @@ import { PanelProps, renderMarkdown, textUtil } from '@grafana/data';
import
config
from
'app/core/config'
;
import
config
from
'app/core/config'
;
// Types
// Types
import
{
TextOptions
}
from
'./types'
;
import
{
TextOptions
}
from
'./types'
;
import
{
stylesFactory
}
from
'@grafana/ui'
;
import
{
stylesFactory
,
CustomScrollbar
}
from
'@grafana/ui'
;
import
{
css
,
cx
}
from
'emotion'
;
import
{
css
,
cx
}
from
'emotion'
;
import
DangerouslySetHtmlContent
from
'dangerously-set-html-content'
;
import
DangerouslySetHtmlContent
from
'dangerously-set-html-content'
;
...
@@ -80,7 +80,11 @@ export class TextPanel extends PureComponent<Props, State> {
...
@@ -80,7 +80,11 @@ export class TextPanel extends PureComponent<Props, State> {
render
()
{
render
()
{
const
{
html
}
=
this
.
state
;
const
{
html
}
=
this
.
state
;
const
styles
=
getStyles
();
const
styles
=
getStyles
();
return
<
DangerouslySetHtmlContent
html=
{
html
}
className=
{
cx
(
'markdown-html'
,
styles
.
content
)
}
/>;
return
(
<
CustomScrollbar
autoHeightMin=
"100%"
>
<
DangerouslySetHtmlContent
html=
{
html
}
className=
{
cx
(
'markdown-html'
,
styles
.
content
)
}
/>
;
</
CustomScrollbar
>
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment