@dimailn/vuetify 2.7.2-alpha23 → 2.7.2-alpha25

package/lib/components/VColorPicker/VColorPickerEdit.js

@@ -1,13 +1,11 @@
-import { h } from 'vue'; // Styles
+import { h, defineComponent } from 'vue'; // Styles
 
 import "../../../src/components/VColorPicker/VColorPickerEdit.sass"; // Components
 
 import VBtn from '../VBtn';
 import VIcon from '../VIcon'; // Helpers
 
-import { parseHex } from '../../util/colorUtils'; // Types
-
-import { defineComponent } from 'vue';
+import { parseHex } from '../../util/colorUtils';
 import { fromRGBA, fromHexa, fromHSLA } from './util';
 export const modes = {
   rgba: {
@@ -25,7 +23,10 @@ export const modes = {
 export default defineComponent({
   name: 'v-color-picker-edit',
   props: {
-    color: Object,
+    color: {
+      type: Object,
+      required: true
+    },
     disabled: Boolean,
     hideAlpha: Boolean,
     hideModeSwitch: Boolean,
@@ -35,17 +36,17 @@ export default defineComponent({
       validator: v => Object.keys(modes).includes(v)
     }
   },
+  emits: ['update:color', 'update:mode'],
 
   data() {
     return {
-      modes,
       internalMode: this.mode
     };
   },
 
   computed: {
     currentMode() {
-      return this.modes[this.internalMode];
+      return modes[this.internalMode];
     }
 
   },
@@ -55,11 +56,6 @@ export default defineComponent({
     }
 
   },
-
-  created() {
-    this.internalMode = this.mode;
-  },
-
   methods: {
     getValue(v, type) {
       if (type === 'float') return Math.round(v * 100) / 100;else if (type === 'int') return Math.round(v);else return 0;
@@ -70,21 +66,21 @@ export default defineComponent({
     },
 
     changeMode() {
-      const modes = Object.keys(this.modes);
-      const index = modes.indexOf(this.internalMode);
-      const newMode = modes[(index + 1) % modes.length];
+      const modeKeys = Object.keys(modes);
+      const index = modeKeys.indexOf(this.internalMode);
+      const newMode = modeKeys[(index + 1) % modeKeys.length];
       this.internalMode = newMode;
       this.$emit('update:mode', newMode);
     },
 
-    genInput(target, attrs, value, on) {
+    genInput(target, attrs, value, onChange) {
       return h('div', {
         class: 'v-color-picker__input'
       }, [h('input', {
         key: target,
         ...attrs,
         value,
-        ...on
+        onChange
       }), h('span', target.toUpperCase())]);
     },
 
@@ -95,11 +91,9 @@ export default defineComponent({
         return this.genInput('hex', {
           maxlength: this.hideAlpha ? 7 : 9,
           disabled: this.disabled
-        }, value, {
-          change: e => {
-            const el = e.target;
-            this.$emit('update:color', this.currentMode.from(parseHex(el.value)));
-          }
+        }, value, e => {
+          const el = e.target;
+          this.$emit('update:color', this.currentMode.from(parseHex(el.value)));
         });
       } else {
         const inputs = this.hideAlpha ? this.currentMode.inputs.slice(0, -1) : this.currentMode.inputs;
@@ -111,14 +105,12 @@ export default defineComponent({
             max,
             step: type === 'float' ? '0.01' : type === 'int' ? '1' : undefined,
             disabled: this.disabled
-          }, this.getValue(value[target], type), {
-            input: e => {
-              const el = e.target;
-              const newVal = this.parseValue(el.value || '0', type);
-              this.$emit('update:color', this.currentMode.from(Object.assign({}, value, {
-                [target]: newVal
-              }), this.color.alpha));
-            }
+          }, this.getValue(value[target], type), e => {
+            const el = e.target;
+            const newVal = this.parseValue(el.value || '0', type);
+            this.$emit('update:color', this.currentMode.from(Object.assign({}, value, {
+              [target]: newVal
+            }), this.color.alpha));
           });
         });
       }
@@ -130,7 +122,9 @@ export default defineComponent({
         icon: true,
         disabled: this.disabled,
         onClick: this.changeMode
-      }, [h(VIcon, '$unfold')]);
+      }, {
+        default: () => [h(VIcon, {}, '$unfold')]
+      });
     }
 
   },

package/lib/components/VColorPicker/VColorPickerEdit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/VColorPicker/VColorPickerEdit.ts"],"names":[],"mappings":"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","sourcesContent":["import {h} from 'vue'\n// Styles\nimport './VColorPickerEdit.sass'\n\n// Components\nimport VBtn from '../VBtn'\nimport VIcon from '../VIcon'\n\n// Helpers\nimport { parseHex } from '../../util/colorUtils'\n\n// Types\nimport { defineComponent, VNode, PropType } from 'vue'\nimport { VColorPickerColor, fromRGBA, fromHexa, fromHSLA } from './util'\n\ntype Input = [string, number, string]\n\nexport type Mode = {\n  inputs?: Input[]\n  from: Function\n}\n\nexport const modes = {\n  rgba: {\n    inputs: [\n      ['r', 255, 'int'],\n      ['g', 255, 'int'],\n      ['b', 255, 'int'],\n      ['a', 1, 'float'],\n    ],\n    from: fromRGBA,\n  },\n  hsla: {\n    inputs: [\n      ['h', 360, 'int'],\n      ['s', 1, 'float'],\n      ['l', 1, 'float'],\n      ['a', 1, 'float'],\n    ],\n    from: fromHSLA,\n  },\n  hexa: {\n    from: fromHexa,\n  },\n} as { [key: string]: Mode }\n\nexport default defineComponent({\n  name: 'v-color-picker-edit',\n\n  props: {\n    color: Object as PropType<VColorPickerColor>,\n    disabled: Boolean,\n    hideAlpha: Boolean,\n    hideModeSwitch: Boolean,\n    mode: {\n      type: String,\n      default: 'rgba',\n      validator: (v: string) => Object.keys(modes).includes(v),\n    },\n  },\n\n  data () {\n    return {\n      modes,\n      internalMode: this.mode,\n    }\n  },\n\n  computed: {\n    currentMode (): Mode {\n      return this.modes[this.internalMode]\n    },\n  },\n\n  watch: {\n    mode (mode) {\n      this.internalMode = mode\n    },\n  },\n\n  created () {\n    this.internalMode = this.mode\n  },\n\n  methods: {\n    getValue (v: any, type: string) {\n      if (type === 'float') return Math.round(v * 100) / 100\n      else if (type === 'int') return Math.round(v)\n      else return 0\n    },\n    parseValue (v: string, type: string) {\n      if (type === 'float') return parseFloat(v)\n      else if (type === 'int') return parseInt(v, 10) || 0\n      else return 0\n    },\n    changeMode () {\n      const modes = Object.keys(this.modes)\n      const index = modes.indexOf(this.internalMode)\n      const newMode = modes[(index + 1) % modes.length]\n      this.internalMode = newMode\n      this.$emit('update:mode', newMode)\n    },\n    genInput (target: string, attrs: any, value: any, on: any): VNode {\n      return h('div', {\n        class: 'v-color-picker__input',\n      }, [\n        h('input', {\n          key: target,\n          ...attrs,\n          value,\n          ...on,\n        }),\n        h('span', target.toUpperCase()),\n      ])\n    },\n    genInputs (): VNode[] | VNode {\n      if (this.internalMode === 'hexa') {\n        const hex = this.color.hexa\n        const value = this.hideAlpha && hex.endsWith('FF') ? hex.substr(0, 7) : hex\n        return this.genInput(\n          'hex',\n          {\n            maxlength: this.hideAlpha ? 7 : 9,\n            disabled: this.disabled,\n          },\n          value,\n          {\n            change: (e: Event) => {\n              const el = e.target as HTMLInputElement\n              this.$emit('update:color', this.currentMode.from(parseHex(el.value)))\n            },\n          }\n        )\n      } else {\n        const inputs = this.hideAlpha ? this.currentMode.inputs!.slice(0, -1) : this.currentMode.inputs!\n        return inputs.map(([target, max, type]) => {\n          const value = this.color[this.internalMode as keyof VColorPickerColor] as any\n          return this.genInput(\n            target,\n            {\n              type: 'number',\n              min: 0,\n              max,\n              step: type === 'float' ? '0.01' : type === 'int' ? '1' : undefined,\n              disabled: this.disabled,\n            },\n            this.getValue(value[target], type),\n            {\n              input: (e: Event) => {\n                const el = e.target as HTMLInputElement\n                const newVal = this.parseValue(el.value || '0', type)\n\n                this.$emit('update:color', this.currentMode.from(\n                  Object.assign({}, value, { [target]: newVal }),\n                  this.color.alpha\n                ))\n              },\n            }\n          )\n        })\n      }\n    },\n    genSwitch (): VNode {\n      return h(VBtn, {\n        small: true,\n        icon: true,\n        disabled: this.disabled,\n        onClick: this.changeMode,\n      }, [\n        h(VIcon, '$unfold'),\n      ])\n    },\n  },\n\n  render (): VNode {\n    return h('div', {\n      class: 'v-color-picker__edit',\n    }, [\n      this.genInputs(),\n      !this.hideModeSwitch && this.genSwitch(),\n    ])\n  },\n})\n"],"sourceRoot":"","file":"VColorPickerEdit.js"}
+{"version":3,"sources":["../../../src/components/VColorPicker/VColorPickerEdit.ts"],"names":[],"mappings":"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","sourcesContent":["import { h, defineComponent } from 'vue'\n\n// Styles\nimport './VColorPickerEdit.sass'\n\n// Components\nimport VBtn from '../VBtn'\nimport VIcon from '../VIcon'\n\n// Helpers\nimport { parseHex } from '../../util/colorUtils'\n\n// Types\nimport type { VNode, PropType } from 'vue'\nimport { VColorPickerColor, fromRGBA, fromHexa, fromHSLA } from './util'\n\ntype Input = [string, number, string]\n\nexport type Mode = {\n  inputs?: Input[]\n  from: Function\n}\n\nexport const modes = {\n  rgba: {\n    inputs: [\n      ['r', 255, 'int'],\n      ['g', 255, 'int'],\n      ['b', 255, 'int'],\n      ['a', 1, 'float'],\n    ],\n    from: fromRGBA,\n  },\n  hsla: {\n    inputs: [\n      ['h', 360, 'int'],\n      ['s', 1, 'float'],\n      ['l', 1, 'float'],\n      ['a', 1, 'float'],\n    ],\n    from: fromHSLA,\n  },\n  hexa: {\n    from: fromHexa,\n  },\n} as { [key: string]: Mode }\n\nexport default defineComponent({\n  name: 'v-color-picker-edit',\n\n  props: {\n    color: {\n      type: Object as PropType<VColorPickerColor>,\n      required: true,\n    },\n    disabled: Boolean,\n    hideAlpha: Boolean,\n    hideModeSwitch: Boolean,\n    mode: {\n      type: String,\n      default: 'rgba',\n      validator: (v: string) => Object.keys(modes).includes(v),\n    },\n  },\n\n  emits: ['update:color', 'update:mode'],\n\n  data () {\n    return {\n      internalMode: this.mode,\n    }\n  },\n\n  computed: {\n    currentMode (): Mode {\n      return modes[this.internalMode]\n    },\n  },\n\n  watch: {\n    mode (mode: string) {\n      this.internalMode = mode\n    },\n  },\n\n  methods: {\n    getValue (v: any, type: string) {\n      if (type === 'float') return Math.round(v * 100) / 100\n      else if (type === 'int') return Math.round(v)\n      else return 0\n    },\n\n    parseValue (v: string, type: string) {\n      if (type === 'float') return parseFloat(v)\n      else if (type === 'int') return parseInt(v, 10) || 0\n      else return 0\n    },\n\n    changeMode () {\n      const modeKeys = Object.keys(modes)\n      const index = modeKeys.indexOf(this.internalMode)\n      const newMode = modeKeys[(index + 1) % modeKeys.length]\n      this.internalMode = newMode\n      this.$emit('update:mode', newMode)\n    },\n\n    genInput (target: string, attrs: any, value: any, onChange: any): VNode {\n      return h('div', {\n        class: 'v-color-picker__input',\n      }, [\n        h('input', {\n          key: target,\n          ...attrs,\n          value,\n          onChange,\n        }),\n        h('span', target.toUpperCase()),\n      ])\n    },\n\n    genInputs (): VNode[] | VNode {\n      if (this.internalMode === 'hexa') {\n        const hex = this.color!.hexa\n        const value = this.hideAlpha && hex.endsWith('FF') ? hex.substr(0, 7) : hex\n        return this.genInput(\n          'hex',\n          {\n            maxlength: this.hideAlpha ? 7 : 9,\n            disabled: this.disabled,\n          },\n          value,\n          (e: Event) => {\n            const el = e.target as HTMLInputElement\n            this.$emit('update:color', this.currentMode.from(parseHex(el.value)))\n          }\n        )\n      } else {\n        const inputs = this.hideAlpha ? this.currentMode.inputs!.slice(0, -1) : this.currentMode.inputs!\n        return inputs.map(([target, max, type]) => {\n          const value = this.color![this.internalMode as keyof VColorPickerColor] as any\n          return this.genInput(\n            target,\n            {\n              type: 'number',\n              min: 0,\n              max,\n              step: type === 'float' ? '0.01' : type === 'int' ? '1' : undefined,\n              disabled: this.disabled,\n            },\n            this.getValue(value[target], type),\n            (e: Event) => {\n              const el = e.target as HTMLInputElement\n              const newVal = this.parseValue(el.value || '0', type)\n\n              this.$emit('update:color', this.currentMode.from(\n                Object.assign({}, value, { [target]: newVal }),\n                this.color!.alpha\n              ))\n            }\n          )\n        })\n      }\n    },\n\n    genSwitch (): VNode {\n      return h(VBtn, {\n        small: true,\n        icon: true,\n        disabled: this.disabled,\n        onClick: this.changeMode,\n      }, {\n        default: () => [h(VIcon, {}, '$unfold')]\n      })\n    },\n  },\n\n  render (): VNode {\n    return h('div', {\n      class: 'v-color-picker__edit',\n    }, [\n      this.genInputs(),\n      !this.hideModeSwitch && this.genSwitch(),\n    ])\n  },\n})\n"],"sourceRoot":"","file":"VColorPickerEdit.js"}

package/lib/components/VColorPicker/VColorPickerPreview.js

@@ -1,77 +1,90 @@
-import { h } from 'vue'; // Styles
+import { h, defineComponent } from 'vue'; // Styles
 
 import "../../../src/components/VColorPicker/VColorPickerPreview.sass"; // Components
 
 import VSlider from '../VSlider/VSlider'; // Utilities
 
-import { RGBtoCSS, RGBAtoCSS } from '../../util/colorUtils'; // Types
-
-import { defineComponent } from 'vue';
+import { RGBtoCSS, RGBAtoCSS } from '../../util/colorUtils';
 import { fromHSVA } from './util';
 export default defineComponent({
   name: 'v-color-picker-preview',
   props: {
-    color: Object,
+    color: {
+      type: Object,
+      required: true
+    },
     disabled: Boolean,
     hideAlpha: Boolean
   },
+  emits: ['update:color'],
   methods: {
     genAlpha() {
+      var _a;
+
+      if (!this.color) return h('div');
       return this.genTrack({
         class: 'v-color-picker__alpha',
         thumbColor: 'grey lighten-2',
         hideDetails: true,
-        value: this.color.alpha,
+        modelValue: this.color.alpha,
         step: 0,
         min: 0,
         max: 1,
         style: {
-          backgroundImage: this.disabled ? undefined : `linear-gradient(to ${this.$vuetify.rtl ? 'left' : 'right'}, transparent, ${RGBtoCSS(this.color.rgba)})`
+          backgroundImage: this.disabled ? undefined : `linear-gradient(to ${((_a = this.$vuetify) === null || _a === void 0 ? void 0 : _a.rtl) ? 'left' : 'right'}, transparent, ${RGBtoCSS(this.color.rgba)})`
         },
-        onInput: val => this.color.alpha !== val && this.$emit('update:color', fromHSVA({ ...this.color.hsva,
-          a: val
-        }))
-      });
-    },
-
-    genSliders() {
-      return h('div', {
-        class: 'v-color-picker__sliders'
-      }, [this.genHue(), !this.hideAlpha && this.genAlpha()]);
-    },
-
-    genDot() {
-      return h('div', {
-        class: 'v-color-picker__dot'
-      }, [h('div', {
-        style: {
-          background: RGBAtoCSS(this.color.rgba)
+        'onUpdate:modelValue': val => {
+          if (this.color && this.color.alpha !== val) {
+            this.$emit('update:color', fromHSVA({ ...this.color.hsva,
+              a: val
+            }));
+          }
         }
-      })]);
+      });
     },
 
     genHue() {
+      if (!this.color) return h('div');
       return this.genTrack({
         class: 'v-color-picker__hue',
         thumbColor: 'grey lighten-2',
         hideDetails: true,
-        value: this.color.hue,
+        modelValue: this.color.hue,
         step: 0,
         min: 0,
         max: 360,
-        onInput: val => this.color.hue !== val && this.$emit('update:color', fromHSVA({ ...this.color.hsva,
-          h: val
-        }))
+        'onUpdate:modelValue': val => {
+          if (this.color && this.color.hue !== val) {
+            this.$emit('update:color', fromHSVA({ ...this.color.hsva,
+              h: val
+            }));
+          }
+        }
       });
     },
 
     genTrack(options) {
       return h(VSlider, {
         class: 'v-color-picker__track',
-        ...options,
         disabled: this.disabled,
-        ...options.props
+        ...options
       });
+    },
+
+    genSliders() {
+      return h('div', {
+        class: 'v-color-picker__sliders'
+      }, [this.genHue(), !this.hideAlpha && this.genAlpha()]);
+    },
+
+    genDot() {
+      return h('div', {
+        class: 'v-color-picker__dot'
+      }, [h('div', {
+        style: {
+          background: this.color ? RGBAtoCSS(this.color.rgba) : 'transparent'
+        }
+      })]);
     }
 
   },

package/lib/components/VColorPicker/VColorPickerPreview.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/VColorPicker/VColorPickerPreview.ts"],"names":[],"mappings":"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","sourcesContent":["import {h} from 'vue'\n// Styles\nimport './VColorPickerPreview.sass'\n\n// Components\nimport VSlider from '../VSlider/VSlider'\n\n// Utilities\nimport { RGBtoCSS, RGBAtoCSS } from '../../util/colorUtils'\n\n// Types\nimport { defineComponent, VNode, VNodeData, PropType } from 'vue'\nimport { VColorPickerColor, fromHSVA } from './util'\n\nexport default defineComponent({\n  name: 'v-color-picker-preview',\n\n  props: {\n    color: Object as PropType<VColorPickerColor>,\n    disabled: Boolean,\n    hideAlpha: Boolean,\n  },\n\n  methods: {\n    genAlpha (): VNode {\n      return this.genTrack({\n        class: 'v-color-picker__alpha',\n        thumbColor: 'grey lighten-2',\n        hideDetails: true,\n        value: this.color.alpha,\n        step: 0,\n        min: 0,\n        max: 1,\n        style: {\n          backgroundImage: this.disabled\n            ? undefined\n            : `linear-gradient(to ${this.$vuetify.rtl ? 'left' : 'right'}, transparent, ${RGBtoCSS(this.color.rgba)})`,\n        },\n        onInput: (val: number) => this.color.alpha !== val && this.$emit('update:color', fromHSVA({ ...this.color.hsva, a: val })),\n      })\n    },\n    genSliders (): VNode {\n      return h('div', {\n        class: 'v-color-picker__sliders',\n      }, [\n        this.genHue(),\n        !this.hideAlpha && this.genAlpha(),\n      ])\n    },\n    genDot (): VNode {\n      return h('div', {\n        class: 'v-color-picker__dot',\n      }, [\n        h('div', {\n          style: {\n            background: RGBAtoCSS(this.color.rgba),\n          },\n        }),\n      ])\n    },\n    genHue (): VNode {\n      return this.genTrack({\n        class: 'v-color-picker__hue',\n        thumbColor: 'grey lighten-2',\n        hideDetails: true,\n        value: this.color.hue,\n        step: 0,\n        min: 0,\n        max: 360,\n        onInput: (val: number) => this.color.hue !== val && this.$emit('update:color', fromHSVA({ ...this.color.hsva, h: val })),\n      })\n    },\n    genTrack (options: VNodeData): VNode {\n      return h(VSlider, {\n        class: 'v-color-picker__track',\n        ...options,\n        disabled: this.disabled,\n        ...options.props\n      })\n    },\n  },\n\n  render (): VNode {\n    return h('div', {\n      class: ['v-color-picker__preview', {\n        'v-color-picker__preview--hide-alpha': this.hideAlpha,\n      }],\n    }, [\n      this.genDot(),\n      this.genSliders(),\n    ])\n  },\n})\n"],"sourceRoot":"","file":"VColorPickerPreview.js"}
+{"version":3,"sources":["../../../src/components/VColorPicker/VColorPickerPreview.ts"],"names":[],"mappings":"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","sourcesContent":["import { h, defineComponent } from 'vue'\n\n// Styles\nimport './VColorPickerPreview.sass'\n\n// Components\nimport VSlider from '../VSlider/VSlider'\n\n// Utilities\nimport { RGBtoCSS, RGBAtoCSS } from '../../util/colorUtils'\n\n// Types\nimport type { VNode, PropType } from 'vue'\nimport type { VColorPickerColor } from './util'\nimport { fromHSVA } from './util'\n\nexport default defineComponent({\n  name: 'v-color-picker-preview',\n\n  props: {\n    color: {\n      type: Object as PropType<VColorPickerColor>,\n      required: true,\n    },\n    disabled: Boolean,\n    hideAlpha: Boolean,\n  },\n\n  emits: ['update:color'],\n\n  methods: {\n    genAlpha (): VNode {\n      if (!this.color) return h('div')\n      return this.genTrack({\n        class: 'v-color-picker__alpha',\n        thumbColor: 'grey lighten-2',\n        hideDetails: true,\n        modelValue: this.color.alpha,\n        step: 0,\n        min: 0,\n        max: 1,\n        style: {\n          backgroundImage: this.disabled\n            ? undefined\n            : `linear-gradient(to ${this.$vuetify?.rtl ? 'left' : 'right'}, transparent, ${RGBtoCSS(this.color.rgba)})`,\n        },\n        'onUpdate:modelValue': (val: number) => {\n          if (this.color && this.color.alpha !== val) {\n            this.$emit('update:color', fromHSVA({ ...this.color.hsva, a: val }))\n          }\n        },\n      })\n    },\n\n    genHue (): VNode {\n      if (!this.color) return h('div')\n      return this.genTrack({\n        class: 'v-color-picker__hue',\n        thumbColor: 'grey lighten-2',\n        hideDetails: true,\n        modelValue: this.color.hue,\n        step: 0,\n        min: 0,\n        max: 360,\n        'onUpdate:modelValue': (val: number) => {\n          if (this.color && this.color.hue !== val) {\n            this.$emit('update:color', fromHSVA({ ...this.color.hsva, h: val }))\n          }\n        },\n      })\n    },\n\n    genTrack (options: Record<string, any>): VNode {\n      return h(VSlider, {\n        class: 'v-color-picker__track',\n        disabled: this.disabled,\n        ...options,\n      })\n    },\n\n    genSliders (): VNode {\n      return h('div', {\n        class: 'v-color-picker__sliders',\n      }, [\n        this.genHue(),\n        !this.hideAlpha && this.genAlpha(),\n      ])\n    },\n\n    genDot (): VNode {\n      return h('div', {\n        class: 'v-color-picker__dot',\n      }, [\n        h('div', {\n          style: {\n            background: this.color ? RGBAtoCSS(this.color.rgba) : 'transparent',\n          },\n        }),\n      ])\n    },\n  },\n\n  render (): VNode {\n    return h('div', {\n      class: ['v-color-picker__preview', {\n        'v-color-picker__preview--hide-alpha': this.hideAlpha,\n      }],\n    }, [\n      this.genDot(),\n      this.genSliders(),\n    ])\n  },\n})\n"],"sourceRoot":"","file":"VColorPickerPreview.js"}

package/lib/components/VColorPicker/VColorPickerSwatches.js

@@ -1,4 +1,4 @@
-import { h } from 'vue'; // Styles
+import { h, defineComponent } from 'vue'; // Styles
 
 import "../../../src/components/VColorPicker/VColorPickerSwatches.sass"; // Components
 
@@ -7,9 +7,9 @@ import VIcon from '../VIcon'; // Helpers
 import colors from '../../util/colors';
 import { fromHex, parseColor } from './util';
 import { convertToUnit, deepEqual } from '../../util/helpers';
-import mixins from '../../util/mixins';
+import { contrastRatio } from '../../util/colorUtils'; // Mixins
+
 import Themeable from '../../mixins/themeable';
-import { contrastRatio } from '../../util/colorUtils';
 
 function parseDefaultColors(colors) {
   return Object.keys(colors).map(key => {
@@ -20,18 +20,23 @@ function parseDefaultColors(colors) {
 
 const white = fromHex('#FFFFFF').rgba;
 const black = fromHex('#000000').rgba;
-export default mixins(Themeable).extend({
+export default defineComponent({
   name: 'v-color-picker-swatches',
+  mixins: [Themeable],
   props: {
     swatches: {
       type: Array,
       default: () => parseDefaultColors(colors)
     },
     disabled: Boolean,
-    color: Object,
+    color: {
+      type: Object,
+      required: true
+    },
     maxWidth: [Number, String],
     maxHeight: [Number, String]
   },
+  emits: ['update:color'],
   methods: {
     genColor(color) {
       const content = h('div', {
@@ -45,9 +50,10 @@ export default mixins(Themeable).extend({
       }, '$success')]);
       return h('div', {
         class: 'v-color-picker__color',
-        on: {
-          // TODO: Less hacky way of catching transparent
-          click: () => this.disabled || this.$emit('update:color', fromHex(color === 'transparent' ? '#00000000' : color))
+        onClick: () => {
+          if (!this.disabled) {
+            this.$emit('update:color', fromHex(color === 'transparent' ? '#00000000' : color));
+          }
         }
       }, [content]);
     },
@@ -65,7 +71,7 @@ export default mixins(Themeable).extend({
 
   render() {
     return h('div', {
-      class: 'v-color-picker__swatches',
+      class: ['v-color-picker__swatches', this.themeClasses],
       style: {
         maxWidth: convertToUnit(this.maxWidth),
         maxHeight: convertToUnit(this.maxHeight)

package/lib/components/VColorPicker/VColorPickerSwatches.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/VColorPicker/VColorPickerSwatches.ts"],"names":[],"mappings":"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","sourcesContent":["import {h} from 'vue'\n// Styles\nimport './VColorPickerSwatches.sass'\n\n// Components\nimport VIcon from '../VIcon'\n\n// Helpers\nimport colors from '../../util/colors'\nimport { VColorPickerColor, fromHex, parseColor } from './util'\nimport { convertToUnit, deepEqual } from '../../util/helpers'\nimport mixins from '../../util/mixins'\nimport Themeable from '../../mixins/themeable'\n\n// Types\nimport { VNode, PropType } from 'vue'\nimport { contrastRatio } from '../../util/colorUtils'\n\nfunction parseDefaultColors (colors: Record<string, Record<string, string>>) {\n  return Object.keys(colors).map(key => {\n    const color = colors[key]\n    return color.base ? [\n      color.base,\n      color.darken4,\n      color.darken3,\n      color.darken2,\n      color.darken1,\n      color.lighten1,\n      color.lighten2,\n      color.lighten3,\n      color.lighten4,\n      color.lighten5,\n    ] : [\n      color.black,\n      color.white,\n      color.transparent,\n    ]\n  })\n}\n\nconst white = fromHex('#FFFFFF').rgba\nconst black = fromHex('#000000').rgba\n\nexport default mixins(Themeable).extend({\n  name: 'v-color-picker-swatches',\n\n  props: {\n    swatches: {\n      type: Array as PropType<string[][]>,\n      default: () => parseDefaultColors(colors),\n    },\n    disabled: Boolean,\n    color: Object as PropType<VColorPickerColor>,\n    maxWidth: [Number, String],\n    maxHeight: [Number, String],\n  },\n\n  methods: {\n    genColor (color: string) {\n      const content = h('div', {\n        style: {\n          background: color,\n        },\n      }, [\n        deepEqual(this.color, parseColor(color, null)) && h(VIcon, {\n          small: true,\n          dark: contrastRatio(this.color.rgba, white) > 2 && this.color.alpha > 0.5,\n          light: contrastRatio(this.color.rgba, black) > 2 && this.color.alpha > 0.5\n        }, '$success'),\n      ])\n\n      return h('div', {\n        class: 'v-color-picker__color',\n        on: {\n          // TODO: Less hacky way of catching transparent\n          click: () => this.disabled || this.$emit('update:color', fromHex(color === 'transparent' ? '#00000000' : color)),\n        },\n      }, [content])\n    },\n    genSwatches () {\n      return this.swatches.map(swatch => {\n        const colors = swatch.map(this.genColor)\n\n        return h('div', {\n          class: 'v-color-picker__swatch',\n        }, colors)\n      })\n    },\n  },\n\n  render (): VNode {\n    return h('div', {\n      class: 'v-color-picker__swatches',\n      style: {\n        maxWidth: convertToUnit(this.maxWidth),\n        maxHeight: convertToUnit(this.maxHeight),\n      },\n    }, [\n      h('div', this.genSwatches()),\n    ])\n  },\n})\n"],"sourceRoot":"","file":"VColorPickerSwatches.js"}
+{"version":3,"sources":["../../../src/components/VColorPicker/VColorPickerSwatches.ts"],"names":[],"mappings":"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","sourcesContent":["import { h, defineComponent } from 'vue'\n\n// Styles\nimport './VColorPickerSwatches.sass'\n\n// Components\nimport VIcon from '../VIcon'\n\n// Helpers\nimport colors from '../../util/colors'\nimport { VColorPickerColor, fromHex, parseColor } from './util'\nimport { convertToUnit, deepEqual } from '../../util/helpers'\nimport { contrastRatio } from '../../util/colorUtils'\n\n// Mixins\nimport Themeable from '../../mixins/themeable'\n\n// Types\nimport type { VNode, PropType } from 'vue'\n\nfunction parseDefaultColors (colors: Record<string, Record<string, string>>) {\n  return Object.keys(colors).map(key => {\n    const color = colors[key]\n    return color.base ? [\n      color.base,\n      color.darken4,\n      color.darken3,\n      color.darken2,\n      color.darken1,\n      color.lighten1,\n      color.lighten2,\n      color.lighten3,\n      color.lighten4,\n      color.lighten5,\n    ] : [\n      color.black,\n      color.white,\n      color.transparent,\n    ]\n  })\n}\n\nconst white = fromHex('#FFFFFF').rgba\nconst black = fromHex('#000000').rgba\n\nexport default defineComponent({\n  name: 'v-color-picker-swatches',\n\n  mixins: [Themeable],\n\n  props: {\n    swatches: {\n      type: Array as PropType<string[][]>,\n      default: () => parseDefaultColors(colors),\n    },\n    disabled: Boolean,\n    color: {\n      type: Object as PropType<VColorPickerColor>,\n      required: true,\n    },\n    maxWidth: [Number, String],\n    maxHeight: [Number, String],\n  },\n\n  emits: ['update:color'],\n\n  methods: {\n    genColor (color: string): VNode {\n      const content = h('div', {\n        style: {\n          background: color,\n        },\n      }, [\n        deepEqual(this.color, parseColor(color, null)) && h(VIcon, {\n          small: true,\n          dark: contrastRatio(this.color.rgba, white) > 2 && this.color.alpha > 0.5,\n          light: contrastRatio(this.color.rgba, black) > 2 && this.color.alpha > 0.5\n        }, '$success'),\n      ])\n\n      return h('div', {\n        class: 'v-color-picker__color',\n        onClick: () => {\n          if (!this.disabled) {\n            this.$emit('update:color', fromHex(color === 'transparent' ? '#00000000' : color))\n          }\n        },\n      }, [content])\n    },\n\n    genSwatches (): VNode[] {\n      return this.swatches.map(swatch => {\n        const colors = swatch.map(this.genColor)\n\n        return h('div', {\n          class: 'v-color-picker__swatch',\n        }, colors)\n      })\n    },\n  },\n\n  render (): VNode {\n    return h('div', {\n      class: ['v-color-picker__swatches', this.themeClasses],\n      style: {\n        maxWidth: convertToUnit(this.maxWidth),\n        maxHeight: convertToUnit(this.maxHeight),\n      },\n    }, [\n      h('div', this.genSwatches()),\n    ])\n  },\n})\n"],"sourceRoot":"","file":"VColorPickerSwatches.js"}

package/lib/components/VDataTable/VDataTable.js

@@ -274,7 +274,7 @@ export default mixins(VDataIterator, Loadable, Mouse).extend({
     genLoading() {
       const th = h('th', {
         class: 'column',
-        attrs: this.colspanAttrs
+        ...this.colspanAttrs
       }, [this.genProgress()]);
       const tr = h('tr', {
         class: 'v-data-table__progress'
@@ -315,8 +315,7 @@ export default mixins(VDataIterator, Loadable, Mouse).extend({
     genEmptyWrapper(content) {
       return h('tr', {
         class: 'v-data-table__empty-wrapper'
-      }, [h('td', {
-        attrs: this.colspanAttrs
+      }, [h('td', { ...this.colspanAttrs
       }, content)]);
     },
 
@@ -389,7 +388,7 @@ export default mixins(VDataIterator, Loadable, Mouse).extend({
         }, [h(VIcon, ['$close'])]);
         const column = h('td', {
           class: 'text-start',
-          attrs: this.colspanAttrs
+          ...this.colspanAttrs
         }, [toggle, `${this.groupByText}: ${group}`, remove]);
         children.unshift(h('template', {
           slot: 'column.header'