🔨 [Sketch] move isTransparent to mixin

qtnizuishuai · Aug 6, 2018 · de68e59 · de68e59
1 parent 2118264
commit de68e59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/components/Sketch.vue b/src/components/Sketch.vue
@@ -39,13 +39,14 @@
       <template v-for="c in presetColors">
         <div
           class="vc-sketch-presets-color"
-          v-if="!colorIsTransparent(c)"
+          v-if="!isTransparent(c)"
           :aria-label="'color:'+c"
           :key="c"
           :style="{background: c}"
           @click="handlePreset(c)">
         </div>
         <div
+          :key="c"
           class="vc-sketch-presets-color"
           v-else
           @click="handlePreset(c)">
@@ -63,7 +64,6 @@ import saturation from './common/Saturation.vue'
 import hue from './common/Hue.vue'
 import alpha from './common/Alpha.vue'
 import checkboard from './common/Checkboard.vue'
-import tinycolor from 'tinycolor2'
 
 const presetColors = [
   '#D0021B', '#F5A623', '#F8E71C', '#8B572A', '#7ED321',
@@ -114,9 +114,6 @@ export default {
         source: 'hex'
       })
     },
-    colorIsTransparent (c) {
-      return tinycolor(c).getAlpha() === 0;
-    },
     childChange (data) {
       this.colorChange(data)
     },

diff --git a/src/mixin/color.js b/src/mixin/color.js
@@ -102,6 +102,9 @@ export default {
     },
     paletteUpperCase (palette) {
       return palette.map(c => c.toUpperCase())
+    },
+    isTransparent (color) {
+      return tinycolor(color).getAlpha() === 0
     }
   }
 }