From 1751a5108893c0fe8cb7885e3daab501675cd187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 12 Dec 2018 14:44:40 +0100
Subject: [PATCH] wip

---
 .../dashboard/dashgrid/VisualizationTab.tsx   | 60 +++++++++++--------
 .../dashboard/dashgrid/VizTypePicker.tsx      | 14 +----
 public/sass/components/_panel_editor.scss     | 12 +++-
 3 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/public/app/features/dashboard/dashgrid/VisualizationTab.tsx b/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
index 793baf15586..ae976ddfd54 100644
--- a/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
+++ b/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
@@ -5,7 +5,7 @@ import React, { PureComponent } from 'react';
 import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
 
 // Components
-import { EditorTabBody } from './EditorTabBody';
+import { EditorTabBody, EditorToolBarView } from './EditorTabBody';
 import { VizTypePicker } from './VizTypePicker';
 import { FadeIn } from 'app/core/components/Animations/FadeIn';
 
@@ -155,23 +155,23 @@ export class VisualizationTab extends PureComponent<Props, State> {
     const { plugin } = this.props;
     const { searchQuery } = this.state;
 
-    // if (this.state.isVizPickerOpen) {
-    //   return (
-    //     <>
-    //     <label className="gf-form--has-input-icon">
-    //       <input
-    //         type="text"
-    //         className="gf-form-input width-13"
-    //         placeholder=""
-    //         onChange={this.onSearchQueryChange}
-    //         value={searchQuery}
-    //         ref={elem => elem && elem.focus()}
-    //       />
-    //       <i className="gf-form-input-icon fa fa-search" />
-    //     </label>
-    //     </>
-    //   );
-    // } else {
+    if (this.state.isVizPickerOpen) {
+      return (
+        <>
+          <label className="gf-form--has-input-icon">
+            <input
+              type="text"
+              className="gf-form-input width-13"
+              placeholder=""
+              onChange={this.onSearchQueryChange}
+              value={searchQuery}
+              ref={elem => elem && elem.focus()}
+            />
+            <i className="gf-form-input-icon fa fa-search" />
+          </label>
+        </>
+      );
+    } else {
       return (
         <div className="toolbar__main" onClick={this.onOpenVizPicker}>
           <img className="toolbar__main-image" src={plugin.info.logos.small} />
@@ -179,7 +179,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
           <i className="fa fa-caret-down" />
         </div>
       );
-    // }
+    }
   };
 
   onTypeChanged = (plugin: PanelPlugin) => {
@@ -190,18 +190,26 @@ export class VisualizationTab extends PureComponent<Props, State> {
   render() {
     const { plugin } = this.props;
     const { isVizPickerOpen, searchQuery } = this.state;
+    const toolbarItems: EditorToolBarView = [];
 
-    const panelHelp = {
-      title: '',
-      icon: 'fa fa-question',
-      render: () => <h2>Help</h2>,
-    };
+    if (!isVizPickerOpen) {
+      toolbarItems.push({
+        title: '',
+        icon: 'fa fa-question',
+        render: () => <h2>Help</h2>,
+      });
+    }
 
     return (
-      <EditorTabBody heading="Visualization" renderToolbar={this.renderToolbar} toolbarItems={[panelHelp]}>
+      <EditorTabBody heading="Visualization" renderToolbar={this.renderToolbar} toolbarItems={toolbarItems}>
         <>
           <FadeIn in={isVizPickerOpen} duration={200} unmountOnExit={true}>
-            <VizTypePicker current={plugin} onTypeChanged={this.onTypeChanged} searchQuery={searchQuery} onClose={this.onCloseVizPicker} />
+            <VizTypePicker
+              current={plugin}
+              onTypeChanged={this.onTypeChanged}
+              searchQuery={searchQuery}
+              onClose={this.onCloseVizPicker}
+            />
           </FadeIn>
           {this.renderPanelOptions()}
         </>
diff --git a/public/app/features/dashboard/dashgrid/VizTypePicker.tsx b/public/app/features/dashboard/dashgrid/VizTypePicker.tsx
index e9f8d895e40..76c6c3af9ce 100644
--- a/public/app/features/dashboard/dashgrid/VizTypePicker.tsx
+++ b/public/app/features/dashboard/dashgrid/VizTypePicker.tsx
@@ -66,17 +66,9 @@ export class VizTypePicker extends PureComponent<Props> {
     const filteredPluginList = this.getFilteredPluginList();
 
     return (
-      <div className="form-section">
-        <div className="form-section__header">
-          <span>Type selection</span>
-          <button className="btn btn-link" onClick={onClose}>
-            <i className="fa fa-remove" />
-          </button>
-        </div>
-        <div className="form-section__body">
-          <div className="viz-picker">
-            {filteredPluginList.map((plugin, index) => this.renderVizPlugin(plugin, index))}
-          </div>
+      <div className="viz-picker">
+        <div className="viz-picker-list">
+          {filteredPluginList.map((plugin, index) => this.renderVizPlugin(plugin, index))}
         </div>
       </div>
     );
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index e2dbbc6f532..34a19ceb72f 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -133,14 +133,20 @@
 }
 
 .viz-picker {
+  background: $toolbar-bg;
+  margin: -40px -20px 40px 106px;
+  padding: 20px;
+  position: relative;
+}
+
+.viz-picker-list {
   display: flex;
   flex-wrap: wrap;
-  margin-bottom: 40px;
 }
 
 .viz-picker__item {
-  background: $panel-bg;
-  border: $panel-border;
+  background: $panel-editor-viz-item-bg;
+  border: $panel-editor-viz-item-border;
   border-radius: 3px;
   height: 100px;
   width: 150px;