@esri/calcite-components 5.2.0-next.0 → 5.2.0-next.10

package/dist/components/calcite-combobox/customElement.js

@@ -27,8 +27,9 @@ import { u as useCancelable } from "../../chunks/useCancelable.js";
 import { u as useInteractive } from "../../chunks/useInteractive.js";
 import { u as useTopLayer } from "../../chunks/useTopLayer.js";
 import { u as useForm } from "../../chunks/useForm.js";
-import { I as IDS, C as CSS, a as ComboboxItemSelector, b as ComboboxItemGroupSelector, c as ICONS } from "../../chunks/resources5.js";
-import { h as hasActiveChildren, i as isSingleLike, g as getLabel, a as getItemAncestors, b as getItemChildren } from "../../chunks/utils2.js";
+import { i as isChip } from "../../chunks/resources6.js";
+import { I as IDS, C as CSS, a as ComboboxItemSelector, b as ComboboxItemGroupSelector, c as ICONS } from "../../chunks/resources7.js";
+import { h as hasActiveChildren, i as isSingleLike, o as orderValuesByPrevious, a as orderByPrevious, g as getLabel, b as getItemAncestors, c as getItemChildren } from "../../chunks/utils2.js";
 const styles = css`:host([disabled]){cursor:default;-webkit-user-select:none;user-select:none;opacity:var(--calcite-opacity-disabled)}:host([disabled]) *,:host([disabled]) ::slotted(*){pointer-events:none}:host{position:relative;display:block}:host([scale=s]){font-size:var(--calcite-font-size-relative-sm);--calcite-internal-combobox-spacing-unit-l: .5rem;--calcite-internal-combobox-spacing-unit-s: .25rem;--calcite-internal-combobox-padding-inline-end: var(--calcite-space-2xs);--calcite-internal-combobox-no-matches-spacing-unit-s: .25rem;--calcite-combobox-input-height: 1rem;--calcite-internal-combobox-input-margin-block: calc(.25rem - 1px) ;--calcite-internal-close-size: 1rem}:host([scale=m]){font-size:var(--calcite-font-size-relative-base);--calcite-internal-combobox-spacing-unit-l: .75rem;--calcite-internal-combobox-spacing-unit-s: .5rem;--calcite-internal-combobox-padding-inline-end: var(--calcite-space-sm);--calcite-internal-combobox-no-matches-spacing-unit-s: .375rem;--calcite-combobox-input-height: 1rem;--calcite-internal-combobox-input-margin-block: calc(.5rem - 1px) ;--calcite-internal-close-size: 1.5rem}:host([scale=l]){font-size:var(--calcite-font-size-relative-md);--calcite-internal-combobox-spacing-unit-l: 1rem;--calcite-internal-combobox-spacing-unit-s: .75rem;--calcite-internal-combobox-padding-inline-end: var(--calcite-space-sm-plus);--calcite-internal-combobox-no-matches-spacing-unit-s: var(--calcite-space-sm-plus);--calcite-combobox-input-height: 1.5rem;--calcite-internal-combobox-input-margin-block: calc(var(--calcite-space-sm-plus) - 1px);--calcite-internal-close-size: 2rem}.wrapper{display:flex;border-width:1px;border-style:solid;outline-color:transparent;padding-block:calc(var(--calcite-internal-combobox-spacing-unit-s) / 4);padding-inline:var(--calcite-internal-combobox-spacing-unit-l) var(--calcite-internal-combobox-padding-inline-end);background-color:var(--calcite-combobox-input-background-color, var(--calcite-color-foreground-1));color:var(--calcite-combobox-input-text-color, var(--calcite-color-text-1));border-color:var(--calcite-combobox-input-border-color, var(--calcite-color-border-input))}.wrapper:hover .icon{color:var(--calcite-combobox-icon-color-hover, var(--calcite-color-text-1))}:host(:focus-within) .wrapper,.wrapper--active{outline:var(--calcite-border-width-md) solid var(--calcite-color-focus, var(--calcite-ui-focus-color, var(--calcite-color-brand)));outline-offset:calc(calc(-1 * var(--calcite-spacing-base)) * calc(1 - (2*clamp(0,var(--calcite-offset-invert-focus),1))))}:host([read-only]) .wrapper{background-color:var(--calcite-color-background)}:host([read-only]) .label{font-weight:var(--calcite-font-weight-medium)}:host([status=invalid]) .wrapper{border-color:var(--calcite-color-status-danger)}:host([status=invalid]:focus-within) .wrapper{outline:var(--calcite-border-width-md) solid var(--calcite-color-status-danger);outline-offset:calc(calc(-1 * var(--calcite-spacing-base)) * calc(1 - (2*clamp(0,var(--calcite-offset-invert-focus),1))))}.wrapper--single{padding-block:0;padding-inline:var(--calcite-internal-combobox-spacing-unit-l) var(--calcite-internal-combobox-padding-inline-end);cursor:pointer;flex-wrap:nowrap}.grid-input{position:relative;display:flex;flex-grow:1;flex-wrap:wrap;align-items:center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0;gap:var(--calcite-internal-combobox-spacing-unit-s);margin-inline-end:var(--calcite-internal-combobox-spacing-unit-s)}.grid-input.selection-display--fit,.grid-input.selection-display--single{flex-wrap:nowrap;overflow:hidden}.input{flex-grow:1;appearance:none;overflow:hidden;text-overflow:ellipsis;border-style:none;background-color:transparent;padding:0;font-family:inherit;color:var(--calcite-color-text-1);font-size:inherit;block-size:var(--calcite-combobox-input-height);line-height:var(--calcite-combobox-input-height);inline-size:100%;margin-block-end:var(--calcite-internal-combobox-spacing-unit-s);min-inline-size:4.8125rem}.input:focus{outline:2px solid transparent;outline-offset:2px}.input:placeholder-shown{text-overflow:ellipsis}.input--single{padding:0;margin-block:var(--calcite-internal-combobox-input-margin-block)}.wrapper--active .input-single{cursor:text}.input--hidden{pointer-events:none;width:0px;min-width:0px;opacity:0}.input--icon{padding-block:0;padding-inline:var(--calcite-internal-combobox-spacing-unit-l)}.placeholder-icon{color:var(--calcite-combobox-icon-color, var(--calcite-color-text-3))}.input-wrap{display:flex;flex-grow:1;align-items:center}.input-wrap--single{flex:1 1 0%;overflow:hidden}.label{pointer-events:none;max-width:100%;flex:1 1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0;font-weight:var(--calcite-font-weight-normal);block-size:var(--calcite-combobox-input-height);line-height:var(--calcite-combobox-input-height)}.label--icon{padding-inline:var(--calcite-internal-combobox-spacing-unit-l)}.icon-end,.icon-start{display:flex;cursor:pointer;align-items:center}.icon-end{flex:none}.icon-end .icon{color:var(--calcite-combobox-icon-color, var(--calcite-color-text-3))}.floating-ui-container{inline-size:max-content;display:none;max-inline-size:100vw;max-block-size:100vh;inset-block-start:0;left:0;z-index:var(--calcite-floating-ui-z-index)}@starting-style{.floating-ui-container{opacity:0;inset-block-start:0;left:0}}:host([top-layer-disabled]) .floating-ui-container{--calcite-floating-ui-z-index: var(--calcite-z-index-dropdown)}.floating-ui-container[popover]{padding:0;margin:0;border:none;background-color:transparent;overflow:visible;display:none}.floating-ui-container:popover-open{display:block}.floating-ui-container .calcite-floating-ui-anim{position:relative;transition-duration:var(--calcite-floating-ui-transition);transition-property:inset-block-start,left,opacity,display;transition-behavior:allow-discrete;opacity:0;box-shadow:0 0 16px #00000029;z-index:var(--calcite-z-index);border-radius:.25rem}.floating-ui-container[data-placement^=bottom] .calcite-floating-ui-anim{inset-block-start:-5px}.floating-ui-container[data-placement^=top] .calcite-floating-ui-anim{inset-block-start:5px}.floating-ui-container[data-placement^=left] .calcite-floating-ui-anim{left:5px}.floating-ui-container[data-placement^=right] .calcite-floating-ui-anim{left:-5px}.floating-ui-container[data-placement] .calcite-floating-ui-anim--active{opacity:1;inset-block-start:0;left:0}@starting-style{.floating-ui-container[data-placement] .calcite-floating-ui-anim--active{opacity:0}}.floating-ui-container .calcite-floating-ui-anim{box-shadow:var(--calcite-shadow-md)}@media(forced-colors:active){.wrapper,.floating-ui-container{border:1px solid canvasText}}.screen-readers-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0}.list-container{max-height:45vh;overflow-y:auto;inline-size:var(--calcite-dropdown-width, 100%);background-color:var(--calcite-combobox-background-color, var(--calcite-color-foreground-1))}.list{margin:0;display:block;padding:0;line-height:var(--calcite-font-line-height-relative-snug)}.list--hide{height:0px;overflow:hidden}calcite-chip{--calcite-animation-timing: 0}.chip{margin-block:calc(var(--calcite-internal-combobox-spacing-unit-s) / 4);max-inline-size:100%}.chip--invisible{visibility:hidden;position:absolute}.item{display:block}.select-all{background-color:var(--calcite-combobox-item-background-color-active, var(--calcite-color-foreground-1));border-block-end-color:var(--calcite-combobox-divider-color, var(--calcite-combobox-item-border-color, var(--calcite-color-border-3)));border-block-end-style:solid;border-block-end-width:var(--calcite-border-width-sm);inset-block-start:0;position:sticky;z-index:var(--calcite-z-index-sticky)}.no-matches{padding-block:var(--calcite-internal-combobox-no-matches-spacing-unit-s);padding-inline:var(--calcite-internal-combobox-spacing-unit-l);color:var(--calcite-combobox-input-text-color, var(--calcite-color-text-1));background:var(--calcite-combobox-background-color, var(--calcite-color-foreground-1));cursor:pointer}.no-matches-placeholder{color:var(--calcite-combobox-icon-color, var(--calcite-color-text-3));cursor:default}.disabled{opacity:.5}:host([disabled]) ::slotted([calcite-hydrated][disabled]),:host([disabled]) [calcite-hydrated][disabled]{opacity:1}.interaction-container{display:contents}.clear-button--container{display:flex;cursor:pointer;align-items:center}.clear-button--container:hover calcite-action{--calcite-action-background-color: var(--calcite-clear-button-background-color-hover, var(--calcite-color-foreground-3));--calcite-action-text-color: var(--calcite-clear-button-icon-color-hover, var(--calcite-color-text-1))}.clear-button--container:active calcite-action{--calcite-action-background-color: var(--calcite-clear-button-background-color-press, var(--calcite-color-border-2));--calcite-action-text-color: var(--calcite-clear-button-icon-color-press, var(--calcite-color-text-1))}.clear-button--container calcite-action{--calcite-internal-action-height: 100%;--calcite-internal-action-padding-inline: var(--calcite-spacing-none);--calcite-internal-action-padding-block: var(--calcite-spacing-none);--calcite-action-background-color: var(--calcite-clear-button-background-color, var(--calcite-color-foreground-2));--calcite-action-text-color: var(--calcite-clear-button-icon-color)}.clear-button--container calcite-action:hover{--calcite-action-background-color-hover: var(--calcite-clear-button-background-color-hover, var(--calcite-color-foreground-3));--calcite-action-text-color-press: var(--calcite-clear-button-icon-color-hover)}.clear-button--container calcite-action:active{--calcite-action-background-color-press: var(--calcite-clear-button-background-color-press, var(--calcite-color-border-2));--calcite-action-text-color-press: var(--calcite-clear-button-icon-color-press)}:host([scale=s]) .clear-button--container{padding:var(--calcite-spacing-xxs)}:host([scale=m]) .clear-button--container{padding:var(--calcite-spacing-xxs);padding-inline-end:var(--calcite-space-sm)}:host([scale=l]) .clear-button--container{padding-inline-end:var(--calcite-spacing-sm-plus)}.validation-container{display:flex;flex-direction:column;align-items:flex-start;align-self:stretch}:host([scale=m]) .validation-container,:host([scale=l]) .validation-container{padding-block-start:.5rem}:host([scale=s]) .validation-container{padding-block-start:.25rem}::slotted(input[slot=hidden-form-input]){margin:0!important;opacity:0!important;outline:none!important;padding:0!important;position:absolute!important;inset:0!important;transform:none!important;-webkit-appearance:none!important;z-index:-1!important}:host([hidden]){display:none}[hidden]{display:none}.text-match{background-color:transparent;color:inherit;font-weight:var(--calcite-font-weight-bold)}.internal-label-alignment--center{align-items:center}.internal-label-alignment--end{align-items:end}.internal-label--container{display:flex;justify-content:space-between;color:var(--calcite-color-text-1)}.internal-label-required--indicator{font-weight:var(--calcite-font-weight-medium);color:var(--calcite-color-status-danger);padding-inline:var(--calcite-spacing-base)}.internal-label-required--indicator:hover{cursor:help}.internal-label--text{line-height:1}:host([scale=s]) .internal-label-spacing--bottom{margin-block-end:var(--calcite-spacing-xxs)}:host([scale=s]) .internal-label-spacing-inline--end{margin-inline-end:var(--calcite-spacing-sm)}:host([scale=s]) .internal-label-spacing-inline--start{margin-inline-start:var(--calcite-spacing-sm)}:host([scale=s]) .internal-label--text{font-size:var(--calcite-font-size--2)}:host([scale=m]) .internal-label-spacing--bottom{margin-block-end:var(--calcite-spacing-sm)}:host([scale=m]) .internal-label-spacing-inline--end{margin-inline-end:var(--calcite-spacing-sm)}:host([scale=m]) .internal-label-spacing-inline--start{margin-inline-start:var(--calcite-spacing-sm)}:host([scale=m]) .internal-label--text{font-size:var(--calcite-font-size--1)}:host([scale=l]) .internal-label-spacing--bottom{margin-block-end:var(--calcite-spacing-sm)}:host([scale=l]) .internal-label-spacing-inline--end{margin-inline-end:var(--calcite-spacing-md)}:host([scale=l]) .internal-label-spacing-inline--start{margin-inline-start:var(--calcite-spacing-md)}:host([scale=l]) .internal-label--text{font-size:var(--calcite-font-size-0)}::placeholder{font-weight:var(--calcite-font-weight-normal);color:var(--calcite-input-placeholder-text-color, var(--calcite-color-text-3))}`;
 class Combobox extends LitElement {
   constructor() {
@@ -39,6 +40,7 @@ class Combobox extends LitElement {
     })(this);
     this.selectAllComboboxItemRef = createRef();
     this.allSelectedIndicatorChipRef = createRef();
+    this.data = [];
     this.cancelable = useCancelable()(this);
     this.filterItems = (() => {
       const find = (item, filteredData) => item && filteredData.some(({ el }) => item === el);
@@ -62,7 +64,7 @@ class Combobox extends LitElement {
           }
         });
         this.noMatchesFound = this.filteredItems.length === 0 && !!this.filterText;
-        this.filterTextMatchPattern = this.filterText && new RegExp(`(${escapeRegExp(this.filterText)})`, "i");
+        this.filterTextMatchPattern = this.filterText ? new RegExp(`(${escapeRegExp(this.filterText)})`, "i") : void 0;
         this.keyboardNavItems.forEach((item) => {
           item.filterTextMatchPattern = this.filterTextMatchPattern;
         });
@@ -77,36 +79,43 @@ class Combobox extends LitElement {
     this._filterText = "";
     this.getSelectedItems = () => {
       if (!this.isMulti()) {
-        const match = this.items.find(({ selected }) => selected);
+        const match = this.allItems.find(({ selected }) => selected);
         return match ? [match] : [];
       }
-      return this.items.filter((item) => item.selected && (this.selectionMode !== "ancestors" || !hasActiveChildren(item))).sort((a, b) => {
-        const aIdx = this.selectedItems.indexOf(a);
-        const bIdx = this.selectedItems.indexOf(b);
-        if (aIdx > -1 && bIdx > -1) {
-          return aIdx - bIdx;
-        }
-        return bIdx - aIdx;
-      });
+      return this.allItems.filter((item) => item.selected && (this.selectionMode !== "ancestors" || !hasActiveChildren(item)));
     };
+    this.groupData = [];
     this.groupItems = [];
     this.guid = guid();
     this.ignoreSelectedEventsFlag = false;
     this.internalValueChangeFlag = false;
+    this.previousAllSelected = false;
+    this.refreshingSelectionDisplay = false;
     this.mutationObserver = createObserver("mutation", () => this.updateItems());
     this.onLabelClick = () => {
       this.setFocus();
     };
     this.transitionProp = "opacity";
-    this.resizeObserver = createObserver("resize", () => {
-      this.setMaxScrollerHeight();
-      this.refreshSelectionDisplay();
-    });
+    this.resizeObserver = (() => {
+      let resizeWorkQueued = false;
+      return createObserver("resize", () => {
+        if (resizeWorkQueued) {
+          return;
+        }
+        resizeWorkQueued = true;
+        requestAnimationFrame(() => {
+          resizeWorkQueued = false;
+          this.setMaxScrollerHeight();
+          this.refreshSelectionDisplay();
+        });
+      });
+    })();
     this.selectedIndicatorChipRef = createRef();
+    this.selectedChipCountRef = createRef();
     this.clearButtonRef = createRef();
     this._selectedItems = [];
     this.textInputRef = createRef();
-    this._value = null;
+    this._value = "";
     this.messages = useT9n();
     this.focusSetter = useSetFocus()(this);
     this.customChipAddHandler = () => {
@@ -120,10 +129,13 @@ class Combobox extends LitElement {
     this.activeDescendant = "";
     this.activeItemIndex = -1;
     this.compactSelectionDisplay = false;
+    this.deferFitChipCountRender = false;
     this.selectedHiddenChipsCount = 0;
     this.selectedVisibleChipsCount = 0;
+    this.fitUsingCompactCountLabel = false;
     this.allItems = [];
     this.items = [];
+    this.noMatchesFound = false;
     this.clearDisabled = false;
     this.disabled = false;
     this.maxItems = 0;
@@ -153,7 +165,7 @@ class Combobox extends LitElement {
     this.listen("click", this.comboboxFocusHandler);
   }
   static {
-    this.properties = { activeChipIndex: [16, {}, { state: true }], activeDescendant: [16, {}, { state: true }], activeItemIndex: [16, {}, { state: true }], compactSelectionDisplay: [16, {}, { state: true }], selectedHiddenChipsCount: [16, {}, { state: true }], selectedVisibleChipsCount: [16, {}, { state: true }], allItems: [16, {}, { state: true }], items: [16, {}, { state: true }], noMatchesFound: [16, {}, { state: true }], allowCustomValues: [7, {}, { reflect: true, type: Boolean }], clearDisabled: [7, {}, { reflect: true, type: Boolean }], disabled: [7, {}, { reflect: true, type: Boolean }], filterText: [3, {}, { reflect: true }], filterProps: [0, {}, { attribute: false }], filteredItems: [32, {}, { attribute: false, readOnly: true }], flipPlacements: [0, {}, { attribute: false }], form: [3, {}, { reflect: true }], label: 1, labelText: 1, maxItems: [11, {}, { reflect: true, type: Number }], messageOverrides: [0, {}, { attribute: false }], name: [3, {}, { reflect: true }], open: [7, {}, { reflect: true, type: Boolean }], overlayPositioning: [3, {}, { reflect: true }], placeholder: 1, placeholderIcon: [3, { type: String }, { reflect: true }], placeholderIconFlipRtl: [7, {}, { reflect: true, type: Boolean }], placement: [3, {}, { reflect: true }], readOnly: [7, {}, { reflect: true, type: Boolean }], required: [7, {}, { reflect: true, type: Boolean }], scale: [3, {}, { reflect: true }], selectAllEnabled: [7, {}, { reflect: true, type: Boolean }], selectedItems: [0, {}, { attribute: false }], selectionDisplay: [3, {}, { reflect: true }], selectionAppearance: [3, {}, { reflect: true }], selectionMode: [3, {}, { reflect: true }], status: [3, {}, { reflect: true }], topLayerDisabled: [7, {}, { reflect: true, type: Boolean }], validationIcon: [3, { converter: stringOrBoolean, type: String }, { reflect: true }], validationMessage: 1, validity: [32, {}, { readOnly: true, attribute: false }], value: 1 };
+    this.properties = { activeChipIndex: [16, {}, { state: true }], activeDescendant: [16, {}, { state: true }], activeItemIndex: [16, {}, { state: true }], compactSelectionDisplay: [16, {}, { state: true }], deferFitChipCountRender: [16, {}, { state: true }], selectedHiddenChipsCount: [16, {}, { state: true }], selectedVisibleChipsCount: [16, {}, { state: true }], fitUsingCompactCountLabel: [16, {}, { state: true }], allItems: [16, {}, { state: true }], items: [16, {}, { state: true }], noMatchesFound: [16, {}, { state: true }], allowCustomValues: [7, {}, { reflect: true, type: Boolean }], clearDisabled: [7, {}, { reflect: true, type: Boolean }], disabled: [7, {}, { reflect: true, type: Boolean }], filterText: [3, {}, { reflect: true }], filterProps: [0, {}, { attribute: false }], filteredItems: [32, {}, { attribute: false, readOnly: true }], flipPlacements: [0, {}, { attribute: false }], form: [3, {}, { reflect: true }], label: 1, labelText: 1, maxItems: [11, {}, { reflect: true, type: Number }], messageOverrides: [0, {}, { attribute: false }], name: [3, {}, { reflect: true }], open: [7, {}, { reflect: true, type: Boolean }], overlayPositioning: [3, {}, { reflect: true }], placeholder: 1, placeholderIcon: [3, { type: String }, { reflect: true }], placeholderIconFlipRtl: [7, {}, { reflect: true, type: Boolean }], placement: [3, {}, { reflect: true }], readOnly: [7, {}, { reflect: true, type: Boolean }], required: [7, {}, { reflect: true, type: Boolean }], scale: [3, {}, { reflect: true }], selectAllEnabled: [7, {}, { reflect: true, type: Boolean }], selectedItems: [0, {}, { attribute: false }], selectionDisplay: [3, {}, { reflect: true }], selectionAppearance: [3, {}, { reflect: true }], selectionMode: [3, {}, { reflect: true }], status: [3, {}, { reflect: true }], topLayerDisabled: [7, {}, { reflect: true, type: Boolean }], validationIcon: [3, { converter: stringOrBoolean, type: String }, { reflect: true }], validationMessage: 1, validity: [32, {}, { readOnly: true, attribute: false }], value: 1 };
   }
   static {
     this.formAssociated = true;
@@ -178,9 +190,6 @@ class Combobox extends LitElement {
     const enabledItems = this.allItems.filter((item) => !item.disabled);
     return enabledItems.length > 0 && enabledItems.every((item) => item.selected);
   }
-  get hasDisabledItems() {
-    return this.allItems.some((item) => item.disabled);
-  }
   get hasDisabledSelected() {
     return this.allItems.some((item) => item.disabled && item.selected);
   }
@@ -325,11 +334,33 @@ class Combobox extends LitElement {
     this.reposition(true);
   }
   selectedItemsHandler() {
+    const wasAllSelected = this.previousAllSelected;
+    const isAllSelected = this.allSelected;
+    this.previousAllSelected = isAllSelected;
     this.internalValueChangeFlag = true;
     this.value = this.getValue();
     this.internalValueChangeFlag = false;
     if (this.selectionDisplay === "fit" && this.isMulti()) {
-      this.refreshSelectionDisplay();
+      const transitioningFromAllSelected = wasAllSelected && !isAllSelected;
+      if (wasAllSelected && !isAllSelected) {
+        this.selectedHiddenChipsCount = 0;
+        this.selectedItems.forEach((item) => {
+          const chipEl = this.referenceEl?.querySelector(`#${IDS.chip(item.guid)}`);
+          if (chipEl) {
+            this.showChip(chipEl);
+          }
+        });
+      }
+      this.updateComplete.then(async () => {
+        if (transitioningFromAllSelected) {
+          await this.updateComplete;
+        }
+        await this.refreshSelectionDisplay();
+        if (this.fitFollowUpRefreshPromise) {
+          await this.fitFollowUpRefreshPromise;
+        }
+        this.deferFitChipCountRender = false;
+      });
     }
   }
   async documentClickHandler(event) {
@@ -348,10 +379,11 @@ class Combobox extends LitElement {
     this.open = false;
   }
   handleSelectAll(isSelectAllTarget) {
-    if (isSelectAllTarget) {
-      this.toggleSelectAll();
+    if (!isSelectAllTarget) {
+      return;
     }
-    if (this.allSelected && (!this.hasDisabledItems || this.hasDisabledSelected)) {
+    this.toggleSelectAll();
+    if (this.selectionDisplay !== "fit" && this.allSelected) {
       this.selectedItems.forEach((item) => {
         const chipEl = this.referenceEl.querySelector(`#${IDS.chip(item.guid)}`);
         if (chipEl) {
@@ -360,6 +392,9 @@ class Combobox extends LitElement {
       });
     }
   }
+  updateSelectedItems() {
+    this.selectedItems = this.getOrderedSelectedItems(this.getSelectedItems());
+  }
   calciteComboboxItemChangeHandler(event) {
     if (this.ignoreSelectedEventsFlag) {
       return;
@@ -372,7 +407,6 @@ class Combobox extends LitElement {
     const newIndex = this.keyboardNavItems.indexOf(isSelectAllTarget ? this.selectAllComboboxItemRef.value : target);
     this.updateActiveItemIndex(newIndex);
     this.toggleSelection(target, target.selected);
-    this.selectedItems = this.getSelectedItems();
   }
   calciteInternalComboboxItemChangeHandler(event) {
     event.stopPropagation();
@@ -381,11 +415,14 @@ class Combobox extends LitElement {
     }
   }
   clearValue() {
-    this.ignoreSelectedEventsFlag = true;
-    this.items.forEach((el) => el.selected = false);
-    this.ignoreSelectedEventsFlag = false;
-    this.selectedItems = [];
-    this.emitComboboxChange();
+    const enabledSelectedItems = this.items.filter((item) => item.selected && !item.disabled);
+    if (enabledSelectedItems.length) {
+      this.ignoreSelectedEventsFlag = true;
+      enabledSelectedItems.forEach((el) => el.selected = false);
+      this.ignoreSelectedEventsFlag = false;
+      this.updateSelectedItems();
+      this.emitComboboxChange();
+    }
     this.open = false;
     this.updateActiveItemIndex(-1);
     this.resetText();
@@ -400,12 +437,22 @@ class Combobox extends LitElement {
   }
   setFilteredPlacements() {
     const { el, flipPlacements } = this;
-    this.filteredFlipPlacements = flipPlacements ? filterValidFlipPlacements(flipPlacements, el) : null;
+    this.filteredFlipPlacements = flipPlacements ? filterValidFlipPlacements(flipPlacements, el) : void 0;
   }
   getValue() {
-    const items = this.selectedItems.map((item) => item.value?.toString());
+    const items = this.getOrderedSelectedValues(this.selectedItems.map((item) => item.value?.toString()));
     return items.length ? items.length > 1 ? items : items[0] : "";
   }
+  getOrderedSelectedValues(selectedValues) {
+    if (!this.isMulti()) {
+      return selectedValues;
+    }
+    const previousValues = Array.isArray(this.value) ? this.value : this.value ? [this.value] : [];
+    return orderValuesByPrevious(selectedValues, previousValues);
+  }
+  getOrderedSelectedItems(selectedItems) {
+    return this.isMulti() ? orderByPrevious(selectedItems, this.selectedItems) : selectedItems;
+  }
   comboboxInViewport() {
     const bounding = this.el.getBoundingClientRect();
     return bounding.top >= 0 && bounding.left >= 0 && bounding.right <= (window.innerWidth || document.documentElement.clientWidth) && bounding.bottom <= (window.innerHeight || document.documentElement.clientHeight);
@@ -418,9 +465,16 @@ class Combobox extends LitElement {
       }
       item.selected = toggledValue;
     });
-    this.selectedItems = this.getSelectedItems();
+    this.updateSelectedItems();
     this.emitComboboxChange();
   }
+  hasHiddenSelectedFitChips() {
+    if (this.selectionDisplay !== "fit" || !this.isMulti()) {
+      return false;
+    }
+    const hiddenCountChip = this.selectedChipCountRef.value;
+    return !!hiddenCountChip && !hiddenCountChip.classList.contains(CSS.chipInvisible);
+  }
   keyDownHandler(event) {
     if (this.readOnly) {
       return;
@@ -443,7 +497,7 @@ class Combobox extends LitElement {
         }
         break;
       case "ArrowLeft":
-        if (this.activeChipIndex !== -1 || this.textInputRef.value.selectionStart === 0) {
+        if (this.activeChipIndex !== -1 || this.textInputRef.value?.selectionStart === 0) {
           this.previousChip();
           event.preventDefault();
         }
@@ -483,7 +537,7 @@ class Combobox extends LitElement {
         }
         break;
       case " ":
-        if (!this.textInputRef.value.value && !event.defaultPrevented) {
+        if (!this.textInputRef.value?.value && !event.defaultPrevented) {
           if (!this.open && this.keyboardNavItems.length) {
             this.open = true;
             this.ensureRecentSelectedItemIsActive();
@@ -520,7 +574,7 @@ class Combobox extends LitElement {
           break;
         }
         if (!this.clearDisabled) {
-          if (this.textInputRef.value?.value.length > 0) {
+          if (this.textInputRef.value.value.length > 0) {
             this.resetText();
             event.preventDefault();
           } else if (this.selectedItems.length > 0 && this.selectionMode !== "single-persist") {
@@ -547,13 +601,16 @@ class Combobox extends LitElement {
         break;
       case "Delete":
       case "Backspace": {
-        const notDeletable = this.selectionDisplay === "single" || this.selectionDisplay === "fit" && this.selectedHiddenChipsCount > 0;
+        const fitDeleteBlockedByOverflow = this.hasHiddenSelectedFitChips();
+        const overflowDeleteBlocked = fitDeleteBlockedByOverflow && this.activeChipIndex === -1;
+        const notDeletable = this.selectionDisplay === "single" || overflowDeleteBlocked;
         if (notDeletable) {
           return;
         }
-        if (this.activeChipIndex > -1) {
+        const deleteTargetChip = event.composedPath().find((node) => isChip(node));
+        if (this.activeChipIndex > -1 && deleteTargetChip) {
           event.preventDefault();
-          this.removeActiveChip(event.target);
+          this.removeActiveChip(deleteTargetChip);
         } else if (!this.filterText && this.isMulti()) {
           event.preventDefault();
           this.removeLastChip();
@@ -581,7 +638,7 @@ class Combobox extends LitElement {
   }
   async setMaxScrollerHeight() {
     const { listContainerEl, open, referenceEl } = this;
-    if (!listContainerEl || !open) {
+    if (!listContainerEl || !open || !referenceEl) {
       return;
     }
     const maxScrollerHeight = this.getMaxScrollerHeight();
@@ -601,12 +658,13 @@ class Combobox extends LitElement {
       return;
     }
     const composedPath = event.composedPath();
-    if (composedPath.some((node) => node.tagName === "CALCITE-CHIP")) {
+    if (composedPath.some((node) => isChip(node))) {
       this.open = false;
       event.preventDefault();
       return;
     }
-    if (composedPath.includes(this.clearButtonRef.value)) {
+    const clearButton = this.clearButtonRef.value;
+    if (clearButton && composedPath.includes(clearButton)) {
       this.clearValue();
       event.preventDefault();
       return;
@@ -630,35 +688,63 @@ class Combobox extends LitElement {
   showChip(chipEl) {
     chipEl.classList.remove(CSS.chipInvisible);
   }
-  refreshChipDisplay({ chipEls, availableHorizontalChipElSpace, chipContainerElGap }) {
+  refreshChipDisplay({ chipEls, availableHorizontalChipElSpace, chipContainerElGap, hideSelectedChips }) {
+    const selectedChipEls = chipEls.filter((chipEl) => chipEl.selected);
+    const enabledSelectedChipEls = selectedChipEls.filter((chipEl) => !chipEl.disabled);
+    const disabledSelectedChipEls = selectedChipEls.filter((chipEl) => chipEl.disabled);
+    const getChipWidth = (chipEl) => {
+      const computedWidth = getElementWidth(chipEl);
+      const fallbackWidth = chipEl.getBoundingClientRect().width;
+      return Number.isFinite(computedWidth) && computedWidth > 0 ? computedWidth : fallbackWidth;
+    };
+    selectedChipEls.forEach((chipEl) => getChipWidth(chipEl));
     chipEls.forEach((chipEl) => {
-      if (!chipEl.selected) {
-        this.hideChip(chipEl);
-      } else {
-        const chipElWidth = getElementWidth(chipEl);
-        if (chipElWidth && chipElWidth < availableHorizontalChipElSpace) {
+      this.hideChip(chipEl);
+    });
+    if (hideSelectedChips) {
+      return;
+    }
+    const renderFittingChips = (chips) => {
+      let visibleChipsCount = 0;
+      chips.forEach((chipEl) => {
+        const chipElWidth = getChipWidth(chipEl);
+        if (chipElWidth && chipElWidth <= availableHorizontalChipElSpace) {
           availableHorizontalChipElSpace -= chipElWidth + chipContainerElGap;
           this.showChip(chipEl);
-          return;
+          visibleChipsCount++;
         }
-      }
-      this.hideChip(chipEl);
-    });
+      });
+      return visibleChipsCount;
+    };
+    const visibleEnabledChipsCount = renderFittingChips(enabledSelectedChipEls);
+    if (visibleEnabledChipsCount <= 1) {
+      renderFittingChips(disabledSelectedChipEls);
+    }
   }
-  async refreshSelectionDisplay() {
-    this.componentOnReady();
-    if (isSingleLike(this.selectionMode)) {
+  async refreshSelectionDisplay(followUpRefresh = true) {
+    if (this.refreshingSelectionDisplay) {
       return;
     }
-    if (!this.textInputRef.value || !this.chipContainerEl) {
+    this.refreshingSelectionDisplay = true;
+    await this.componentOnReady();
+    if (isSingleLike(this.selectionMode)) {
+      this.refreshingSelectionDisplay = false;
       return;
     }
     const { allSelectedIndicatorChipRef, chipContainerEl, selectionDisplay, placeholder, selectedIndicatorChipRef, textInputRef } = this;
-    const chipContainerElGap = parseInt(getComputedStyle(chipContainerEl).gap.replace("px", ""));
+    if (!textInputRef.value || !chipContainerEl) {
+      this.refreshingSelectionDisplay = false;
+      return;
+    }
+    const chipContainerElGap = parseInt(getComputedStyle(chipContainerEl).gap, 10);
     const chipContainerElWidth = getElementWidth(chipContainerEl);
-    const { fontSize, fontFamily } = getComputedStyle(textInputRef.value);
-    const inputTextWidth = getTextWidth(placeholder, `${fontSize} ${fontFamily}`);
-    const inputWidth = (inputTextWidth || parseInt(calciteSize48)) + chipContainerElGap;
+    const { fontSize, fontFamily, minInlineSize } = getComputedStyle(textInputRef.value);
+    const placeholderWidthMultiplier = 0.55;
+    const inputMinWidth = parseFloat(minInlineSize) || parseInt(calciteSize48, 10);
+    const measuredPlaceholderWidth = getTextWidth(placeholder, `${fontSize} ${fontFamily}`);
+    const placeholderWidth = measuredPlaceholderWidth > 0 ? measuredPlaceholderWidth : Math.max(inputMinWidth, Math.round((placeholder?.length || 0) * (parseFloat(fontSize) || parseInt(calciteSize48, 10)) * placeholderWidthMultiplier));
+    const fitInputWidth = Math.max(inputMinWidth, placeholderWidth);
+    const inputWidth = (selectionDisplay === "fit" ? fitInputWidth : placeholderWidth) + chipContainerElGap;
     const allSelectedIndicatorChipElWidth = getElementWidth(allSelectedIndicatorChipRef.value);
     const selectedIndicatorChipElWidth = getElementWidth(selectedIndicatorChipRef.value);
     const largestSelectedIndicatorChipWidth = Math.max(allSelectedIndicatorChipElWidth, selectedIndicatorChipElWidth);
@@ -668,9 +754,9 @@ class Combobox extends LitElement {
       inputWidth,
       largestSelectedIndicatorChipWidth
     });
-    if (this.allSelected && this.selectAllEnabled && (!this.hasDisabledItems || this.hasDisabledSelected)) {
+    if (selectionDisplay !== "fit" && this.allSelected && this.selectAllEnabled) {
       this.selectedItems.forEach((item) => {
-        const chipEl = this.referenceEl.querySelector(`#${IDS.chip(item.guid)}`);
+        const chipEl = this.referenceEl?.querySelector(`#${IDS.chip(item.guid)}`);
         if (chipEl) {
           this.hideChip(chipEl);
         }
@@ -678,23 +764,71 @@ class Combobox extends LitElement {
     }
     if (this.indeterminate) {
       this.selectedItems.forEach((item) => {
-        const chipEl = this.referenceEl.querySelector(`#${IDS.chip(item.guid)}`);
+        const chipEl = this.referenceEl?.querySelector(`#${IDS.chip(item.guid)}`);
         if (chipEl) {
           this.showChip(chipEl);
         }
       });
     }
     if (selectionDisplay === "fit") {
-      const chipEls = Array.from(this.el.shadowRoot.querySelectorAll("calcite-chip")).filter((chipEl) => chipEl.closable);
-      const availableHorizontalChipElSpace = Math.round(chipContainerElWidth - ((this.selectedHiddenChipsCount > 0 ? selectedIndicatorChipElWidth : 0) + chipContainerElGap + inputWidth + chipContainerElGap));
-      this.refreshChipDisplay({ availableHorizontalChipElSpace, chipContainerElGap, chipEls });
-      this.setVisibleAndHiddenChips(chipEls);
+      const chipEls = Array.from(this.renderRoot.querySelectorAll("calcite-chip")).filter((chipEl) => {
+        const chipValue = chipEl.value;
+        const hasValue = chipValue != null && `${chipValue}` !== "";
+        return chipEl.disabled || hasValue;
+      });
+      const { hiddenChipIndicatorWidth, hideSelectedChips, reservedPlaceholderInputWidth } = this.getFitCompactDisplayState({
+        chipContainerElGap,
+        chipContainerElWidth,
+        inputMinWidth,
+        placeholderWidth,
+        selectedIndicatorChipElWidth
+      });
+      this.fitUsingCompactCountLabel = hideSelectedChips;
+      const availableHorizontalChipElSpace = Math.round(chipContainerElWidth - (hiddenChipIndicatorWidth + chipContainerElGap + reservedPlaceholderInputWidth + chipContainerElGap));
+      this.refreshChipDisplay({
+        availableHorizontalChipElSpace,
+        chipContainerElGap,
+        chipEls,
+        hideSelectedChips
+      });
+      const previousHiddenChipsCount = this.selectedHiddenChipsCount;
+      this.syncChipVisibilityCounts(chipEls);
+      const didHiddenCountChange = previousHiddenChipsCount !== this.selectedHiddenChipsCount;
+      if (didHiddenCountChange && followUpRefresh) {
+        this.fitFollowUpRefreshPromise = this.updateComplete.then(() => this.refreshSelectionDisplay(false)).then(() => {
+          this.fitFollowUpRefreshPromise = void 0;
+        });
+      }
     }
+    this.refreshingSelectionDisplay = false;
   }
   setFloatingEl(el) {
     this.floatingEl = el;
     connectFloatingUI(this);
   }
+  shouldUseFitCompactDisplay({ chipContainerElGap, chipContainerElWidth, hiddenChipIndicatorWidth, inputMinWidth, placeholderWidth, reservedPlaceholderInputWidth }) {
+    const availableHorizontalChipElSpaceWithPlaceholder = Math.round(chipContainerElWidth - (hiddenChipIndicatorWidth + chipContainerElGap + reservedPlaceholderInputWidth + chipContainerElGap));
+    const placeholderIsReallyLong = placeholderWidth > inputMinWidth * 2;
+    return placeholderIsReallyLong && availableHorizontalChipElSpaceWithPlaceholder <= 0;
+  }
+  getFitCompactDisplayState({ chipContainerElGap, chipContainerElWidth, inputMinWidth, placeholderWidth, selectedIndicatorChipElWidth }) {
+    const selectedChipCountElWidth = getElementWidth(this.selectedChipCountRef.value);
+    const hiddenChipIndicatorWidth = this.deferFitChipCountRender || this.selectedHiddenChipsCount <= 0 ? 0 : selectedChipCountElWidth || selectedIndicatorChipElWidth;
+    const reservedPlaceholderInputWidth = Math.max(inputMinWidth, placeholderWidth);
+    const hideSelectedChips = this.shouldUseFitCompactDisplay({
+      chipContainerElGap,
+      chipContainerElWidth,
+      hiddenChipIndicatorWidth,
+      inputMinWidth,
+      placeholderWidth,
+      reservedPlaceholderInputWidth
+    });
+    return {
+      hiddenChipIndicatorWidth,
+      hideSelectedChips,
+      reservedPlaceholderInputWidth
+    };
+  }
   setCompactSelectionDisplay({ chipContainerElGap, chipContainerElWidth, inputWidth, largestSelectedIndicatorChipWidth }) {
     const newCompactBreakpoint = Math.round(largestSelectedIndicatorChipWidth + chipContainerElGap + inputWidth);
     if (!this.maxCompactBreakpoint || this.maxCompactBreakpoint < newCompactBreakpoint) {
@@ -715,17 +849,21 @@ class Combobox extends LitElement {
     this.referenceEl = el;
     connectFloatingUI(this);
   }
-  setVisibleAndHiddenChips(chipEls) {
+  syncChipVisibilityCounts(chipEls) {
     let newSelectedVisibleChipsCount = 0;
+    let selectedChipCount = 0;
     chipEls.forEach((chipEl) => {
-      if (chipEl.selected && !chipEl.classList.contains(CSS.chipInvisible)) {
-        newSelectedVisibleChipsCount++;
+      if (chipEl.selected) {
+        selectedChipCount++;
+        if (!chipEl.classList.contains(CSS.chipInvisible)) {
+          newSelectedVisibleChipsCount++;
+        }
       }
     });
     if (newSelectedVisibleChipsCount !== this.selectedVisibleChipsCount) {
       this.selectedVisibleChipsCount = newSelectedVisibleChipsCount;
     }
-    const newSelectedHiddenChipsCount = Math.max(0, this.getSelectedItems().length - newSelectedVisibleChipsCount);
+    const newSelectedHiddenChipsCount = Math.max(0, selectedChipCount - newSelectedVisibleChipsCount);
     if (newSelectedHiddenChipsCount !== this.selectedHiddenChipsCount) {
       this.selectedHiddenChipsCount = newSelectedHiddenChipsCount;
     }
@@ -770,6 +908,9 @@ class Combobox extends LitElement {
     if (!item || this.selectionMode === "single-persist" && item.selected && item.value === this.value && !value) {
       return;
     }
+    if (this.selectionDisplay === "fit" && this.isMulti()) {
+      this.deferFitChipCountRender = true;
+    }
     if (this.isMulti()) {
       this.handleMultiSelection(item, value);
     } else {
@@ -779,7 +920,7 @@ class Combobox extends LitElement {
   handleMultiSelection(item, value) {
     item.selected = value;
     this.updateAncestors(item);
-    this.selectedItems = this.getSelectedItems();
+    this.updateSelectedItems();
     this.emitComboboxChange();
     this.resetText();
     this.filterItems("");
@@ -788,7 +929,7 @@ class Combobox extends LitElement {
     this.ignoreSelectedEventsFlag = true;
     this.items.forEach((el) => el.selected = el === item ? value : false);
     this.ignoreSelectedEventsFlag = false;
-    this.selectedItems = this.getSelectedItems();
+    this.updateSelectedItems();
     this.emitComboboxChange();
     if (this.textInputRef.value) {
       this.textInputRef.value.value = getLabel(item);
@@ -805,11 +946,14 @@ class Combobox extends LitElement {
     const ancestors = getItemAncestors(item);
     const children = getItemChildren(item);
     if (item.selected) {
-      ancestors.forEach((el) => {
+      [...children, ...ancestors].forEach((el) => {
+        if (el.disabled) {
+          return;
+        }
         el.selected = true;
       });
     } else {
-      children.forEach((el) => {
+      [...children].forEach((el) => {
         if (el.disabled) {
           return;
         }
@@ -829,7 +973,8 @@ class Combobox extends LitElement {
     this.data = this.getData();
     this.groupData = this.getGroupData();
     this.updateItemProps();
-    this.selectedItems = this.getSelectedItems();
+    this.updateSelectedItems();
+    this.previousAllSelected = this.allSelected;
   }
   updateItemProps() {
     this.allItems.forEach((item) => {
@@ -903,13 +1048,17 @@ class Combobox extends LitElement {
   }
   removeActiveChip(chip) {
     const activeItem = this.selectedItems[this.activeChipIndex];
-    if (activeItem && `${IDS.chip(activeItem.guid)}` === chip.id) {
+    if (activeItem && !activeItem.disabled && `${IDS.chip(activeItem.guid)}` === chip.id) {
       this.toggleSelection(activeItem, false);
     }
     this.setFocus();
   }
   removeLastChip() {
-    this.toggleSelection(this.selectedItems[this.selectedItems.length - 1], false);
+    const lastEnabledSelectedItem = this.selectedItems.findLast((item) => !item.disabled);
+    if (!lastEnabledSelectedItem) {
+      return;
+    }
+    this.toggleSelection(lastEnabledSelectedItem, false);
     this.setFocus();
   }
   previousChip() {
@@ -933,7 +1082,7 @@ class Combobox extends LitElement {
   }
   focusChip() {
     const guid2 = this.selectedItems[this.activeChipIndex]?.guid;
-    const chip = guid2 ? this.referenceEl.querySelector(`#${IDS.chip(guid2)}`) : null;
+    const chip = guid2 ? this.referenceEl?.querySelector(`#${IDS.chip(guid2)}`) : void 0;
     chip?.setFocus();
   }
   scrollToActiveOrSelectedItem(scrollToSelected = false) {
@@ -959,7 +1108,7 @@ class Combobox extends LitElement {
   }
   updateActiveItemIndex(index) {
     this.activeItemIndex = index;
-    let activeDescendant = null;
+    let activeDescendant = "";
     this.keyboardNavItems.forEach((el, i) => {
       if (i === index) {
         el.active = true;
@@ -980,7 +1129,11 @@ class Combobox extends LitElement {
     if (this.disabled) {
       return;
     }
-    this.textInputRef.value.focus();
+    this.activeChipIndex = -1;
+    this.textInputRef.value?.focus();
+    if (this.open && this.selectionDisplay === "fit" && this.isMulti()) {
+      void this.refreshSelectionDisplay();
+    }
   }
   createScreenReaderItem({ ariaLabel, ariaSelected, id, textContent }) {
     return html`<li aria-label=${ariaLabel ?? nothing} aria-selected=${ariaSelected ?? nothing} id=${id ?? nothing} role=option tabindex=-1>${textContent}</li>`;
@@ -992,7 +1145,7 @@ class Combobox extends LitElement {
   }
   getDescriptionMessage() {
     const value = Array.isArray(this.value) ? this.value.join(", ") : this.value;
-    return this.readOnly ? this.messages.nonEditable?.replace("{value}", `${value}`) : value;
+    return this.readOnly ? this.messages.nonEditable?.replace("{value}", `${value}`) ?? `${value}` : value;
   }
   getChipLabel(item, isAncestors) {
     if (!isAncestors) {
@@ -1006,64 +1159,58 @@ class Combobox extends LitElement {
     return keyed(item.guid || item.value || label, html`<calcite-chip .appearance=${readOnly ? "outline" : "solid"} class=${safeClassMap({
       [CSS.chip]: true,
       [CSS.disabled]: disabled
-    })} .closable=${!disabled && !readOnly} .disabled=${disabled} .icon=${item.icon} .iconFlipRtl=${item.iconFlipRtl} id=${(!disabled && item.guid ? `${IDS.chip(item.guid)}` : null) ?? nothing} .label=${label} .messageOverrides=${!disabled ? { dismissLabel: messages.removeTag } : null} @calciteChipClose=${!disabled ? () => this.calciteChipCloseHandler(item) : null} @focusin=${!disabled ? () => this.activeChipIndex = index : null} .scale=${scale} .selected=${item.selected} .tabIndex=${!disabled && activeChipIndex === index ? 0 : -1} title=${label ?? nothing} .value=${item.value}>${label}</calcite-chip>`);
+    })} .closable=${!disabled && !readOnly} data-testid=${`${disabled ? "disabled-chip" : "chip"}-${index}`} .disabled=${disabled} .icon=${item.icon} .iconFlipRtl=${item.iconFlipRtl} id=${(!disabled && item.guid ? `${IDS.chip(item.guid)}` : void 0) ?? nothing} .label=${label} .messageOverrides=${!disabled ? { dismissLabel: messages.removeTag } : void 0} @calciteChipClose=${!disabled ? () => this.calciteChipCloseHandler(item) : void 0} @focusin=${!disabled ? () => this.activeChipIndex = index : void 0} .scale=${scale} .selected=${item.selected} .tabIndex=${!disabled && activeChipIndex === index ? 0 : -1} title=${label ?? nothing} .value=${item.value}>${label}</calcite-chip>`);
   }
   renderChipCount(count, scale) {
-    const label = this.messages.disabledSelectedCount?.replace("{count}", `${count}`) ?? `+${count}`;
+    const label = this.fitUsingCompactCountLabel ? `${count}` : this.messages.disabledSelectedCount?.replace("{count}", `${count}`) ?? `+${count}`;
     return html`<calcite-chip appearance=solid class=${safeClassMap({
       [CSS.chip]: true
-    })} .label=${label} .scale=${scale} tabindex=-1 title=${label ?? nothing}>${label}</calcite-chip>`;
+    })} data-testid=selected-chip-count id=selected-chip-count .label=${label} .scale=${scale} tabindex=-1 title=${label ?? nothing} ${ref(this.selectedChipCountRef)}>${label}</calcite-chip>`;
   }
   renderChips() {
     const { activeChipIndex, readOnly, scale, selectionDisplay, selectionMode, messages } = this;
     const chips = [];
     const isAncestors = selectionMode === "ancestors";
-    const allSelectedNoDisabled = this.allSelected && !this.hasDisabledItems;
-    const allSelectedWithDisabledSelected = this.allSelected && this.hasDisabledSelected;
-    const disabledItems = this.allItems.filter((item) => item.disabled && item.selected && (!isAncestors || !hasActiveChildren(item)));
+    const hideSelectedChipsForSelectAll = this.selectAllEnabled && this.allSelected;
     const preserveOrder = selectionDisplay === "all";
-    if (selectionDisplay === "fit" && (allSelectedNoDisabled || allSelectedWithDisabledSelected) || selectionDisplay === "all" && this.selectAllEnabled && allSelectedWithDisabledSelected || this.selectAllEnabled && this.allSelected && !this.hasDisabledItems) {
+    if (hideSelectedChipsForSelectAll) {
       return null;
     }
     let selectedIndex = 0;
     let disabledIndex = 0;
     if (preserveOrder) {
-      this.allItems.forEach((item) => {
+      const selectedChipItems = this.allItems.filter((item) => item.selected && (!isAncestors || !hasActiveChildren(item)));
+      const orderedSelectedChipItems = orderByPrevious(selectedChipItems, this.selectedItems);
+      orderedSelectedChipItems.forEach((item) => {
         if (item.disabled) {
-          if (item.selected && (!isAncestors || !hasActiveChildren(item))) {
-            chips.push(this.renderChip({
-              activeChipIndex,
-              disabled: true,
-              index: disabledIndex++,
-              item,
-              messages,
-              readOnly,
-              scale,
-              isAncestors
-            }));
-          }
+          chips.push(this.renderChip({
+            activeChipIndex,
+            disabled: true,
+            index: disabledIndex++,
+            item,
+            messages,
+            readOnly,
+            scale,
+            isAncestors
+          }));
           return;
         }
-        if (!this.selectAllEnabled || !this.allSelected || this.hasDisabledItems) {
-          if (item.selected && (!isAncestors || !hasActiveChildren(item))) {
-            chips.push(this.renderChip({
-              activeChipIndex,
-              disabled: false,
-              index: selectedIndex++,
-              item,
-              messages,
-              readOnly,
-              scale,
-              isAncestors
-            }));
-          }
-        }
+        chips.push(this.renderChip({
+          activeChipIndex,
+          disabled: false,
+          index: selectedIndex++,
+          item,
+          messages,
+          readOnly,
+          scale,
+          isAncestors
+        }));
       });
-    } else if (!this.selectAllEnabled || !this.allSelected || this.hasDisabledItems) {
+    } else if (!hideSelectedChipsForSelectAll) {
       this.selectedItems.forEach((item) => {
         chips.push(this.renderChip({
           activeChipIndex,
-          disabled: false,
+          disabled: item.disabled,
           index: selectedIndex++,
           item,
           messages,
@@ -1073,32 +1220,53 @@ class Combobox extends LitElement {
         }));
       });
     }
-    if (selectionDisplay === "fit" && disabledItems.length) {
-      chips.push(this.renderChipCount(disabledItems.length, scale));
+    if (selectionDisplay === "fit") {
+      const hiddenSelectedCount = this.selectedHiddenChipsCount;
+      const countChipValue = this.selectedVisibleChipsCount === 0 ? this.selectedItems.length : hiddenSelectedCount;
+      if (hiddenSelectedCount > 0 && !this.deferFitChipCountRender) {
+        chips.push(this.renderChipCount(countChipValue, scale));
+      }
     }
     return chips.length ? chips : null;
   }
   renderAllSelectedIndicatorChip() {
     const { allSelectedIndicatorChipRef, compactSelectionDisplay, scale, selectedVisibleChipsCount } = this;
-    const label = compactSelectionDisplay ? this.messages.all : this.messages.allSelected;
-    const showAllSelectedChip = this.allSelected && (this.selectionDisplay === "single" || !selectedVisibleChipsCount || this.selectionDisplay === "fit" && this.hasDisabledSelected || this.selectionDisplay === "all" && this.hasDisabledSelected);
+    let useFitCompactLabel = false;
+    if (this.selectionDisplay === "fit" && this.textInputRef.value && this.chipContainerEl) {
+      const chipContainerElGap = parseInt(getComputedStyle(this.chipContainerEl).gap, 10);
+      const chipContainerElWidth = getElementWidth(this.chipContainerEl);
+      const { fontSize, fontFamily, minInlineSize } = getComputedStyle(this.textInputRef.value);
+      const placeholderWidthMultiplier = 0.55;
+      const inputMinWidth = parseFloat(minInlineSize) || parseInt(calciteSize48, 10);
+      const measuredPlaceholderWidth = getTextWidth(this.placeholder, `${fontSize} ${fontFamily}`);
+      const placeholderWidth = measuredPlaceholderWidth > 0 ? measuredPlaceholderWidth : Math.max(inputMinWidth, Math.round((this.placeholder?.length || 0) * (parseFloat(fontSize) || parseInt(calciteSize48, 10)) * placeholderWidthMultiplier));
+      const selectedIndicatorChipElWidth = getElementWidth(this.selectedIndicatorChipRef.value);
+      useFitCompactLabel = this.getFitCompactDisplayState({
+        chipContainerElGap,
+        chipContainerElWidth,
+        inputMinWidth,
+        placeholderWidth,
+        selectedIndicatorChipElWidth
+      }).hideSelectedChips;
+    }
+    const useCompactAllLabel = compactSelectionDisplay || useFitCompactLabel;
+    const label = useCompactAllLabel ? this.messages.all : this.messages.allSelected;
+    const showAllSelectedChip = this.allSelected && (this.selectionDisplay === "single" || !selectedVisibleChipsCount || this.selectionDisplay === "all");
     return html`<calcite-chip class=${safeClassMap({
       [CSS.chip]: true,
       [CSS.chipInvisible]: !showAllSelectedChip,
       [CSS.allSelected]: true
-    })} .label=${label} .scale=${scale} title=${label ?? nothing} value ${ref(allSelectedIndicatorChipRef)}>${label}</calcite-chip>`;
+    })} data-testid=all-selected-indicator-chip .label=${label} .scale=${scale} title=${label ?? nothing} value ${ref(allSelectedIndicatorChipRef)}>${label}</calcite-chip>`;
   }
   renderSelectedIndicatorChip() {
-    const { compactSelectionDisplay, selectionDisplay, scale, selectedHiddenChipsCount, selectedVisibleChipsCount, selectedIndicatorChipRef } = this;
-    const allSelectedNoDisabled = this.allSelected && !this.hasDisabledItems;
-    const allSelectedWithDisabledSelected = this.allSelected && this.hasDisabledSelected;
-    let chipInvisible;
+    const { compactSelectionDisplay, selectionDisplay, scale, selectedIndicatorChipRef } = this;
+    let chipInvisible = false;
     let label;
+    const selectedItemsCount = this.getSelectedItems().length;
     if (compactSelectionDisplay) {
       chipInvisible = true;
     } else {
       if (selectionDisplay === "single") {
-        const selectedItemsCount = this.allItems.filter((item) => item.selected && (this.selectionMode !== "ancestors" || !hasActiveChildren(item))).length;
         if (this.allSelected) {
           chipInvisible = true;
         } else if (selectedItemsCount > 0) {
@@ -1107,9 +1275,6 @@ class Combobox extends LitElement {
           chipInvisible = true;
         }
         label = `${selectedItemsCount} ${this.messages.selected}`;
-      } else if (selectionDisplay === "fit") {
-        chipInvisible = !!((allSelectedNoDisabled || allSelectedWithDisabledSelected) && selectedVisibleChipsCount === 0 || selectedHiddenChipsCount === 0);
-        label = selectedVisibleChipsCount > 0 ? `+${selectedHiddenChipsCount}` : `${selectedHiddenChipsCount} ${this.messages.selected}`;
       }
     }
     return html`<calcite-chip class=${safeClassMap({
@@ -1118,18 +1283,13 @@ class Combobox extends LitElement {
     })} .label=${label} .scale=${scale} title=${label ?? nothing} value ${ref(selectedIndicatorChipRef)}>${label}</calcite-chip>`;
   }
   renderSelectedIndicatorChipCompact() {
-    const { compactSelectionDisplay, selectionDisplay, scale, selectedHiddenChipsCount } = this;
-    const allSelectedNoDisabled = this.allSelected && !this.hasDisabledItems;
-    const allSelectedWithDisabledSelected = this.allSelected && this.hasDisabledSelected;
-    let chipInvisible;
+    const { compactSelectionDisplay, selectionDisplay, scale } = this;
+    let chipInvisible = false;
     let label;
+    const selectedItemsCount = this.getSelectedItems().length;
     if (compactSelectionDisplay) {
-      const selectedItemsCount = this.allItems.filter((item) => item.selected && (this.selectionMode !== "ancestors" || !hasActiveChildren(item))).length;
-      if (allSelectedNoDisabled || allSelectedWithDisabledSelected || selectionDisplay === "single" && this.allSelected) {
+      if (this.allSelected) {
         chipInvisible = true;
-      } else if (selectionDisplay === "fit") {
-        chipInvisible = !(selectedHiddenChipsCount > 0);
-        label = `${selectedHiddenChipsCount || 0}`;
       } else if (selectionDisplay === "single") {
         chipInvisible = !(selectedItemsCount > 0);
         label = `${selectedItemsCount}`;
@@ -1158,7 +1318,7 @@ class Combobox extends LitElement {
       [CSS.inputSingle]: true,
       [CSS.inputHidden]: showLabel,
       [CSS.inputIcon]: this.showingInlineIcon && !!this.placeholderIcon
-    })} .disabled=${disabled} .id=${`${IDS.input(guid2)}`} @focus=${this.comboboxFocusHandler} @input=${this.inputHandler} placeholder=${placeholder ?? nothing} .readOnly=${this.readOnly} .required=${this.required} role=combobox .tabIndex=${this.activeChipIndex === -1 ? 0 : -1} type=text .value=${live(this.filterText ?? "")} ${ref(this.textInputRef)}>`)}</span>`;
+    })} data-testid=input .disabled=${disabled} .id=${`${IDS.input(guid2)}`} @focus=${this.comboboxFocusHandler} @input=${this.inputHandler} placeholder=${placeholder ?? nothing} .readOnly=${this.readOnly} .required=${this.required} role=combobox .tabIndex=${this.activeChipIndex === -1 ? 0 : -1} type=text .value=${live(this.filterText ?? "")} ${ref(this.textInputRef)}>`)}</span>`;
   }
   renderListBoxOptions() {
     const mappedListBoxOptions = this.keyboardNavItems.map((item) => this.createScreenReaderItem({
@@ -1187,7 +1347,7 @@ class Combobox extends LitElement {
       [FloatingCSS.animationActive]: open
     };
     const label = (this.filterText && messages.add?.replace("{text}", `${this.filterText}`)) ?? "";
-    return html`<div aria-hidden=true class=${safeClassMap(CSS.floatingUIContainer)} popover=manual ${ref(setFloatingEl)}><div class=${safeClassMap(classes)} ${ref(setContainerEl)}><ul class=${safeClassMap({ [CSS.list]: true, [CSS.listHide]: !open })}>${this.selectAllEnabled && this.selectionMode !== "single" && this.selectionMode !== "single-persist" && html`<calcite-combobox-item class=${safeClassMap(CSS.selectAll)} .heading=${messages.selectAll} .id=${`${this.guid}-select-all-enabled-interactive`} .indeterminate=${this.indeterminate} .label=${messages.selectAll} .scale=${scale} .selected=${this.allSelected} tabindex=-1 value=select-all ${ref(this.selectAllComboboxItemRef)}></calcite-combobox-item>` || ""}<slot></slot>${this.noMatchesFound && (this.allowCustomValues ? html`<li aria-label=${label ?? nothing} class=${safeClassMap(CSS.noMatches)} @click=${this.customChipAddHandler} role=option tabindex=0>${highlightText({
+    return html`<div aria-hidden=true class=${safeClassMap(CSS.floatingUIContainer)} popover=manual ${ref(setFloatingEl)}><div class=${safeClassMap(classes)} ${ref(setContainerEl)}><ul class=${safeClassMap({ [CSS.list]: true, [CSS.listHide]: !open })}>${this.selectAllEnabled && this.selectionMode !== "single" && this.selectionMode !== "single-persist" && html`<calcite-combobox-item class=${safeClassMap(CSS.selectAll)} data-testid=select-all-item .heading=${messages.selectAll} .id=${`${this.guid}-select-all-enabled-interactive`} .indeterminate=${this.indeterminate} .label=${messages.selectAll} .scale=${scale} .selected=${this.allSelected} tabindex=-1 value=select-all ${ref(this.selectAllComboboxItemRef)}></calcite-combobox-item>` || ""}<slot></slot>${this.noMatchesFound && (this.allowCustomValues ? html`<li aria-label=${label ?? nothing} class=${safeClassMap(CSS.noMatches)} @click=${this.customChipAddHandler} role=option tabindex=0>${highlightText({
       text: label,
       pattern: new RegExp(`(${escapeRegExp(this.filterText)})`, "i")
     })}</li>` : html`<li class=${safeClassMap({ [CSS.noMatchesPlaceholder]: true, [CSS.noMatches]: true })}>${messages.noMatches}</li>`) || ""}</ul></div></div>`;
@@ -1212,8 +1372,10 @@ class Combobox extends LitElement {
     const allSelectionDisplay = selectionDisplay === "all";
     const singleSelectionDisplay = selectionDisplay === "single";
     const fitSelectionDisplay = !singleSelectionMode && selectionDisplay === "fit";
-    const isClearable = !this.clearDisabled && this.selectionMode !== "single-persist" && !!this.value?.length;
-    const hasDisabledItems = this.hasDisabledItems;
+    const showIndicatorChips = !singleSelectionMode && !allSelectionDisplay;
+    const showSingleIndicatorChips = showIndicatorChips && !fitSelectionDisplay;
+    const hasClearableSelection = this.items.some((item) => item.selected && !item.disabled);
+    const isClearable = !this.clearDisabled && this.selectionMode !== "single-persist" && !!this.value?.length && hasClearableSelection;
     return this.interactiveContainer({ disabled: this.disabled, children: html`${this.labelText && InternalLabel({ labelText: this.labelText, onClick: this.onLabelClick, required: this.required, tooltipText: this.messages.required }) || ""}<div aria-live=polite class=${safeClassMap({
       [CSS.wrapper]: true,
       [CSS.wrapperSingle]: singleSelectionMode || !this.selectedItems.length,
@@ -1222,11 +1384,7 @@ class Combobox extends LitElement {
       [CSS.gridInput]: true,
       [CSS.selectionDisplayFit]: fitSelectionDisplay,
       [CSS.selectionDisplaySingle]: singleSelectionDisplay
-    })} ${ref(this.setChipContainerEl)}>${!singleSelectionMode && !singleSelectionDisplay && this.renderChips() || ""}${!singleSelectionMode && !singleSelectionDisplay && this.selectAllEnabled && allSelectionDisplay && (!hasDisabledItems || this.hasDisabledSelected) && this.renderAllSelectedIndicatorChip() || ""}${!singleSelectionMode && !allSelectionDisplay && [
-      this.renderSelectedIndicatorChip(),
-      this.renderSelectedIndicatorChipCompact(),
-      this.renderAllSelectedIndicatorChip()
-    ] || ""}<label class=${safeClassMap(CSS.screenReadersOnly)} .htmlFor=${`${IDS.input(guid2)}`} .id=${`${IDS.label(guid2)}`}>${label}</label>${this.renderInput()}</div>`)}${!readOnly && isClearable ? ClearButton({ ariaLabel: this.messages.clear, disabled: this.disabled, ref: this.clearButtonRef, scale: this.scale, title: this.messages.clear }) : null}${!readOnly && this.renderChevronIcon() || ""}</div><ul aria-labelledby=${`${IDS.label(guid2)}`} aria-multiselectable=true class=${safeClassMap(CSS.screenReadersOnly)} .id=${`${IDS.listbox(guid2)}`} role=listbox tabindex=-1>${this.renderListBoxOptions()}</ul>${this.renderFloatingUIContainer()}${this.validationMessage && this.status === "invalid" ? Validation({ icon: this.validationIcon, id: IDS.validationMessage, message: this.validationMessage, scale: this.scale, status: this.status }) : null}` });
+    })} ${ref(this.setChipContainerEl)}>${!singleSelectionMode && !singleSelectionDisplay && this.renderChips() || ""}${!singleSelectionMode && !singleSelectionDisplay && this.selectAllEnabled && allSelectionDisplay && this.renderAllSelectedIndicatorChip() || ""}${showSingleIndicatorChips && this.renderSelectedIndicatorChip() || ""}${showSingleIndicatorChips && this.renderSelectedIndicatorChipCompact() || ""}${showIndicatorChips && this.renderAllSelectedIndicatorChip() || ""}<label class=${safeClassMap(CSS.screenReadersOnly)} .htmlFor=${`${IDS.input(guid2)}`} .id=${`${IDS.label(guid2)}`}>${label}</label>${this.renderInput()}</div>`)}${!readOnly && isClearable ? ClearButton({ ariaLabel: this.messages.clear, disabled: this.disabled, ref: this.clearButtonRef, scale: this.scale, title: this.messages.clear }) : null}${!readOnly && this.renderChevronIcon() || ""}</div><ul aria-labelledby=${`${IDS.label(guid2)}`} aria-multiselectable=true class=${safeClassMap(CSS.screenReadersOnly)} .id=${`${IDS.listbox(guid2)}`} role=listbox tabindex=-1>${this.renderListBoxOptions()}</ul>${this.renderFloatingUIContainer()}${this.validationMessage && this.status === "invalid" ? Validation({ icon: this.validationIcon, id: IDS.validationMessage, message: this.validationMessage, scale: this.scale, status: this.status }) : null}` });
   }
 }
 customElement("calcite-combobox", Combobox);