lightning-base-components 1.18.1-alpha → 1.18.2-alpha

package/src/lightning/datetimepicker/datetimepicker.html

@@ -26,7 +26,10 @@
                             required={required}
                             onfocus={handleDatepickerFocus}
                             onblur={handleDatepickerBlur}
-                            onchange={handleDateChange}>
+                            onchange={handleDateChange}
+                            aria-error-message-element={errorMessageElement}
+                            root-aria-node={rootAriaNode}
+                        >
                         </lightning-datepicker>
 
                         <lightning-timepicker
@@ -43,12 +46,15 @@
                             disabled={disabled}
                             onfocus={handleTimepickerFocus}
                             onblur={handleTimepickerBlur}
-                            onchange={handleTimeChange}>
+                            onchange={handleTimeChange}
+                            aria-error-message-element={errorMessageElement}
+                            root-aria-node={rootAriaNode}
+                        >
                         </lightning-timepicker>
                     </div>
                 </div>
             </div>
-                <div data-error-message id="errormessage" class={computedClass} aria-live="assertive">{customErrorMessage}</div>
+            <div data-error-message id="errormessage" class={computedClass} aria-live="assertive">{customErrorMessage}</div>
 
         </fieldset>
     </div>

package/src/lightning/datetimepicker/datetimepicker.js

@@ -4,14 +4,13 @@ import labelRangeUnderflow from '@salesforce/label/LightningDateTimePicker.range
 import labelTime from '@salesforce/label/LightningDateTimePicker.timeLabel';
 import labelHelpTextAlternativeText from '@salesforce/label/LightningInput.helptextAlternativeText';
 import sfTimeZone from '@salesforce/i18n/timeZone';
-import { LightningElement, track, api } from 'lwc';
+import { LightningElement, api, track } from 'lwc';
 import { classSet, formatLabel } from 'lightning/utils';
 import {
     normalizeBoolean,
-    normalizeAriaAttribute,
     synchronizeAttrs,
-    getRealDOMId,
     computeAriaInvalid,
+    reflectAttribute,
 } from 'lightning/utilsPrivate';
 import {
     getCurrentTimeString,
@@ -57,6 +56,8 @@ export default class LightningDateTimePicker extends LightningElement {
 
     @api timeAriaLabel;
 
+    @api rootAriaNode;
+
     /**
      * Controls auto-filling of the input. Set the attribute to pass
      * through autocomplete values to be interpreted by the browser.
@@ -268,6 +269,10 @@ export default class LightningDateTimePicker extends LightningElement {
         return this.getDatepicker().hasBadInput();
     }
 
+    get hasMissingDateTimeInput() {
+        return this.required && !this._dateValue && !this._timeValue;
+    }
+
     get hasBadTimeInput() {
         const timeBadInput = this.getTimepicker().hasBadInput();
         const timeMissing =
@@ -286,19 +291,37 @@ export default class LightningDateTimePicker extends LightningElement {
             return;
         }
 
+        if (this.hasMissingDateTimeInput) {
+            this.clearHelpMessage();
+            reflectAttribute(this.getDatepicker(), 'invalid', true);
+            reflectAttribute(this.getTimeCombobox(), 'invalid', true);
+        }
+
         if (this.hasBadDateInput && !this._messageWhenBadInput) {
             this.clearHelpMessage();
+            reflectAttribute(
+                this.getDatepicker(),
+                'invalid',
+                this.hasBadDateInput
+            );
             this.getDatepicker().showHelpMessage(message);
             return;
         }
 
         if (this.hasBadTimeInput && !this._messageWhenBadInput) {
             this.clearHelpMessage();
+            reflectAttribute(
+                this.getTimepicker(),
+                'invalid',
+                this.hasBadTimeInput
+            );
+            reflectAttribute(this.getTimeCombobox(), 'invalid', true);
             this.getTimepicker().showHelpMessage(message);
             return;
         }
 
         this.classList.add('slds-has-error');
+
         this._customErrorMessage = message;
     }
 
@@ -306,7 +329,10 @@ export default class LightningDateTimePicker extends LightningElement {
         this.classList.remove('slds-has-error');
         this._customErrorMessage = '';
         this.getDatepicker().showHelpMessage('');
+        this.getDatepicker().removeAttribute('invalid');
         this.getTimepicker().showHelpMessage('');
+        this.getTimepicker().removeAttribute('invalid');
+        this.getTimeCombobox().removeAttribute('invalid');
     }
 
     get isLabelHidden() {
@@ -340,36 +366,8 @@ export default class LightningDateTimePicker extends LightningElement {
         return 'slds-form-element__help ' + displayClass;
     }
 
-    get errorMessageElementId() {
-        return getRealDOMId(
-            this.template.querySelector('[data-error-message]')
-        );
-    }
-
-    get computedDateAriaDescribedBy() {
-        const ariaValues = [];
-
-        if (this.customErrorMessage) {
-            ariaValues.push(this.errorMessageElementId);
-        }
-        if (this.dateAriaDescribedBy) {
-            ariaValues.push(this.dateAriaDescribedBy);
-        }
-
-        return normalizeAriaAttribute(ariaValues);
-    }
-
-    get computedTimeAriaDescribedBy() {
-        const ariaValues = [];
-
-        if (this.customErrorMessage) {
-            ariaValues.push(this.errorMessageElementId);
-        }
-        if (this.timeAriaDescribedBy) {
-            ariaValues.push(this.timeAriaDescribedBy);
-        }
-
-        return normalizeAriaAttribute(ariaValues);
+    get errorMessageElement() {
+        return this.template.querySelector('[data-error-message]');
     }
 
     get hasExternalLabel() {
@@ -394,7 +392,7 @@ export default class LightningDateTimePicker extends LightningElement {
         if (datepicker) {
             synchronizeAttrs(datepicker, {
                 ariaLabelledByElement: this.dateAriaLabelledBy,
-                ariaDescribedByElements: this.computedDateAriaDescribedBy,
+                ariaDescribedByElements: this.dateAriaDescribedBy,
                 ariaControlsElement: this.dateAriaControls,
                 'aria-label': this.dateAriaLabel,
             });
@@ -403,7 +401,7 @@ export default class LightningDateTimePicker extends LightningElement {
         if (timepicker) {
             synchronizeAttrs(timepicker, {
                 ariaLabelledByElement: this.timeAriaLabelledBy,
-                ariaDescribedByElements: this.computedTimeAriaDescribedBy,
+                ariaDescribedByElements: this.timeAriaDescribedBy,
                 ariaControlsElement: this.timeAriaControls,
                 'aria-label': this.timeAriaLabel,
             });
@@ -441,6 +439,12 @@ export default class LightningDateTimePicker extends LightningElement {
         return this.template.querySelector('lightning-timepicker');
     }
 
+    getTimeCombobox() {
+        return this.getTimepicker().shadowRoot.querySelector(
+            'lightning-base-combobox'
+        );
+    }
+
     getDatepicker() {
         return this.template.querySelector('lightning-datepicker');
     }

package/src/lightning/datetimepicker/form-element.slds.css

@@ -0,0 +1,281 @@
+
+/* 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: '') {
+    /* TODO: Swap with utility classes */
+    :host([data-render-mode="shadow"]) fieldset {
+      border: 0;
+      margin: 0;
+      padding: 0;
+    }
+
+    /* FORM ELEMENT: BASE */
+    :host([data-render-mode="shadow"]) .slds-form-element {
+        position: relative;
+        min-width: 0;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__label {
+        overflow-wrap: break-word;
+        word-wrap: break-word;
+        hyphens: auto;
+        display: inline-block;
+        color: var(--sds-g-color-neutral-base-30, #444444);
+        font-size: var(--sds-g-font-scale-neg-3, 0.75rem);
+        padding-inline-end: var(--sds-g-spacing-2, 0.5rem);
+        padding-block-start: var(--sds-g-spacing-1, 0.25rem);
+        margin-block-end: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__label:empty {
+        margin: 0;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__control {
+        clear: left; /* NOTE: Ideally we want left to be inline-start but browser support is not ready for that value. We need to figure out better RTL support */
+        position: relative;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__icon {
+        display: inline-block;
+        position: relative;
+        padding-block-start: var(--sds-g-spacing-1, 0.25rem);
+        vertical-align: top;
+        line-height: var(--sds-g-font-lineheight-1, 1);
+        z-index: 1;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__icon .slds-button_icon {
+        position: relative;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__help,:host([data-render-mode="shadow"]) 
+    .slds-form-element__helper {
+        font-size: var(--sds-g-font-scale-neg-3, 0.75rem);
+        margin-block-start: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+        display: block;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element_edit .slds-form-element__static {
+        width: calc(100% - var(--sds-g-sizing-7, 1.5rem));
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element_readonly {
+        flex-basis: 0%;
+        border-bottom: var(--sds-g-sizing-border-1, 1px) solid var(--sds-g-color-neutral-base-90, #e5e5e5);
+        margin-block-end: 0;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element_readonly .slds-form-element__control {
+        padding-block-start: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+        padding-block-end: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element_readonly .slds-form-element__label {
+        margin-block-end: 0;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__legend {
+        font-weight: var(--sds-g-font-weight-7, 700);
+        float: left;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__addon {
+        display: inline-block;
+        margin-block-start: 0;
+        margin-block-end: 0;
+        margin-inline-start: var(--sds-g-spacing-2, 0.5rem);
+        margin-inline-end: var(--sds-g-spacing-2, 0.5rem);
+        align-self: center;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__static {
+        overflow-wrap: break-word;
+        word-wrap: break-word;
+        word-break: break-word;
+        display: inline-block;
+        font-size: var(--sds-g-font-scale-neg-1, 0.875rem);
+        font-weight: var(--sds-g-font-weight-4, 400);
+        color: var(--sds-g-color-neutral-base-10, #181818);
+        width: 100%;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__static.slds-text-longform *:last-child {
+        margin-block-end: 0;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__static:empty {
+        min-height: calc(var(--sds-g-sizing-6, 1.25rem) + 1px);
+        vertical-align: bottom;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element__static--edit {
+        width: calc(100% - var(--sds-g-sizing-7, 1.5rem));
+    }
+
+    :host([data-render-mode="shadow"]) .slds-required {
+        color: var(--sds-g-color-error-base-50, #ea001e);
+        margin-block-start: 0;
+        margin-block-end: 0;
+        margin-inline-start: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+        margin-inline-end: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+    }
+
+    :host([data-render-mode="shadow"]) .slds-has-error .slds-form-element__help {
+        color: var(--sds-g-color-error-base-50, #ea001e);
+    }
+
+    :host([data-render-mode="shadow"][invalid]) .slds-form-element__help {
+        color: var(--sds-g-color-error-base-50, #ea001e);
+    }
+
+    /* --------------------------------------- */
+
+    /* FORM ELEMENT: STACKED */
+
+    :host([data-render-mode="shadow"][variant~='label-stacked']) {
+        display: block;
+    }
+
+    /* TODO: Using `:not` is currently not working, and it could break the build because of issues with the dist script */
+
+    /* :host([variant~='label-stacked']):not(.slds-form-element_readonly) {
+        margin-block-end: var(--sds-g-spacing-2);
+    }
+
+    :host([variant~='label-stacked']):not(.slds-is-editing) {
+        padding: 0 var(--sds-g-spacing-1);
+    } */
+
+    /* :host([variant~='label-stacked']):not([class*="slds-size"]) {
+          width: 100%;
+          flex-basis: 100%;
+    } */
+
+    :host([data-render-mode="shadow"][variant~='label-stacked']) .slds-form-element {
+        padding: 0;
+        margin-block-end: 0;
+    }
+
+    :host([data-render-mode="shadow"][variant~='label-stacked']) .slds-form-element__label,:host([data-render-mode="shadow"][variant~='label-stacked']) .slds-form-element__control {
+        border-bottom: 0; /* Remove border when using legacy version of slds-form-element */
+        padding-inline-start: 0;
+    }
+
+    :host([data-render-mode="shadow"][variant~='label-stacked']) .slds-form-element__control {
+        width: 100%;
+        flex-basis: 100%;
+        clear: left;
+    }
+
+    :host([data-render-mode="shadow"][variant~='label-stacked']) .slds-form-element__icon {
+        float: none;
+        padding-block-start: var(--sds-g-spacing-1, 0.25rem);
+    }
+
+    /* --------------------------------------- */
+
+    /* FORM ELEMENT: INLINE */
+
+    :host([data-render-mode="shadow"][variant~='label-inline']) {
+        display: block;
+    }
+
+    /*
+    we have to combine with slds class here to avoid duplication
+    of this rule in child elements who import this stylesheet
+    in lighting-input this slds class is synonymous with the variant
+    */
+
+    :host([data-render-mode="shadow"][variant~='label-inline'].slds-form-element_horizontal) {
+        padding: var(--sds-g-spacing-1, 0.25rem);
+        margin-block-end: var(--sds-g-spacing-2, 0.5rem);
+    }
+
+    /* TODO: Using `:not` is currently not working, and it could break the build because of issues with the dist script */
+
+    /* :host([variant~='label-inline']):not(.slds-form-element_readonly) {
+        margin-block-end: var(--sds-g-spacing-2);
+    }
+
+    :host([variant~='label-inline']):not([class*="slds-size"]) {
+        width: 100%;
+        flex-basis: 100%;
+    }
+
+    :host([variant~='label-inline']:not(.slds-is-editing)) {
+        padding: var(--sds-g-spacing-1);
+    } */
+
+    :host([data-render-mode="shadow"][variant~='label-inline']).slds-is-edited {
+        padding-block-start: var(--sds-g-sizing-6, 1.25rem)
+    }
+
+    @media (min-width: 48em) {
+        :host([data-render-mode="shadow"][variant~='label-inline']) .slds-form-element__label {
+          float: left;
+          max-width: calc(33% - var(--sds-g-sizing-6, 1.25rem)); /* Removing icon width for when the help-text icon is present */
+          flex-basis: calc(33% - var(--sds-g-sizing-6, 1.25rem)); /* Some form element controls are set to display:flex */
+          flex-grow: 1; /* For IE and Safari which didn't auto expand to the available space */
+          margin-block-end: 0;
+          position: relative;
+          z-index: 1;
+        }
+
+        :host([data-render-mode="shadow"][variant~='label-inline']) lightning-helptext {
+          float: left;
+        }
+
+        :host([data-render-mode="shadow"][variant~='label-inline']) .slds-form-element__control {
+          margin-inline-start: 33%;
+          clear: none; /* Reset clear: left when switching to horizontal form layout */
+        }
+
+        :host([data-render-mode="shadow"][variant~='label-inline']) .slds-form-element__control .slds-form-element__control {
+          padding-inline-start: 0; /* Remove left padding on nested form controls, due to issues related to lightning-form components */
+        }
+
+        :host([data-render-mode="shadow"][variant~='label-inline']) .slds-dueling-list__column .slds-form-element__label {
+            width: auto;
+            max-width: 100%;
+            -ms-flex-preferred-size: auto;
+            flex-basis: auto;
+            float: none;
+            position: relative;
+            padding-inline-start: 0;
+            margin-block-end: 0;
+        }
+
+        :host([data-render-mode="shadow"][variant~='label-inline']) .slds-form-element__help {
+          margin-inline-start: 33%;
+        }
+
+        :host([data-render-mode="shadow"][variant~='label-inline']) .slds-dueling-list {
+            clear: none;
+        }
+    }
+
+    /* --------------------------------------- */
+
+    /* FORM ELEMENT: COMPOUND */
+
+    :host([data-render-mode="shadow"]) .slds-form-element_compound .slds-form-element__row {
+      display: flex;
+      margin-bottom: var(--sds-g-spacing-1, 0.25rem);
+      margin-left: calc(var(--sds-g-spacing-1, 0.25rem) * -1);
+      margin-right: calc(var(--sds-g-spacing-1, 0.25rem) * -1);
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element_compound .slds-form-element__row .slds-form-element__label {
+      padding-top: 0;
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element_compound .slds-form-element {
+      padding-left: var(--sds-g-spacing-1, 0.25rem);
+      padding-right: var(--sds-g-spacing-1, 0.25rem);
+    }
+
+    :host([data-render-mode="shadow"]) .slds-form-element_address .slds-form-element__row {
+      align-items: flex-end;
+    }
+}