Merge pull request #12 from qlik-oss/DEB-257/ColorPicker

ColorPicker picking correct color
qlik-oss · Jun 27, 2019 · 2b2f523 · 2b2f523
2 parents 6e9031b + a4d56a3
commit 2b2f523
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/definition.js b/src/definition.js
@@ -28,8 +28,8 @@ define([], function () {
             component: "color-picker",
             dualOutput: true,
             defaultValue: {
-              index: 6,
-              color: null
+              index: -1,
+              color: "#4477aa"
             },
             show: (a) => !a.color.auto
           },

diff --git a/src/theme.js b/src/theme.js
@@ -47,7 +47,12 @@ class ThemeManager {
 
   static colorFromTheme(index) {
     if (typeof ThemeManager.qlikTheme != 'undefined') {
-      return ThemeManager.qlikTheme.properties.palettes.ui[0].colors[index - 1];
+      const colors = ThemeManager.qlikTheme.properties.palettes.ui[0].colors;
+      let i = index;
+      if (colors[0] !== "none") {
+        i--;
+      }
+      return ThemeManager.qlikTheme.properties.palettes.ui[0].colors[i];
     } else {
       return colors[index];
     }