lightning-base-components 1.21.2-alpha → 1.21.4-alpha

package/src/lightning/badge/badge.js-meta.xml

@@ -3,4 +3,7 @@
     <isExposed>true</isExposed>
     <minApiVersion>0.0</minApiVersion>
     <support>GA</support>
+    <capabilities>
+        <capability>lightning__ServerRenderableWithHydration</capability>
+    </capabilities>
 </LightningComponentBundle>

package/src/lightning/baseCombobox/base-combobox.slds.css

@@ -2,10 +2,10 @@
 /* Copyright (c) 2015-present, salesforce.com, inc. All rights reserved
   Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license */
 
-@supports (--styling-hooks: '') {
   /**
    * Combobox
    */
+
   :host([data-render-mode="shadow"]) .slds-combobox {
     position: static;
     display: flex;
@@ -16,6 +16,7 @@
   /**
    * Combobox Container
    */
+
   :host([data-render-mode="shadow"]) .slds-combobox_container {
     display: flex;
     flex-direction: column;
@@ -25,6 +26,7 @@
   /**
    * Faux Input
    */
+
   :host([data-render-mode="shadow"]) .slds-input_faux {
     padding-block-start: 0;
     padding-block-end: 0;
@@ -74,7 +76,8 @@
   /**
    * Combobox Focus State: When rendering `button` instead of `input`
    */
-   :host([data-render-mode="shadow"]) .slds-input_faux:focus-within {
+
+  :host([data-render-mode="shadow"]) .slds-input_faux:focus-within {
     border-color: var(--slds-g-color-brand-base-60);
     box-shadow: 0 0 var(--slds-g-sizing-border-3) var(--slds-g-color-accent-1);
   }
@@ -82,6 +85,7 @@
   /**
    * Has Icon
    */
+
   :host([data-render-mode="shadow"]) .slds-input-has-icon {
     position: relative;
   }
@@ -103,6 +107,7 @@
   }
 
   /* Icon Left */
+
   :host([data-render-mode="shadow"]) .slds-input-has-icon_left .slds-input__icon {
     inset-inline-start: var(--slds-g-spacing-3);
   }
@@ -112,6 +117,7 @@
   }
 
   /* Icon Right */
+
   :host([data-render-mode="shadow"]) .slds-input-has-icon_right .slds-input__icon {
     inset-inline-end: var(--slds-g-spacing-3);
   }
@@ -123,6 +129,7 @@
   /**
    * Has Icon Group
    */
+
   :host([data-render-mode="shadow"]) .slds-input__icon-group {
     position: absolute;
     height: var(--slds-g-sizing-5);
@@ -146,11 +153,11 @@
   }
 
   :host([data-render-mode="shadow"]) .slds-p-top_medium {
-    padding-top: var(--slds-g-spacing-4)
+    padding-top: var(--slds-g-spacing-4);
   }
 
   :host([data-render-mode="shadow"]) .slds-p-bottom_medium {
-    padding-bottom: var(--slds-g-spacing-4)
+    padding-bottom: var(--slds-g-spacing-4);
   }
 
   :host([data-render-mode="shadow"]) .slds-spinner_inline {
@@ -180,7 +187,6 @@
     color: var(--slds-g-color-on-surface-1);
   }
 
-
   :host([data-render-mode="shadow"][data-filter-on]) [part="input-container"] {
     border-start-end-radius: var(--slds-g-sizing-border-4);
     border-end-end-radius: var(--slds-g-sizing-border-4);
@@ -227,4 +233,3 @@
       var(--slds-g-color-brand-base-60);
     --sds-c-inputtext-shadow: none;
   }
-}

package/src/lightning/baseCombobox/baseCombobox.html

@@ -29,6 +29,7 @@
                                 placeholder={computedPlaceholder}
                                 maxlength={inputMaxlength}
                                 disabled={disabled}
+                                aria-disabled={disabled}
                                 aria-readonly={_inputAriaReadOnly}
                                 aria-autocomplete={computedAriaAutocomplete}
                                 aria-owns="dropdown-element"
@@ -54,7 +55,8 @@
                         role={customRole}
                         data-value={computedInputValue}
                         disabled={disabled}
-                        aria-label={computedButtonTriggerAriaLabel}
+                        aria-disabled={disabled}
+                        aria-label={inputLabel}
                         aria-required={required}
                         onfocus={handleFocus}
                         onkeydown={handleInputKeyDown}
@@ -115,6 +117,7 @@
                                 item={item}
                                 id={item.id}
                                 data-item-id={item.id}
+                                exportparts="option"
                                 aria-checked={item.checked}
                                 key={item.value}
                                 data-value={item.value}
@@ -149,7 +152,7 @@
                         </template>
                     </template>
                     <template if:true={showDropdownActivityIndicator}>
-                        <div role="presentation" class="slds-listbox__item slds-spinner_inline">
+                        <div role="option" class="slds-listbox__item slds-spinner_inline">
                             <div class="slds-align_absolute-center slds-p-top_medium slds-p-bottom_medium">
                                 <lightning-spinner size="x-small" alternative-text={i18n.loadingText}></lightning-spinner>
                             </div>

package/src/lightning/baseCombobox/baseCombobox.js

@@ -5,10 +5,10 @@ import labelPillCloseButtonAlternativeText from '@salesforce/label/LightningComb
 import labelPlaceholder from '@salesforce/label/LightningCombobox.placeholder';
 import { api, track } from 'lwc';
 import LightningShadowBaseClass from 'lightning/shadowBaseClassPrivate';
-import labelCurrentSelection from '@salesforce/label/LightningCombobox.currentSelection';
+// import labelCurrentSelection from '@salesforce/label/LightningCombobox.currentSelection';
 import { handleKeyDownOnInput } from './keyboard';
 import { BaseComboboxEvents } from './baseComboboxEvents';
-import { classSet, formatLabel } from 'lightning/utils';
+import { classSet } from 'lightning/utils';
 import {
     assert,
     computeAriaInvalid,
@@ -450,9 +450,7 @@ export default class LightningBaseCombobox extends LightningShadowBaseClass {
             return;
         }
         synchronizeAttrs(input, {
-            [ARIA_LABEL]: this.isUserInputDisabled
-                ? this.computedButtonTriggerAriaLabel
-                : this.inputLabel,
+            [ARIA_LABEL]: this.inputLabel,
             [ARIA_INVALID]: this.computedAriaInvalid,
             [ARIA_ACTIVEDESCENDANT]: this.computedAriaActiveDescendant,
         });
@@ -586,17 +584,6 @@ export default class LightningBaseCombobox extends LightningShadowBaseClass {
         return this.hasInputPill ? this.inputPill.label : this.inputText;
     }
 
-    get computedButtonTriggerAriaLabel() {
-        const label = this.inputLabel;
-        const value = this.computedInputValue || this.computedPlaceholder;
-
-        if (!label) {
-            return value;
-        }
-
-        return formatLabel(labelCurrentSelection, label, value);
-    }
-
     handleListboxScroll(event) {
         // We don't want this to bubble up to the modal which due to event retargeting wouldn't be able
         // to know what is actually being scrolled and thus may lead to the scrolling of the modal
@@ -869,7 +856,7 @@ export default class LightningBaseCombobox extends LightningShadowBaseClass {
     highlightOption(option) {
         this.removeHighlight();
         if (option) {
-            option.highlight();
+            option.highlight(option.ariaChecked);
             this._highlightedOptionElement = option;
             this._highlightedOptionElementId =
                 option.getAttribute('data-item-id');
@@ -890,7 +877,7 @@ export default class LightningBaseCombobox extends LightningShadowBaseClass {
     removeHighlight() {
         const option = this._highlightedOptionElement;
         if (option) {
-            option.removeHighlight();
+            option.removeHighlight(option.ariaChecked);
             this._highlightedOptionElement = null;
             this._highlightedOptionElementId = null;
             this._activeElementDomId = null;

package/src/lightning/baseCombobox/baseCombobox.js-meta.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="xmlns=http://soap.sforce.com/2006/04/metadata">
+    <capabilities>
+        <capability>lightning__ServerRenderableWithHydration</capability>
+    </capabilities>
+</LightningComponentBundle>

package/src/lightning/baseCombobox/input-text.slds.css

@@ -221,11 +221,10 @@
   text-transform: none !important;
   white-space: nowrap !important;
 }
-@supports (--styling-hooks: '') {
-   /**
+/**
    * Input Text
    */
-    :host([data-render-mode="shadow"]) [part='input-text'] {
+:host([data-render-mode="shadow"]) [part='input-text'] {
         /* Host reassignments to composed slds-icon */
         --slds-c-icon-color-foreground: var(
             --slds-c-inputtext-icon-color-foreground,
@@ -267,30 +266,25 @@
         flex-wrap: wrap;
         align-items: center;
     }
-
-   /**
+/**
    * Input Container
    */
-    :host([data-render-mode="shadow"]) [part='input-container'] {
+:host([data-render-mode="shadow"]) [part='input-container'] {
         flex: 1 0 100%;
         align-items: stretch;
     }
-
-    :host([data-render-mode="shadow"]) [part='input-container'][type='range'] {
+:host([data-render-mode="shadow"]) [part='input-container'][type='range'] {
         border: none;
         display: inline-block;
     }
-
-    :host([data-render-mode="shadow"]) [part='input-container'] .slds-input__icon:not(button) {
+:host([data-render-mode="shadow"]) [part='input-container'] .slds-input__icon:not(button) {
             pointer-events: none;
     }
-
-    :host([data-render-mode="shadow"]) [part='input'][type='range'] {
+:host([data-render-mode="shadow"]) [part='input'][type='range'] {
         min-height: calc(1.875rem + (1px * 2));
         margin: 0;
     }
-
-    :host([data-render-mode="shadow"]) [part='input-container'][type='range']:focus-within,:host([data-render-mode="shadow"]) 
+:host([data-render-mode="shadow"]) [part='input-container'][type='range']:focus-within,:host([data-render-mode="shadow"]) 
     [part='input-container'][type='range']:active {
         --sds-c-inputtext-color-border: var(--slds-g-color-border-accent-1);
         --sds-c-inputtext-shadow: 0 0 3px var(--slds-g-color-accent-2);
@@ -300,11 +294,10 @@
         border-width: var(--sds-c-inputtext-sizing-border, var(--slds-g-sizing-border-1));
         border-color: var(--sds-c-inputtext-color-border, var(--slds-g-color-border-2));
     }
-
-   /**
+/**
    * Input
    */
-    :host([data-render-mode="shadow"]) [part='input'] {
+:host([data-render-mode="shadow"]) [part='input'] {
         padding-inline-start: var(
             --slds-c-inputtext-spacing-inlinestart,
             var(--slds-g-spacing-3));
@@ -314,11 +307,10 @@
         height: unset;
         font-family: var(--slds-g-font-family);
     }
-
-   /**
+/**
    * Focus / active State
    */
-   :host(:not([disabled])) [part="input-container"]:focus-within,
+:host(:not([disabled])) [part="input-container"]:focus-within,
    :host(:not([disabled])) [part="input-container"]:active {
       --sds-c-inputtext-color-border: var(--slds-g-color-border-accent-1);
       --sds-c-inputtext-shadow: 0 0 var(--slds-g-sizing-border-3) var(--slds-g-color-accent-2);
@@ -326,72 +318,66 @@
 
       outline: 0;
     }
-
-   /**
+/**
    * Read Only State
    */
-    :host([data-render-mode="shadow"][readonly]) [part='input-text'] {
+:host([data-render-mode="shadow"][readonly]) [part='input-text'] {
         --sds-c-inputtext-spacing-inline-start-readonly: 0;
         --sds-c-inputtext-color-border-focus: transparent;
         --slds-c-inputtext-color-border: transparent;
         --slds-c-inputtext-color-background: transparent;
         --slds-c-inputtext-color-background-focus: transparent;
     }
-
-    :host([data-render-mode="shadow"][readonly]) [part="input-container"]:focus-within,:host([data-render-mode="shadow"][readonly]) [part="input-container"]:active {
+:host([data-render-mode="shadow"][readonly]) [part="input-container"]:focus-within,:host([data-render-mode="shadow"][readonly]) [part="input-container"]:active {
        --sds-c-inputtext-color-border: var(--slds-g-color-disabled-container-2);
        --sds-c-inputtext-shadow: 0 0 var(--slds-g-sizing-border-3) var(--slds-g-color-accent-1);
        --sds-c-inputtext-color-background: transparent;
 
        outline: 0;
      }
-
-    /**
+/**
    * Invalid State
    *
    * Does not use --sds-c-inputtext-color-border-invalid due to this hook being
    * tied to :host([aria-invalid]) which this subsystem does not use. Instead, it
    * uses :host([invalid]).
    */
-    :host([data-render-mode="shadow"][invalid]) [part='input-text'] {
+:host([data-render-mode="shadow"][invalid]) [part='input-text'] {
         --sds-c-inputtext-shadow: 0 0 0 var(--slds-g-sizing-border-1) inset
             var(--slds-g-color-error-1);
         --slds-c-inputtext-color-border: var(--slds-g-color-border-error-1);
         --slds-c-icon-color-foreground: var(--slds-g-color-error-1);
     }
-
-    /**
+/**
    * Invalid State - Focus
    *
    * The following styling hooks are included in SDS and need to be reassigned
    * here to prevent a bug with the focus state border and box-shadow
    */
-    :host([data-render-mode="shadow"][invalid]) [part='input-container']:focus-within {
+:host([data-render-mode="shadow"][invalid]) [part='input-container']:focus-within {
       --sds-c-inputtext-shadow:
         var(--slds-g-color-error-base-50) 0 0 0 var(--slds-g-sizing-border-1) inset,
         0 0 var(--slds-g-sizing-border-3) var(--slds-g-color-border-error-1);
       --sds-c-inputtext-color-border: var(--slds-g-color-error-1);
     }
-
-    /**
+/**
    * Disabled State
    *
    * Both parts form the visible form control.
    */
-    :host([data-render-mode="shadow"][disabled]) [part='input-container'],:host([data-render-mode="shadow"][disabled]) [part='input'] {
+:host([data-render-mode="shadow"][disabled]) [part='input-container'],:host([data-render-mode="shadow"][disabled]) [part='input'] {
         cursor: not-allowed;
         --sds-c-inputtext-color-background: var(--slds-g-color-disabled-container-1);
         --sds-c-inputtext-color-border: var(--slds-g-color-border-1);
         --sds-c-inputtext-text-color: var(--slds-g-color-on-surface-1);
     }
-
-    /**
+/**
    * Label
    *
    * Add [part='input-text'] to increase specificity and
    * avoid collisions with other components using [part='label'] (e.g. slds-input-checkbox)
    */
-    :host([data-render-mode="shadow"]) [part='input-text'] [part='label'] {
+:host([data-render-mode="shadow"]) [part='input-text'] [part='label'] {
         padding-block-start: var(--slds-g-spacing-1);
         padding-inline-end: var(--slds-g-spacing-2);
         color: var(
@@ -407,19 +393,17 @@
         /* We inline flex to control the spacing between elements and not have to rely on whitespace characters */
         display: inline-flex;
     }
-
-    /**
+/**
    * Start
    *
    * Only expects an SLDS icon. We assign the SLDS Icon Styling Hook here
    * so we don't add spacing to other icons composed in the component, e.g.,
    * the icon in the inline help text.
    */
-    :host([data-render-mode="shadow"]) [part='start'] {
+:host([data-render-mode="shadow"]) [part='start'] {
         --slds-c-icon-spacing-inlineend: var(--slds-g-spacing-2);
     }
-
-    /**
+/**
    * Label Inline Variant
    *
    * Note: all the 33% values you see are remnants of legacy SLDS. We need to
@@ -431,7 +415,7 @@
    *
    * Ref: https://github.com/salesforce-ux/design-system-internal/blob/240-winter-23/ui/components/form-element/horizontal/_index.scss#L63
    */
-    @media (width >= 48em) {
+@media (width >= 48em) {
         :host([data-render-mode="shadow"][variant='label-inline']) [part='input-text'] {
             display: block;
         }
@@ -453,22 +437,18 @@
             padding-block-start: var(--slds-g-spacing-1);
         }
     }
-
-    :host([data-render-mode="shadow"]) input[type="search"] + lightning-primitive-icon::part(icon) {
+:host([data-render-mode="shadow"]) input[type="search"] + lightning-primitive-icon::part(icon) {
         left: var(--slds-g-spacing-3);
         fill: var(--slds-g-color-on-surface-1);
     }
-
-    :host([data-render-mode="shadow"]) .slds-input-has-icon .slds-button_icon {
+:host([data-render-mode="shadow"]) .slds-input-has-icon .slds-button_icon {
         background-color: transparent;
     }
-
-    :host([data-render-mode="shadow"]) .slds-input-has-icon .slds-button_icon:focus,:host([data-render-mode="shadow"]) 
+:host([data-render-mode="shadow"]) .slds-input-has-icon .slds-button_icon:focus,:host([data-render-mode="shadow"]) 
     .slds-input-has-icon .slds-button_icon:hover {
         --slds-c-icon-color-foreground: var(--slds-g-color-accent-4);
     }
-
-    :host([data-render-mode="shadow"]) .slds-input-has-icon .slds-input__icon {
+:host([data-render-mode="shadow"]) .slds-input-has-icon .slds-input__icon {
         width: 0.875rem;
         height: 0.875rem;
         position: absolute;
@@ -478,47 +458,41 @@
         border: 0;
         z-index: 2;
     }
-
-    /**
+/**
    * Has Icon Left
    */
-    :host([data-render-mode="shadow"]) .slds-input-has-icon_left {
+:host([data-render-mode="shadow"]) .slds-input-has-icon_left {
         --slds-c-inputtext-spacing-inlinestart: var(--slds-g-spacing-6);
     }
-
-    :host([data-render-mode="shadow"]) .slds-input-has-icon_left .slds-input__icon,:host([data-render-mode="shadow"]) 
+:host([data-render-mode="shadow"]) .slds-input-has-icon_left .slds-input__icon,:host([data-render-mode="shadow"]) 
     .slds-input-has-icon_left-right .slds-input__icon_left {
         inset-inline-start: var(--slds-g-spacing-3);
     }
-
-    /**
+/**
    * Has Icon Right
    */
-    :host([data-render-mode="shadow"]) .slds-input-has-icon_right {
+:host([data-render-mode="shadow"]) .slds-input-has-icon_right {
         --slds-c-inputtext-spacing-inlineend: var(--slds-g-spacing-6);
     }
-
-    :host([data-render-mode="shadow"]) .slds-input-has-icon_right .slds-input__icon,:host([data-render-mode="shadow"]) 
+:host([data-render-mode="shadow"]) .slds-input-has-icon_right .slds-input__icon,:host([data-render-mode="shadow"]) 
     .slds-input-has-icon_left-right .slds-input__icon_right {
         inset-inline-end: var(--slds-g-spacing-3);
     }
-
-    /**
+/**
    * Has Icon Left & Right
    */
-    :host([data-render-mode="shadow"]) .slds-input-has-icon_left-right {
+:host([data-render-mode="shadow"]) .slds-input-has-icon_left-right {
         --slds-c-inputtext-spacing-inlinestart: var(--slds-g-spacing-6);
         --slds-c-inputtext-spacing-inlineend: var(--slds-g-spacing-6);
     }
-
-  /**
+/**
  * A temporarily baked-in utility class until SLDS gets a proper utility package.
  *
  * This is a hybrid patch between synthetic and native shadow. The ideal final
  * outcome is the removal of this class and replacing the class with the SLDS
  * utility package solution.
  */
-  :host([data-render-mode="shadow"]) .slds-assistive-text {
+:host([data-render-mode="shadow"]) .slds-assistive-text {
     position: absolute !important;
     margin: -1px !important;
     border: 0 !important;
@@ -530,4 +504,3 @@
     text-transform: none !important;
     white-space: nowrap !important;
   }
-}

package/src/lightning/baseCombobox/keyboard.js

@@ -95,13 +95,21 @@ function handleUpOrDownKey({ event, currentIndex, dropdownInterface }) {
     }
 }
 
-function handleEscapeOrTabKey({ event, dropdownInterface }) {
+function handleEscapeKey({ event, dropdownInterface }) {
     if (dropdownInterface.isDropdownVisible()) {
         event.stopPropagation();
         dropdownInterface.closeDropdown();
     }
 }
 
+function handleTabKey({ event, dropdownInterface, currentIndex }) {
+    if (dropdownInterface.isDropdownVisible() && currentIndex >= 0) {
+        event.stopPropagation();
+        dropdownInterface.closeDropdown();
+        dropdownInterface.selectByIndex(currentIndex);
+    }
+}
+
 function handleDeletionKeys({ event, dropdownInterface }) {
     if (dropdownInterface.shouldPreventInputDeletion()) {
         event.preventDefault();
@@ -152,9 +160,9 @@ const eventKeyToHandlerMap = {
     ArrowUp: handleUpOrDownKey,
     ArrowDown: handleUpOrDownKey,
 
-    Esc: handleEscapeOrTabKey, // IE11/Edge specific
-    Escape: handleEscapeOrTabKey,
-    Tab: handleEscapeOrTabKey,
+    Esc: handleEscapeKey, // IE11/Edge specific
+    Escape: handleEscapeKey,
+    Tab: handleTabKey,
 
     Backspace: handleDeletionKeys,
     Delete: handleDeletionKeys,