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

Merge pull request #14434 from grafana/14274-reset-search

Browse Source 
14274 develop - Reset DsPicker and VizPicker state when closed
This commit is contained in:
Torkel Ödegaard 2018-12-11 09:14:41 +01:00 committed by GitHub
commit 75a1536c91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/core/components/Animations/FadeIn.tsx
View File

@ -5,6 +5,7 @@ interface Props {
duration: number; duration: number;
children: JSX.Element; children: JSX.Element;
in: boolean; in: boolean;
unmountOnExit?: boolean;
} }
export const FadeIn: SFC<Props> = props => { export const FadeIn: SFC<Props> = props => {
@ -21,7 +22,7 @@ export const FadeIn: SFC<Props> = props => {
}; };
return ( return (
<Transition in={props.in} timeout={props.duration}> <Transition in={props.in} timeout={props.duration} unmountOnExit={props.unmountOnExit || false}>
{state => ( {state => (
<div <div
style={{ style={{

2
public/app/features/dashboard/dashgrid/EditorTabBody.tsx
View File

@ -117,7 +117,7 @@ export class EditorTabBody extends PureComponent<Props, State> {
</div> </div>
<div className="panel-editor__scroll"> <div className="panel-editor__scroll">
<CustomScrollbar autoHide={false}> <CustomScrollbar autoHide={false}>
<FadeIn in={isOpen} duration={200}> <FadeIn in={isOpen} duration={200} unmountOnExit={true}>
<div className="panel-editor__toolbar-view">{openView && this.renderOpenView(openView)}</div> <div className="panel-editor__toolbar-view">{openView && this.renderOpenView(openView)}</div>
</FadeIn> </FadeIn>
<div className="panel-editor__content"> <div className="panel-editor__content">