Merge pull request #15350 from grafana/fix/clear-search-on-vizpicker-close

Clear visualization picker search on picker close
This commit is contained in:
Torkel Ödegaard
2019-02-11 11:39:07 +01:00
committed by GitHub
3 changed files with 14 additions and 3 deletions
+1
View File
@@ -27,6 +27,7 @@
"@types/react-dom": "^16.0.9", "@types/react-dom": "^16.0.9",
"@types/react-grid-layout": "^0.16.6", "@types/react-grid-layout": "^0.16.6",
"@types/react-select": "^2.0.4", "@types/react-select": "^2.0.4",
"@types/react-transition-group": "^2.0.15",
"@types/react-virtualized": "^9.18.12", "@types/react-virtualized": "^9.18.12",
"angular-mocks": "1.6.6", "angular-mocks": "1.6.6",
"autoprefixer": "^6.4.0", "autoprefixer": "^6.4.0",
@@ -1,11 +1,12 @@
import React, { FC } from 'react'; import React, { FC } from 'react';
import Transition from 'react-transition-group/Transition'; import Transition, { ExitHandler } from 'react-transition-group/Transition';
interface Props { interface Props {
duration: number; duration: number;
children: JSX.Element; children: JSX.Element;
in: boolean; in: boolean;
unmountOnExit?: boolean; unmountOnExit?: boolean;
onExited?: ExitHandler;
} }
export const FadeIn: FC<Props> = props => { export const FadeIn: FC<Props> = props => {
@@ -22,7 +23,12 @@ export const FadeIn: FC<Props> = props => {
}; };
return ( return (
<Transition in={props.in} timeout={props.duration} unmountOnExit={props.unmountOnExit || false}> <Transition
in={props.in}
timeout={props.duration}
unmountOnExit={props.unmountOnExit || false}
onExited={props.onExited}
>
{state => ( {state => (
<div <div
style={{ style={{
@@ -149,6 +149,10 @@ export class VisualizationTab extends PureComponent<Props, State> {
} }
} }
clearQuery = () => {
this.setState({ searchQuery: '' });
};
onPanelOptionsChanged = (options: any) => { onPanelOptionsChanged = (options: any) => {
this.props.panel.updateOptions(options); this.props.panel.updateOptions(options);
this.forceUpdate(); this.forceUpdate();
@@ -241,7 +245,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
setScrollTop={this.setScrollTop} setScrollTop={this.setScrollTop}
> >
<> <>
<FadeIn in={isVizPickerOpen} duration={200} unmountOnExit={true}> <FadeIn in={isVizPickerOpen} duration={200} unmountOnExit={true} onExited={this.clearQuery}>
<VizTypePicker <VizTypePicker
current={plugin} current={plugin}
onTypeChanged={this.onTypeChanged} onTypeChanged={this.onTypeChanged}