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

package/dist/esm/calcite-color-picker_3.entry.js

@@ -1,22 +1,22 @@
 /*!
  * 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 { r as registerInstance, c as createEvent, h, a as getElement } from './index-34f68bbe.js';
-import { i as isPrimaryPointerButton, b as getElementDir, f as focusElement, h as getModeName } from './dom-2b55c6b1.js';
-import { n as normalizeHex, C as CSSColorMode, p as parseMode, c as colorEqual, i as isValidHex, a as isLonghandHex, r as rgbToHex, b as hexChar } from './utils-ab93be5f.js';
-import { u as updateHostInteraction } from './interactive-a2eb6b56.js';
-import { i as isActivationKey } from './key-a12e3d36.js';
-import { c as componentLoaded, s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-7ddbc3f7.js';
-import { c as connectLocalized, d as disconnectLocalized } from './locale-cdbef5ac.js';
-import { c as clamp } from './math-2b6a45bc.js';
-import { u as updateMessages, s as setUpMessages, c as connectMessages, d as disconnectMessages } from './t9n-c5155b27.js';
-import { t as throttle } from './throttle-161e1712.js';
-import './guid-08c9d9d2.js';
-import './resources-509df361.js';
-import './observers-58b3356b.js';
-import './debounce-911eef82.js';
+import { r as registerInstance, c as createEvent, h, a as getElement, F as Fragment } from './index-de813188.js';
+import { i as isPrimaryPointerButton, b as getElementDir, f as focusElement, h as getModeName } from './dom-3643d47b.js';
+import { C as CSSColorMode, n as normalizeHex, a as hexify, o as opacityToAlpha, b as alphaToOpacity, c as alphaCompatible, p as parseMode, d as colorEqual, t as toNonAlphaMode, e as normalizeAlpha, f as toAlphaMode, g as normalizeColor, j as isLonghandHex, i as isValidHex, r as rgbToHex, k as hexChar } from './utils-119581ee.js';
+import { u as updateHostInteraction } from './interactive-7577fa95.js';
+import { i as isActivationKey } from './key-204f54dc.js';
+import { c as componentLoaded, s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-295e7059.js';
+import { c as connectLocalized, d as disconnectLocalized } from './locale-cf07a13b.js';
+import { c as clamp } from './math-81cb18a5.js';
+import { u as updateMessages, s as setUpMessages, c as connectMessages, d as disconnectMessages } from './t9n-62bf4e90.js';
+import { t as throttle } from './throttle-ab3e5fce.js';
+import './guid-00c961cf.js';
+import './resources-f496ba11.js';
+import './observers-e24920a0.js';
+import './debounce-13053af0.js';
 
 function createCommonjsModule(fn, basedir, module) {
 	return module = {
@@ -2129,30 +2129,36 @@ function zeroArray(array, length) {
 var color = Color;
 
 const CSS$2 = {
+  channel: "channel",
+  channels: "channels",
+  colorField: "color-field",
+  colorFieldScope: "scope--color-field",
+  colorMode: "color-mode",
+  colorModeContainer: "color-mode-container",
   container: "container",
+  control: "control",
+  controlAndScope: "control-and-scope",
   controlSection: "control-section",
-  hexOptions: "color-hex-options",
-  section: "section",
+  deleteColor: "delete-color",
   header: "header",
-  control: "control",
-  splitSection: "section--split",
-  colorModeContainer: "color-mode-container",
-  colorMode: "color-mode",
-  channels: "channels",
-  channel: "channel",
-  savedColors: "saved-colors",
-  savedColorsSection: "saved-colors-section",
+  hexAndChannelsGroup: "hex-and-channels-group",
+  hexOptions: "color-hex-options",
+  hueScope: "scope--hue",
+  hueSlider: "hue-slider",
+  opacityScope: "scope--opacity",
+  opacitySlider: "opacity-slider",
+  preview: "preview",
+  previewAndSliders: "preview-and-sliders",
   saveColor: "save-color",
-  deleteColor: "delete-color",
+  savedColor: "saved-color",
+  savedColors: "saved-colors",
   savedColorsButtons: "saved-colors-buttons",
-  headerHex: "header--hex",
-  colorFieldAndSlider: "color-field-and-slider",
-  colorFieldAndSliderInteractive: "color-field-and-slider--interactive",
-  colorFieldAndSliderWrap: "color-field-and-slider-wrap",
+  savedColorsSection: "saved-colors-section",
   scope: "scope",
-  hueScope: "scope--hue",
-  colorFieldScope: "scope--color-field",
-  savedColor: "saved-color"
+  section: "section",
+  slider: "slider",
+  sliders: "sliders",
+  splitSection: "section--split"
 };
 const DEFAULT_COLOR$1 = color("#007AC2");
 const DEFAULT_STORAGE_KEY_PREFIX = "calcite-color-";
@@ -2166,24 +2172,28 @@ const HSV_LIMITS = {
   s: 100,
   v: 100
 };
+const OPACITY_LIMITS = {
+  min: 0,
+  max: 100
+};
 const DIMENSIONS = {
   s: {
     slider: {
-      height: 10,
-      width: 160
+      height: 12,
+      width: 104
     },
     colorField: {
       height: 80,
       width: 160
     },
     thumb: {
-      radius: 8
+      radius: 10
     }
   },
   m: {
     slider: {
-      height: 14,
-      width: 272
+      height: 12,
+      width: 204
     },
     colorField: {
       height: 150,
@@ -2195,35 +2205,30 @@ const DIMENSIONS = {
   },
   l: {
     slider: {
-      height: 16,
-      width: 464
+      height: 12,
+      width: 384
     },
     colorField: {
       height: 200,
       width: 464
     },
     thumb: {
-      radius: 12
+      radius: 10
     }
   }
 };
 
-const colorPickerCss = "@keyframes in{0%{opacity:0}100%{opacity:1}}@keyframes in-down{0%{opacity:0;transform:translate3D(0, -5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-up{0%{opacity:0;transform:translate3D(0, 5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-scale{0%{opacity:0;transform:scale3D(0.95, 0.95, 1)}100%{opacity:1;transform:scale3D(1, 1, 1)}}:root{--calcite-animation-timing:calc(150ms * var(--calcite-internal-duration-factor));--calcite-internal-duration-factor:var(--calcite-duration-factor, 1);--calcite-internal-animation-timing-fast:calc(100ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-medium:calc(200ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-slow:calc(300ms * var(--calcite-internal-duration-factor))}.calcite-animate{opacity:0;animation-fill-mode:both;animation-duration:var(--calcite-animation-timing)}.calcite-animate__in{animation-name:in}.calcite-animate__in-down{animation-name:in-down}.calcite-animate__in-up{animation-name:in-up}.calcite-animate__in-scale{animation-name:in-scale}@media (prefers-reduced-motion: reduce){:root{--calcite-internal-duration-factor:0.01}}:root{--calcite-floating-ui-transition:var(--calcite-animation-timing);--calcite-floating-ui-z-index:600}:host([hidden]){display:none}:host([disabled]){cursor:default;-webkit-user-select:none;user-select:none;opacity:var(--calcite-ui-opacity-disabled)}:host([disabled]) *,:host([disabled]) ::slotted(*){pointer-events:none}:host{display:inline-block;font-size:var(--calcite-font-size--2);line-height:1rem;font-weight:var(--calcite-font-weight-normal)}:host([disabled]) ::slotted([calcite-hydrated][disabled]),:host([disabled]) [calcite-hydrated][disabled]{opacity:1}:host([scale=s]) .container{inline-size:160px}:host([scale=s]) .saved-colors{grid-template-columns:repeat(auto-fill, minmax(20px, 1fr))}:host([scale=s]) .channels{flex-direction:column}:host([scale=s]) .channel{inline-size:100%;margin-block-end:4px}:host([scale=s]) .channel:last-child{margin-block-end:0}:host([scale=m]) .container{inline-size:272px}:host([scale=l]) .header{padding-block-end:0px}:host([scale=l]){font-size:var(--calcite-font-size--1);line-height:1rem}:host([scale=l]) .container{inline-size:464px}:host([scale=l]) .color-field-and-slider{margin-block-end:-20px}:host([scale=l]) .section{padding-block:0 16px;padding-inline:16px}:host([scale=l]) .section:first-of-type{padding-block-start:16px}:host([scale=l]) .saved-colors{grid-template-columns:repeat(auto-fill, minmax(28px, 1fr));grid-gap:12px;padding-block-start:16px}:host([scale=l]) .control-section{flex-wrap:nowrap;align-items:baseline}:host([scale=l]) .control-section>:nth-child(2){margin-inline-start:12px}:host([scale=l]) .color-hex-options{display:flex;flex-shrink:1;flex-direction:column;justify-content:space-around;min-block-size:98px;inline-size:160px}:host([scale=l]) .color-mode-container{flex-shrink:3}.container{background-color:var(--calcite-ui-foreground-1);display:inline-block;border:1px solid var(--calcite-ui-border-1)}.color-field-and-slider-wrap{position:relative}.scope{position:absolute;font-size:var(--calcite-font-size--1);outline-color:transparent;outline-offset:14px}.scope:focus{outline:2px solid var(--calcite-ui-focus-color, var(--calcite-ui-brand));outline-offset:calc(\n            2px *\n            calc(\n              1 -\n              2 * clamp(\n                0,\n                var(--calcite-ui-focus-offset-invert),\n                1\n              )\n            )\n          );outline-offset:16px}.color-field-and-slider{margin-block-end:-16px;touch-action:none}.color-field-and-slider--interactive{cursor:pointer}.control-section{display:flex;flex-direction:row;flex-wrap:wrap}.section{padding-block:0 12px;padding-inline:12px}.section:first-of-type{padding-block-start:12px}.color-hex-options,.section--split{flex-grow:1}.header{display:flex;align-items:center;justify-content:space-between;padding-block-end:0.25rem;color:var(--calcite-ui-text-1)}.header--hex,.color-mode-container{padding-block-start:12px}.channels{display:flex;justify-content:space-between}.channel{inline-size:31%}.saved-colors{padding-block-start:12px;display:grid;grid-template-columns:repeat(auto-fill, minmax(24px, 1fr));grid-gap:8px;inline-size:100%}.saved-colors-buttons{display:flex}.saved-color{outline-offset:0;outline-color:transparent;cursor:pointer}.saved-color:focus{outline:2px solid var(--calcite-ui-brand);outline-offset:2px}.saved-color:hover{transition:outline-color var(--calcite-internal-animation-timing-fast) ease-in-out;outline:2px solid var(--calcite-ui-border-2);outline-offset:2px}";
+const colorPickerCss = "@keyframes in{0%{opacity:0}100%{opacity:1}}@keyframes in-down{0%{opacity:0;transform:translate3D(0, -5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-up{0%{opacity:0;transform:translate3D(0, 5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-scale{0%{opacity:0;transform:scale3D(0.95, 0.95, 1)}100%{opacity:1;transform:scale3D(1, 1, 1)}}:root{--calcite-animation-timing:calc(150ms * var(--calcite-internal-duration-factor));--calcite-internal-duration-factor:var(--calcite-duration-factor, 1);--calcite-internal-animation-timing-fast:calc(100ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-medium:calc(200ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-slow:calc(300ms * var(--calcite-internal-duration-factor))}.calcite-animate{opacity:0;animation-fill-mode:both;animation-duration:var(--calcite-animation-timing)}.calcite-animate__in{animation-name:in}.calcite-animate__in-down{animation-name:in-down}.calcite-animate__in-up{animation-name:in-up}.calcite-animate__in-scale{animation-name:in-scale}@media (prefers-reduced-motion: reduce){:root{--calcite-internal-duration-factor:0.01}}:root{--calcite-floating-ui-transition:var(--calcite-animation-timing);--calcite-floating-ui-z-index:600}:host([hidden]){display:none}:host([disabled]){cursor:default;-webkit-user-select:none;user-select:none;opacity:var(--calcite-ui-opacity-disabled)}:host([disabled]) *,:host([disabled]) ::slotted(*){pointer-events:none}:host{display:inline-block;font-size:var(--calcite-font-size--2);line-height:1rem;font-weight:var(--calcite-font-weight-normal)}:host([disabled]) ::slotted([calcite-hydrated][disabled]),:host([disabled]) [calcite-hydrated][disabled]{opacity:1}:host([scale=s]){--calcite-color-picker-spacing:8px}:host([scale=s]) .container{inline-size:160px}:host([scale=s]) .saved-colors{gap:0.25rem;grid-template-columns:repeat(auto-fill, 20px)}:host([scale=m]){--calcite-color-picker-spacing:12px}:host([scale=m]) .container{inline-size:272px}:host([scale=l]){--calcite-color-picker-spacing:16px;font-size:var(--calcite-font-size--1);line-height:1rem}:host([scale=l]) .container{inline-size:464px}:host([scale=l]) .section:first-of-type{padding-block-start:var(--calcite-color-picker-spacing)}:host([scale=l]) .saved-colors{grid-template-columns:repeat(auto-fill, 32px)}:host([scale=l]) .control-section{flex-wrap:nowrap;align-items:baseline;flex-wrap:wrap}:host([scale=l]) .color-hex-options{display:flex;flex-shrink:1;flex-direction:column;justify-content:space-around}:host([scale=l]) .color-mode-container{flex-shrink:3}.container{background-color:var(--calcite-ui-foreground-1);display:inline-block;border:1px solid var(--calcite-ui-border-1)}.control-and-scope{position:relative;display:flex;cursor:pointer;touch-action:none}.scope{position:absolute;z-index:1;font-size:var(--calcite-font-size--1);outline-color:transparent}.scope:focus{outline:2px solid var(--calcite-ui-focus-color, var(--calcite-ui-brand));outline-offset:calc(\n            2px *\n            calc(\n              1 -\n              2 * clamp(\n                0,\n                var(--calcite-ui-focus-offset-invert),\n                1\n              )\n            )\n          );outline-offset:16px}.hex-and-channels-group{inline-size:100%}.hex-and-channels-group,.control-section{display:flex;flex-direction:row;flex-wrap:wrap}.section{padding-block:0 var(--calcite-color-picker-spacing);padding-inline:var(--calcite-color-picker-spacing)}.section:first-of-type{padding-block-start:var(--calcite-color-picker-spacing)}.sliders{display:flex;flex-direction:column;justify-content:space-between;margin-inline-start:var(--calcite-color-picker-spacing)}.preview-and-sliders{display:flex;align-items:center;padding:var(--calcite-color-picker-spacing)}.color-hex-options,.section--split{flex-grow:1}.header{display:flex;align-items:center;justify-content:space-between;color:var(--calcite-ui-text-1)}.color-mode-container{padding-block-start:var(--calcite-color-picker-spacing)}.channels{display:flex;row-gap:0.125rem}.channel[data-channel-index=\"3\"]{inline-size:159px}:host([scale=s]) .channels{flex-wrap:wrap}:host([scale=s]) .channel{flex-basis:30%;flex-grow:1}:host([scale=s]) .channel[data-channel-index=\"3\"]{inline-size:unset;margin-inline-start:unset}:host([scale=l]) .channel[data-channel-index=\"3\"]{inline-size:131px}.saved-colors{display:grid;gap:0.5rem;padding-block-start:var(--calcite-color-picker-spacing);grid-template-columns:repeat(auto-fill, 24px)}.saved-colors-buttons{display:flex}.saved-color{outline-offset:0;outline-color:transparent;cursor:pointer}.saved-color:focus{outline:2px solid var(--calcite-ui-brand);outline-offset:2px}.saved-color:hover{transition:outline-color var(--calcite-internal-animation-timing-fast) ease-in-out;outline:2px solid var(--calcite-ui-border-2);outline-offset:2px}";
 
 const throttleFor60FpsInMs = 16;
-const defaultValue = normalizeHex(DEFAULT_COLOR$1.hex());
-const defaultFormat = "auto";
 const ColorPicker = class {
   constructor(hostRef) {
     registerInstance(this, hostRef);
     this.calciteColorPickerChange = createEvent(this, "calciteColorPickerChange", 6);
     this.calciteColorPickerInput = createEvent(this, "calciteColorPickerInput", 6);
-    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);
@@ -2268,7 +2273,7 @@ const ColorPicker = class {
         this.internalColorSet(null);
         return;
       }
-      const normalizedHex = color$1 && normalizeHex(color$1.hex());
+      const normalizedHex = color$1 && normalizeHex(hexify(color$1, alphaCompatible(this.mode)));
       if (hex !== normalizedHex) {
         this.internalColorSet(color(hex));
       }
@@ -2280,16 +2285,20 @@ const ColorPicker = class {
     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;
@@ -2303,11 +2312,13 @@ const ColorPicker = class {
       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) => {
@@ -2316,144 +2327,101 @@ const ColorPicker = class {
         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) => {
@@ -2469,23 +2437,35 @@ const ColorPicker = class {
       return (h("calcite-tab-title", { class: CSS$2.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$2.control, key: channelMode, selected: selected }, h("div", { class: CSS$2.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$2.control, key: channelMode, selected: selected }, h("div", { class: CSS$2.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$2.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$2.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;
@@ -2498,7 +2478,7 @@ const ColorPicker = class {
       }
     };
     this.saveColor = () => {
-      const colorToSave = this.color.hex();
+      const colorToSave = hexify(this.color, this.alphaChannel);
       const alreadySaved = this.savedColors.indexOf(colorToSave) > -1;
       if (alreadySaved) {
         return;
@@ -2510,12 +2490,18 @@ const ColorPicker = class {
         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;
@@ -2523,24 +2509,56 @@ const ColorPicker = class {
       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$1;
     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$1, this.alphaChannel));
     this.defaultMessages = undefined;
-    this.colorFieldAndSliderInteractive = false;
     this.channelMode = "rgb";
     this.channels = this.toChannels(DEFAULT_COLOR$1);
     this.dimensions = DIMENSIONS.m;
@@ -2549,12 +2567,19 @@ const ColorPicker = class {
     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;
   }
@@ -2564,7 +2589,8 @@ const ColorPicker = class {
   }
   handleScaleChange(scale = "m") {
     this.updateDimensions(scale);
-    this.updateCanvasSize(this.fieldAndSliderRenderingContext?.canvas);
+    this.updateCanvasSize("all");
+    this.drawColorControls();
   }
   onMessagesChange() {
     /* wired up by t9n util */
@@ -2581,9 +2607,9 @@ const ColorPicker = class {
         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;
     }
@@ -2594,17 +2620,16 @@ const ColorPicker = class {
       }
       return;
     }
-    const color$1 = allowEmpty && !value ? null : color(value);
+    const color$1 = allowEmpty && !value
+      ? null
+      : color(value != null && typeof value === "object" && alphaCompatible(this.mode)
+        ? normalizeColor(value)
+        : value);
     const colorChanged = !colorEqual(color$1, this.color);
     if (modeChanged || colorChanged) {
-      this.internalColorSet(color$1, true, "internal");
+      this.internalColorSet(color$1, this.alphaChannel && !(this.mode.endsWith("a") || this.mode.endsWith("a-css")), "internal");
     }
   }
-  //--------------------------------------------------------------------------
-  //
-  //  Internal State/Props
-  //
-  //--------------------------------------------------------------------------
   get baseColorFieldColor() {
     return this.color || this.previousColor || DEFAULT_COLOR$1;
   }
@@ -2660,7 +2685,7 @@ const ColorPicker = class {
     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}`;
@@ -2691,34 +2716,38 @@ const ColorPicker = class {
   //
   //--------------------------------------------------------------------------
   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$1.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$1.hue()) / HSV_LIMITS.h;
+    const opacityTop = thumbRadius;
+    const opacityLeft = opacityScopeLeft ??
+      (colorFieldWidth * alphaToOpacity(DEFAULT_COLOR$1.alpha())) / OPACITY_LIMITS.max;
     const noColor = color === null;
     const vertical = scopeOrientation === "vertical";
-    return (h("div", { class: CSS$2.container }, h("div", { class: CSS$2.colorFieldAndSliderWrap }, h("canvas", { class: {
-        [CSS$2.colorFieldAndSlider]: true,
-        [CSS$2.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$2.container }, h("div", { class: CSS$2.controlAndScope }, h("canvas", { class: CSS$2.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$2.scope]: true, [CSS$2.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$2.previewAndSliders }, h("calcite-color-picker-swatch", { class: CSS$2.preview, color: selectedColorInHex, scale: "l" }), h("div", { class: CSS$2.sliders }, h("div", { class: CSS$2.controlAndScope }, h("canvas", { class: { [CSS$2.slider]: true, [CSS$2.hueSlider]: true }, onPointerDown: this.handleHueSliderPointerDown,
       // 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$2.scope]: true, [CSS$2.colorFieldScope]: true }, onKeyDown: this.handleColorFieldScopeKeyDown, role: "slider", style: { top: `${colorFieldScopeTop || 0}px`, left: `${colorFieldScopeLeft || 0}px` }, tabindex: "0",
+      ref: this.initHueSlider }), h("div", { "aria-label": messages.hue, "aria-valuemax": HSV_LIMITS.h, "aria-valuemin": "0", "aria-valuenow": color?.round().hue() || DEFAULT_COLOR$1.round().hue(), class: { [CSS$2.scope]: true, [CSS$2.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.storeColorFieldScope }), h("div", { "aria-label": messages.hue, "aria-valuemax": HSV_LIMITS.h, "aria-valuemin": "0", "aria-valuenow": color?.round().hue() || DEFAULT_COLOR$1.round().hue(), class: { [CSS$2.scope]: true, [CSS$2.hueScope]: true }, onKeyDown: this.handleHueScopeKeyDown, role: "slider", style: { top: `${hueTop}px`, left: `${hueLeft}px` }, tabindex: "0",
+      ref: this.storeHueScope })), alphaChannel ? (h("div", { class: CSS$2.controlAndScope }, h("canvas", { class: { [CSS$2.slider]: true, [CSS$2.opacitySlider]: true }, onPointerDown: this.handleOpacitySliderPointerDown,
       // eslint-disable-next-line react/jsx-sort-props
-      ref: this.storeHueScope })), hideHex && hideChannels ? null : (h("div", { class: {
+      ref: this.initOpacitySlider }), h("div", { "aria-label": messages.opacity, "aria-valuemax": OPACITY_LIMITS.max, "aria-valuemin": OPACITY_LIMITS.min, "aria-valuenow": (color || DEFAULT_COLOR$1).round().alpha(), class: { [CSS$2.scope]: true, [CSS$2.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.storeOpacityScope }))) : null)), noHex && noChannels ? null : (h("div", { class: {
         [CSS$2.controlSection]: true,
         [CSS$2.section]: true
-      } }, hideHex ? null : (h("div", { class: CSS$2.hexOptions }, h("span", { class: {
-        [CSS$2.header]: true,
-        [CSS$2.headerHex]: true
-      } }, messages.hex), h("calcite-color-picker-hex-input", { allowEmpty: allowEmpty, class: CSS$2.control, hexLabel: messages.hex, numberingSystem: this.numberingSystem, onCalciteColorPickerHexInputChange: this.handleHexInputChange, scale: hexInputScale, value: selectedColorInHex }))), hideChannels ? null : (h("calcite-tabs", { class: {
+      } }, h("div", { class: CSS$2.hexAndChannelsGroup }, noHex ? null : (h("div", { class: CSS$2.hexOptions }, h("calcite-color-picker-hex-input", { allowEmpty: allowEmpty, alphaChannel: alphaChannel, class: CSS$2.control, messages: messages, numberingSystem: this.numberingSystem, onCalciteColorPickerHexInputChange: this.handleHexInputChange, scale: scale, value: selectedColorInHex }))), noChannels ? null : (h("calcite-tabs", { class: {
         [CSS$2.colorModeContainer]: true,
         [CSS$2.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$2.savedColorsSection]: true, [CSS$2.section]: true } }, h("div", { class: CSS$2.header }, h("label", null, messages.saved), h("div", { class: CSS$2.savedColorsButtons }, h("calcite-button", { appearance: "transparent", class: CSS$2.deleteColor, disabled: noColor, iconStart: "minus", kind: "neutral", label: messages.deleteColor, onClick: this.deleteColor, scale: hexInputScale, type: "button" }), h("calcite-button", { appearance: "transparent", class: CSS$2.saveColor, disabled: noColor, iconStart: "plus", kind: "neutral", label: messages.saveColor, onClick: this.saveColor, scale: hexInputScale, type: "button" }))), savedColors.length > 0 ? (h("div", { class: CSS$2.savedColors }, [
-      ...savedColors.map((color) => (h("calcite-color-picker-swatch", { active: selectedColorInHex === color, class: CSS$2.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$2.savedColorsSection]: true, [CSS$2.section]: true } }, h("div", { class: CSS$2.header }, h("label", null, messages.saved), h("div", { class: CSS$2.savedColorsButtons }, h("calcite-button", { appearance: "transparent", class: CSS$2.deleteColor, disabled: noColor, iconStart: "minus", kind: "neutral", label: messages.deleteColor, onClick: this.deleteColor, scale: scale, type: "button" }), h("calcite-button", { appearance: "transparent", class: CSS$2.saveColor, disabled: noColor, iconStart: "plus", kind: "neutral", label: messages.saveColor, onClick: this.saveColor, scale: scale, type: "button" }))), savedColors.length > 0 ? (h("div", { class: CSS$2.savedColors }, [
+      ...savedColors.map((color) => (h("calcite-color-picker-swatch", { class: CSS$2.savedColor, color: color, key: color, onClick: this.handleSavedColorSelect, onKeyDown: this.handleSavedColorKeyDown, scale: scale, tabIndex: 0 })))
     ])) : null))));
   }
   // --------------------------------------------------------------------------
@@ -2734,23 +2763,38 @@ const ColorPicker = class {
   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)) {
@@ -2767,16 +2811,25 @@ const ColorPicker = class {
     }
     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;
   }
@@ -2788,9 +2841,14 @@ const ColorPicker = class {
     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)");
@@ -2805,6 +2863,9 @@ const ColorPicker = class {
     this.drawActiveColorFieldColor();
   }
   setCanvasContextSize(canvas, { height, width }) {
+    if (!canvas) {
+      return;
+    }
     const devicePixelRatio = window.devicePixelRatio || 1;
     canvas.width = width * devicePixelRatio;
     canvas.height = height * devicePixelRatio;
@@ -2813,21 +2874,21 @@ const ColorPicker = class {
     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;
@@ -2842,22 +2903,23 @@ const ColorPicker = class {
       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() {
@@ -2866,18 +2928,19 @@ const ColorPicker = class {
       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);
@@ -2886,27 +2949,107 @@ const ColorPicker = class {
       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 delegatesFocus() { return true; }
   static get assetsDirs() { return ["assets"]; }
   get el() { return getElement(this); }
   static get watchers() { return {
+    "alphaChannel": ["handleAlphaChannelChange"],
     "color": ["handleColorChange"],
     "format": ["handleFormatChange"],
     "scale": ["handleScaleChange"],
@@ -2919,43 +3062,131 @@ ColorPicker.style = colorPickerCss;
 
 const CSS$1 = {
   container: "container",
-  preview: "preview",
-  input: "input"
+  hexInput: "hex-input",
+  opacityInput: "opacity-input"
 };
 
-const colorPickerHexInputCss = "@keyframes in{0%{opacity:0}100%{opacity:1}}@keyframes in-down{0%{opacity:0;transform:translate3D(0, -5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-up{0%{opacity:0;transform:translate3D(0, 5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-scale{0%{opacity:0;transform:scale3D(0.95, 0.95, 1)}100%{opacity:1;transform:scale3D(1, 1, 1)}}:root{--calcite-animation-timing:calc(150ms * var(--calcite-internal-duration-factor));--calcite-internal-duration-factor:var(--calcite-duration-factor, 1);--calcite-internal-animation-timing-fast:calc(100ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-medium:calc(200ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-slow:calc(300ms * var(--calcite-internal-duration-factor))}.calcite-animate{opacity:0;animation-fill-mode:both;animation-duration:var(--calcite-animation-timing)}.calcite-animate__in{animation-name:in}.calcite-animate__in-down{animation-name:in-down}.calcite-animate__in-up{animation-name:in-up}.calcite-animate__in-scale{animation-name:in-scale}@media (prefers-reduced-motion: reduce){:root{--calcite-internal-duration-factor:0.01}}:root{--calcite-floating-ui-transition:var(--calcite-animation-timing);--calcite-floating-ui-z-index:600}:host([hidden]){display:none}:host{display:block}.container{display:inline-grid;inline-size:100%;align-items:center;grid-template-columns:1fr auto}.preview{grid-column:2/3;pointer-events:none;margin-block:0px;margin-inline:0.25rem;display:flex;align-items:center}.preview,.input{grid-row:1}.input{grid-column:1/3;inline-size:100%;text-transform:uppercase}";
+const colorPickerHexInputCss = "@keyframes in{0%{opacity:0}100%{opacity:1}}@keyframes in-down{0%{opacity:0;transform:translate3D(0, -5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-up{0%{opacity:0;transform:translate3D(0, 5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-scale{0%{opacity:0;transform:scale3D(0.95, 0.95, 1)}100%{opacity:1;transform:scale3D(1, 1, 1)}}:root{--calcite-animation-timing:calc(150ms * var(--calcite-internal-duration-factor));--calcite-internal-duration-factor:var(--calcite-duration-factor, 1);--calcite-internal-animation-timing-fast:calc(100ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-medium:calc(200ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-slow:calc(300ms * var(--calcite-internal-duration-factor))}.calcite-animate{opacity:0;animation-fill-mode:both;animation-duration:var(--calcite-animation-timing)}.calcite-animate__in{animation-name:in}.calcite-animate__in-down{animation-name:in-down}.calcite-animate__in-up{animation-name:in-up}.calcite-animate__in-scale{animation-name:in-scale}@media (prefers-reduced-motion: reduce){:root{--calcite-internal-duration-factor:0.01}}:root{--calcite-floating-ui-transition:var(--calcite-animation-timing);--calcite-floating-ui-z-index:600}:host([hidden]){display:none}:host{display:block}.container{display:flex;inline-size:100%;flex-wrap:nowrap;align-items:center}.hex-input{flex-grow:1;text-transform:uppercase}.opacity-input{inline-size:68px;margin-inline-start:-1px}:host([scale=s]) .container{flex-wrap:wrap;row-gap:0.125rem}:host([scale=s]) .opacity-input{inline-size:unset;margin-inline-start:unset}:host([scale=l]) .opacity-input{inline-size:88px}";
 
 const DEFAULT_COLOR = color();
 const ColorPickerHexInput = class {
   constructor(hostRef) {
     registerInstance(this, hostRef);
     this.calciteColorPickerHexInputChange = createEvent(this, "calciteColorPickerHexInputChange", 6);
-    this.onCalciteInternalInputBlur = () => {
-      const node = this.inputNode;
+    this.onHexInputBlur = () => {
+      const node = this.hexInputNode;
       const inputValue = node.value;
       const hex = `#${inputValue}`;
-      const willClearValue = this.allowEmpty && !inputValue;
-      if (willClearValue || (isValidHex(hex) && isLonghandHex(hex))) {
+      const { allowEmpty, internalColor } = this;
+      const willClearValue = allowEmpty && !inputValue;
+      const isLonghand = isLonghandHex(hex);
+      if (willClearValue || (isValidHex(hex) && isLonghand)) {
         return;
       }
       // manipulating DOM directly since rerender doesn't update input value
       node.value =
-        this.allowEmpty && !this.internalColor
+        allowEmpty && !internalColor
           ? ""
-          : this.formatForInternalInput(rgbToHex(this.internalColor.object()));
+          : this.formatHexForInternalInput(rgbToHex(
+          // always display hex input in RRGGBB format
+          internalColor.object()));
+    };
+    this.onOpacityInputBlur = () => {
+      const node = this.opacityInputNode;
+      const inputValue = node.value;
+      const { allowEmpty, internalColor } = this;
+      const willClearValue = allowEmpty && !inputValue;
+      if (willClearValue) {
+        return;
+      }
+      // manipulating DOM directly since rerender doesn't update input value
+      node.value =
+        allowEmpty && !internalColor ? "" : this.formatOpacityForInternalInput(internalColor);
+    };
+    this.onHexInputChange = () => {
+      const nodeValue = this.hexInputNode.value;
+      let value = nodeValue;
+      if (value) {
+        const normalized = normalizeHex(value, false);
+        const preserveExistingAlpha = isValidHex(normalized) && this.alphaChannel;
+        if (preserveExistingAlpha && this.internalColor) {
+          const alphaHex = normalizeHex(this.internalColor.hexa(), true).slice(-2);
+          value = `${normalized + alphaHex}`;
+        }
+      }
+      this.internalSetValue(value, this.value);
     };
-    this.onInputChange = () => {
-      this.internalSetValue(this.inputNode.value, this.value);
+    this.onOpacityInputChange = () => {
+      const node = this.opacityInputNode;
+      let value;
+      if (!node.value) {
+        value = node.value;
+      }
+      else {
+        const alpha = opacityToAlpha(Number(node.value));
+        value = this.internalColor?.alpha(alpha).hexa();
+      }
+      this.internalSetValue(value, this.value);
+    };
+    this.onInputKeyDown = (event) => {
+      const { altKey, ctrlKey, metaKey, shiftKey } = event;
+      const { alphaChannel, hexInputNode, internalColor, value } = this;
+      const { key } = event;
+      const composedPath = event.composedPath();
+      if (key === "Tab" || key === "Enter") {
+        if (composedPath.includes(hexInputNode)) {
+          this.onHexInputChange();
+        }
+        else {
+          this.onOpacityInputChange();
+        }
+        if (key === "Enter") {
+          event.preventDefault();
+        }
+        return;
+      }
+      const isNudgeKey = key === "ArrowDown" || key === "ArrowUp";
+      const oldValue = this.value;
+      if (isNudgeKey) {
+        if (!value) {
+          this.internalSetValue(this.previousNonNullValue, oldValue);
+          event.preventDefault();
+          return;
+        }
+        const direction = key === "ArrowUp" ? 1 : -1;
+        const bump = shiftKey ? 10 : 1;
+        this.internalSetValue(hexify(this.nudgeRGBChannels(internalColor, bump * direction, composedPath.includes(hexInputNode) ? "rgb" : "a"), alphaChannel), oldValue);
+        event.preventDefault();
+        return;
+      }
+      const withModifiers = altKey || ctrlKey || metaKey;
+      const singleChar = key.length === 1;
+      const validHexChar = hexChar.test(key);
+      if (singleChar && !withModifiers && !validHexChar) {
+        event.preventDefault();
+      }
+    };
+    this.onHexInputPaste = (event) => {
+      const hex = event.clipboardData.getData("text");
+      if (isValidHex(hex)) {
+        event.preventDefault();
+        this.hexInputNode.value = hex.slice(1);
+      }
     };
     this.previousNonNullValue = this.value;
-    this.storeInputRef = (node) => {
-      this.inputNode = node;
+    this.storeHexInputRef = (node) => {
+      this.hexInputNode = node;
+    };
+    this.storeOpacityInputRef = (node) => {
+      this.opacityInputNode = node;
     };
-    this.hexLabel = "Hex";
     this.allowEmpty = false;
-    this.scale = "m";
-    this.value = normalizeHex(DEFAULT_COLOR.hex());
+    this.alphaChannel = false;
+    this.hexLabel = "Hex";
+    this.messages = undefined;
     this.numberingSystem = undefined;
+    this.scale = "m";
+    this.value = normalizeHex(hexify(DEFAULT_COLOR, this.alphaChannel), this.alphaChannel, true);
     this.internalColor = DEFAULT_COLOR;
   }
   //--------------------------------------------------------------------------
@@ -2964,10 +3195,10 @@ const ColorPickerHexInput = class {
   //
   //--------------------------------------------------------------------------
   connectedCallback() {
-    const { allowEmpty, value } = this;
+    const { allowEmpty, alphaChannel, value } = this;
     if (value) {
-      const normalized = normalizeHex(value);
-      if (isValidHex(normalized)) {
+      const normalized = normalizeHex(value, alphaChannel);
+      if (isValidHex(normalized, alphaChannel)) {
         this.internalSetValue(normalized, normalized, false);
       }
       return;
@@ -2985,54 +3216,21 @@ const ColorPickerHexInput = class {
   handleValueChange(value, oldValue) {
     this.internalSetValue(value, oldValue, false);
   }
-  // using @Listen as a workaround for VDOM listener not firing
-  onInputKeyDown(event) {
-    const { altKey, ctrlKey, metaKey, shiftKey } = event;
-    const { internalColor, value } = this;
-    const { key } = event;
-    if (key === "Tab" || key === "Enter") {
-      this.onInputChange();
-      return;
-    }
-    const isNudgeKey = key === "ArrowDown" || key === "ArrowUp";
-    const oldValue = this.value;
-    if (isNudgeKey) {
-      if (!value) {
-        this.internalSetValue(this.previousNonNullValue, oldValue);
-        event.preventDefault();
-        return;
-      }
-      const direction = key === "ArrowUp" ? 1 : -1;
-      const bump = shiftKey ? 10 : 1;
-      this.internalSetValue(normalizeHex(this.nudgeRGBChannels(internalColor, bump * direction).hex()), oldValue);
-      event.preventDefault();
-      return;
-    }
-    const withModifiers = altKey || ctrlKey || metaKey;
-    const singleChar = key.length === 1;
-    const validHexChar = hexChar.test(key);
-    if (singleChar && !withModifiers && !validHexChar) {
-      event.preventDefault();
-    }
-  }
-  onPaste(event) {
-    const hex = event.clipboardData.getData("text");
-    if (isValidHex(hex)) {
-      event.preventDefault();
-      this.inputNode.value = hex.slice(1);
-    }
-  }
   //--------------------------------------------------------------------------
   //
   //  Lifecycle
   //
   //--------------------------------------------------------------------------
   render() {
-    const { value } = this;
-    const hexInputValue = this.formatForInternalInput(value);
-    return (h("div", { class: CSS$1.container }, h("calcite-input", { class: CSS$1.input, label: this.hexLabel, maxLength: 6, numberingSystem: this.numberingSystem, onCalciteInputChange: this.onInputChange, onCalciteInternalInputBlur: this.onCalciteInternalInputBlur, onKeyDown: this.handleKeyDown, onPaste: this.onPaste, prefixText: "#", scale: this.scale, value: hexInputValue,
+    const { alphaChannel, hexLabel, internalColor, messages, scale, value } = this;
+    const hexInputValue = this.formatHexForInternalInput(value);
+    const opacityInputValue = this.formatOpacityForInternalInput(internalColor);
+    const inputScale = scale === "l" ? "m" : "s";
+    return (h("div", { class: CSS$1.container }, h("calcite-input", { class: CSS$1.hexInput, label: messages?.hex || hexLabel, maxLength: 6, numberingSystem: this.numberingSystem, onCalciteInputChange: this.onHexInputChange, onCalciteInternalInputBlur: this.onHexInputBlur, onKeyDown: this.onInputKeyDown, onPaste: this.onHexInputPaste, prefixText: "#", scale: inputScale, value: hexInputValue,
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: this.storeHexInputRef }), alphaChannel ? (h("calcite-input-number", { class: CSS$1.opacityInput, key: "opacity-input", label: messages?.opacity, max: OPACITY_LIMITS.max, maxLength: 3, min: OPACITY_LIMITS.min, numberButtonType: "none", numberingSystem: this.numberingSystem, onCalciteInputNumberChange: this.onOpacityInputChange, onCalciteInternalInputNumberBlur: this.onOpacityInputBlur, onKeyDown: this.onInputKeyDown, scale: inputScale, suffixText: "%", value: opacityInputValue,
       // eslint-disable-next-line react/jsx-sort-props
-      ref: this.storeInputRef }), hexInputValue ? (h("calcite-color-picker-swatch", { active: true, class: CSS$1.preview, color: `#${hexInputValue}`, scale: this.scale })) : null));
+      ref: this.storeOpacityInputRef })) : null));
   }
   //--------------------------------------------------------------------------
   //
@@ -3042,7 +3240,7 @@ const ColorPickerHexInput = class {
   /** Sets focus on the component. */
   async setFocus() {
     await componentLoaded(this);
-    focusElement(this.inputNode);
+    focusElement(this.hexInputNode);
   }
   //--------------------------------------------------------------------------
   //
@@ -3051,13 +3249,17 @@ const ColorPickerHexInput = class {
   //--------------------------------------------------------------------------
   internalSetValue(value, oldValue, emit = true) {
     if (value) {
-      const normalized = normalizeHex(value);
-      if (isValidHex(normalized)) {
-        const { internalColor } = this;
-        const changed = !internalColor || normalized !== normalizeHex(internalColor.hex());
-        this.internalColor = color(normalized);
-        this.previousNonNullValue = normalized;
-        this.value = normalized;
+      const { alphaChannel } = this;
+      const normalized = normalizeHex(value, alphaChannel, alphaChannel);
+      if (isValidHex(normalized, alphaChannel)) {
+        const { internalColor: currentColor } = this;
+        const nextColor = color(normalized);
+        const normalizedLonghand = normalizeHex(hexify(nextColor, alphaChannel), alphaChannel);
+        const changed = !currentColor ||
+          normalizedLonghand !== normalizeHex(hexify(currentColor, alphaChannel), alphaChannel);
+        this.internalColor = nextColor;
+        this.previousNonNullValue = normalizedLonghand;
+        this.value = normalizedLonghand;
         if (changed && emit) {
           this.calciteColorPickerHexInputChange.emit();
         }
@@ -3074,16 +3276,28 @@ const ColorPickerHexInput = class {
     }
     this.value = oldValue;
   }
-  formatForInternalInput(hex) {
-    return hex ? hex.replace("#", "") : "";
+  formatHexForInternalInput(hex) {
+    return hex ? hex.replace("#", "").slice(0, 6) : "";
   }
-  nudgeRGBChannels(color$1, amount) {
-    return color.rgb(color$1.array().map((channel) => channel + amount));
+  formatOpacityForInternalInput(color) {
+    return color ? `${alphaToOpacity(color.alpha())}` : "";
   }
-  handleKeyDown(event) {
-    if (event.key === "Enter") {
-      event.preventDefault();
+  nudgeRGBChannels(color$1, amount, context) {
+    let nudgedChannels;
+    const channels = color$1.array();
+    const rgbChannels = channels.slice(0, 3);
+    if (context === "rgb") {
+      const nudgedRGBChannels = rgbChannels.map((channel) => channel + amount);
+      nudgedChannels = [
+        ...nudgedRGBChannels,
+        this.alphaChannel ? channels[3] : undefined
+      ];
+    }
+    else {
+      const nudgedAlpha = opacityToAlpha(alphaToOpacity(color$1.alpha()) + amount);
+      nudgedChannels = [...rgbChannels, nudgedAlpha];
     }
+    return color(nudgedChannels);
   }
   get el() { return getElement(this); }
   static get watchers() { return {
@@ -3094,14 +3308,20 @@ ColorPickerHexInput.style = colorPickerHexInputCss;
 
 const CSS = {
   swatch: "swatch",
-  noColorIcon: "no-color-icon"
+  noColorSwatch: "swatch--no-color",
+  checker: "checker"
 };
 const COLORS = {
   borderLight: "rgba(0, 0, 0, 0.3)",
   borderDark: "rgba(255, 255, 255, 0.15)"
 };
+const checkerSquareSize = 4;
+const CHECKER_DIMENSIONS = {
+  squareSize: checkerSquareSize,
+  size: checkerSquareSize * 2
+};
 
-const colorPickerSwatchCss = "@keyframes in{0%{opacity:0}100%{opacity:1}}@keyframes in-down{0%{opacity:0;transform:translate3D(0, -5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-up{0%{opacity:0;transform:translate3D(0, 5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-scale{0%{opacity:0;transform:scale3D(0.95, 0.95, 1)}100%{opacity:1;transform:scale3D(1, 1, 1)}}:root{--calcite-animation-timing:calc(150ms * var(--calcite-internal-duration-factor));--calcite-internal-duration-factor:var(--calcite-duration-factor, 1);--calcite-internal-animation-timing-fast:calc(100ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-medium:calc(200ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-slow:calc(300ms * var(--calcite-internal-duration-factor))}.calcite-animate{opacity:0;animation-fill-mode:both;animation-duration:var(--calcite-animation-timing)}.calcite-animate__in{animation-name:in}.calcite-animate__in-down{animation-name:in-down}.calcite-animate__in-up{animation-name:in-up}.calcite-animate__in-scale{animation-name:in-scale}@media (prefers-reduced-motion: reduce){:root{--calcite-internal-duration-factor:0.01}}:root{--calcite-floating-ui-transition:var(--calcite-animation-timing);--calcite-floating-ui-z-index:600}:host([hidden]){display:none}:host{position:relative;display:inline-flex}:host([scale=s]){block-size:1.25rem;inline-size:1.25rem}:host([scale=m]){block-size:1.5rem;inline-size:1.5rem}:host([scale=l]){block-size:2rem;inline-size:2rem}.swatch{overflow:visible;block-size:inherit;inline-size:inherit}.swatch rect{transition-property:all;transition-duration:150ms;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1)}.no-color-icon{position:absolute;inset:0px;block-size:100%;inline-size:100%}";
+const colorPickerSwatchCss = "@keyframes in{0%{opacity:0}100%{opacity:1}}@keyframes in-down{0%{opacity:0;transform:translate3D(0, -5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-up{0%{opacity:0;transform:translate3D(0, 5px, 0)}100%{opacity:1;transform:translate3D(0, 0, 0)}}@keyframes in-scale{0%{opacity:0;transform:scale3D(0.95, 0.95, 1)}100%{opacity:1;transform:scale3D(1, 1, 1)}}:root{--calcite-animation-timing:calc(150ms * var(--calcite-internal-duration-factor));--calcite-internal-duration-factor:var(--calcite-duration-factor, 1);--calcite-internal-animation-timing-fast:calc(100ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-medium:calc(200ms * var(--calcite-internal-duration-factor));--calcite-internal-animation-timing-slow:calc(300ms * var(--calcite-internal-duration-factor))}.calcite-animate{opacity:0;animation-fill-mode:both;animation-duration:var(--calcite-animation-timing)}.calcite-animate__in{animation-name:in}.calcite-animate__in-down{animation-name:in-down}.calcite-animate__in-up{animation-name:in-up}.calcite-animate__in-scale{animation-name:in-scale}@media (prefers-reduced-motion: reduce){:root{--calcite-internal-duration-factor:0.01}}:root{--calcite-floating-ui-transition:var(--calcite-animation-timing);--calcite-floating-ui-z-index:600}:host([hidden]){display:none}:host{position:relative;display:inline-flex}:host([scale=s]){block-size:1.25rem;inline-size:1.25rem}:host([scale=m]){block-size:1.5rem;inline-size:1.5rem}:host([scale=l]){block-size:2rem;inline-size:2rem}.swatch{overflow:hidden;block-size:inherit;inline-size:inherit}.swatch rect{transition-property:all;transition-duration:150ms;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1)}.swatch--no-color rect{fill:var(--calcite-ui-foreground-1)}.swatch--no-color line{stroke:var(--calcite-ui-danger)}.checker{fill:#cacaca}";
 
 const ColorPickerSwatch = class {
   constructor(hostRef) {
@@ -3111,7 +3331,7 @@ const ColorPickerSwatch = class {
     this.scale = "m";
   }
   handleColorChange(color$1) {
-    this.internalColor = color(color$1);
+    this.internalColor = color$1 ? color(color$1) : null;
   }
   //--------------------------------------------------------------------------
   //
@@ -3122,12 +3342,38 @@ const ColorPickerSwatch = class {
     this.handleColorChange(this.color);
   }
   render() {
+    const isEmpty = !this.internalColor;
+    const classes = {
+      [CSS.swatch]: true,
+      [CSS.noColorSwatch]: isEmpty
+    };
+    return (h("svg", { class: classes, xmlns: "http://www.w3.org/2000/svg" }, this.renderSwatch()));
+  }
+  renderSwatch() {
     const { active, el, internalColor } = this;
     const borderRadius = active ? "100%" : "0";
-    const hex = internalColor.hex();
     const theme = getModeName(el);
     const borderColor = theme === "light" ? COLORS.borderLight : COLORS.borderDark;
-    return (h("svg", { class: CSS.swatch, xmlns: "http://www.w3.org/2000/svg" }, h("title", null, hex), h("rect", { fill: hex, height: "100%", id: "swatch", rx: borderRadius, stroke: borderColor, "stroke-width": "2", style: { "clip-path": `inset(0 round ${borderRadius})` }, width: "100%" })));
+    const commonSwatchProps = {
+      height: "100%",
+      rx: borderRadius,
+      stroke: borderColor,
+      // stroke-width and clip-path are needed to hide overflowing portion of stroke
+      // see https://stackoverflow.com/a/7273346/194216
+      // using attribute to work around Stencil using the prop name vs the attribute when rendering
+      ["stroke-width"]: "2",
+      width: "100%"
+    };
+    const isEmpty = !internalColor;
+    if (isEmpty) {
+      return (h(Fragment, null, h("clipPath", { id: "shape" }, h("rect", { height: "100%", rx: borderRadius, width: "100%" })), h("rect", { "clip-path": `inset(0 round ${borderRadius})`, rx: borderRadius, ...commonSwatchProps }), h("line", { "clip-path": "url(#shape)", "stroke-width": "3", x1: "100%", x2: "0", y1: "0", y2: "100%" })));
+    }
+    const alpha = internalColor.alpha();
+    const hex = hexify(internalColor);
+    const hexa = hexify(internalColor, alpha < 1);
+    return (h(Fragment, null, h("title", null, hexa), h("defs", null, h("pattern", { height: CHECKER_DIMENSIONS.size, id: "checker", patternUnits: "userSpaceOnUse", width: CHECKER_DIMENSIONS.size, x: "0", y: "0" }, h("rect", { class: CSS.checker, height: CHECKER_DIMENSIONS.squareSize, width: CHECKER_DIMENSIONS.squareSize, x: "0", y: "0" }), h("rect", { class: CSS.checker, height: CHECKER_DIMENSIONS.squareSize, width: CHECKER_DIMENSIONS.squareSize, x: CHECKER_DIMENSIONS.squareSize, y: CHECKER_DIMENSIONS.squareSize }))), h("rect", { fill: "url(#checker)", height: "100%", rx: borderRadius, width: "100%" }), h("rect", { fill: hex, style: {
+        "clip-path": alpha < 1 ? "polygon(100% 0, 0 0, 0 100%)" : `inset(0 round ${borderRadius})`
+      }, ...commonSwatchProps }), alpha < 1 ? (h("rect", { fill: hexa, key: "opacity-fill", style: { "clip-path": "polygon(100% 0, 100% 100%, 0 100%)" }, ...commonSwatchProps })) : null));
   }
   get el() { return getElement(this); }
   static get watchers() { return {