lightning-base-components 1.21.0-alpha → 1.21.2-alpha

package/src/lightning/dualListbox/dual-listbox.slds.css

@@ -29,12 +29,12 @@
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__column > lightning-button-icon {
-    margin-block: var(--sds-g-spacing-4, 1rem);
-    margin-inline: var(--sds-g-spacing-1, 0.25rem);
+    margin-block: var(--slds-g-spacing-4);
+    margin-inline: var(--slds-g-spacing-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__column > lightning-button-icon:first-of-type {
-    margin-block-start: var(--sds-g-spacing-5, 1.5rem);
+    margin-block-start: var(--slds-g-spacing-5);
   }
 
   /* Changes the layout of the dueling picklist to be responsive */
@@ -42,7 +42,7 @@
     flex: 1 1 15rem;
     flex-wrap: wrap;
     overflow: hidden;
-    min-width: calc(var(--sds-g-sizing-9, 2rem) * 3);
+    min-width: calc(var(--slds-g-sizing-9) * 3);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__column_responsive .slds-dueling-list__options {
@@ -52,26 +52,26 @@
 
   /* Bounding visual container for listbox of options */
   :host([data-render-mode="shadow"]) .slds-dueling-list__options {
-    border: var(--sds-g-sizing-border-1, 1px) solid var(--sds-g-color-neutral-base-80, #c9c9c9);
-    border-radius: var(--sds-g-radius-border-2, 0.25rem);
-    padding-block: var(--sds-g-spacing-1, 0.25rem);
+    border: var(--slds-g-sizing-border-1) solid var(--slds-g-color-border-1);
+    border-radius: var(--slds-g-radius-border-2);
+    padding-block: var(--slds-g-spacing-1);
     padding-inline: 0;
-    width: var(--sds-g-sizing-14, 15rem);
-    height: var(--sds-g-sizing-14, 15rem);
-    background-color: var(--sds-g-color-neutral-base-100, #ffffff);
+    width: var(--slds-g-sizing-14);
+    height: var(--slds-g-sizing-14);
+    background-color: var(--slds-g-color-surface-container-1);
     overflow: auto;
   }
 
   /* Selected/dragging state of a listbox option, not currently supported by lbc */
   :host([data-render-mode="shadow"]) .slds-dueling-list__options [aria-selected='true'] {
-    background-color: var(--sds-g-color-brand-base-50, #0176d3);
-    color: var(--sds-g-color-neutral-base-100, #ffffff);
+    background-color: var(--slds-g-color-accent-container-2);
+    color: var(--slds-g-color-on-accent-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__options [aria-selected='true']:hover,:host([data-render-mode="shadow"]) 
   .slds-dueling-list__options [aria-selected='true']:focus {
-    background: var(--sds-g-color-brand-base-30, #014486);
-    color: var(--sds-g-color-neutral-base-100, #ffffff);
+    background: var(--slds-g-color-accent-container-3);
+    color: var(--slds-g-color-on-accent-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__options .slds-is-grabbed {
@@ -80,9 +80,9 @@
 
   /* Disabled state of a picklist option */
   :host([data-render-mode="shadow"]) .slds-dueling-list__options.slds-is-disabled {
-    background-color: var(--sds-g-color-neutral-base-95, #f3f3f3);
-    border-color: var(--sds-g-color-neutral-base-80, #c9c9c9);
-    color: var(--sds-g-color-neutral-base-30, #444444);
+    background-color: var(--slds-g-color-disabled-container-1);
+    border-color: var(--slds-g-color-border-disabled-1);
+    color: var(--slds-g-color-on-disabled-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__options.slds-is-disabled:hover {
@@ -99,10 +99,10 @@
   }
 
   :host([data-render-mode="shadow"][variant='label-inline']) {
-    margin-block-end: var(--sds-g-spacing-2, 0.5rem);
+    margin-block-end: var(--slds-g-spacing-2);
     width: 100%;
     flex-basis: 100%;
-    padding: var(--sds-g-spacing-1, 0.25rem);
+    padding: var(--slds-g-spacing-1);
   }
 
   :host([data-render-mode="shadow"][variant='label-inline']).slds-form-element {
@@ -124,11 +124,11 @@
 
   :host([data-render-mode="shadow"]) .slds-media__figure {
     flex-shrink: 0;
-    margin-inline-end: var(--sds-g-spacing-3, 0.75rem);
+    margin-inline-end: var(--slds-g-spacing-3);
   }
 
   :host([data-render-mode="shadow"]) .slds-media__figure_fixed-width {
-    min-width: var(--sds-g-sizing-10, 3rem);
+    min-width: var(--slds-g-sizing-10);
   }
 
   :host([data-render-mode="shadow"]) .slds-media__body {
@@ -147,19 +147,19 @@
   }
 
   :host([data-render-mode="shadow"]) .slds-media_small .slds-media__figure {
-    margin-inline-end: var(--sds-g-spacing-1, 0.25rem);
+    margin-inline-end: var(--slds-g-spacing-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-media_small .slds-media__figure_reverse {
-    margin-inline-start: var(--sds-g-spacing-1, 0.25rem);
+    margin-inline-start: var(--slds-g-spacing-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-media_large .slds-media__figure {
-    margin-inline-end: var(--sds-g-spacing-5, 1.5rem);
+    margin-inline-end: var(--slds-g-spacing-5);
   }
 
   :host([data-render-mode="shadow"]) .slds-media_large .slds-media__figure_reverse {
-    margin-inline-start: var(--sds-g-spacing-5, 1.5rem);
+    margin-inline-start: var(--slds-g-spacing-5);
   }
 
   :host([data-render-mode="shadow"]) .slds-media_inline .slds-media__body {
@@ -172,7 +172,7 @@
 
   :host([data-render-mode="shadow"]) .slds-media__figure_reverse {
     margin-block: 0;
-    margin-inline-start: var(--sds-g-spacing-3, 0.75rem);
+    margin-inline-start: var(--slds-g-spacing-3);
     margin-inline-end: 0;
   }
 
@@ -184,7 +184,7 @@
 
     :host([data-render-mode="shadow"]) .slds-media_responsive .slds-media__figure {
       margin-block: 0;
-      margin-inline-start: var(--sds-g-spacing-3, 0.75rem);
+      margin-inline-start: var(--slds-g-spacing-3);
       margin-inline-end: 0;
     }
   }

package/src/lightning/dualListbox/dualListbox.css

@@ -1,8 +1,2 @@
-/* @import 'lightning/sldsCommon';
-@import "./form-element.slds.css";
-@import './listbox.slds.css';
-@import './dual-listbox.slds.css'; */
-
-:host {
-    display: block;
-}
+@import './dualListbox.lbc.synthetic.css';
+@import './dualListbox.lbc.native.css';

package/src/lightning/dualListbox/dualListbox.html

@@ -34,10 +34,10 @@
                 </div>
                 <div class="slds-dueling-list__column">
                     <lightning-button-icon icon-name="utility:right" variant="container" onclick={handleRightButtonClick} disabled={moveButtonsDisabled}
-                        title={addButtonLabel} alternative-text={addButtonLabel}>
+                        title={addButtonLabel} alternative-text={addButtonLabel} tooltip={addButtonDescription}>
                     </lightning-button-icon>
                     <lightning-button-icon icon-name="utility:left" variant="container" onclick={handleLeftButtonClick} disabled={moveButtonsDisabled}
-                        title={removeButtonLabel} alternative-text={removeButtonLabel}>
+                        title={removeButtonLabel} alternative-text={removeButtonLabel} tooltip={removeButtonDescription}>
                     </lightning-button-icon>
                 </div>
                 <div class="slds-dueling-list__column slds-dueling-list__column_responsive">

package/src/lightning/dualListbox/dualListbox.js

@@ -13,11 +13,14 @@ import labelRequiredError from '@salesforce/label/LightningDualListbox.requiredE
 import labelRequiredOptionError from '@salesforce/label/LightningDualListbox.requiredOptionError';
 import labelUpButtonAssistiveText from '@salesforce/label/LightningDualListbox.upButtonAssistiveText';
 import labelMoveSelectionToAssistiveText from '@salesforce/label/LightningDualListbox.moveSelectionToAssistiveText';
+import labelMoveToAssistiveText from '@salesforce/label/LightningDualListbox.moveToAssistiveText';
 import labelLoadingText from '@salesforce/label/LightningCombobox.loadingText';
 import labelMovedOptionsSingular from '@salesforce/label/LightningDualListbox.movedOptionsSingular';
 import labelMovedOptionsPlural from '@salesforce/label/LightningDualListbox.movedOptionsPlural';
+import labelVerticallyMovedOptionsText from '@salesforce/label/LightningDualListbox.verticallyMovedOptions';
 import labelHelpTextAlternativeText from '@salesforce/label/LightningInput.helptextAlternativeText';
-import { LightningElement, api, track } from 'lwc';
+import { api, track } from 'lwc';
+import LightningShadowBaseClass from 'lightning/shadowBaseClassPrivate';
 import { handleKeyDownOnOption } from './keyboard';
 import { classSet, formatLabel } from 'lightning/utils';
 import {
@@ -26,6 +29,7 @@ import {
     getRealDOMId,
     classListMutation,
     reflectAttribute,
+    isCSR,
 } from 'lightning/utilsPrivate';
 import {
     InteractingState,
@@ -50,16 +54,19 @@ const i18n = {
     requiredOptionError: labelRequiredOptionError,
     upButtonAssistiveText: labelUpButtonAssistiveText,
     moveSelectionToAssistiveText: labelMoveSelectionToAssistiveText,
+    moveToAssistiveText: labelMoveToAssistiveText,
     loadingText: labelLoadingText,
     movedOptionsSingular: labelMovedOptionsSingular,
     movedOptionsPlural: labelMovedOptionsPlural,
     helpTextAlternativeText: labelHelpTextAlternativeText,
+    verticallyMovedOptionsText: labelVerticallyMovedOptionsText,
 };
 
 /**
  * A pair of listboxes that enables multiple options to be selected and reordered.
  */
-export default class LightningDualListbox extends LightningElement {
+export default class LightningDualListbox extends LightningShadowBaseClass {
+    static validationOptOut = ['class'];
     // Component attributes
     /**
      * Label for the source options listbox.
@@ -108,22 +115,22 @@ export default class LightningDualListbox extends LightningElement {
      */
     @api name;
 
-    @track _showActivityIndicator = false;
+    _showActivityIndicator = false;
     @track _requiredOptions = [];
     @track _selectedValues = [];
-    @track _variant;
-    @track _disabled;
-    @track _disableReordering = false;
-    @track _required = false;
-    @track _addButtonLabel;
-    @track _removeButtonLabel;
-    @track _upButtonLabel;
-    @track _downButtonLabel;
-    @track _size;
-    @track errorMessage = '';
+    _variant;
+    _disabled;
+    _disableReordering = false;
+    _required = false;
+    _addButtonLabel;
+    _removeButtonLabel;
+    _upButtonLabel;
+    _downButtonLabel;
+    _size;
+    errorMessage = '';
     @track highlightedOptions = [];
-    @track focusableInSource;
-    @track focusableInSelected;
+    focusableInSource;
+    focusableInSelected;
     @track highlightedOptionsLabel = [];
 
     _messageToDisplay = '';
@@ -298,7 +305,9 @@ export default class LightningDualListbox extends LightningElement {
     focus() {
         // focus on the first option from either list
         // if nothing on source, then it'll pick the one on selected
-        const firstOption = this.template.querySelector(`div[data-index='0']`);
+        const firstOption = isCSR
+            ? this.template.querySelector(`div[data-index='0']`)
+            : null;
         if (firstOption) {
             firstOption.focus();
             this.updateSelectedOptions(firstOption, true, false);
@@ -354,6 +363,7 @@ export default class LightningDualListbox extends LightningElement {
     }
 
     connectedCallback() {
+        super.connectedCallback();
         this.classList.add('slds-form-element');
         this.updateClassList();
         this.keyboardInterface = this.selectKeyboardInterface();
@@ -366,11 +376,15 @@ export default class LightningDualListbox extends LightningElement {
             debounceInteraction: true,
         });
         this.interactingState.onenter(() => {
-            this.dispatchEvent(new CustomEvent('focus'));
+            if (isCSR) {
+                this.dispatchEvent(new CustomEvent('focus'));
+            }
         });
         this.interactingState.onleave(() => {
             this.showHelpMessageIfInvalid();
-            this.dispatchEvent(new CustomEvent('blur'));
+            if (isCSR) {
+                this.dispatchEvent(new CustomEvent('blur'));
+            }
 
             // reset the optionToFocus otherwise dualListbox will steal the focus any time it's rerendered.
             this.optionToFocus = null;
@@ -393,9 +407,14 @@ export default class LightningDualListbox extends LightningElement {
 
         if (this.optionToFocus) {
             // value could have an apostrophe, which is why we need to escape it otherwise the queryselector will not work
-            const option = this.template.querySelector(
-                `div[data-value='${this.optionToFocus.replace(/'/g, "\\'")}']`
-            );
+            const option = isCSR
+                ? this.template.querySelector(
+                      `div[data-value='${this.optionToFocus.replace(
+                          /'/g,
+                          "\\'"
+                      )}']`
+                  )
+                : null;
             if (option) {
                 this.isFocusOnList = true;
                 option.focus();
@@ -408,13 +427,15 @@ export default class LightningDualListbox extends LightningElement {
     }
 
     get computedSourceListId() {
-        return getRealDOMId(this.template.querySelector('[data-source-list]'));
+        return isCSR
+            ? getRealDOMId(this.template.querySelector('[data-source-list]'))
+            : 'source-list';
     }
 
     get computedSelectedListId() {
-        return getRealDOMId(
-            this.template.querySelector('[data-selected-list]')
-        );
+        return isCSR
+            ? getRealDOMId(this.template.querySelector('[data-selected-list]'))
+            : 'selected-list';
     }
 
     get ariaDisabled() {
@@ -584,12 +605,25 @@ export default class LightningDualListbox extends LightningElement {
      * @type {string}
      * @default Move selection to {selectedLabel}
      */
+    get addButtonDescription() {
+        return this.getRightButtonAssistiveText();
+    }
+
+    getRightButtonAssistiveLabel() {
+        return formatLabel(i18n.moveToAssistiveText, this.selectedLabel);
+    }
+
+    /**
+     * Label for add button.
+     * @type {string}
+     * @default Move to {selectedLabel}
+     */
     @api
     get addButtonLabel() {
         if (this._addButtonLabel) {
             return this._addButtonLabel;
         }
-        return this.getRightButtonAssistiveText();
+        return this.getRightButtonAssistiveLabel();
     }
 
     set addButtonLabel(value) {
@@ -600,6 +634,19 @@ export default class LightningDualListbox extends LightningElement {
         return formatLabel(i18n.moveSelectionToAssistiveText, this.sourceLabel);
     }
 
+    /**
+     * Label for remove button.
+     * @type {string}
+     * @default "Move Selection to {sourceLabel}"
+     */
+    get removeButtonDescription() {
+        return this.getLeftButtonAssistiveText();
+    }
+
+    getLeftButtonAssistiveLabel() {
+        return formatLabel(i18n.moveToAssistiveText, this.sourceLabel);
+    }
+
     /**
      * Label for remove button.
      * @type {string}
@@ -610,7 +657,7 @@ export default class LightningDualListbox extends LightningElement {
         if (this._removeButtonLabel) {
             return this._removeButtonLabel;
         }
-        return this.getLeftButtonAssistiveText();
+        return this.getLeftButtonAssistiveLabel();
     }
 
     set removeButtonLabel(value) {
@@ -817,6 +864,7 @@ export default class LightningDualListbox extends LightningElement {
         this.updateFocusableOption(this.selectedList, toMove[0]);
         this.optionToFocus = null;
         this.dispatchChangeEvent(values);
+        this.selectedUpDownMovedOptions();
     }
 
     selectAllFromLastSelectedToOption(option, all) {
@@ -945,14 +993,16 @@ export default class LightningDualListbox extends LightningElement {
     }
 
     dispatchChangeEvent(values) {
-        // the change event needs to propagate to elements outside of the light-DOM, hence making it composed.
-        this.dispatchEvent(
-            new CustomEvent('change', {
-                composed: true,
-                bubbles: true,
-                detail: { value: values },
-            })
-        );
+        if (isCSR) {
+            // the change event needs to propagate to elements outside of the light-DOM, hence making it composed.
+            this.dispatchEvent(
+                new CustomEvent('change', {
+                    composed: true,
+                    bubbles: true,
+                    detail: { value: values },
+                })
+            );
+        }
     }
 
     assertRequiredAttributes() {
@@ -981,9 +1031,9 @@ export default class LightningDualListbox extends LightningElement {
     }
 
     getElementsOfList(listId) {
-        const elements = this.template.querySelectorAll(
-            `div[data-type='${listId}']`
-        );
+        const elements = isCSR
+            ? this.template.querySelectorAll(`div[data-type='${listId}']`)
+            : null;
         return elements ? elements : [];
     }
 
@@ -1098,4 +1148,27 @@ export default class LightningDualListbox extends LightningElement {
     get helptextAlternativeText() {
         return formatLabel(i18n.helpTextAlternativeText, this.label);
     }
+
+    selectedUpDownMovedOptions() {
+        let strMessage = [];
+        for (let i = 0; i < this.computedSelectedList.length; i++) {
+            const highlightedOption = this.highlightedOptions.indexOf(
+                this.computedSelectedList[i].value
+            );
+            if (highlightedOption !== -1) {
+                strMessage.push(
+                    formatLabel(
+                        i18n.verticallyMovedOptionsText,
+                        this.computedSelectedList[i].label,
+                        i + 1
+                    )
+                );
+            }
+        }
+        if (strMessage.length === 0) {
+            this._messageToDisplay = '';
+        } else {
+            this._messageToDisplay = strMessage.join(', ');
+        }
+    }
 }

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

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

package/src/lightning/dualListbox/dualListbox.lbc.native.css

@@ -0,0 +1,4 @@
+@import 'lightning/sldsCommon';
+@import "./form-element.slds.css";
+@import './listbox.slds.css';
+@import './dual-listbox.slds.css';

package/src/lightning/dualListbox/dualListbox.lbc.synthetic.css

@@ -0,0 +1,3 @@
+:host {
+    display: block;
+}