@esri/calcite-components 1.3.0-next.16 → 1.3.0-next.18

package/dist/collection/components/input/input.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { getElementDir, getSlotted, isPrimaryPointerButton, setRequestedIcon } from "../../utils/dom";
@@ -16,7 +16,6 @@ import { createObserver } from "../../utils/observers";
 import { CSS_UTILITY } from "../../utils/resources";
 import { connectMessages, disconnectMessages, setUpMessages, updateMessages } from "../../utils/t9n";
 import { CSS, INPUT_TYPE_ICONS, SLOTS } from "./resources";
-import { unwatchGlobalAttributes, watchGlobalAttributes } from "../../utils/globalAttributes";
 /**
  * @slot action - A slot for positioning a `calcite-button` next to the component.
  */
@@ -76,6 +75,11 @@ export class Input {
     this.inputFocusHandler = () => {
       this.calciteInternalInputFocus.emit();
     };
+    this.inputChangeHandler = () => {
+      if (this.type === "file") {
+        this.files = this.childEl.files;
+      }
+    };
     this.inputInputHandler = (nativeEvent) => {
       if (this.disabled || this.readOnly) {
         return;
@@ -341,11 +345,11 @@ export class Input {
     this.editingEnabled = false;
     this.type = "text";
     this.value = "";
+    this.files = undefined;
     this.messages = undefined;
     this.messageOverrides = undefined;
     this.defaultMessages = undefined;
     this.effectiveLocale = "";
-    this.globalAttributes = {};
     this.localizedValue = undefined;
     this.slottedActionElDisabledInternally = false;
   }
@@ -406,7 +410,6 @@ export class Input {
     }
     connectLabel(this);
     connectForm(this);
-    watchGlobalAttributes(this, ["role"]);
     this.setPreviousEmittedValue(this.value);
     this.setPreviousValue(this.value);
     if (this.type === "number") {
@@ -425,7 +428,6 @@ export class Input {
     disconnectForm(this);
     disconnectLocalized(this);
     disconnectMessages(this);
-    unwatchGlobalAttributes(this);
     this.mutationObserver?.disconnect();
     this.el.removeEventListener("calciteInternalHiddenInputChange", this.hiddenInputChangeHandler);
   }
@@ -591,9 +593,9 @@ export class Input {
         h(this.childElType, { accept: this.accept, "aria-label": getLabelText(this), autocomplete: this.autocomplete, autofocus: this.autofocus ? true : null, class: {
             [CSS.editingEnabled]: this.editingEnabled,
             [CSS.inlineChild]: !!this.inlineEditableEl
-          }, defaultValue: this.defaultValue, disabled: this.disabled ? true : null, enterKeyHint: this.enterKeyHint, inputMode: this.inputMode, max: this.maxString, maxLength: this.maxLength, min: this.minString, minLength: this.minLength, multiple: this.multiple, name: this.name, onBlur: this.inputBlurHandler, onFocus: this.inputFocusHandler, onInput: this.inputInputHandler, onKeyDown: this.inputKeyDownHandler, onKeyUp: this.inputKeyUpHandler, pattern: this.pattern, placeholder: this.placeholder || "", readOnly: this.readOnly, required: this.required ? true : null, step: this.step, tabIndex: this.disabled || (this.inlineEditableEl && !this.editingEnabled) ? -1 : null, type: this.type, value: this.value,
+          }, defaultValue: this.defaultValue, disabled: this.disabled ? true : null, enterKeyHint: this.enterKeyHint, inputMode: this.inputMode, max: this.maxString, maxLength: this.maxLength, min: this.minString, minLength: this.minLength, multiple: this.multiple, name: this.name, onBlur: this.inputBlurHandler, onChange: this.inputChangeHandler, onFocus: this.inputFocusHandler, onInput: this.inputInputHandler, onKeyDown: this.inputKeyDownHandler, onKeyUp: this.inputKeyUpHandler, pattern: this.pattern, placeholder: this.placeholder || "", readOnly: this.readOnly, required: this.required ? true : null, step: this.step, tabIndex: this.disabled || (this.inlineEditableEl && !this.editingEnabled) ? -1 : null, type: this.type, value: this.value,
           // eslint-disable-next-line react/jsx-sort-props
-          ref: this.setChildElRef, ...this.globalAttributes }),
+          ref: this.setChildElRef }),
         this.isTextarea ? (h("div", { class: CSS.resizeIconWrapper }, h("calcite-icon", { icon: "chevron-down", scale: this.scale === "l" ? "m" : "s" }))) : null
       ]
       : null;
@@ -1333,6 +1335,28 @@ export class Input {
         "reflect": false,
         "defaultValue": "\"\""
       },
+      "files": {
+        "type": "unknown",
+        "mutable": false,
+        "complexType": {
+          "original": "FileList | undefined",
+          "resolved": "FileList",
+          "references": {
+            "FileList": {
+              "location": "global"
+            }
+          }
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [{
+              "name": "mdn",
+              "text": "https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/files"
+            }],
+          "text": "When `type` is `\"file\"`, specifies the component's selected files."
+        }
+      },
       "messages": {
         "type": "unknown",
         "mutable": true,
@@ -1385,7 +1409,6 @@ export class Input {
     return {
       "defaultMessages": {},
       "effectiveLocale": {},
-      "globalAttributes": {},
       "localizedValue": {},
       "slottedActionElDisabledInternally": {}
     };

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

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   loader: "loader",

package/dist/collection/components/input-date-picker/input-date-picker.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { Build, h, Host } from "@stencil/core";
 import { dateFromISO, dateFromLocalizedString, dateFromRange, datePartsFromLocalizedString, dateToISO, inRange } from "../../utils/date";

package/dist/collection/components/input-date-picker/resources.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   menu: "menu-container",

package/dist/collection/components/input-message/input-message.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { setRequestedIcon } from "../../utils/dom";

package/dist/collection/components/input-message/interfaces.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export var StatusIconDefaults;
 (function (StatusIconDefaults) {

package/dist/collection/components/input-number/input-number.css

@@ -193,8 +193,18 @@
 }
 
 :host input:focus {
-  outline: 2px solid var(--calcite-ui-brand);
-  outline-offset: -2px;
+  outline: 2px solid var(--calcite-ui-focus-color);
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 
 :host([status=invalid]) input {
@@ -202,7 +212,17 @@
 }
 :host([status=invalid]) input:focus {
   outline: 2px solid var(--calcite-ui-danger);
-  outline-offset: -2px;
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 
 :host([scale=s]) .icon {
@@ -278,8 +298,18 @@
   color: var(--calcite-ui-text-1);
 }
 .clear-button:focus {
-  outline: 2px solid var(--calcite-ui-brand);
-  outline-offset: -2px;
+  outline: 2px solid var(--calcite-ui-focus-color);
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 .clear-button:disabled {
   opacity: var(--calcite-ui-opacity-disabled);

package/dist/collection/components/input-number/input-number.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { getElementDir, getSlotted, isPrimaryPointerButton, setRequestedIcon } from "../../utils/dom";

package/dist/collection/components/input-number/resources.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   loader: "loader",

package/dist/collection/components/input-text/input-text.css

@@ -197,8 +197,18 @@ input {
 }
 
 input:focus {
-  outline: 2px solid var(--calcite-ui-brand);
-  outline-offset: -2px;
+  outline: 2px solid var(--calcite-ui-focus-color);
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 
 :host([status=invalid]) input {
@@ -206,7 +216,17 @@ input:focus {
 }
 :host([status=invalid]) input:focus {
   outline: 2px solid var(--calcite-ui-danger);
-  outline-offset: -2px;
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 
 :host([scale=s]) .icon {
@@ -289,8 +309,18 @@ input[type=text]::-ms-reveal {
   color: var(--calcite-ui-text-1);
 }
 .clear-button:focus {
-  outline: 2px solid var(--calcite-ui-brand);
-  outline-offset: -2px;
+  outline: 2px solid var(--calcite-ui-focus-color);
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 .clear-button:disabled {
   opacity: var(--calcite-ui-opacity-disabled);

package/dist/collection/components/input-text/input-text.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { getElementDir, getSlotted, setRequestedIcon } from "../../utils/dom";

package/dist/collection/components/input-text/resources.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   loader: "loader",

package/dist/collection/components/input-time-picker/input-time-picker.css

@@ -119,4 +119,31 @@
   transform: none !important;
   -webkit-appearance: none !important;
   z-index: -1 !important;
+}
+
+:host([scale=s]) {
+  --calcite-toggle-spacing: 0.5rem;
+}
+
+:host([scale=m]) {
+  --calcite-toggle-spacing: 0.75rem;
+}
+
+:host([scale=l]) {
+  --calcite-toggle-spacing: 1rem;
+}
+
+.input-wrapper {
+  position: relative;
+}
+
+.toggle-icon {
+  position: absolute;
+  display: flex;
+  inline-size: 1rem;
+  cursor: pointer;
+  align-items: center;
+  inset-inline-end: 0;
+  inset-block: 0;
+  padding-inline: var(--calcite-toggle-spacing);
 }

package/dist/collection/components/input-time-picker/input-time-picker.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { connectForm, disconnectForm, HiddenFormInputSlot, submitForm } from "../../utils/form";
@@ -12,8 +12,11 @@ import { connectLabel, disconnectLabel, getLabelText } from "../../utils/label";
 import { componentLoaded, setComponentLoaded, setUpLoadableComponent } from "../../utils/loadable";
 import { connectLocalized, disconnectLocalized, numberStringFormatter } from "../../utils/locale";
 import { formatTimeString, isValidTime, localizeTimeString } from "../../utils/time";
+import { CSS } from "./resources";
+import { toAriaBoolean } from "../../utils/dom";
 export class InputTimePicker {
   constructor() {
+    this.dialogId = `time-picker-dialog--${guid()}`;
     /** whether the value of the input was changed as a result of user typing or not */
     this.internalValueChange = false;
     this.previousValidValue = null;
@@ -66,6 +69,9 @@ export class InputTimePicker {
         .join("");
       this.setInputValue(localizedValue);
     };
+    this.inputFocus = () => {
+      this.open = false;
+    };
     this.timePickerChangeHandler = (event) => {
       event.stopPropagation();
       const target = event.target;
@@ -87,7 +93,11 @@ export class InputTimePicker {
           event.preventDefault();
         }
       }
-      if (key === "Escape" && this.open) {
+      else if (key === "ArrowDown") {
+        this.open = true;
+        event.preventDefault();
+      }
+      else if (key === "Escape" && this.open) {
         this.open = false;
         event.preventDefault();
       }
@@ -151,6 +161,12 @@ export class InputTimePicker {
         }
       }
     };
+    this.onInputWrapperClick = () => {
+      this.open = !this.open;
+    };
+    this.deactivate = () => {
+      this.open = false;
+    };
     this.open = false;
     this.disabled = false;
     this.form = undefined;
@@ -271,15 +287,18 @@ export class InputTimePicker {
   //
   // --------------------------------------------------------------------------
   render() {
-    const popoverId = `${this.referenceElementId}-popover`;
-    return (h(Host, { onKeyDown: this.keyDownHandler }, h("div", { "aria-controls": popoverId, "aria-haspopup": "dialog", "aria-label": this.name, "aria-owns": popoverId, id: this.referenceElementId, role: "combobox" }, h("calcite-input", { disabled: this.disabled, icon: "clock", label: getLabelText(this), onCalciteInputInput: this.calciteInputInputHandler, onCalciteInternalInputBlur: this.calciteInternalInputBlurHandler, onCalciteInternalInputFocus: this.calciteInternalInputFocusHandler, readOnly: this.readOnly, scale: this.scale, step: this.step,
+    const { dialogId } = this;
+    return (h(Host, { onBlur: this.deactivate, onKeyDown: this.keyDownHandler }, h("div", { "aria-controls": dialogId, "aria-haspopup": "dialog", "aria-label": this.name, "aria-owns": dialogId, id: this.referenceElementId, role: "combobox" }, h("div", { class: "input-wrapper", onClick: this.onInputWrapperClick }, h("calcite-input", { "aria-autocomplete": "none", "aria-controls": this.dialogId, "aria-expanded": toAriaBoolean(this.open), "aria-haspopup": "dialog", disabled: this.disabled, icon: "clock", label: getLabelText(this), onCalciteInputInput: this.calciteInputInputHandler, onCalciteInternalInputBlur: this.calciteInternalInputBlurHandler, onCalciteInternalInputFocus: this.calciteInternalInputFocusHandler, onFocus: this.inputFocus, readOnly: this.readOnly, role: "combobox", scale: this.scale, step: this.step,
       // eslint-disable-next-line react/jsx-sort-props
-      ref: this.setCalciteInputEl })), h("calcite-popover", { focusTrapDisabled: true, id: popoverId, label: "Time Picker", open: this.open, overlayPositioning: this.overlayPositioning, placement: this.placement, referenceElement: this.referenceElementId, triggerDisabled: true,
+      ref: this.setCalciteInputEl }), this.renderToggleIcon(this.open))), h("calcite-popover", { "aria-live": "polite", focusTrapDisabled: true, id: dialogId, label: "Time Picker", open: this.open, overlayPositioning: this.overlayPositioning, placement: this.placement, referenceElement: this.referenceElementId, role: "dialog", triggerDisabled: true,
       // eslint-disable-next-line react/jsx-sort-props
       ref: this.setCalcitePopoverEl }, h("calcite-time-picker", { lang: this.effectiveLocale, messageOverrides: this.messagesOverrides, numberingSystem: this.numberingSystem, onCalciteInternalTimePickerChange: this.timePickerChangeHandler, scale: this.scale, step: this.step, value: this.value,
       // eslint-disable-next-line react/jsx-sort-props
       ref: this.setCalciteTimePickerEl })), h(HiddenFormInputSlot, { component: this })));
   }
+  renderToggleIcon(open) {
+    return (h("span", { class: CSS.toggleIcon }, h("calcite-icon", { icon: open ? "chevron-up" : "chevron-down", scale: "s" })));
+  }
   static get is() { return "calcite-input-time-picker"; }
   static get encapsulation() { return "shadow"; }
   static get delegatesFocus() { return true; }

package/dist/collection/components/input-time-picker/resources.js

@@ -0,0 +1,8 @@
+/*!
+ * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
+ * See https://github.com/Esri/calcite-components/blob/master/LICENSE.md for details.
+ * v1.3.0-next.18
+ */
+export const CSS = {
+  toggleIcon: "toggle-icon"
+};

package/dist/collection/components/label/label.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { labelConnectedEvent, labelDisconnectedEvent } from "../../utils/label";

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

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   container: "container"

package/dist/collection/components/link/link.css

@@ -128,8 +128,18 @@
 }
 :host a:focus,
 :host span:focus {
-  outline: 2px solid var(--calcite-ui-brand);
-  outline-offset: -2px;
+  outline: 2px solid var(--calcite-ui-focus-color);
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 
 calcite-icon {

package/dist/collection/components/link/link.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { focusElement, getElementDir } from "../../utils/dom";

package/dist/collection/components/list/list.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h } from "@stencil/core";
 import { debounce } from "lodash-es";

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

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   container: "container",

package/dist/collection/components/list-item/list-item.css

@@ -163,7 +163,7 @@ td {
 tr:focus,
 td:focus {
   z-index: 300;
-  outline: 2px solid var(--calcite-ui-brand);
+  outline: 2px solid var(--calcite-ui-focus-color);
 }
 
 .content,

package/dist/collection/components/list-item/list-item.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { getElementDir, slotChangeHasAssignedElement, toAriaBoolean } from "../../utils/dom";

package/dist/collection/components/list-item/resources.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   container: "container",

package/dist/collection/components/list-item/utils.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { Build } from "@stencil/core";
 const listItemGroupSelector = "calcite-list-item-group";

package/dist/collection/components/list-item-group/list-item-group.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { updateHostInteraction } from "../../utils/interactive";

package/dist/collection/components/list-item-group/resources.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   container: "container",

package/dist/collection/components/loader/loader.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { guid } from "../../utils/guid";

package/dist/collection/components/modal/modal.css

@@ -248,8 +248,18 @@
   vertical-align: -2px;
 }
 .close:focus {
-  outline: 2px solid var(--calcite-ui-brand);
-  outline-offset: -2px;
+  outline: 2px solid var(--calcite-ui-focus-color);
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 .close:hover, .close:focus, .close:active {
   background-color: var(--calcite-ui-foreground-2);

package/dist/collection/components/modal/modal.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h, Host } from "@stencil/core";
 import { connectConditionalSlotComponent, disconnectConditionalSlotComponent } from "../../utils/conditionalSlot";

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

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 export const CSS = {
   modal: "modal",

package/dist/collection/components/notice/notice.css

@@ -200,8 +200,18 @@
   outline-color: transparent;
 }
 .notice-close:focus {
-  outline: 2px solid var(--calcite-ui-brand);
-  outline-offset: -2px;
+  outline: 2px solid var(--calcite-ui-focus-color);
+  outline-offset: calc(
+            -2px *
+            calc(
+              1 -
+              2 * clamp(
+                0,
+                var(--calcite-ui-focus-offset-invert),
+                1
+              )
+            )
+          );
 }
 
 :host {

package/dist/collection/components/notice/notice.js

@@ -1,7 +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.3.0-next.16
+ * v1.3.0-next.18
  */
 import { h } from "@stencil/core";
 import { connectConditionalSlotComponent, disconnectConditionalSlotComponent } from "../../utils/conditionalSlot";