Merge pull request #151 from adrlen/dot-color-picked

fix: support for color chosen with lowercased palette #150 closes: #150
xiaokaike · Aug 6, 2018 · 16ca183 · 16ca183
2 parents 904a7f0 + 6933946
commit 16ca183
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/components/Compact.vue b/src/components/Compact.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="vc-compact">
     <ul class="vc-compact-colors">
-      <li class="vc-compact-color-item" v-for="c in palette" :key="c"
+      <li class="vc-compact-color-item" v-for="c in paletteUpperCase(palette)" :key="c"
         :aria-label="'color:' + c"
         @click="handlerClick(c)"
         :class="{'vc-compact-color-item--white': c === '#FFFFFF' }"
@@ -41,7 +41,7 @@ export default {
   },
   computed: {
     pick () {
-      return this.colors.hex
+      return this.colors.hex.toUpperCase()
     }
   },
   methods: {

diff --git a/src/components/Grayscale.vue b/src/components/Grayscale.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="vc-grayscale">
     <ul class="vc-grayscale-colors">
-      <li class="vc-grayscale-color-item" v-for="c in palette" :key="c"
+      <li class="vc-grayscale-color-item" v-for="c in paletteUpperCase(palette)" :key="c"
         :aria-label="'color:' + c"
         @click="handlerClick(c)"
         :class="{'vc-grayscale-color-item--white': c == '#FFFFFF'}"
@@ -37,7 +37,7 @@ export default {
   },
   computed: {
     pick () {
-      return this.colors.hex
+      return this.colors.hex.toUpperCase()
     }
   },
   methods: {

diff --git a/src/mixin/color.js b/src/mixin/color.js
@@ -99,6 +99,9 @@ export default {
       if (checked === passed) {
         return data
       }
+    },
+    paletteUpperCase (palette) {
+      return palette.map(c => c.toUpperCase())
     }
   }
 }