lightning-base-components 1.17.1-alpha → 1.17.3-alpha

package/src/lightning/modal/__docs__/modal.md

@@ -1,17 +1,17 @@
-A `lightningModal` component overlays a message modal on top of the current app window. A modal interrupts a user’s workflow and draws attention to the message. 
+A `lightningModal` component overlays a message modal on top of the current app window. A modal interrupts a user’s workflow and draws attention to the message.
 
 `LightningModal` implements the SLDS [modals](https://www.lightningdesignsystem.com/components/modals/) blueprint.
 
 Create a modal component in response to a user action, such as clicking a button or link. The modal blocks interaction with everything else on the page until the user acts upon or dismisses the modal.
 
-Unlike other components, this component doesn't use a `lightning-modal` tag or extend `LightningElement`. There is no `lightning-modal` component. Instead, you create a modal by extending `LightningModal` and using these helper `lightning-modal-*` components to provide a header, footer and the body of the modal. 
+Unlike other components, this component doesn't use a `lightning-modal` tag or extend `LightningElement`. There is no `lightning-modal` component. Instead, you create a modal by extending `LightningModal` and using these helper `lightning-modal-*` components to provide a header, footer and the body of the modal.
 - `lightning-modal-body`
 - `lightning-modal-header`
 - `lightning-modal-footer`
 
 To create a modal component, import `LightningModal` from `lightning/modal`. The component has access to the normal LWC resources as well as the special container, helper components, methods, and events of the `lightning/modal` module.
 
-In this example, the `content` property passes data to the modal from the component that invokes it. 
+In this example, the `content` property passes data to the modal from the component that invokes it.
 
 ```js
 /* c/myModal.js */
@@ -28,7 +28,7 @@ export default class MyModal extends LightningModal {
 }
 ```
 
-The modal’s HTML template uses helper `lightning-modal-*` components to provide a header, footer, and the body of the modal. In this example, the content for the modal body comes from the `content` property we defined in the modal's JavaScript file. 
+The modal’s HTML template uses helper `lightning-modal-*` components to provide a header, footer, and the body of the modal. In this example, the content for the modal body comes from the `content` property we defined in the modal's JavaScript file.
 
 ```html
 <!-- c/myModal.html -->
@@ -42,19 +42,19 @@ The modal’s HTML template uses helper `lightning-modal-*` components to provid
 </template>
 ```
 
-The `lightning-modal-body` component is required for the modal template. 
+The `lightning-modal-body` component is required for the modal template.
 
-The `lightning-modal-header` and `lightning-modal-footer` components are optional, but recommended. The `lightning-modal-*` components render in the order they appear in the template. Place the `lightning-modal-body` component after `lightning-modal-header` and before the `lightning-modal-footer` component. 
+The `lightning-modal-header` and `lightning-modal-footer` components are optional, but recommended. The `lightning-modal-*` components render in the order they appear in the template. Place the `lightning-modal-body` component after `lightning-modal-header` and before the `lightning-modal-footer` component.
 
 #### Open a Modal Instance
 
 `LightningModal` provides an `.open()` method which opens a modal and returns a promise that asynchronously resolves with the result of the user’s interaction with the modal.
 
-Each invocation of a modal component’s `.open()` method creates a unique instance of the modal. You can think of a modal as a self-contained application that starts from scratch when it opens. It displays the content you pass in through the `.open()` method or that you set within the modal's HTML template. 
+Each invocation of a modal component’s `.open()` method creates a unique instance of the modal. You can think of a modal as a self-contained application that starts from scratch when it opens. It displays the content you pass in through the `.open()` method or that you set within the modal's HTML template.
 
-When you close a modal, the modal instance is destroyed, not hidden. On close, the modal must save the user’s input data or pass it to the invoking component as the promise result. Otherwise, the data is lost when the modal instance is closed. 
+When you close a modal, the modal instance is destroyed, not hidden. On close, the modal must save the user’s input data or pass it to the invoking component as the promise result. Otherwise, the data is lost when the modal instance is closed.
 
-The `.open()` method lets you assign values to the modal's properties. `LightningModal` provides these properties. 
+The `.open()` method lets you assign values to the modal's properties. `LightningModal` provides these properties.
 
 * `label` - Required. Sets the modal's title and assistive device label. If the modal has a header, set `label` in the `lightning-modal-header` component. If the modal doesn't have a header, set the `label` property when opening the modal.
 
@@ -95,14 +95,14 @@ The HTML template for this app contains a button that opens the modal and displa
 <template>
     <lightning-button
         onclick={handleClick}
-        aria-haspopup="modal"
+        aria-haspopup="dialog"
         label="Open My Modal">
-    </lightning-button> 
+    </lightning-button>
     <p>Result: {result}</p>
 </template>
 ```
 
-You can also use `.open()` to pass data from your invoking component into the modal with custom properties decorated with `@api`. These properties can be any type, such as a string or an object that’s an array of key/value pairs to be assigned to the new modal instance. 
+You can also use `.open()` to pass data from your invoking component into the modal with custom properties decorated with `@api`. These properties can be any type, such as a string or an object that’s an array of key/value pairs to be assigned to the new modal instance.
 
 For example, this app component sets an `options` property to a set of key/value pairs in `MyModal.open()`. The promise is handled using an arrow function that logs the result to the console.
 
@@ -155,14 +155,14 @@ export default class MyModal extends LightningModal {
             >
                 {option.label}
             </lightning-button>
-        </template>   
+        </template>
     </lightning-modal-body>
 </template>
 ```
 
 #### Close a Modal Instance
 
-Use `this.close(result)` to close the modal, where `result` is anything you want to return from the modal. The `.close()` operation is asynchronous to display a brief fade out animation before the modal is destroyed. The `result` data can’t be modified after the close operation begins. 
+Use `this.close(result)` to close the modal, where `result` is anything you want to return from the modal. The `.close()` operation is asynchronous to display a brief fade out animation before the modal is destroyed. The `result` data can’t be modified after the close operation begins.
 
 You can also close the modal with the default close button, the X at the top right corner. Closing a modal like this is the same as calling `this.close()` with an `undefined` result, so any data input is lost.
 
@@ -320,7 +320,7 @@ export default class MyModalForm extends LightningModal {
 
 A modal can only fire events captured by the component that opened it, not the modal itself. Normal techniques can't catch events that fire from the modal, because the events bubble up to a top root element outside of the component that opened the modal.
 
-To capture modal events, attach them in the `.open()` method invoked by the component that opens the modal. 
+To capture modal events, attach them in the `.open()` method invoked by the component that opens the modal.
 
 For example, here's a custom `select` event dispatched from `MyModal`.
 
@@ -374,18 +374,185 @@ handleOpenModal() {
 
 See [Create and Dispatch Events](https://developer.salesforce.com/docs/component-library/documentation/en/lwc/events_create_dispatch) in the LWC Dev Guide for more information about events.
 
+#### Modal Events with Aura
+
+For `LightningModal`, only the top level LWC component or application can communicate to the parent Aura component or application layer with eventing. This topmost component is usually the one that opens the `LightningModal`. `LightningModal`'s child components can't event to a parent Aura component or application layer.
+
+All required eventing that should occur during the `LightningModal`'s life cycle must be passed in when you call `Modal.open()`. See `onselect` within `.open()` in the **Modal Events** section. 
+
+If you want the Aura layer to respond to events within child components embedded in the `LightningModal`, use event bubbling to move any data that you want to make available to the Aura layer into the topmost LWC component that opened the modal. Then, send the event from the LWC component.
+
+With this in mind, there are two suggested methods for extracting data from the `LightningModal` to the Aura layer.
+
+1. To only communicate data out of modal after it's closed, first, close the modal, and pass the data out with `this.close({ data })`, and handle the data received in `.then((result) { ... })` where the Modal is initially opened.
+2. To continuously communicate data out of the `LightningModal` while the modal remains open, use events created and passed in when opening the modal from `Modal.open({ size, title, onmyevent })`.
+
+These extracting methods fit into the larger LWC Modal-to-Aura event workflow.
+
+1. Pass any events that should occur within the modal through `LightningModal`'s `.open()` method
+2. Have the `LightningModal` JavaScript code fire any custom events
+3. In the topmost LWC component that opened the modal, create an event handler to process the events, including stopping propagation.
+4. Fire a separate event containing the LWC-processed event details and send it to the Aura parent component.
+5. Use an Aura-based event handler to handle and process the event.
+
+For more information, see [Send Events to an Enclosing Aura Component](https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.events_sending_to_aura_components) and [Events Best Practices](https://developer.salesforce.com/docs/component-library/documentation/en/lwc/events_best_practices).
+
+Let's see this workflow in action. In this example, we'll create a button (`lightning-button`) that launches a modal (`LightningModal`) containing a tree grid component (`lightning-tree-grid`) with a button in each record row that automatically navigates our user to that record's page (`lightning-navigation`). This use case requires data passing between our LWC components and a parent Aura component. 
+
+Because `lightning-navigation` requires you to pass in a `recordId` to construct a page reference, we need to pass the record's data out of `LightningModal`, and then use the methods provided by `lightning-navigation`. With modal's limitations for event bubbling to the Aura layer, we can't just wrap the button or treegrid with `lightning-navigation`. We need to pull that data up to the topmost LWC component, where the `LightningModal` `.open()` is called, for our Aura wrapper to handle the navigation.
+
+So, we `import` the `lightning-navigation` component into the topmost LWC component that sits within the Aura layer by passing the data through `LightningModal`'s close method, `this.close({ data })`. Then the parent LWC component invokes the methods provided by `lightning-navigation`, which handles the navigation away from the page after the modal exits. From a UX perspective, this also lets us close the modal first, since `lightning-navigation` takes the user away from the current page.
+
+Note that this sample code isn't fully functional. We're only showing the relevant code that makes the `lightning-navigation` use case work with `LightningModal`.
+
+Here's our Aura component, containing our topmost LWC component, `myLwcAppModalLauncher`.
+
+```html
+/* c/myApp.cmp */
+<aura:component>
+    <!-- <c:myLwcTreeGridWithNavigation/> component is a child component
+        inside of <c:myLwcAppModalLauncher/>
+    -->
+    <c:myLwcAppModalLauncher/>
+</aura:component>
+```
+
+The topmost component, `myLwcAppModalLauncher`, launches and handles events that occur within our modal (`MyModal`). `myLwcAppModalLauncher` is also where we import the `lightning-navigation` component and use the `rowId` handed up through modal's `this.close({ ..., rowId })` function.
+
+```html
+<!-- c/myLwcAppModalLauncher.html -->
+
+<template>
+    <lightning-button
+        onclick={handleModalOpen}
+        aria-haspopup="dialog"
+        label="Launch Navigation Modal">
+    </lightning-button>
+</template>
+```
+
+```js
+/* c/myLwcAppModalLauncher.js */
+
+import { LightningElement, wire } from 'lwc';
+import { NavigationMixin } from 'lightning/navigation';
+import MyModal from 'c/myModalWithTreeGridNavigation';
+
+export default class MyLwcAppModalLauncher extends NavigationMixin(LightningElement) {
+
+/// ... other modal code
+
+handleModalOpen() {
+    // open up the Modal
+    MyModal.open({
+        size: 'medium',
+        heading: 'Navigate to Record Page',
+        description: 'Navigate to a record page by clicking the row button',
+        options: [{ data }, { data }],
+    }).then((result) => {
+        // when the LightningModal closes, result is whatever
+        // data that was passed out using this.close({ data })
+        if (result === null) {
+            // do something else
+        } else {
+            // shouldNavigate is boolean, arbitrary
+            // rowId is what's needed for lightning-navigation
+            const { shouldNavigate, rowId } = result;
+            if (shouldNavigate) {
+                this.navigateToObjectHome(rowId);
+            }
+        }
+    });
+}
+
+navigateToObjectHome(rowId) {
+    // construct the page ref
+    const pageRef = {
+        type: 'standard__recordPage',
+        attributes: {
+            recordId: rowId,
+            actionName: 'view'
+        }
+    }
+    // then call the .Navigate method with the pageRef
+    this[NavigationMixin.Navigate](pageRef);
+}
+
+/* ... other modal code */
+```
+
+This `template` is our modal, containing a tree grid with the navigation buttons, named `c-my-lwc-tree-grid-with-navigation`. The `handleNavSelection` function in this component processes the `rowId` data for the modal component to pass to its parent.
+
+```html
+<!-- c/myModalWithTreeGridNavigation.html -->
+<template>
+    <lightning-modal-header label="My Modal Heading">
+        The modal tagline.
+    </lightning-modal-header>
+    <lightning-modal-body>
+        <h2>Choose a record to navigate to:</h2>
+        <!-- custom event listener when button clicked inside tree grid -->
+        <div onnavselection={handleNavSelection}>
+            <c-my-lwc-tree-grid-with-navigation></c-my-lwc-tree-grid-with-navigation>
+        </div>
+    </lightning-modal-body>
+    <!-- no <lightning-modal-footer> in this example -->
+</template>
+```
+
+```js
+/* c/myModalWithTreeGridNavigation.js */
+handleNavSelection(event) {
+    event.stopPropagation();
+    const { detail: { rowId } } = event;
+    if (rowId) {
+        // rowId value is important to lightning-navigation
+        // passing this data out through the LightningModal's
+        // .close() method, then handled in the .then((result) {})
+        // see code above: c/myLwcAppModalLauncher.js
+        this.close({ shouldNavigate: true, rowId });
+    }
+}
+```
+
+```js
+/* c/myLwcTreeGridWithNavigation.js */
+
+dispatchNavSelectionEvent(rowId) {
+    // add rowId to event.detail
+    // this custom event listener exists in
+    // LightningModal body code, see code above:
+    // c/myModalWithTreeGridNavigation.html
+    const eventToFire = new CustomEvent('navselection', {
+        detail: { rowId },
+        bubbles: true,
+        cancelable: false
+    });
+    // dispatch custom event
+    // see event listener added to lightning-modal-body
+    this.dispatchEvent(eventToFire);
+}
+
+handleRowButtonClick(event) {
+    // simplified handler to get row.Id
+    // from the tree grid row button that was clicked
+    const row = event.detail.row;
+    this.dispatchNavSelectionEvent(row.Id);
+}
+```
+
 #### Styling Variants
 
-The `lightning-modal-header` and `lightning-modal-footer` child components are optional, and you can choose to not include one or the other in your modal. 
+The `lightning-modal-header` and `lightning-modal-footer` child components are optional, and you can choose to not include one or the other in your modal.
 
 The headerless variant of `LightningModal` has these additional requirements.
 - Must set a descriptive modal title with the `label` property using `Modal.open({ label })` or you’ll get a console error.
--  The `label` property is required for all variants of `LightningModal`. Assistive devices read the `label` value, even though the headerless modal variant doesn't display the label. 
+-  The `label` property is required for all variants of `LightningModal`. Assistive devices read the `label` value, even though the headerless modal variant doesn't display the label.
 -  Because this variant doesn't use `lightning-modal-header`, you have to manually create an `<h1>` heading in `lightning-modal-body`. Provide accessible structure by starting with heading level `<h1>` and using levels up to `<h6>` appropriately. For more information, see [Semantic Structure, Headings on WebAim.org](https://webaim.org/techniques/semanticstructure/#headings).
 
 The `LightningModal` component also supports the SLDS [Directional variant](https://www.lightningdesignsystem.com/components/modals/#Directional) modal blueprint pattern.
 
-To achieve the directional button layout, place the buttons in a `div` with the `slds-modal__footer_directional` class. 
+To achieve the directional button layout, place the buttons in a `div` with the `slds-modal__footer_directional` class.
 
 ```html
 <!-- c/modalDirectional.html -->
@@ -403,7 +570,7 @@ To achieve the directional button layout, place the buttons in a `div` with the
 
 #### Styling Hooks
 
-The `lightning-modal-*` helper components support [style hooks](https://www.lightningdesignsystem.com/components/modals/#Styling-Hooks-Overview). The styling hooks for the template that invokes the helper components doesn't carry over to them, so you must style each helper component individually. 
+The `lightning-modal-*` helper components support [style hooks](https://www.lightningdesignsystem.com/components/modals/#Styling-Hooks-Overview). The styling hooks for the template that invokes the helper components doesn't carry over to them, so you must style each helper component individually.
 
 Customizing the styling on the white modal frame and background, close button, or gray backdrop isn't supported.
 
@@ -411,4 +578,4 @@ Customizing the styling on the white modal frame and background, close button, o
 
 The `lightning-modal-header` component renders the `label` value in an `<h1>` element. If your modal uses the header, begin any additional heading levels in the modal with `<h2>` for accessibility. Provide accessible structure by using heading levels up to `<h6>` appropriately. For more information, see [Semantic Structure, Headings on WebAim.org](https://webaim.org/techniques/semanticstructure/#headings).
 
-To include tagline text or link content for the header section, add it between the `<lightning-modal-header>` tags. 
+To include tagline text or link content for the header section, add it between the `<lightning-modal-header>` tags.

package/src/lightning/modalBase/modalBase.js

@@ -10,7 +10,10 @@ import {
     isAriaDescriptionSupported,
 } from 'lightning/utilsPrivate';
 import { instanceName, secure } from 'lightning/overlayUtils';
-import { getElementWithFocus } from 'lightning/focusUtils';
+import {
+    getElementWithFocus,
+    returnFocusToElement,
+} from 'lightning/focusUtils';
 import closeButtonAltText from '@salesforce/label/LightningModalBase.cancelandclose';
 import disableCloseBtnMessage from '@salesforce/label/LightningModalBase.waitstate';
 
@@ -147,7 +150,7 @@ export default class LightningModalBase extends LightningElement {
         // we track both in order to handle transition correctly
         const isSwitchingToDisabled =
             !this.disableCloseButton && this.disableClose;
-        /* Future enhancement possibility - trigger setInterval to remove and 
+        /* Future enhancement possibility - trigger setInterval to remove and
            again add back 'Processing' text, as this will indicate to the screen
            reader user that the interface continues to be busy
         */
@@ -349,10 +352,8 @@ export default class LightningModalBase extends LightningElement {
      */
     returnFocusToBackground() {
         const { savedActiveElement } = this;
-        const isSavedElemInDOM = document.body.contains(savedActiveElement);
-        if (savedActiveElement && isSavedElemInDOM) {
-            savedActiveElement.focus();
-        } else {
+        const elementWasFocused = returnFocusToElement(savedActiveElement);
+        if (!elementWasFocused) {
             // eslint-disable-next-line no-console
             console.warn('Modal :: Nothing to return focus to');
         }

package/src/lightning/positionLibrary/overlayDetector.js

@@ -6,6 +6,7 @@ export const OVERLAY_TYPE = {
     DIALOG: 'lightning-dialog',
     POPOVER: 'lightning-popover',
     PANEL: 'uiPanel',
+    SLDSMODAL: 'slds-modal',
 };
 
 export function isOverlay(element) {
@@ -30,6 +31,13 @@ export function isOverlay(element) {
     if (isPanel) {
         return OVERLAY_TYPE.PANEL;
     }
+
+    const isSldsModal =
+        element.classList && element.classList.contains(OVERLAY_TYPE.SLDSMODAL);
+    if (isSldsModal) {
+        return OVERLAY_TYPE.SLDSMODAL;
+    }
+
     return OVERLAY_TYPE.NONE;
 }
 
@@ -80,7 +88,8 @@ export class OverlayDetector {
         return (
             this.isInside &&
             (this._detection.type === OVERLAY_TYPE.MODAL ||
-                this._detection.type === OVERLAY_TYPE.DIALOG)
+                this._detection.type === OVERLAY_TYPE.DIALOG ||
+                this._detection.type === OVERLAY_TYPE.SLDSMODAL)
         );
     }
 

package/src/lightning/primitiveBubble/primitiveBubble.css

@@ -1,2 +1,11 @@
 /* @import 'lightning/sldsCommon';
 @import './tooltip.slds.css'; */
+
+/* Fix for tooltip alignment issue, for details see: W-11677142
+ *
+ * fix-tooltip_alignment - the custom class that edits min-width
+ */
+
+.fix-popover_tooltip_alignment {
+    min-width: inherit;
+}

package/src/lightning/primitiveBubble/primitiveBubble.js

@@ -102,7 +102,9 @@ export default class LightningPrimitiveBubble extends LightningElement {
 
     // compute class value for this bubble
     get computedPopoverClass() {
-        const classes = classSet('slds-popover').add('slds-popover_tooltip');
+        const classes = classSet('slds-popover')
+            .add('slds-popover_tooltip')
+            .add('fix-popover_tooltip_alignment'); // fix for W-11677142
 
         // show or hide bubble
         classes.add({

package/src/lightning/primitiveCellActions/primitiveCellActions.html

@@ -7,6 +7,7 @@
         onopen={handleMenuOpen}
         is-loading={_isLoadingActions}
         loading-state-alternative-text={spinnerAlternateText}
+        tab-index={internalTabIndex}
     >
         <template for:each={_actions} for:item="action">
             <lightning-menu-item

package/src/lightning/primitiveCellActions/primitiveCellActions.js

@@ -33,13 +33,13 @@ export default class PrimitiveCellActions extends LightningElement {
     static delegatesFocus = true;
     _isLoadingActions;
     _menuAlignment = DEFAULT_MENU_ALIGNMENT;
-    _internalTabIndex = false;
 
     /************************** PUBLIC ATTRIBUTES ***************************/
 
     @api rowKeyValue;
     @api colKeyValue;
     @api rowActions;
+    @api internalTabIndex;
 
     /**
      * Defines the current menu alignment

package/src/lightning/primitiveCellCheckbox/primitiveCellCheckbox.js

@@ -11,12 +11,26 @@ const i18n = {
 };
 
 export default class PrimitiveCellCheckbox extends PrimitiveDatatableCell {
+    _columnHeaderId = '';
     @api rowIndex = 0;
     @api isSelected = false;
     @api isDisabled = false;
     @api type = 'checkbox';
     @api dtContextId;
-    @api columnHeaderId = ''; //required as a part for aria-labelledby
+    @api
+    get columnHeaderId() {
+        return this._columnHeaderId;
+    }
+
+    set columnHeaderId(id) {
+        this._columnHeaderId = id || '';
+        const labelId = this.computedLabelId;
+        if (labelId) {
+            synchronizeAttrs(this.template.querySelector('input'), {
+                'aria-labelledby': `${labelId} ${this._columnHeaderId}`,
+            });
+        }
+    }
 
     render() {
         if (this.type === 'radio') {

package/src/lightning/primitiveCellFactory/cellWithStandardLayout.html

@@ -8,6 +8,7 @@
             <template if:true={hasTreeData}>
                 <lightning-primitive-treegrid-cell-toggle row-key-value={rowKeyValue}
                                                           col-key-value={colKeyValue}
+                                                          display-value={displayValue}
                                                           value={value}
                                                           has-children={typeAttribute21}
                                                           is-expanded={typeAttribute22}
@@ -33,6 +34,7 @@
                                                   row-key-value={rowKeyValue}
                                                   col-key-value={colKeyValue}
                                                   tabindex={internalTabIndex}
+                                                  internal-tab-index={internalTabIndex}
                                                   menu-alignment={typeAttribute0}
                                                   row-actions={typeAttribute1}>
                 </lightning-primitive-cell-actions>
@@ -278,7 +280,7 @@
             </button>
         </template>
         <!-- TODO: displayReadOnlyIcon is true only when the cell's "editable" property is false and its "displayReadOnlyIcon"
-        property is true. The markup in this template therefore cannot be rendered concurrently with the template above that checks 
+        property is true. The markup in this template therefore cannot be rendered concurrently with the template above that checks
         the editable property. -->
         <template if:true={shouldDisplayReadOnlyIcon}>
             <!-- TODO: Update the svg-classes once the SLDS team updates their read only icon design to not use classes that have the word 'button'

package/src/lightning/primitiveCellFactory/primitiveCellFactory.js

@@ -35,6 +35,7 @@ export default class PrivateCellFactory extends PrimitiveDatatableCell {
     @api types;
     @api alignment;
     @api value;
+    @api displayValue;
     @api iconName;
     @api iconLabel;
     @api iconPosition;

package/src/lightning/primitiveHeaderFactory/primitiveHeaderFactory.js

@@ -1,4 +1,5 @@
 import labelChooseARow from '@salesforce/label/LightningDatatable.chooseARow';
+import labelChooseARowSelectAll from '@salesforce/label/LightningDatatable.chooseARowSelectAll';
 import labelSelectAll from '@salesforce/label/LightningDatatable.selectAll';
 import labelSort from '@salesforce/label/LightningDatatable.sort';
 import labelSortAsc from '@salesforce/label/LightningDatatable.sortAsc';
@@ -15,6 +16,7 @@ import nonsortable from './nonsortableHeader.html';
 
 const i18n = {
     chooseARow: labelChooseARow,
+    chooseARowSelectAll: labelChooseARowSelectAll,
     selectAll: labelSelectAll,
     sort: labelSort,
     sortAsc: labelSortAsc,
@@ -201,6 +203,17 @@ export default class PrimitiveHeaderFactory extends PrimitiveDatatableCell {
         );
     }
 
+    /**
+     * Computes column header label
+     *
+     * @return {string} The computed column header label
+     */
+    get computedColumnHeaderLabel() {
+        return this.showCheckbox
+            ? this.i18n.chooseARowSelectAll
+            : this.i18n.chooseARow;
+    }
+
     /**
      * Returns the header's aria role
      *
@@ -316,6 +329,22 @@ export default class PrimitiveHeaderFactory extends PrimitiveDatatableCell {
         if (this.isSelectableHeader && this.showCheckbox) {
             this.updateBulkSelectionCheckbox();
         }
+        if (this.isSelectableHeader) {
+            const columnHeaderId = this.computedColumnHeaderId;
+            const columnHeaderEvent = new CustomEvent('privatecolumnheaderid', {
+                detail: columnHeaderId,
+            });
+            this.dispatchEvent(columnHeaderEvent);
+        }
+    }
+
+    disconnectedCallback() {
+        if (this.isSelectableHeader) {
+            const columnHeaderEvent = new CustomEvent('privatecolumnheaderid', {
+                detail: null,
+            });
+            this.dispatchEvent(columnHeaderEvent);
+        }
     }
 
     /************************** EVENT HANDLERS ***************************/

package/src/lightning/primitiveHeaderFactory/selectableHeader.html

@@ -1,9 +1,11 @@
 <template>
+    <span id="column-group-header" class="slds-assistive-text" data-column-header>
+        {computedColumnHeaderLabel}
+    </span>
     <!-- Header Content -->
     <div class="slds-th__action slds-th__action_form slds-cell-fixed" style={columnStyles}>
         <template if:true={showCheckbox}>
             <span class="slds-checkbox">
-                
                 <!-- Selectable Checkbox -->
                 <input
                     type="checkbox"
@@ -23,10 +25,5 @@
                 </label>
             </span>
         </template>
-        <template if:false={showCheckbox}>
-            <span id="column-group-header" class="slds-assistive-text" data-column-header>
-                {i18n.chooseARow}
-            </span>
-        </template>
     </div>
 </template>

package/src/lightning/primitiveTreegridCellToggle/primitiveTreegridCellToggle.js

@@ -2,7 +2,7 @@ import labelCollapseBranch from '@salesforce/label/LightningPrimitiveCellTree.co
 import labelExpandBranch from '@salesforce/label/LightningPrimitiveCellTree.expandBranch';
 import { LightningElement, api } from 'lwc';
 import { classSet, formatLabel } from 'lightning/utils';
-import { normalizeBoolean } from 'lightning/utilsPrivate';
+import { normalizeString, normalizeBoolean } from 'lightning/utilsPrivate';
 
 const i18n = {
     collapseBranch: labelCollapseBranch,
@@ -13,6 +13,7 @@ export default class PrivateTreeGridCellToggle extends LightningElement {
     @api rowKeyValue;
     @api colKeyValue;
     @api value;
+    @api displayValue;
 
     _expanded = false;
     _hasChildren = false;
@@ -60,10 +61,14 @@ export default class PrivateTreeGridCellToggle extends LightningElement {
     }
 
     get buttonTitle() {
+        let title =
+            normalizeString(this.displayValue) !== ''
+                ? this.displayValue
+                : this.value;
         if (this.isExpanded) {
-            return formatLabel(i18n.collapseBranch, this.value);
+            return formatLabel(i18n.collapseBranch, title);
         }
-        return formatLabel(i18n.expandBranch, this.value);
+        return formatLabel(i18n.expandBranch, title);
     }
 
     handleChevronClick() {

package/src/lightning/progressIndicator/progressIndicator.js

@@ -33,7 +33,7 @@ export default class LightningProgressIndicator extends LightningElement {
 
     /**
      * Changes the appearance of the progress indicator for the base type only.
-     * Valid values are base or shaded. The shaded variant adds a light gray border to the step indicators.
+     * Valid values are base or shade. The shade variant adds a light gray border to the step indicators.
      * The default is base.
      * @type {string}
      * @default base

package/src/lightning/radioGroup/radioGroup.html

@@ -58,7 +58,7 @@
         </div>
 
         <template if:true={_helpMessage}>
-            <div data-help-message id="help-message" class="slds-form-element__help">{_helpMessage}</div>
+            <div data-help-message id="help-message" role="alert" class="slds-form-element__help">{_helpMessage}</div>
         </template>
 
     </fieldset>

package/src/lightning/textarea/textarea.js

@@ -102,6 +102,12 @@ export default class LightningTextarea extends LightningElement {
     @track _helpMessage;
     @track _fieldLevelHelp;
 
+    /**
+     * Aria Described by value on parent lighting-textarea
+     * @type {string}
+     */
+    @api ariaDescribedBy;
+
     connectedCallback() {
         this.classList.add('slds-form-element');
         this.updateClassList();
@@ -433,7 +439,13 @@ export default class LightningTextarea extends LightningElement {
 
     get computedUniqueHelpElementId() {
         const helpMessage = this.template.querySelector('[data-help-message]');
-        return getRealDOMId(helpMessage);
+        let spaceSeperatedDescribedByIds = getRealDOMId(helpMessage);
+        if (this.ariaDescribedBy && spaceSeperatedDescribedByIds) {
+            spaceSeperatedDescribedByIds += ` ${this.ariaDescribedBy}`;
+        } else if (this.ariaDescribedBy) {
+            spaceSeperatedDescribedByIds = this.ariaDescribedBy;
+        }
+        return spaceSeperatedDescribedByIds;
     }
 
     _setInputValue(value) {