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
3952083b
Commit
3952083b
authored
Sep 17, 2019
by
Hugo Häggmark
Committed by
Torkel Ödegaard
Sep 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TimePicker: Fixes onBlur issue with FireFox on MacOS (#19154)
Fixes: #18531
parent
aaf93b2f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
packages/grafana-ui/src/components/Select/ButtonSelect.tsx
+3
-2
No files found.
packages/grafana-ui/src/components/Select/ButtonSelect.tsx
View file @
3952083b
...
@@ -13,11 +13,12 @@ const ButtonComponent = (buttonProps: ButtonComponentProps) => (props: any) => {
...
@@ -13,11 +13,12 @@ const ButtonComponent = (buttonProps: ButtonComponentProps) => (props: any) => {
const
{
label
,
className
,
iconClass
}
=
buttonProps
;
const
{
label
,
className
,
iconClass
}
=
buttonProps
;
return
(
return
(
<
button
<
div
// changed to div because of FireFox on MacOs issue below
ref=
{
props
.
innerRef
}
ref=
{
props
.
innerRef
}
className=
{
`btn navbar-button navbar-button--tight ${className}`
}
className=
{
`btn navbar-button navbar-button--tight ${className}`
}
onClick=
{
props
.
selectProps
.
menuIsOpen
?
props
.
selectProps
.
onMenuClose
:
props
.
selectProps
.
onMenuOpen
}
onClick=
{
props
.
selectProps
.
menuIsOpen
?
props
.
selectProps
.
onMenuClose
:
props
.
selectProps
.
onMenuOpen
}
onBlur=
{
props
.
selectProps
.
onMenuClose
}
onBlur=
{
props
.
selectProps
.
onMenuClose
}
tabIndex=
{
0
}
// necessary to get onBlur to work https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#Clicking_and_focus
>
>
<
div
className=
"select-button"
>
<
div
className=
"select-button"
>
{
iconClass
&&
<
i
className=
{
`select-button-icon ${iconClass}`
}
/>
}
{
iconClass
&&
<
i
className=
{
`select-button-icon ${iconClass}`
}
/>
}
...
@@ -25,7 +26,7 @@ const ButtonComponent = (buttonProps: ButtonComponentProps) => (props: any) => {
...
@@ -25,7 +26,7 @@ const ButtonComponent = (buttonProps: ButtonComponentProps) => (props: any) => {
{
!
props
.
menuIsOpen
&&
<
i
className=
"fa fa-caret-down fa-fw"
/>
}
{
!
props
.
menuIsOpen
&&
<
i
className=
"fa fa-caret-down fa-fw"
/>
}
{
props
.
menuIsOpen
&&
<
i
className=
"fa fa-caret-up fa-fw"
/>
}
{
props
.
menuIsOpen
&&
<
i
className=
"fa fa-caret-up fa-fw"
/>
}
</
div
>
</
div
>
</
button
>
</
div
>
);
);
};
};
...
...
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