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
20134c90
Commit
20134c90
authored
Dec 10, 2018
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add keyboard navigation to datasource picker via a hoc.
parent
1ffac5a3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
101 additions
and
9 deletions
+101
-9
public/app/features/dashboard/dashgrid/DataSourcePicker.tsx
+34
-7
public/app/features/dashboard/dashgrid/withKeyboardNavigation.tsx
+65
-0
public/sass/components/_panel_editor.scss
+2
-2
No files found.
public/app/features/dashboard/dashgrid/DataSourcePicker.tsx
View file @
20134c90
import
React
,
{
PureComponent
}
from
'react'
;
import
classNames
from
'classnames'
;
import
_
from
'lodash'
;
import
withKeyboardNavigation
from
'./withKeyboardNavigation'
;
import
{
DataSourceSelectItem
}
from
'app/types'
;
interface
Props
{
export
interface
Props
{
onChangeDataSource
:
(
ds
:
any
)
=>
void
;
datasources
:
DataSourceSelectItem
[];
selected
?:
number
;
onKeyDown
?:
(
evt
:
any
,
maxSelectedIndex
:
number
,
onEnterAction
:
()
=>
void
)
=>
void
;
onMouseEnter
?:
(
select
:
number
)
=>
void
;
}
interface
State
{
searchQuery
:
string
;
}
export
class
DataSourcePicker
extends
PureComponent
<
Props
,
State
>
{
export
const
DataSourcePicker
=
withKeyboardNavigation
(
class
DataSourcePicker
extends
PureComponent
<
Props
,
State
>
{
searchInput
:
HTMLElement
;
constructor
(
props
)
{
...
...
@@ -35,15 +39,27 @@ export class DataSourcePicker extends PureComponent<Props, State> {
return
filtered
;
}
get
maxSelectedIndex
()
{
const
filtered
=
this
.
getDataSources
();
return
filtered
.
length
-
1
;
}
renderDataSource
=
(
ds
:
DataSourceSelectItem
,
index
:
number
)
=>
{
const
{
onChangeDataSource
}
=
this
.
props
;
const
{
onChangeDataSource
,
selected
,
onMouseEnter
}
=
this
.
props
;
const
onClick
=
()
=>
onChangeDataSource
(
ds
);
const
isSelected
=
selected
===
index
;
const
cssClass
=
classNames
({
'ds-picker-list__item'
:
true
,
'ds-picker-list__item--selected'
:
isSelected
,
});
return
(
<
div
key=
{
index
}
className=
{
cssClass
}
title=
{
ds
.
name
}
onClick=
{
onClick
}
>
<
div
key=
{
index
}
className=
{
cssClass
}
title=
{
ds
.
name
}
onClick=
{
onClick
}
onMouseEnter=
{
()
=>
onMouseEnter
(
index
)
}
>
<
img
className=
"ds-picker-list__img"
src=
{
ds
.
meta
.
info
.
logos
.
small
}
/>
<
div
className=
"ds-picker-list__name"
>
{
ds
.
name
}
</
div
>
</
div
>
...
...
@@ -66,6 +82,7 @@ export class DataSourcePicker extends PureComponent<Props, State> {
renderFilters
()
{
const
{
searchQuery
}
=
this
.
state
;
const
{
onKeyDown
}
=
this
.
props
;
return
(
<>
<
label
className=
"gf-form--has-input-icon"
>
...
...
@@ -76,6 +93,13 @@ export class DataSourcePicker extends PureComponent<Props, State> {
ref=
{
elem
=>
(
this
.
searchInput
=
elem
)
}
onChange=
{
this
.
onSearchQueryChange
}
value=
{
searchQuery
}
onKeyDown=
{
evt
=>
{
onKeyDown
(
evt
,
this
.
maxSelectedIndex
,
()
=>
{
const
{
onChangeDataSource
,
selected
}
=
this
.
props
;
const
ds
=
this
.
getDataSources
()[
selected
];
onChangeDataSource
(
ds
);
});
}
}
/>
<
i
className=
"gf-form-input-icon fa fa-search"
/>
</
label
>
...
...
@@ -94,4 +118,7 @@ export class DataSourcePicker extends PureComponent<Props, State> {
</>
);
}
}
}
);
export
default
DataSourcePicker
;
public/app/features/dashboard/dashgrid/withKeyboardNavigation.tsx
0 → 100644
View file @
20134c90
import
React
from
'react'
;
import
{
Props
}
from
'./DataSourcePicker'
;
interface
State
{
selected
:
number
;
}
const
withKeyboardNavigation
=
WrappedComponent
=>
{
return
class
extends
React
.
Component
<
Props
,
State
>
{
constructor
(
props
)
{
super
(
props
);
this
.
state
=
{
selected
:
0
,
};
}
goToNext
=
(
maxSelectedIndex
:
number
)
=>
{
const
nextIndex
=
this
.
state
.
selected
>=
maxSelectedIndex
?
0
:
this
.
state
.
selected
+
1
;
this
.
setState
({
selected
:
nextIndex
,
});
};
goToPrev
=
(
maxSelectedIndex
:
number
)
=>
{
const
nextIndex
=
this
.
state
.
selected
<=
0
?
maxSelectedIndex
:
this
.
state
.
selected
-
1
;
this
.
setState
({
selected
:
nextIndex
,
});
};
onKeyDown
=
(
evt
:
KeyboardEvent
,
maxSelectedIndex
:
number
,
onEnterAction
:
any
)
=>
{
if
(
evt
.
key
===
'ArrowDown'
)
{
evt
.
preventDefault
();
this
.
goToNext
(
maxSelectedIndex
);
}
if
(
evt
.
key
===
'ArrowUp'
)
{
evt
.
preventDefault
();
this
.
goToPrev
(
maxSelectedIndex
);
}
if
(
evt
.
key
===
'Enter'
&&
onEnterAction
)
{
onEnterAction
();
}
};
onMouseEnter
=
(
mouseEnterIndex
:
number
)
=>
{
this
.
setState
({
selected
:
mouseEnterIndex
,
});
};
render
()
{
return
(
<
WrappedComponent
selected=
{
this
.
state
.
selected
}
onKeyDown=
{
this
.
onKeyDown
}
onMouseEnter=
{
this
.
onMouseEnter
}
{
...
this
.
props
}
/>
);
}
};
};
export
default
withKeyboardNavigation
;
public/sass/components/_panel_editor.scss
View file @
20134c90
...
...
@@ -257,13 +257,13 @@
align-items
:
center
;
height
:
44px
;
&
:hover
{
&
--selected
{
background
:
$panel-editor-viz-item-bg-hover
;
border
:
$panel-editor-viz-item-border-hover
;
box-shadow
:
$panel-editor-viz-item-shadow-hover
;
}
&
--
selected
{
&
--
active
{
box-shadow
:
0
0
6px
$orange
;
border
:
1px
solid
$orange
;
...
...
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