@esri/calcite-components 1.4.0-next.4 → 1.4.0-next.6

package/dist/collection/components/color-picker/color-picker.js

@@ -1,14 +1,14 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
- * v1.4.0-next.4
+ * v1.4.0-next.6
  */
 import { h } from "@stencil/core";
 import Color from "color";
 import { throttle } from "lodash-es";
 import { getElementDir, isPrimaryPointerButton } from "../../utils/dom";
-import { CSS, DEFAULT_COLOR, DEFAULT_STORAGE_KEY_PREFIX, DIMENSIONS, HSV_LIMITS, RGB_LIMITS } from "./resources";
-import { colorEqual, CSSColorMode, normalizeHex, parseMode } from "./utils";
+import { CSS, DEFAULT_COLOR, DEFAULT_STORAGE_KEY_PREFIX, DIMENSIONS, HSV_LIMITS, OPACITY_LIMITS, RGB_LIMITS } from "./resources";
+import { alphaCompatible, alphaToOpacity, colorEqual, CSSColorMode, hexify, normalizeAlpha, normalizeColor, normalizeHex, opacityToAlpha, parseMode, toAlphaMode, toNonAlphaMode } from "./utils";
 import { updateHostInteraction } from "../../utils/interactive";
 import { isActivationKey } from "../../utils/key";
 import { componentLoaded, setComponentLoaded, setUpLoadableComponent } from "../../utils/loadable";
@@ -16,16 +16,11 @@ import { connectLocalized, disconnectLocalized } from "../../utils/locale";
 import { clamp } from "../../utils/math";
 import { connectMessages, disconnectMessages, setUpMessages, updateMessages } from "../../utils/t9n";
 const throttleFor60FpsInMs = 16;
-const defaultValue = normalizeHex(DEFAULT_COLOR.hex());
-const defaultFormat = "auto";
 export class ColorPicker {
   constructor() {
-    this.colorFieldAndSliderHovered = false;
-    this.hueThumbState = "idle";
     this.internalColorUpdateContext = null;
     this.mode = CSSColorMode.HEX;
     this.shiftKeyChannelAdjustment = 0;
-    this.sliderThumbState = "idle";
     this.handleTabActivate = (event) => {
       this.channelMode = event.currentTarget.getAttribute("data-color-mode");
       this.updateChannelsFromColor(this.color);
@@ -70,7 +65,7 @@ export class ColorPicker {
         this.internalColorSet(null);
         return;
       }
-      const normalizedHex = color && normalizeHex(color.hex());
+      const normalizedHex = color && normalizeHex(hexify(color, alphaCompatible(this.mode)));
       if (hex !== normalizedHex) {
         this.internalColorSet(Color(hex));
       }
@@ -82,16 +77,20 @@ export class ColorPicker {
     this.handleChannelInput = (event) => {
       const input = event.currentTarget;
       const channelIndex = Number(input.getAttribute("data-channel-index"));
-      const limit = this.channelMode === "rgb"
-        ? RGB_LIMITS[Object.keys(RGB_LIMITS)[channelIndex]]
-        : HSV_LIMITS[Object.keys(HSV_LIMITS)[channelIndex]];
+      const isAlphaChannel = channelIndex === 3;
+      const limit = isAlphaChannel
+        ? OPACITY_LIMITS.max
+        : this.channelMode === "rgb"
+          ? RGB_LIMITS[Object.keys(RGB_LIMITS)[channelIndex]]
+          : HSV_LIMITS[Object.keys(HSV_LIMITS)[channelIndex]];
       let inputValue;
       if (this.allowEmpty && !input.value) {
         inputValue = "";
       }
       else {
-        const value = Number(input.value) + this.shiftKeyChannelAdjustment;
-        const clamped = clamp(value, 0, limit);
+        const value = Number(input.value);
+        const adjustedValue = value + this.shiftKeyChannelAdjustment;
+        const clamped = clamp(adjustedValue, 0, limit);
         inputValue = clamped.toString();
       }
       input.value = inputValue;
@@ -105,11 +104,13 @@ export class ColorPicker {
       const channels = [...this.channels];
       const shouldClearChannels = this.allowEmpty && !input.value;
       if (shouldClearChannels) {
-        this.channels = [null, null, null];
+        this.channels = [null, null, null, null];
         this.internalColorSet(null);
         return;
       }
-      channels[channelIndex] = Number(input.value);
+      const isAlphaChannel = channelIndex === 3;
+      const value = Number(input.value);
+      channels[channelIndex] = isAlphaChannel ? opacityToAlpha(value) : value;
       this.updateColorFromChannels(channels);
     };
     this.handleSavedColorKeyDown = (event) => {
@@ -118,144 +119,101 @@ export class ColorPicker {
         this.handleSavedColorSelect(event);
       }
     };
-    this.handleColorFieldAndSliderPointerLeave = () => {
-      this.colorFieldAndSliderInteractive = false;
-      this.colorFieldAndSliderHovered = false;
-      if (this.sliderThumbState !== "drag" && this.hueThumbState !== "drag") {
-        this.hueThumbState = "idle";
-        this.sliderThumbState = "idle";
-        this.drawColorFieldAndSlider();
-      }
-    };
-    this.handleColorFieldAndSliderPointerDown = (event) => {
+    this.handleColorFieldPointerDown = (event) => {
       if (!isPrimaryPointerButton(event)) {
         return;
       }
       const { offsetX, offsetY } = event;
-      const region = this.getCanvasRegion(offsetY);
-      if (region === "color-field") {
-        this.hueThumbState = "drag";
-        this.captureColorFieldColor(offsetX, offsetY);
-        this.colorFieldScopeNode?.focus();
+      document.addEventListener("pointermove", this.globalPointerMoveHandler);
+      document.addEventListener("pointerup", this.globalPointerUpHandler, { once: true });
+      this.activeCanvasInfo = {
+        context: this.colorFieldRenderingContext,
+        bounds: this.colorFieldRenderingContext.canvas.getBoundingClientRect()
+      };
+      this.captureColorFieldColor(offsetX, offsetY);
+      this.colorFieldScopeNode.focus();
+    };
+    this.handleHueSliderPointerDown = (event) => {
+      if (!isPrimaryPointerButton(event)) {
+        return;
       }
-      else if (region === "slider") {
-        this.sliderThumbState = "drag";
-        this.captureHueSliderColor(offsetX);
-        this.hueScopeNode?.focus();
+      const { offsetX } = event;
+      document.addEventListener("pointermove", this.globalPointerMoveHandler);
+      document.addEventListener("pointerup", this.globalPointerUpHandler, { once: true });
+      this.activeCanvasInfo = {
+        context: this.hueSliderRenderingContext,
+        bounds: this.hueSliderRenderingContext.canvas.getBoundingClientRect()
+      };
+      this.captureHueSliderColor(offsetX);
+      this.hueScopeNode.focus();
+    };
+    this.handleOpacitySliderPointerDown = (event) => {
+      if (!isPrimaryPointerButton(event)) {
+        return;
       }
+      const { offsetX } = event;
       document.addEventListener("pointermove", this.globalPointerMoveHandler);
       document.addEventListener("pointerup", this.globalPointerUpHandler, { once: true });
-      this.activeColorFieldAndSliderRect =
-        this.fieldAndSliderRenderingContext.canvas.getBoundingClientRect();
+      this.activeCanvasInfo = {
+        context: this.opacitySliderRenderingContext,
+        bounds: this.opacitySliderRenderingContext.canvas.getBoundingClientRect()
+      };
+      this.captureOpacitySliderValue(offsetX);
+      this.opacityScopeNode.focus();
     };
     this.globalPointerUpHandler = (event) => {
       if (!isPrimaryPointerButton(event)) {
         return;
       }
-      const previouslyDragging = this.sliderThumbState === "drag" || this.hueThumbState === "drag";
-      this.hueThumbState = "idle";
-      this.sliderThumbState = "idle";
-      this.activeColorFieldAndSliderRect = null;
-      this.drawColorFieldAndSlider();
+      const previouslyDragging = this.activeCanvasInfo;
+      this.activeCanvasInfo = null;
+      this.drawColorControls();
       if (previouslyDragging) {
         this.calciteColorPickerChange.emit();
       }
     };
     this.globalPointerMoveHandler = (event) => {
-      const { el, dimensions } = this;
-      const sliderThumbDragging = this.sliderThumbState === "drag";
-      const hueThumbDragging = this.hueThumbState === "drag";
-      if (!el.isConnected || (!sliderThumbDragging && !hueThumbDragging)) {
+      const { activeCanvasInfo, el } = this;
+      if (!el.isConnected || !activeCanvasInfo) {
         return;
       }
+      const { context, bounds } = activeCanvasInfo;
       let samplingX;
       let samplingY;
-      const colorFieldAndSliderRect = this.activeColorFieldAndSliderRect;
       const { clientX, clientY } = event;
-      if (this.colorFieldAndSliderHovered) {
-        samplingX = clientX - colorFieldAndSliderRect.x;
-        samplingY = clientY - colorFieldAndSliderRect.y;
+      if (context.canvas.matches(":hover")) {
+        samplingX = clientX - bounds.x;
+        samplingY = clientY - bounds.y;
       }
       else {
-        const colorFieldWidth = dimensions.colorField.width;
-        const colorFieldHeight = dimensions.colorField.height;
-        const hueSliderHeight = dimensions.slider.height;
-        if (clientX < colorFieldAndSliderRect.x + colorFieldWidth &&
-          clientX > colorFieldAndSliderRect.x) {
-          samplingX = clientX - colorFieldAndSliderRect.x;
+        // snap x and y to the closest edge
+        if (clientX < bounds.x + bounds.width && clientX > bounds.x) {
+          samplingX = clientX - bounds.x;
         }
-        else if (clientX < colorFieldAndSliderRect.x) {
+        else if (clientX < bounds.x) {
           samplingX = 0;
         }
         else {
-          samplingX = colorFieldWidth - 1;
+          samplingX = bounds.width;
         }
-        if (clientY < colorFieldAndSliderRect.y + colorFieldHeight + hueSliderHeight &&
-          clientY > colorFieldAndSliderRect.y) {
-          samplingY = clientY - colorFieldAndSliderRect.y;
+        if (clientY < bounds.y + bounds.height && clientY > bounds.y) {
+          samplingY = clientY - bounds.y;
         }
-        else if (clientY < colorFieldAndSliderRect.y) {
+        else if (clientY < bounds.y) {
           samplingY = 0;
         }
         else {
-          samplingY = colorFieldHeight + hueSliderHeight;
+          samplingY = bounds.height;
         }
       }
-      if (hueThumbDragging) {
+      if (context === this.colorFieldRenderingContext) {
         this.captureColorFieldColor(samplingX, samplingY, false);
       }
-      else {
+      else if (context === this.hueSliderRenderingContext) {
         this.captureHueSliderColor(samplingX);
       }
-    };
-    this.handleColorFieldAndSliderPointerEnterOrMove = ({ offsetX, offsetY }) => {
-      const { dimensions: { colorField, slider, thumb } } = this;
-      this.colorFieldAndSliderInteractive = offsetY <= colorField.height + slider.height;
-      this.colorFieldAndSliderHovered = true;
-      const region = this.getCanvasRegion(offsetY);
-      if (region === "color-field") {
-        const prevHueThumbState = this.hueThumbState;
-        const color = this.baseColorFieldColor.hsv();
-        const centerX = Math.round(color.saturationv() / (HSV_LIMITS.s / colorField.width));
-        const centerY = Math.round(colorField.height - color.value() / (HSV_LIMITS.v / colorField.height));
-        const hoveringThumb = this.containsPoint(offsetX, offsetY, centerX, centerY, thumb.radius);
-        let transitionedBetweenHoverAndIdle = false;
-        if (prevHueThumbState === "idle" && hoveringThumb) {
-          this.hueThumbState = "hover";
-          transitionedBetweenHoverAndIdle = true;
-        }
-        else if (prevHueThumbState === "hover" && !hoveringThumb) {
-          this.hueThumbState = "idle";
-          transitionedBetweenHoverAndIdle = true;
-        }
-        if (this.hueThumbState !== "drag") {
-          if (transitionedBetweenHoverAndIdle) {
-            // refresh since we won't update color and thus no redraw
-            this.drawColorFieldAndSlider();
-          }
-        }
-      }
-      else if (region === "slider") {
-        const sliderThumbColor = this.baseColorFieldColor.hsv().saturationv(100).value(100);
-        const prevSliderThumbState = this.sliderThumbState;
-        const sliderThumbCenterX = Math.round(sliderThumbColor.hue() / (360 / slider.width));
-        const sliderThumbCenterY = Math.round((slider.height + this.getSliderCapSpacing()) / 2) + colorField.height;
-        const hoveringSliderThumb = this.containsPoint(offsetX, offsetY, sliderThumbCenterX, sliderThumbCenterY, thumb.radius);
-        let sliderThumbTransitionedBetweenHoverAndIdle = false;
-        if (prevSliderThumbState === "idle" && hoveringSliderThumb) {
-          this.sliderThumbState = "hover";
-          sliderThumbTransitionedBetweenHoverAndIdle = true;
-        }
-        else if (prevSliderThumbState === "hover" && !hoveringSliderThumb) {
-          this.sliderThumbState = "idle";
-          sliderThumbTransitionedBetweenHoverAndIdle = true;
-        }
-        if (this.sliderThumbState !== "drag") {
-          if (sliderThumbTransitionedBetweenHoverAndIdle) {
-            // refresh since we won't update color and thus no redraw
-            this.drawColorFieldAndSlider();
-          }
-        }
+      else if (context === this.opacitySliderRenderingContext) {
+        this.captureOpacitySliderValue(samplingX);
       }
     };
     this.storeColorFieldScope = (node) => {
@@ -271,23 +229,35 @@ export class ColorPicker {
       return (h("calcite-tab-title", { class: CSS.colorMode, "data-color-mode": channelMode, key: channelMode, onCalciteTabsActivate: this.handleTabActivate, selected: selected }, label));
     };
     this.renderChannelsTab = (channelMode) => {
-      const { channelMode: activeChannelMode, channels, messages } = this;
+      const { allowEmpty, channelMode: activeChannelMode, channels, messages, alphaChannel } = this;
       const selected = channelMode === activeChannelMode;
       const isRgb = channelMode === "rgb";
-      const channelLabels = isRgb
-        ? [messages.r, messages.g, messages.b]
-        : [messages.h, messages.s, messages.v];
       const channelAriaLabels = isRgb
         ? [messages.red, messages.green, messages.blue]
         : [messages.hue, messages.saturation, messages.value];
       const direction = getElementDir(this.el);
-      return (h("calcite-tab", { class: CSS.control, key: channelMode, selected: selected }, h("div", { class: CSS.channels, dir: "ltr" }, channels.map((channel, index) => 
-      /* the channel container is ltr, so we apply the host's direction */
-      this.renderChannel(channel, index, channelLabels[index], channelAriaLabels[index], direction)))));
+      const channelsToRender = alphaChannel ? channels : channels.slice(0, 3);
+      return (h("calcite-tab", { class: CSS.control, key: channelMode, selected: selected }, h("div", { class: CSS.channels, dir: "ltr" }, channelsToRender.map((channelValue, index) => {
+        const isAlphaChannel = index === 3;
+        if (isAlphaChannel) {
+          channelValue =
+            allowEmpty && !channelValue ? channelValue : alphaToOpacity(channelValue);
+        }
+        /* the channel container is ltr, so we apply the host's direction */
+        return this.renderChannel(channelValue, index, channelAriaLabels[index], direction, isAlphaChannel ? "%" : "");
+      }))));
+    };
+    this.renderChannel = (value, index, ariaLabel, direction, suffix) => {
+      return (h("calcite-input", { class: CSS.channel, "data-channel-index": index, dir: direction, key: index, label: ariaLabel, lang: this.effectiveLocale, numberButtonType: "none", numberingSystem: this.numberingSystem, onCalciteInputChange: this.handleChannelChange, onCalciteInputInput: this.handleChannelInput, onKeyDown: this.handleKeyDown, scale: this.scale === "l" ? "m" : "s",
+        // workaround to ensure input borders overlap as desired
+        // this is because the build transforms margin-left to its
+        // logical-prop, which is undesired as channels are always ltr
+        style: {
+          marginLeft: index > 0 && !(this.scale === "s" && this.alphaChannel && index === 3) ? "-1px" : ""
+        }, suffixText: suffix, type: "number", value: value?.toString() }));
     };
-    this.renderChannel = (value, index, label, ariaLabel, direction) => (h("calcite-input", { class: CSS.channel, "data-channel-index": index, dir: direction, label: ariaLabel, lang: this.effectiveLocale, numberButtonType: "none", numberingSystem: this.numberingSystem, onCalciteInputChange: this.handleChannelChange, onCalciteInputInput: this.handleChannelInput, onKeyDown: this.handleKeyDown, prefixText: label, scale: this.scale === "l" ? "m" : "s", type: "number", value: value?.toString() }));
     this.deleteColor = () => {
-      const colorToDelete = this.color.hex();
+      const colorToDelete = hexify(this.color, this.alphaChannel);
       const inStorage = this.savedColors.indexOf(colorToDelete) > -1;
       if (!inStorage) {
         return;
@@ -300,7 +270,7 @@ export class ColorPicker {
       }
     };
     this.saveColor = () => {
-      const colorToSave = this.color.hex();
+      const colorToSave = hexify(this.color, this.alphaChannel);
       const alreadySaved = this.savedColors.indexOf(colorToSave) > -1;
       if (alreadySaved) {
         return;
@@ -312,12 +282,18 @@ export class ColorPicker {
         localStorage.setItem(storageKey, JSON.stringify(savedColors));
       }
     };
-    this.drawColorFieldAndSlider = throttle(() => {
-      if (!this.fieldAndSliderRenderingContext) {
-        return;
+    this.drawColorControls = throttle((type = "all") => {
+      if ((type === "all" || type === "color-field") && this.colorFieldRenderingContext) {
+        this.drawColorField();
+      }
+      if ((type === "all" || type === "hue-slider") && this.hueSliderRenderingContext) {
+        this.drawHueSlider();
+      }
+      if (this.alphaChannel &&
+        (type === "all" || type === "opacity-slider") &&
+        this.opacitySliderRenderingContext) {
+        this.drawOpacitySlider();
       }
-      this.drawColorField();
-      this.drawHueSlider();
     }, throttleFor60FpsInMs);
     this.captureColorFieldColor = (x, y, skipEqual = true) => {
       const { dimensions: { colorField: { height, width } } } = this;
@@ -325,24 +301,56 @@ export class ColorPicker {
       const value = Math.round((HSV_LIMITS.v / height) * (height - y));
       this.internalColorSet(this.baseColorFieldColor.hsv().saturationv(saturation).value(value), skipEqual);
     };
-    this.initColorFieldAndSlider = (canvas) => {
-      this.fieldAndSliderRenderingContext = canvas.getContext("2d");
-      this.updateCanvasSize(canvas);
+    this.initColorField = (canvas) => {
+      this.colorFieldRenderingContext = canvas.getContext("2d");
+      this.updateCanvasSize("color-field");
+      this.drawColorControls();
+    };
+    this.initHueSlider = (canvas) => {
+      this.hueSliderRenderingContext = canvas.getContext("2d");
+      this.updateCanvasSize("hue-slider");
+      this.drawHueSlider();
+    };
+    this.initOpacitySlider = (canvas) => {
+      this.opacitySliderRenderingContext = canvas.getContext("2d");
+      this.updateCanvasSize("opacity-slider");
+      this.drawOpacitySlider();
+    };
+    this.storeOpacityScope = (node) => {
+      this.opacityScopeNode = node;
+    };
+    this.handleOpacityScopeKeyDown = (event) => {
+      const modifier = event.shiftKey ? 10 : 1;
+      const { key } = event;
+      const arrowKeyToXOffset = {
+        ArrowUp: 1,
+        ArrowRight: 1,
+        ArrowDown: -1,
+        ArrowLeft: -1
+      };
+      if (arrowKeyToXOffset[key]) {
+        event.preventDefault();
+        const delta = opacityToAlpha(arrowKeyToXOffset[key] * modifier);
+        this.captureHueSliderColor(this.opacityScopeLeft + delta);
+      }
     };
     this.allowEmpty = false;
+    this.alphaChannel = false;
+    this.channelsDisabled = false;
     this.color = DEFAULT_COLOR;
     this.disabled = false;
-    this.format = defaultFormat;
-    this.hideHex = false;
+    this.format = "auto";
     this.hideChannels = false;
+    this.hexDisabled = false;
+    this.hideHex = false;
     this.hideSaved = false;
+    this.savedDisabled = false;
     this.scale = "m";
     this.storageId = undefined;
     this.messageOverrides = undefined;
     this.numberingSystem = undefined;
-    this.value = defaultValue;
+    this.value = normalizeHex(hexify(DEFAULT_COLOR, this.alphaChannel));
     this.defaultMessages = undefined;
-    this.colorFieldAndSliderInteractive = false;
     this.channelMode = "rgb";
     this.channels = this.toChannels(DEFAULT_COLOR);
     this.dimensions = DIMENSIONS.m;
@@ -351,12 +359,19 @@ export class ColorPicker {
     this.savedColors = [];
     this.colorFieldScopeTop = undefined;
     this.colorFieldScopeLeft = undefined;
-    this.scopeOrientation = undefined;
     this.hueScopeLeft = undefined;
-    this.hueScopeTop = undefined;
+    this.opacityScopeLeft = undefined;
+    this.scopeOrientation = undefined;
+  }
+  handleAlphaChannelChange(alphaChannel) {
+    const { format } = this;
+    if (alphaChannel && format !== "auto" && !alphaCompatible(format)) {
+      console.warn(`ignoring alphaChannel as the current format (${format}) does not support alpha`);
+      this.alphaChannel = false;
+    }
   }
   handleColorChange(color, oldColor) {
-    this.drawColorFieldAndSlider();
+    this.drawColorControls();
     this.updateChannelsFromColor(color);
     this.previousColor = oldColor;
   }
@@ -366,7 +381,8 @@ export class ColorPicker {
   }
   handleScaleChange(scale = "m") {
     this.updateDimensions(scale);
-    this.updateCanvasSize(this.fieldAndSliderRenderingContext?.canvas);
+    this.updateCanvasSize("all");
+    this.drawColorControls();
   }
   onMessagesChange() {
     /* wired up by t9n util */
@@ -383,9 +399,9 @@ export class ColorPicker {
         return;
       }
       modeChanged = this.mode !== nextMode;
-      this.setMode(nextMode);
+      this.setMode(nextMode, this.internalColorUpdateContext === null);
     }
-    const dragging = this.sliderThumbState === "drag" || this.hueThumbState === "drag";
+    const dragging = this.activeCanvasInfo;
     if (this.internalColorUpdateContext === "initial") {
       return;
     }
@@ -396,17 +412,16 @@ export class ColorPicker {
       }
       return;
     }
-    const color = allowEmpty && !value ? null : Color(value);
+    const color = allowEmpty && !value
+      ? null
+      : Color(value != null && typeof value === "object" && alphaCompatible(this.mode)
+        ? normalizeColor(value)
+        : value);
     const colorChanged = !colorEqual(color, this.color);
     if (modeChanged || colorChanged) {
-      this.internalColorSet(color, true, "internal");
+      this.internalColorSet(color, this.alphaChannel && !(this.mode.endsWith("a") || this.mode.endsWith("a-css")), "internal");
     }
   }
-  //--------------------------------------------------------------------------
-  //
-  //  Internal State/Props
-  //
-  //--------------------------------------------------------------------------
   get baseColorFieldColor() {
     return this.color || this.previousColor || DEFAULT_COLOR;
   }
@@ -462,7 +477,7 @@ export class ColorPicker {
     if (!valueIsCompatible) {
       this.showIncompatibleColorWarning(value, format);
     }
-    this.setMode(format);
+    this.setMode(format, false);
     this.internalColorSet(initialColor, false, "initial");
     this.updateDimensions(this.scale);
     const storageKey = `${DEFAULT_STORAGE_KEY_PREFIX}${this.storageId}`;
@@ -493,34 +508,38 @@ export class ColorPicker {
   //
   //--------------------------------------------------------------------------
   render() {
-    const { allowEmpty, color, messages, hideHex, hideChannels, hideSaved, savedColors, scale } = this;
-    const selectedColorInHex = color ? color.hex() : null;
-    const hexInputScale = scale === "l" ? "m" : "s";
-    const { colorFieldAndSliderInteractive, colorFieldScopeTop, colorFieldScopeLeft, hueScopeLeft, hueScopeTop, scopeOrientation, dimensions: { colorField: { height: colorFieldHeight, width: colorFieldWidth }, slider: { height: sliderHeight } } } = this;
-    const hueTop = hueScopeTop ?? sliderHeight / 2 + colorFieldHeight;
-    const hueLeft = hueScopeLeft ?? (colorFieldWidth * DEFAULT_COLOR.hue()) / HSV_LIMITS.h;
+    const { allowEmpty, channelsDisabled, color, colorFieldScopeLeft, colorFieldScopeTop, dimensions: { colorField: { width: colorFieldWidth }, slider: { width: sliderWidth }, thumb: { radius: thumbRadius } }, hexDisabled, hideChannels, hideHex, hideSaved, hueScopeLeft, messages, alphaChannel, opacityScopeLeft, savedColors, savedDisabled, scale, scopeOrientation } = this;
+    const selectedColorInHex = color ? hexify(color, alphaChannel) : null;
+    const hueTop = thumbRadius;
+    const hueLeft = hueScopeLeft ?? (sliderWidth * DEFAULT_COLOR.hue()) / HSV_LIMITS.h;
+    const opacityTop = thumbRadius;
+    const opacityLeft = opacityScopeLeft ??
+      (colorFieldWidth * alphaToOpacity(DEFAULT_COLOR.alpha())) / OPACITY_LIMITS.max;
     const noColor = color === null;
     const vertical = scopeOrientation === "vertical";
-    return (h("div", { class: CSS.container }, h("div", { class: CSS.colorFieldAndSliderWrap }, h("canvas", { class: {
-        [CSS.colorFieldAndSlider]: true,
-        [CSS.colorFieldAndSliderInteractive]: colorFieldAndSliderInteractive
-      }, onPointerDown: this.handleColorFieldAndSliderPointerDown, onPointerEnter: this.handleColorFieldAndSliderPointerEnterOrMove, onPointerLeave: this.handleColorFieldAndSliderPointerLeave, onPointerMove: this.handleColorFieldAndSliderPointerEnterOrMove,
+    const noHex = hexDisabled || hideHex;
+    const noChannels = channelsDisabled || hideChannels;
+    const noSaved = savedDisabled || hideSaved;
+    return (h("div", { class: CSS.container }, h("div", { class: CSS.controlAndScope }, h("canvas", { class: CSS.colorField, onPointerDown: this.handleColorFieldPointerDown,
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: this.initColorField }), h("div", { "aria-label": vertical ? messages.value : messages.saturation, "aria-valuemax": vertical ? HSV_LIMITS.v : HSV_LIMITS.s, "aria-valuemin": "0", "aria-valuenow": (vertical ? color?.saturationv() : color?.value()) || "0", class: { [CSS.scope]: true, [CSS.colorFieldScope]: true }, onKeyDown: this.handleColorFieldScopeKeyDown, role: "slider", style: { top: `${colorFieldScopeTop || 0}px`, left: `${colorFieldScopeLeft || 0}px` }, tabindex: "0",
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: this.storeColorFieldScope })), h("div", { class: CSS.previewAndSliders }, h("calcite-color-picker-swatch", { class: CSS.preview, color: selectedColorInHex, scale: "l" }), h("div", { class: CSS.sliders }, h("div", { class: CSS.controlAndScope }, h("canvas", { class: { [CSS.slider]: true, [CSS.hueSlider]: true }, onPointerDown: this.handleHueSliderPointerDown,
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: this.initHueSlider }), h("div", { "aria-label": messages.hue, "aria-valuemax": HSV_LIMITS.h, "aria-valuemin": "0", "aria-valuenow": color?.round().hue() || DEFAULT_COLOR.round().hue(), class: { [CSS.scope]: true, [CSS.hueScope]: true }, onKeyDown: this.handleHueScopeKeyDown, role: "slider", style: { top: `${hueTop}px`, left: `${hueLeft}px` }, tabindex: "0",
       // eslint-disable-next-line react/jsx-sort-props
-      ref: this.initColorFieldAndSlider }), h("div", { "aria-label": vertical ? messages.value : messages.saturation, "aria-valuemax": vertical ? HSV_LIMITS.v : HSV_LIMITS.s, "aria-valuemin": "0", "aria-valuenow": (vertical ? color?.saturationv() : color?.value()) || "0", class: { [CSS.scope]: true, [CSS.colorFieldScope]: true }, onKeyDown: this.handleColorFieldScopeKeyDown, role: "slider", style: { top: `${colorFieldScopeTop || 0}px`, left: `${colorFieldScopeLeft || 0}px` }, tabindex: "0",
+      ref: this.storeHueScope })), alphaChannel ? (h("div", { class: CSS.controlAndScope }, h("canvas", { class: { [CSS.slider]: true, [CSS.opacitySlider]: true }, onPointerDown: this.handleOpacitySliderPointerDown,
       // eslint-disable-next-line react/jsx-sort-props
-      ref: this.storeColorFieldScope }), h("div", { "aria-label": messages.hue, "aria-valuemax": HSV_LIMITS.h, "aria-valuemin": "0", "aria-valuenow": color?.round().hue() || DEFAULT_COLOR.round().hue(), class: { [CSS.scope]: true, [CSS.hueScope]: true }, onKeyDown: this.handleHueScopeKeyDown, role: "slider", style: { top: `${hueTop}px`, left: `${hueLeft}px` }, tabindex: "0",
+      ref: this.initOpacitySlider }), h("div", { "aria-label": messages.opacity, "aria-valuemax": OPACITY_LIMITS.max, "aria-valuemin": OPACITY_LIMITS.min, "aria-valuenow": (color || DEFAULT_COLOR).round().alpha(), class: { [CSS.scope]: true, [CSS.opacityScope]: true }, onKeyDown: this.handleOpacityScopeKeyDown, role: "slider", style: { top: `${opacityTop}px`, left: `${opacityLeft}px` }, tabindex: "0",
       // eslint-disable-next-line react/jsx-sort-props
-      ref: this.storeHueScope })), hideHex && hideChannels ? null : (h("div", { class: {
+      ref: this.storeOpacityScope }))) : null)), noHex && noChannels ? null : (h("div", { class: {
         [CSS.controlSection]: true,
         [CSS.section]: true
-      } }, hideHex ? null : (h("div", { class: CSS.hexOptions }, h("span", { class: {
-        [CSS.header]: true,
-        [CSS.headerHex]: true
-      } }, messages.hex), h("calcite-color-picker-hex-input", { allowEmpty: allowEmpty, class: CSS.control, hexLabel: messages.hex, numberingSystem: this.numberingSystem, onCalciteColorPickerHexInputChange: this.handleHexInputChange, scale: hexInputScale, value: selectedColorInHex }))), hideChannels ? null : (h("calcite-tabs", { class: {
+      } }, h("div", { class: CSS.hexAndChannelsGroup }, noHex ? null : (h("div", { class: CSS.hexOptions }, h("calcite-color-picker-hex-input", { allowEmpty: allowEmpty, alphaChannel: alphaChannel, class: CSS.control, messages: messages, numberingSystem: this.numberingSystem, onCalciteColorPickerHexInputChange: this.handleHexInputChange, scale: scale, value: selectedColorInHex }))), noChannels ? null : (h("calcite-tabs", { class: {
         [CSS.colorModeContainer]: true,
         [CSS.splitSection]: true
-      }, scale: hexInputScale }, h("calcite-tab-nav", { slot: "title-group" }, this.renderChannelsTabTitle("rgb"), this.renderChannelsTabTitle("hsv")), this.renderChannelsTab("rgb"), this.renderChannelsTab("hsv"))))), hideSaved ? null : (h("div", { class: { [CSS.savedColorsSection]: true, [CSS.section]: true } }, h("div", { class: CSS.header }, h("label", null, messages.saved), h("div", { class: CSS.savedColorsButtons }, h("calcite-button", { appearance: "transparent", class: CSS.deleteColor, disabled: noColor, iconStart: "minus", kind: "neutral", label: messages.deleteColor, onClick: this.deleteColor, scale: hexInputScale, type: "button" }), h("calcite-button", { appearance: "transparent", class: CSS.saveColor, disabled: noColor, iconStart: "plus", kind: "neutral", label: messages.saveColor, onClick: this.saveColor, scale: hexInputScale, type: "button" }))), savedColors.length > 0 ? (h("div", { class: CSS.savedColors }, [
-      ...savedColors.map((color) => (h("calcite-color-picker-swatch", { active: selectedColorInHex === color, class: CSS.savedColor, color: color, key: color, onClick: this.handleSavedColorSelect, onKeyDown: this.handleSavedColorKeyDown, scale: scale, tabIndex: 0 })))
+      }, scale: scale === "l" ? "m" : "s" }, h("calcite-tab-nav", { slot: "title-group" }, this.renderChannelsTabTitle("rgb"), this.renderChannelsTabTitle("hsv")), this.renderChannelsTab("rgb"), this.renderChannelsTab("hsv")))))), noSaved ? null : (h("div", { class: { [CSS.savedColorsSection]: true, [CSS.section]: true } }, h("div", { class: CSS.header }, h("label", null, messages.saved), h("div", { class: CSS.savedColorsButtons }, h("calcite-button", { appearance: "transparent", class: CSS.deleteColor, disabled: noColor, iconStart: "minus", kind: "neutral", label: messages.deleteColor, onClick: this.deleteColor, scale: scale, type: "button" }), h("calcite-button", { appearance: "transparent", class: CSS.saveColor, disabled: noColor, iconStart: "plus", kind: "neutral", label: messages.saveColor, onClick: this.saveColor, scale: scale, type: "button" }))), savedColors.length > 0 ? (h("div", { class: CSS.savedColors }, [
+      ...savedColors.map((color) => (h("calcite-color-picker-swatch", { class: CSS.savedColor, color: color, key: color, onClick: this.handleSavedColorSelect, onKeyDown: this.handleSavedColorKeyDown, scale: scale, tabIndex: 0 })))
     ])) : null))));
   }
   // --------------------------------------------------------------------------
@@ -536,23 +555,38 @@ export class ColorPicker {
   showIncompatibleColorWarning(value, format) {
     console.warn(`ignoring color value (${value}) as it is not compatible with the current format (${format})`);
   }
-  setMode(format) {
-    this.mode = format === "auto" ? this.mode : format;
+  setMode(format, warn = true) {
+    const mode = format === "auto" ? this.mode : format;
+    this.mode = this.ensureCompatibleMode(mode, warn);
+  }
+  ensureCompatibleMode(mode, warn) {
+    const { alphaChannel } = this;
+    const isAlphaCompatible = alphaCompatible(mode);
+    if (alphaChannel && !isAlphaCompatible) {
+      const alphaMode = toAlphaMode(mode);
+      if (warn) {
+        console.warn(`setting format to (${alphaMode}) as the provided one (${mode}) does not support alpha`);
+      }
+      return alphaMode;
+    }
+    if (!alphaChannel && isAlphaCompatible) {
+      const nonAlphaMode = toNonAlphaMode(mode);
+      if (warn) {
+        console.warn(`setting format to (${nonAlphaMode}) as the provided one (${mode}) does not support alpha`);
+      }
+      return nonAlphaMode;
+    }
+    return mode;
   }
   captureHueSliderColor(x) {
     const { dimensions: { slider: { width } } } = this;
     const hue = (360 / width) * x;
     this.internalColorSet(this.baseColorFieldColor.hue(hue), false);
   }
-  getCanvasRegion(y) {
-    const { dimensions: { colorField: { height: colorFieldHeight }, slider: { height: sliderHeight } } } = this;
-    if (y <= colorFieldHeight) {
-      return "color-field";
-    }
-    if (y <= colorFieldHeight + sliderHeight) {
-      return "slider";
-    }
-    return "none";
+  captureOpacitySliderValue(x) {
+    const { dimensions: { slider: { width } } } = this;
+    const alpha = opacityToAlpha((OPACITY_LIMITS.max / width) * x);
+    this.internalColorSet(this.baseColorFieldColor.alpha(alpha), false);
   }
   internalColorSet(color, skipEqual = true, context = "user-interaction") {
     if (skipEqual && colorEqual(color, this.color)) {
@@ -569,16 +603,25 @@ export class ColorPicker {
     }
     const hexMode = "hex";
     if (format.includes(hexMode)) {
-      return normalizeHex(color.round()[hexMode]());
+      const hasAlpha = format === CSSColorMode.HEXA;
+      return normalizeHex(hexify(color.round(), hasAlpha), hasAlpha);
     }
     if (format.includes("-css")) {
-      return color[format.replace("-css", "").replace("a", "")]().round().string();
+      const value = color[format.replace("-css", "").replace("a", "")]().round().string();
+      // Color omits alpha values when alpha is 1
+      const needToInjectAlpha = (format.endsWith("a") || format.endsWith("a-css")) && color.alpha() === 1;
+      if (needToInjectAlpha) {
+        const model = value.slice(0, 3);
+        const values = value.slice(4, -1);
+        return `${model}a(${values}, ${color.alpha()})`;
+      }
+      return value;
     }
-    const colorObject = color[format]().round().object();
+    const colorObject = 
+    /* Color() does not support hsva, hsla nor rgba, so we use the non-alpha mode */
+    color[toNonAlphaMode(format)]().round().object();
     if (format.endsWith("a")) {
-      // normalize alpha prop
-      colorObject.a = colorObject.alpha;
-      delete colorObject.alpha;
+      return normalizeAlpha(colorObject);
     }
     return colorObject;
   }
@@ -590,9 +633,14 @@ export class ColorPicker {
     this.dimensions = DIMENSIONS[scale];
   }
   drawColorField() {
-    const context = this.fieldAndSliderRenderingContext;
+    const context = this.colorFieldRenderingContext;
     const { dimensions: { colorField: { height, width } } } = this;
-    context.fillStyle = this.baseColorFieldColor.hsv().saturationv(100).value(100).string();
+    context.fillStyle = this.baseColorFieldColor
+      .hsv()
+      .saturationv(100)
+      .value(100)
+      .alpha(1)
+      .string();
     context.fillRect(0, 0, width, height);
     const whiteGradient = context.createLinearGradient(0, 0, width, 0);
     whiteGradient.addColorStop(0, "rgba(255,255,255,1)");
@@ -607,6 +655,9 @@ export class ColorPicker {
     this.drawActiveColorFieldColor();
   }
   setCanvasContextSize(canvas, { height, width }) {
+    if (!canvas) {
+      return;
+    }
     const devicePixelRatio = window.devicePixelRatio || 1;
     canvas.width = width * devicePixelRatio;
     canvas.height = height * devicePixelRatio;
@@ -615,21 +666,21 @@ export class ColorPicker {
     const context = canvas.getContext("2d");
     context.scale(devicePixelRatio, devicePixelRatio);
   }
-  updateCanvasSize(canvas) {
-    if (!canvas) {
-      return;
+  updateCanvasSize(context = "all") {
+    const { dimensions } = this;
+    if (context === "all" || context === "color-field") {
+      this.setCanvasContextSize(this.colorFieldRenderingContext?.canvas, dimensions.colorField);
+    }
+    const adjustedSliderDimensions = {
+      width: dimensions.slider.width,
+      height: dimensions.slider.height + (dimensions.thumb.radius - dimensions.slider.height / 2) * 2
+    };
+    if (context === "all" || context === "hue-slider") {
+      this.setCanvasContextSize(this.hueSliderRenderingContext?.canvas, adjustedSliderDimensions);
+    }
+    if (context === "all" || context === "opacity-slider") {
+      this.setCanvasContextSize(this.opacitySliderRenderingContext?.canvas, adjustedSliderDimensions);
     }
-    this.setCanvasContextSize(canvas, {
-      width: this.dimensions.colorField.width,
-      height: this.dimensions.colorField.height +
-        this.dimensions.slider.height +
-        this.getSliderCapSpacing() * 2
-    });
-    this.drawColorFieldAndSlider();
-  }
-  containsPoint(testPointX, testPointY, boundsX, boundsY, boundsRadius) {
-    return (Math.pow(testPointX - boundsX, 2) + Math.pow(testPointY - boundsY, 2) <=
-      Math.pow(boundsRadius, 2));
   }
   drawActiveColorFieldColor() {
     const { color } = this;
@@ -644,22 +695,23 @@ export class ColorPicker {
       this.colorFieldScopeLeft = x;
       this.colorFieldScopeTop = y;
     });
-    this.drawThumb(this.fieldAndSliderRenderingContext, radius, x, y, hsvColor, this.hueThumbState);
+    this.drawThumb(this.colorFieldRenderingContext, radius, x, y, hsvColor);
   }
-  drawThumb(context, radius, x, y, color, state) {
+  drawThumb(context, radius, x, y, color) {
     const startAngle = 0;
     const endAngle = 2 * Math.PI;
+    const outlineWidth = 1;
+    radius = radius - outlineWidth;
     context.beginPath();
     context.arc(x, y, radius, startAngle, endAngle);
-    context.shadowBlur = state === "hover" ? 32 : 16;
-    context.shadowColor = `rgba(0, 0, 0, ${state === "drag" ? 0.32 : 0.16})`;
     context.fillStyle = "#fff";
     context.fill();
+    context.strokeStyle = "rgba(0,0,0,0.3)";
+    context.lineWidth = outlineWidth;
+    context.stroke();
     context.beginPath();
     context.arc(x, y, radius - 3, startAngle, endAngle);
-    context.shadowBlur = 0;
-    context.shadowColor = "transparent";
-    context.fillStyle = color.rgb().string();
+    context.fillStyle = color.rgb().alpha(1).string();
     context.fill();
   }
   drawActiveHueSliderColor() {
@@ -668,18 +720,19 @@ export class ColorPicker {
       return;
     }
     const hsvColor = color.hsv().saturationv(100).value(100);
-    const { dimensions: { colorField: { height: colorFieldHeight }, slider: { height, width }, thumb: { radius } } } = this;
+    const { dimensions: { slider: { height, width }, thumb: { radius } } } = this;
     const x = hsvColor.hue() / (360 / width);
-    const y = height / 2 + colorFieldHeight;
+    const y = radius - height / 2 + height / 2;
     requestAnimationFrame(() => {
       this.hueScopeLeft = x;
-      this.hueScopeTop = y;
     });
-    this.drawThumb(this.fieldAndSliderRenderingContext, radius, x, y, hsvColor, this.sliderThumbState);
+    this.drawThumb(this.hueSliderRenderingContext, radius, x, y, hsvColor);
   }
   drawHueSlider() {
-    const context = this.fieldAndSliderRenderingContext;
-    const { dimensions: { colorField: { height: colorFieldHeight }, slider: { height, width } } } = this;
+    const context = this.hueSliderRenderingContext;
+    const { dimensions: { slider: { height, width }, thumb: { radius: thumbRadius } } } = this;
+    const x = 0;
+    const y = thumbRadius - height / 2;
     const gradient = context.createLinearGradient(0, 0, width, 0);
     const hueSliderColorStopKeywords = ["red", "yellow", "lime", "cyan", "blue", "magenta", "red"];
     const offset = 1 / (hueSliderColorStopKeywords.length - 1);
@@ -688,22 +741,101 @@ export class ColorPicker {
       gradient.addColorStop(currentOffset, Color(keyword).string());
       currentOffset += offset;
     });
+    context.clearRect(0, 0, width, height + this.getSliderCapSpacing() * 2);
+    this.drawSliderPath(context, height, width, x, y);
     context.fillStyle = gradient;
-    context.clearRect(0, colorFieldHeight, width, height + this.getSliderCapSpacing() * 2);
-    context.fillRect(0, colorFieldHeight, width, height);
+    context.fill();
+    context.strokeStyle = "rgba(0,0,0,0.3)";
+    context.lineWidth = 1;
+    context.stroke();
     this.drawActiveHueSliderColor();
   }
+  drawOpacitySlider() {
+    const context = this.opacitySliderRenderingContext;
+    const { baseColorFieldColor: previousColor, dimensions: { slider: { height, width }, thumb: { radius: thumbRadius } } } = this;
+    const x = 0;
+    const y = thumbRadius - height / 2;
+    context.clearRect(0, 0, width, height + this.getSliderCapSpacing() * 2);
+    const gradient = context.createLinearGradient(0, y, width, 0);
+    const startColor = previousColor.rgb().alpha(0);
+    const midColor = previousColor.rgb().alpha(0.5);
+    const endColor = previousColor.rgb().alpha(1);
+    gradient.addColorStop(0, startColor.string());
+    gradient.addColorStop(0.5, midColor.string());
+    gradient.addColorStop(1, endColor.string());
+    this.drawSliderPath(context, height, width, x, y);
+    const pattern = context.createPattern(this.getCheckeredBackgroundPattern(), "repeat");
+    context.fillStyle = pattern;
+    context.fill();
+    context.fillStyle = gradient;
+    context.fill();
+    context.strokeStyle = "rgba(0,0,0,0.3)";
+    context.lineWidth = 1;
+    context.stroke();
+    this.drawActiveOpacitySliderColor();
+  }
+  drawSliderPath(context, height, width, x, y) {
+    const radius = height / 2 + 1;
+    context.beginPath();
+    context.moveTo(x + radius, y);
+    context.lineTo(x + width - radius, y);
+    context.quadraticCurveTo(x + width, y, x + width, y + radius);
+    context.lineTo(x + width, y + height - radius);
+    context.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
+    context.lineTo(x + radius, y + height);
+    context.quadraticCurveTo(x, y + height, x, y + height - radius);
+    context.lineTo(x, y + radius);
+    context.quadraticCurveTo(x, y, x + radius, y);
+    context.closePath();
+  }
+  getCheckeredBackgroundPattern() {
+    if (this.checkerPattern) {
+      return this.checkerPattern;
+    }
+    const pattern = document.createElement("canvas");
+    pattern.width = 10;
+    pattern.height = 10;
+    const patternContext = pattern.getContext("2d");
+    patternContext.fillStyle = "#ccc";
+    patternContext.fillRect(0, 0, 10, 10);
+    patternContext.fillStyle = "#fff";
+    patternContext.fillRect(0, 0, 5, 5);
+    patternContext.fillRect(5, 5, 5, 5);
+    this.checkerPattern = pattern;
+    return pattern;
+  }
+  drawActiveOpacitySliderColor() {
+    const { color } = this;
+    if (!color) {
+      return;
+    }
+    const hsvColor = color;
+    const { dimensions: { slider: { width }, thumb: { radius } } } = this;
+    const x = alphaToOpacity(hsvColor.alpha()) / (OPACITY_LIMITS.max / width);
+    const y = radius;
+    requestAnimationFrame(() => {
+      this.opacityScopeLeft = x;
+    });
+    this.drawThumb(this.opacitySliderRenderingContext, radius, x, y, hsvColor);
+  }
   updateColorFromChannels(channels) {
     this.internalColorSet(Color(channels, this.channelMode));
   }
   updateChannelsFromColor(color) {
-    this.channels = color ? this.toChannels(color) : [null, null, null];
+    this.channels = color ? this.toChannels(color) : [null, null, null, null];
   }
   toChannels(color) {
     const { channelMode } = this;
-    return color[channelMode]()
+    const channels = color[channelMode]()
       .array()
-      .map((value) => Math.floor(value));
+      .map((value, index) => {
+      const isAlpha = index === 3;
+      return isAlpha ? value : Math.floor(value);
+    });
+    if (channels.length === 3) {
+      channels.push(1); // Color omits alpha when 1
+    }
+    return channels;
   }
   static get is() { return "calcite-color-picker"; }
   static get encapsulation() { return "shadow"; }
@@ -739,6 +871,42 @@ export class ColorPicker {
         "reflect": true,
         "defaultValue": "false"
       },
+      "alphaChannel": {
+        "type": "boolean",
+        "mutable": false,
+        "complexType": {
+          "original": "boolean",
+          "resolved": "boolean",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": "When true, the component will allow updates to the color's alpha value."
+        },
+        "attribute": "alpha-channel",
+        "reflect": false,
+        "defaultValue": "false"
+      },
+      "channelsDisabled": {
+        "type": "boolean",
+        "mutable": false,
+        "complexType": {
+          "original": "boolean",
+          "resolved": "boolean",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": "When true, hides the RGB/HSV channel inputs"
+        },
+        "attribute": "channels-disabled",
+        "reflect": false,
+        "defaultValue": "false"
+      },
       "color": {
         "type": "unknown",
         "mutable": true,
@@ -805,9 +973,9 @@ export class ColorPicker {
         },
         "attribute": "format",
         "reflect": true,
-        "defaultValue": "defaultFormat"
+        "defaultValue": "\"auto\""
       },
-      "hideHex": {
+      "hideChannels": {
         "type": "boolean",
         "mutable": false,
         "complexType": {
@@ -818,14 +986,17 @@ export class ColorPicker {
         "required": false,
         "optional": false,
         "docs": {
-          "tags": [],
-          "text": "When `true`, hides the Hex input."
+          "tags": [{
+              "name": "deprecated",
+              "text": "use `channelsDisabled` instead"
+            }],
+          "text": "When `true`, hides the RGB/HSV channel inputs."
         },
-        "attribute": "hide-hex",
+        "attribute": "hide-channels",
         "reflect": true,
         "defaultValue": "false"
       },
-      "hideChannels": {
+      "hexDisabled": {
         "type": "boolean",
         "mutable": false,
         "complexType": {
@@ -837,9 +1008,30 @@ export class ColorPicker {
         "optional": false,
         "docs": {
           "tags": [],
-          "text": "When `true`, hides the RGB/HSV channel inputs."
+          "text": "When true, hides the hex input"
         },
-        "attribute": "hide-channels",
+        "attribute": "hex-disabled",
+        "reflect": false,
+        "defaultValue": "false"
+      },
+      "hideHex": {
+        "type": "boolean",
+        "mutable": false,
+        "complexType": {
+          "original": "boolean",
+          "resolved": "boolean",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [{
+              "name": "deprecated",
+              "text": "use `hexDisabled` instead"
+            }],
+          "text": "When `true`, hides the hex input."
+        },
+        "attribute": "hide-hex",
         "reflect": true,
         "defaultValue": "false"
       },
@@ -854,13 +1046,34 @@ export class ColorPicker {
         "required": false,
         "optional": false,
         "docs": {
-          "tags": [],
+          "tags": [{
+              "name": "deprecated",
+              "text": "use `savedDisabled` instead"
+            }],
           "text": "When `true`, hides the saved colors section."
         },
         "attribute": "hide-saved",
         "reflect": true,
         "defaultValue": "false"
       },
+      "savedDisabled": {
+        "type": "boolean",
+        "mutable": false,
+        "complexType": {
+          "original": "boolean",
+          "resolved": "boolean",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": "When true, hides the saved colors section"
+        },
+        "attribute": "saved-disabled",
+        "reflect": true,
+        "defaultValue": "false"
+      },
       "scale": {
         "type": "string",
         "mutable": false,
@@ -976,7 +1189,7 @@ export class ColorPicker {
         },
         "attribute": "value",
         "reflect": false,
-        "defaultValue": "defaultValue"
+        "defaultValue": "normalizeHex(\n    hexify(DEFAULT_COLOR, this.alphaChannel)\n  )"
       },
       "messages": {
         "type": "unknown",
@@ -1006,7 +1219,6 @@ export class ColorPicker {
   static get states() {
     return {
       "defaultMessages": {},
-      "colorFieldAndSliderInteractive": {},
       "channelMode": {},
       "channels": {},
       "dimensions": {},
@@ -1014,9 +1226,9 @@ export class ColorPicker {
       "savedColors": {},
       "colorFieldScopeTop": {},
       "colorFieldScopeLeft": {},
-      "scopeOrientation": {},
       "hueScopeLeft": {},
-      "hueScopeTop": {}
+      "opacityScopeLeft": {},
+      "scopeOrientation": {}
     };
   }
   static get events() {
@@ -1075,6 +1287,9 @@ export class ColorPicker {
   static get elementRef() { return "el"; }
   static get watchers() {
     return [{
+        "propName": "alphaChannel",
+        "methodName": "handleAlphaChannelChange"
+      }, {
         "propName": "color",
         "methodName": "handleColorChange"
       }, {