@esri/calcite-components 1.0.0-beta.80 → 1.0.0-beta.83

package/dist/collection/components/block/block.js

@@ -1,10 +1,11 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 import { Component, Element, Event, h, Host, Prop } from "@stencil/core";
 import { CSS, HEADING_LEVEL, ICONS, SLOTS, TEXT } from "./resources";
-import { getSlotted } from "../../utils/dom";
+import { getSlotted, toAriaBoolean } from "../../utils/dom";
 import { Heading } from "../functional/Heading";
 import { connectConditionalSlotComponent, disconnectConditionalSlotComponent } from "../../utils/conditionalSlot";
 import { updateHostInteraction } from "../../utils/interactive";
@@ -34,11 +35,27 @@ export class Block {
      * When true, displays a drag handle in the header.
      */
     this.dragHandle = false;
-    /** string to override English loading text
+    /**
+     * Aria-label for collapsing the toggle and tooltip used for the toggle when expanded.
+     *
+     * @default "Collapse"
+     */
+    this.intlCollapse = TEXT.collapse;
+    /**
+     * Aria-label for expanding the toggle and tooltip used for the toggle when collapsed.
+     *
+     * @default "Expand"
+     */
+    this.intlExpand = TEXT.expand;
+    /**
+     * string to override English loading text
+     *
      * @default "Loading"
      */
     this.intlLoading = TEXT.loading;
-    /** Text string used for the actions menu
+    /**
+     * Text string used for the actions menu
+     *
      * @default "Options"
      */
     this.intlOptions = TEXT.options;
@@ -123,7 +140,7 @@ export class Block {
     const buttonId = `${guid}-button`;
     const headerNode = (h("div", { class: CSS.headerContainer },
       this.dragHandle ? h("calcite-handle", null) : null,
-      collapsible ? (h("button", { "aria-controls": regionId, "aria-expanded": collapsible ? open.toString() : null, "aria-label": toggleLabel, class: CSS.toggle, id: buttonId, onClick: this.onHeaderClick, title: toggleLabel },
+      collapsible ? (h("button", { "aria-controls": regionId, "aria-expanded": collapsible ? toAriaBoolean(open) : null, "aria-label": toggleLabel, class: CSS.toggle, id: buttonId, onClick: this.onHeaderClick, title: toggleLabel },
         headerContent,
         !hasControl && !hasMenuActions ? (h("calcite-icon", { "aria-hidden": "true", class: CSS.toggleIcon, icon: collapseIcon, scale: "s" })) : null)) : (headerContent),
       loading ? (h("calcite-loader", { inline: true, "is-active": true, label: intlLoading })) : hasControl ? (h("div", { class: CSS.controlContainer },
@@ -131,11 +148,11 @@ export class Block {
       hasMenuActions ? (h("calcite-action-menu", { label: this.intlOptions || TEXT.options },
         h("slot", { name: SLOTS.headerMenuActions }))) : null));
     return (h(Host, null,
-      h("article", { "aria-busy": loading.toString(), class: {
+      h("article", { "aria-busy": toAriaBoolean(loading), class: {
           [CSS.article]: true
         } },
         headerNode,
-        h("section", { "aria-expanded": this.open.toString(), "aria-labelledby": buttonId, class: CSS.content, hidden: !open, id: regionId }, this.renderScrim()))));
+        h("section", { "aria-expanded": toAriaBoolean(open), "aria-labelledby": buttonId, class: CSS.content, hidden: !open, id: regionId }, this.renderScrim()))));
   }
   static get is() { return "calcite-block"; }
   static get encapsulation() { return "shadow"; }
@@ -250,11 +267,15 @@ export class Block {
       "required": false,
       "optional": true,
       "docs": {
-        "tags": [],
-        "text": "Tooltip used for the toggle when expanded."
+        "tags": [{
+            "name": "default",
+            "text": "\"Collapse\""
+          }],
+        "text": "Aria-label for collapsing the toggle and tooltip used for the toggle when expanded."
       },
       "attribute": "intl-collapse",
-      "reflect": false
+      "reflect": false,
+      "defaultValue": "TEXT.collapse"
     },
     "intlExpand": {
       "type": "string",
@@ -267,11 +288,15 @@ export class Block {
       "required": false,
       "optional": true,
       "docs": {
-        "tags": [],
-        "text": "Tooltip used for the toggle when collapsed."
+        "tags": [{
+            "name": "default",
+            "text": "\"Expand\""
+          }],
+        "text": "Aria-label for expanding the toggle and tooltip used for the toggle when collapsed."
       },
       "attribute": "intl-expand",
-      "reflect": false
+      "reflect": false,
+      "defaultValue": "TEXT.expand"
     },
     "intlLoading": {
       "type": "string",

package/dist/collection/components/block/resources.js

@@ -1,6 +1,7 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 export const CSS = {
   article: "article",

package/dist/collection/components/block-section/block-section.css

@@ -121,9 +121,7 @@
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
   font-size: var(--calcite-font-size--1);
-  outline-offset: 0;
   outline-color: transparent;
-  transition: outline-offset 100ms ease-in-out, outline-color 100ms ease-in-out;
 }
 .toggle--switch:focus, .section-header:focus {
   outline: 2px solid var(--calcite-ui-brand);

package/dist/collection/components/block-section/block-section.js

@@ -1,9 +1,10 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 import { Component, Element, Event, Prop, h, Host } from "@stencil/core";
-import { getElementDir } from "../../utils/dom";
+import { getElementDir, toAriaBoolean } from "../../utils/dom";
 import { CSS, ICONS, TEXT } from "./resources";
 import { guid } from "../../utils/guid";
 /**
@@ -83,7 +84,7 @@ export class BlockSection {
       this.renderStatusIcon()));
     return (h(Host, null,
       headerNode,
-      h("section", { "aria-expanded": open.toString(), "aria-labelledby": buttonId, class: CSS.content, hidden: !open, id: regionId },
+      h("section", { "aria-expanded": toAriaBoolean(open), "aria-labelledby": buttonId, class: CSS.content, hidden: !open, id: regionId },
         h("slot", null))));
   }
   static get is() { return "calcite-block-section"; }

package/dist/collection/components/block-section/interfaces.js

@@ -1,5 +1,6 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 export {};

package/dist/collection/components/block-section/resources.js

@@ -1,6 +1,7 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 export const CSS = {
   content: "content",

package/dist/collection/components/button/button.css

@@ -92,9 +92,7 @@
 }
 
 :host button, :host a {
-  outline-offset: 0;
   outline-color: transparent;
-  transition: outline-offset 100ms ease-in-out, outline-color 100ms ease-in-out;
 }
 :host button:focus, :host a:focus {
   outline: 2px solid var(--calcite-ui-brand);
@@ -126,7 +124,7 @@
   font-weight: var(--calcite-font-weight-normal);
   -webkit-text-decoration-line: none;
           text-decoration-line: none;
-  transition: color var(--calcite-animation-timing) ease-in-out, background-color var(--calcite-animation-timing) ease-in-out, box-shadow var(--calcite-animation-timing) ease-in-out, outline-offset var(--calcite-internal-animation-timing-fast) ease-in-out, outline-color var(--calcite-internal-animation-timing-fast) ease-in-out;
+  transition: color var(--calcite-animation-timing) ease-in-out, background-color var(--calcite-animation-timing) ease-in-out, box-shadow var(--calcite-animation-timing) ease-in-out, outline-color var(--calcite-internal-animation-timing-fast) ease-in-out;
 }
 :host button:hover, :host a:hover {
   -webkit-text-decoration-line: none;

package/dist/collection/components/button/button.js

@@ -1,6 +1,7 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 import "form-request-submit-polyfill/form-request-submit-polyfill";
 import { Component, Element, h, Method, Prop, Build, State, Watch } from "@stencil/core";
@@ -9,6 +10,7 @@ import { closestElementCrossShadowBoundary } from "../../utils/dom";
 import { connectLabel, disconnectLabel, getLabelText } from "../../utils/label";
 import { createObserver } from "../../utils/observers";
 import { updateHostInteraction } from "../../utils/interactive";
+import { submitForm, resetForm } from "../../utils/form";
 /** Passing a 'href' will render an anchor link, instead of a button. Role will be set to link, or button, depending on this. */
 /** It is the consumers responsibility to add aria information, rel, target, for links, and any button attributes for form submission */
 /** @slot - A slot for adding text. */
@@ -27,7 +29,9 @@ export class Button {
     this.color = "blue";
     /** is the button disabled  */
     this.disabled = false;
-    /** string to override English loading text
+    /**
+     * string to override English loading text
+     *
      * @default "Loading"
      */
     this.intlLoading = TEXT.loading;
@@ -39,9 +43,11 @@ export class Button {
     this.scale = "m";
     /** is the button a child of a calcite-split-button */
     this.splitChild = false;
+    /** The type attribute to apply to the button */
+    this.type = "button";
     /** specify the width of the button, defaults to auto */
     this.width = "auto";
-    /** watches for changing text content **/
+    /** watches for changing text content */
     this.mutationObserver = createObserver("mutation", () => this.updateHasContent());
     /** determine if there is slotted content for styling purposes */
     this.hasContent = false;
@@ -49,15 +55,16 @@ export class Button {
     this.hasLoader = false;
     // act on a requested or nearby form based on type
     this.handleClick = () => {
-      const { formEl, type } = this;
+      const { type } = this;
+      if (this.href) {
+        return;
+      }
       // this.type refers to type attribute, not child element type
-      if (!this.href && type !== "button") {
-        if (type === "submit") {
-          formEl === null || formEl === void 0 ? void 0 : formEl.requestSubmit();
-        }
-        else if (type === "reset") {
-          formEl === null || formEl === void 0 ? void 0 : formEl.reset();
-        }
+      if (type === "submit") {
+        submitForm(this);
+      }
+      else if (type === "reset") {
+        resetForm(this);
       }
     };
   }
@@ -91,9 +98,6 @@ export class Button {
   componentWillLoad() {
     if (Build.isBrowser) {
       this.updateHasContent();
-      if (!this.href && !this.type) {
-        this.type = "submit";
-      }
     }
   }
   componentDidRender() {
@@ -512,13 +516,14 @@ export class Button {
         "references": {}
       },
       "required": false,
-      "optional": true,
+      "optional": false,
       "docs": {
         "tags": [],
         "text": "The type attribute to apply to the button"
       },
       "attribute": "type",
-      "reflect": false
+      "reflect": false,
+      "defaultValue": "\"button\""
     },
     "width": {
       "type": "string",

package/dist/collection/components/button/interfaces.js

@@ -1,5 +1,6 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 export {};

package/dist/collection/components/button/resources.js

@@ -1,6 +1,7 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 export const CSS = {
   buttonLoader: "calcite-button--loader",

package/dist/collection/components/card/card.css

@@ -115,6 +115,7 @@
 }
 
 .container {
+  position: relative;
   display: flex;
   flex: 1 1 auto;
   flex-direction: column;
@@ -210,15 +211,28 @@ slot[name=footer-trailing]::slotted(*), *::slotted([slot=footer-trailing]) {
   line-height: 1.375;
 }
 
-.thumbnail-wrapper {
-  font-size: var(--calcite-font-size-0);
-  line-height: 1.375;
-}
-
 .checkbox-wrapper {
   position: absolute;
   margin: 0px;
   padding: 0px;
   top: 0.5rem;
   inset-inline-end: 0.5rem;
+}
+
+.thumbnail-wrapper {
+  display: flex;
+}
+
+.calcite-card-container.inline {
+  flex-direction: row;
+}
+.calcite-card-container.inline > .container {
+  width: 60%;
+}
+.calcite-card-container.inline > .thumbnail-wrapper {
+  width: 40%;
+  align-items: flex-start;
+}
+.calcite-card-container.inline slot[name=thumbnail]::slotted(img), .calcite-card-container.inline img::slotted([slot=thumbnail]) {
+  width: 100%;
 }

package/dist/collection/components/card/card.js

@@ -1,12 +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.0.0-beta.83
  */
 import { Component, Element, Event, h, Prop } from "@stencil/core";
-import { getSlotted } from "../../utils/dom";
+import { getSlotted, toAriaBoolean } from "../../utils/dom";
 import { CSS, SLOTS, TEXT } from "./resources";
 import { connectConditionalSlotComponent, disconnectConditionalSlotComponent } from "../../utils/conditionalSlot";
-/** Cards do not include a grid or bounding container
+/**
+ * Cards do not include a grid or bounding container
  * - cards will expand to fit the width of their container
  */
 /**
@@ -30,18 +32,25 @@ export class Card {
     this.selected = false;
     /** Indicates whether the card is selectable. */
     this.selectable = false;
-    /** string to override English loading text
+    /**
+     * string to override English loading text
+     *
      * @default "Loading"
      */
     this.intlLoading = TEXT.loading;
-    /** string to override English select text for checkbox when selectable is true
+    /**
+     * string to override English select text for checkbox when selectable is true
+     *
      * @default "Select"
      */
     this.intlSelect = TEXT.select;
-    /** string to override English deselect text for checkbox when selectable is true
+    /**
+     * string to override English deselect text for checkbox when selectable is true
+     *
      * @default "Deselect"
      */
     this.intlDeselect = TEXT.deselect;
+    this.thumbnailPosition = "block-start";
     //--------------------------------------------------------------------------
     //
     //  Private State/Props
@@ -77,23 +86,26 @@ export class Card {
     disconnectConditionalSlotComponent(this);
   }
   render() {
-    return (h("div", { class: "calcite-card-container" },
+    const thumbnailInline = this.thumbnailPosition.startsWith("inline");
+    const thumbnailStart = this.thumbnailPosition.endsWith("start");
+    return (h("div", { class: { "calcite-card-container": true, inline: thumbnailInline } },
       this.loading ? (h("div", { class: "calcite-card-loader-container" },
         h("calcite-loader", { active: true, label: this.intlLoading }))) : null,
-      h("section", { "aria-busy": this.loading.toString(), class: { [CSS.container]: true } },
+      thumbnailStart && this.renderThumbnail(),
+      h("section", { "aria-busy": toAriaBoolean(this.loading), class: { [CSS.container]: true } },
         this.selectable ? this.renderCheckbox() : null,
-        this.renderThumbnail(),
         this.renderHeader(),
         h("div", { class: "card-content" },
           h("slot", null)),
-        this.renderFooter())));
+        this.renderFooter()),
+      !thumbnailStart && this.renderThumbnail()));
   }
   selectCard() {
     this.selected = !this.selected;
     this.calciteCardSelect.emit();
   }
   renderThumbnail() {
-    return getSlotted(this.el, SLOTS.thumbnail) ? (h("div", { class: CSS.thumbnailWrapper, key: "thumbnail-wrapper" },
+    return getSlotted(this.el, SLOTS.thumbnail) ? (h("section", { class: CSS.thumbnailWrapper },
       h("slot", { name: SLOTS.thumbnail }))) : null;
   }
   renderCheckbox() {
@@ -244,6 +256,29 @@ export class Card {
       "attribute": "intl-deselect",
       "reflect": false,
       "defaultValue": "TEXT.deselect"
+    },
+    "thumbnailPosition": {
+      "type": "string",
+      "mutable": false,
+      "complexType": {
+        "original": "LogicalFlowPosition",
+        "resolved": "\"block-end\" | \"block-start\" | \"inline-end\" | \"inline-start\"",
+        "references": {
+          "LogicalFlowPosition": {
+            "location": "import",
+            "path": "../interfaces"
+          }
+        }
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [],
+        "text": ""
+      },
+      "attribute": "thumbnail-position",
+      "reflect": false,
+      "defaultValue": "\"block-start\""
     }
   }; }
   static get events() { return [{

package/dist/collection/components/card/resources.js

@@ -1,6 +1,7 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 export const CSS = {
   container: "container",
@@ -8,8 +9,8 @@ export const CSS = {
   footer: "footer",
   title: "title",
   subtitle: "subtitle",
-  thumbnailWrapper: "thumbnail-wrapper",
-  checkboxWrapper: "checkbox-wrapper"
+  checkboxWrapper: "checkbox-wrapper",
+  thumbnailWrapper: "thumbnail-wrapper"
 };
 export const SLOTS = {
   thumbnail: "thumbnail",

package/dist/collection/components/checkbox/checkbox.css

@@ -105,20 +105,21 @@
           user-select: none;
   -webkit-tap-highlight-color: transparent;
 }
+:host .check-svg,
+:host .toggle {
+  width: var(--calcite-checkbox-size);
+  height: var(--calcite-checkbox-size);
+}
 :host .check-svg {
   pointer-events: none;
   box-sizing: border-box;
   display: block;
+  overflow: hidden;
   background-color: var(--calcite-ui-foreground-1);
   fill: currentColor;
   stroke: currentColor;
   stroke-width: 1;
-  transition-property: all;
-  transition-duration: 150ms;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  overflow: hidden;
-  width: var(--calcite-checkbox-size);
-  height: var(--calcite-checkbox-size);
+  transition: all var(--calcite-animation-timing) ease-in-out 0s, outline 0s, outline-offset 0s;
   box-shadow: inset 0 0 0 1px var(--calcite-ui-border-input);
   color: var(--calcite-ui-background);
 }
@@ -133,10 +134,12 @@
   box-shadow: inset 0 0 0 2px var(--calcite-ui-brand);
 }
 
-:host .toggle:focus .check-svg,
-:host .toggle:active .check-svg {
-  box-shadow: inset 0 0 0 1px var(--calcite-ui-brand), 0 0 0 2px var(--calcite-ui-foreground-1), 0 0 0 4px var(--calcite-ui-brand);
-  transition: var(--calcite-animation-timing);
+.toggle {
+  outline-color: transparent;
+}
+.toggle:active, .toggle:focus, .toggle:focus-visible {
+  outline: 2px solid var(--calcite-ui-brand);
+  outline-offset: 2px;
 }
 
 :host([disabled]) {

package/dist/collection/components/checkbox/checkbox.js

@@ -1,6 +1,7 @@
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.0.0-beta.83
  */
 import { Component, Element, Event, h, Host, Method, Prop } from "@stencil/core";
 import { guid } from "../../utils/guid";
@@ -8,6 +9,7 @@ import { HiddenFormInputSlot } from "../../utils/form";
 import { connectLabel, disconnectLabel, getLabelText } from "../../utils/label";
 import { connectForm, disconnectForm } from "../../utils/form";
 import { updateHostInteraction } from "../../utils/interactive";
+import { toAriaBoolean } from "../../utils/dom";
 export class Checkbox {
   constructor() {
     //--------------------------------------------------------------------------
@@ -21,6 +23,7 @@ export class Checkbox {
     this.disabled = false;
     /**
      * The hovered state of the checkbox.
+     *
      * @internal
      */
     this.hovered = false;
@@ -28,7 +31,7 @@ export class Checkbox {
      * True if the checkbox is initially indeterminate,
      * which is independent from its checked state
      * https://css-tricks.com/indeterminate-checkboxes/
-     * */
+     */
     this.indeterminate = false;
     /**
      * When true, makes the component required for form-submission.
@@ -117,7 +120,7 @@ export class Checkbox {
   // --------------------------------------------------------------------------
   render() {
     return (h(Host, { onClick: this.clickHandler, onKeyDown: this.keyDownHandler },
-      h("div", { "aria-checked": this.checked.toString(), "aria-label": getLabelText(this), class: "toggle", onBlur: this.onToggleBlur, onFocus: this.onToggleFocus, ref: (toggleEl) => (this.toggleEl = toggleEl), role: "checkbox", tabIndex: this.disabled ? undefined : 0 },
+      h("div", { "aria-checked": toAriaBoolean(this.checked), "aria-label": getLabelText(this), class: "toggle", onBlur: this.onToggleBlur, onFocus: this.onToggleFocus, ref: (toggleEl) => (this.toggleEl = toggleEl), role: "checkbox", tabIndex: this.disabled ? undefined : 0 },
         h("svg", { class: "check-svg", viewBox: "0 0 16 16" },
           h("path", { d: this.getPath() })),
         h("slot", null)),

package/dist/collection/components/chip/chip.css

@@ -84,7 +84,7 @@
   --calcite-chip-spacing-unit-l: 0.5rem;
   --calcite-chip-spacing-unit-s: 0.25rem;
 }
-:host([scale=s]) .chip-image-container {
+:host([scale=s]) .image-container {
   height: 1.25rem;
   width: 1.25rem;
 }
@@ -95,7 +95,7 @@
   --calcite-chip-spacing-unit-l: 0.75rem;
   --calcite-chip-spacing-unit-s: 6px;
 }
-:host([scale=m]) .chip-image-container {
+:host([scale=m]) .image-container {
   height: 1.5rem;
   width: 1.5rem;
   padding-inline-start: 0.25rem;
@@ -107,10 +107,10 @@
   --calcite-chip-spacing-unit-l: 1rem;
   --calcite-chip-spacing-unit-s: 0.5rem;
 }
-:host([scale=l]) .chip-image-container {
+:host([scale=l]) .image-container {
   height: 2rem;
   width: 2rem;
-  padding-left: 0.25rem;
+  padding-inline-start: 0.25rem;
 }
 
 :host {
@@ -162,13 +162,8 @@
   border-style: none;
   background-color: transparent;
   color: var(--calcite-ui-text-1);
-  outline-offset: 0;
   outline-color: transparent;
-  transition: outline-offset 100ms ease-in-out, outline-color 100ms ease-in-out;
-  transition-property: all;
-  transition-duration: var(--calcite-animation-timing);
-  transition-timing-function: ease-in-out;
-  transition-delay: 0s;
+  transition: all var(--calcite-animation-timing) ease-in-out 0s, outline 0s, outline-offset 0s;
   -webkit-appearance: none;
   border-start-start-radius: 0;
   border-start-end-radius: 50px;
@@ -191,21 +186,21 @@
   background-color: var(--calcite-chip-transparent-press);
 }
 
-.chip-image-container {
+.image-container {
   display: inline-flex;
-  border-radius: 50%;
   overflow: hidden;
+  border-radius: 50%;
 }
 
 :host slot[name=image]::slotted(*) {
   display: flex;
   height: 100%;
   width: 100%;
-  border-radius: 50%;
   overflow: hidden;
+  border-radius: 50%;
 }
 
-.calcite-chip--icon {
+.chip-icon {
   position: relative;
   margin-top: 0px;
   margin-bottom: 0px;
@@ -250,41 +245,44 @@
   color: var(--calcite-ui-text-1);
 }
 :host([color=grey][appearance=solid]) button,
-:host([color=grey][appearance=solid]) calcite-icon {
+:host([color=grey][appearance=solid]) .close-icon {
   color: var(--calcite-ui-text-3);
 }
+:host([color=grey][appearance=solid]) .chip-icon {
+  color: var(--calcite-ui-icon-color, var(--calcite-ui-text-3));
+}
 
 :host([color=blue][appearance=clear]) {
   border-color: var(--calcite-ui-info);
 }
-:host([color=blue][appearance=clear]) .calcite-chip--icon {
-  color: var(--calcite-ui-info);
+:host([color=blue][appearance=clear]) .chip-icon {
+  color: var(--calcite-ui-icon-color, var(--calcite-ui-info));
 }
 
 :host([color=red][appearance=clear]) {
   border-color: var(--calcite-ui-danger);
 }
-:host([color=red][appearance=clear]) .calcite-chip--icon {
-  color: var(--calcite-ui-danger);
+:host([color=red][appearance=clear]) .chip-icon {
+  color: var(--calcite-ui-icon-color, var(--calcite-ui-danger));
 }
 
 :host([color=yellow][appearance=clear]) {
   border-color: var(--calcite-ui-warning);
 }
-:host([color=yellow][appearance=clear]) .calcite-chip--icon {
-  color: var(--calcite-ui-warning);
+:host([color=yellow][appearance=clear]) .chip-icon {
+  color: var(--calcite-ui-icon-color, var(--calcite-ui-warning));
 }
 
 :host([color=green][appearance=clear]) {
   border-color: var(--calcite-ui-success);
 }
-:host([color=green][appearance=clear]) .calcite-chip--icon {
-  color: var(--calcite-ui-success);
+:host([color=green][appearance=clear]) .chip-icon {
+  color: var(--calcite-ui-icon-color, var(--calcite-ui-success));
 }
 
 :host([color=grey][appearance=clear]) {
   border-color: var(--calcite-ui-border-1);
 }
-:host([color=grey][appearance=clear]) .calcite-chip--icon {
-  color: var(--calcite-ui-text-3);
+:host([color=grey][appearance=clear]) .chip-icon {
+  color: var(--calcite-ui-icon-color, var(--calcite-ui-text-3));
 }