From 7eb2558fc5d8d99588f41734c887fab8ac7c1f47 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Wed, 6 Feb 2019 15:06:27 +0100
Subject: [PATCH] Fix issue with graph legend color picker disapearing on color
 selection

---
 public/app/core/utils/ConfigProvider.tsx | 3 +--
 public/app/plugins/panel/graph/graph.ts  | 5 ++++-
 scripts/webpack/getThemeVariable.js      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/app/core/utils/ConfigProvider.tsx b/public/app/core/utils/ConfigProvider.tsx
index 56b6fc3d8b9..cb3ad88b191 100644
--- a/public/app/core/utils/ConfigProvider.tsx
+++ b/public/app/core/utils/ConfigProvider.tsx
@@ -21,8 +21,7 @@ export const ThemeProvider = ({ children }: { children: React.ReactNode }) => {
   return (
     <ConfigConsumer>
       {config => {
-        const currentTheme = getCurrentThemeName();
-        return <ThemeContext.Provider value={getTheme(currentTheme)}>{children}</ThemeContext.Provider>;
+        return <ThemeContext.Provider value={getCurrentTheme()}>{children}</ThemeContext.Provider>;
       }}
     </ConfigConsumer>
   );
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 3800e147d9d..846d11ea475 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -28,6 +28,8 @@ import { GraphCtrl } from './module';
 import { GrafanaThemeType, getValueFormat } from '@grafana/ui';
 import { provideTheme } from 'app/core/utils/ConfigProvider';
 
+const LegendWithThemeProvider = provideTheme(Legend);
+
 class GraphElement {
   ctrl: GraphCtrl;
   tooltip: any;
@@ -44,6 +46,7 @@ class GraphElement {
   legendElem: HTMLElement;
 
   constructor(private scope, private elem, private timeSrv) {
+
     this.ctrl = scope.ctrl;
     this.dashboard = this.ctrl.dashboard;
     this.panel = this.ctrl.panel;
@@ -110,7 +113,7 @@ class GraphElement {
       onToggleAxis: this.ctrl.onToggleAxis,
     };
 
-    const legendReactElem = React.createElement(provideTheme(Legend), legendProps);
+    const legendReactElem = React.createElement(LegendWithThemeProvider, legendProps);
     ReactDOM.render(legendReactElem, this.legendElem, () => this.renderPanel());
   }
 
diff --git a/scripts/webpack/getThemeVariable.js b/scripts/webpack/getThemeVariable.js
index 0db0a9842a8..6726f95d47c 100644
--- a/scripts/webpack/getThemeVariable.js
+++ b/scripts/webpack/getThemeVariable.js
@@ -29,7 +29,7 @@ function getThemeVariable(variablePath, themeName) {
   const variable = get(theme, variablePath.getValue());
 
   if (!variable) {
-    throw new Error(`${variablePath} is not defined fo ${themeName}`);
+    throw new Error(`${variablePath.getValue()} is not defined for ${themeName.getValue()} theme`);
   }
 
   if (isHex(variable)) {