@aurodesignsystem-dev/auro-formkit 0.0.0-pr624.7 → 0.0.0-pr624.70

package/components/radio/dist/index.js

@@ -81,6 +81,7 @@ let AuroLibraryRuntimeUtils$1 = class AuroLibraryRuntimeUtils {
   }
 };
 
+/* eslint-disable max-lines */
 // Copyright (c) 2020 Alaska Airlines. All right reserved. Licensed under the Apache-2.0 license
 // See LICENSE in the project root for license information.
 
@@ -115,8 +116,8 @@ class AuroRadio extends LitElement {
     this.required = false;
     this.error = false;
     this.onDark = false;
-    this.tabIndex = -1;
     this.touched = false;
+    this.role = 'radio';
 
     /**
      * @private
@@ -158,10 +159,6 @@ class AuroRadio extends LitElement {
       label:    { type: String },
       name:     { type: String },
       value:    { type: String },
-      tabIndex: {
-        type: Number,
-        reflect: true
-      },
 
       /**
        * Whether or not the radio button has been touched by the user.
@@ -174,13 +171,22 @@ class AuroRadio extends LitElement {
       },
 
       /**
+       * ID for input node.
        * @private
-       * id for input node
        */
       inputId: {
         type: String,
         reflect: false,
         attribute: false
+      },
+
+      /**
+       *  Do not add to api doc since changing of this can easily break a11y.
+       * @private
+       */
+      role: {
+        type: String,
+        reflect: true
       }
     };
   }
@@ -206,7 +212,6 @@ class AuroRadio extends LitElement {
   handleChange(event) {
     this.checked = event.target.checked;
     const customEvent = new CustomEvent(event.type, event);
-
     this.dispatchEvent(customEvent);
   }
 
@@ -265,7 +270,27 @@ class AuroRadio extends LitElement {
   }
 
   updated(changedProperties) {
+    if (changedProperties.has('error') || changedProperties.has('validity')) {
+      this.setAttribute('aria-invalid', this.error || this.validity !== 'valid' ? 'true' : 'false');
+    }
+
+    if (changedProperties.has('required')) {
+      this.setAttribute('aria-required', this.isRequired(this.required));
+    }
+
+    if (changedProperties.has('disabled')) {
+      if (this.disabled) {
+        this.setAttribute('aria-disabled', '');
+      } else {
+        this.removeAttribute('aria-disabled');
+      }
+    }
+
     if (changedProperties.has('checked')) {
+      this.setAttribute('aria-checked', this.checked ? 'true' : 'false');
+      // eslint-disable-next-line no-magic-numbers
+      this.setAttribute('tabindex', this.checked ? 0 : -1);
+
       this.dispatchEvent(new CustomEvent('resetRadio', {
         bubbles: true,
         composed: true
@@ -280,20 +305,6 @@ class AuroRadio extends LitElement {
     }
   }
 
-  /**
-   * Method for handling content when it is invalid accessibility wise.
-   * @private
-   * @param {Boolean} error - The element's error attribute.
-   * @returns {void}
-   */
-  invalid(error) {
-    if (error) {
-      return 'true';
-    }
-
-    return 'false';
-  }
-
   /**
    * Method for handling passing the required status to aria.
    * @private
@@ -312,6 +323,7 @@ class AuroRadio extends LitElement {
     // Add the tag name as an attribute if it is different than the component name
     this.runtimeUtils.handleComponentTagRename(this, 'auro-radio');
 
+    this.addEventListener('focus', this.handleFocus);
     this.addEventListener('blur', this.handleBlur);
 
     this.input = this.shadowRoot.querySelector('input');
@@ -336,27 +348,21 @@ class AuroRadio extends LitElement {
     return html`
       <div class="ods-inputGroup rdoGroup" part="radio">
         <input
-          class="util_displayHiddenVisually ods-inputOption rdo--input"
+          class="util_displayHidden ods-inputOption rdo--input"
           part="radio-input"
-          @focus="${this.handleFocus}"
           @input="${this.handleInput}"
           @change="${this.handleChange}"
           ?disabled="${this.disabled}"
-          aria-invalid="${this.invalid(this.error)}"
-          aria-required="${this.isRequired(this.required)}"
           .checked="${this.checked}"
           id="${this.inputId}"
           name="${ifDefined(this.name)}"
           type="radio"
           .value="${this.value}"
+          aria-hidden="true"
           tabindex="-1"
         />
 
-        <label
-          for="${this.inputId}"
-          class="${classMap(labelClasses)}"
-          part="radio-label"
-        >
+        <label for="${this.inputId}" class="${classMap(labelClasses)}" part="radio-label">
           <slot>${this.label}</slot>
         </label>
       </div>
@@ -365,7 +371,7 @@ class AuroRadio extends LitElement {
   }
 }
 
-var styleCss$1 = css`:host{display:block;padding-bottom:var(--ds-size-150, 0.75rem)}fieldset{all:unset}.displayFlex legend+slot{display:flex;white-space:nowrap}legend{margin-bottom:var(--ds-size-150, 0.75rem)}`;
+var styleCss$1 = css`:host{display:block;padding-bottom:var(--ds-size-150, 0.75rem)}fieldset{all:unset}.displayFlex legend+slot{display:flex;white-space:nowrap}legend{margin-bottom:var(--ds-size-150, 0.75rem)}[auro-helptext]{margin-top:var(--ds-size-150, 0.75rem)}`;
 
 var colorCss$1 = css`:host legend{color:var(--ds-auro-radio-group-label-color)}:host([disabled]){--ds-auro-radio-group-label-color: var(--ds-basic-color-texticon-disabled, #d0d0d0)}:host([onDark]){--ds-auro-radio-group-label-color: var(--ds-basic-color-texticon-inverse, #ffffff)}:host([onDark][disabled]){--ds-auro-radio-group-label-color: var(--ds-basic-color-texticon-inverse-disabled, #7e8894)}`;
 
@@ -845,19 +851,19 @@ class AuroFormValidation {
           {
             check: (e) => e.value?.length > 0 && e.value?.length < e.minLength,
             validity: 'tooShort',
-            message: e => e.setCustomValidityTooShort || e.setCustomValidity || ''
+            message: e => e.getAttribute('setCustomValidityTooShort') || e.setCustomValidity || ''
           },
           {
             check: (e) => e.value?.length > e.maxLength,
             validity: 'tooLong',
-            message: e => e.setCustomValidityTooLong || e.setCustomValidity || ''
+            message: e => e.getAttribute('setCustomValidityTooLong') || e.setCustomValidity || ''
           }
         ],
         pattern: [
           {
             check: (e) => e.pattern && !new RegExp(`^${e.pattern}$`, 'u').test(e.value),
             validity: 'patternMismatch',
-            message: e => e.setCustomValidityPatternMismatch || e.setCustomValidity || ''
+            message: e => e.getAttribute('setCustomValidityPatternMismatch') || e.setCustomValidity || ''
           }
         ]
       },
@@ -1004,13 +1010,24 @@ class AuroFormValidation {
     this.getInputElements(elem);
     this.getAuroInputs(elem);
 
-    // Validate only if noValidate is not true and the input does not have focus
+    // Check if validation should run
     let validationShouldRun =
+
+      // If the validation was forced
       force ||
-      (!elem.contains(document.activeElement) &&
-        (elem.touched ||
-          (!elem.touched && typeof elem.value !== "undefined"))) ||
-      elem.validateOnInput;
+
+      // If the validation should run on input
+      elem.validateOnInput ||
+
+      // State-based checks
+      (
+        // Element is not currently focused
+        !elem.contains(document.activeElement) && // native input is not focused directly
+        !document.activeElement.shadowRoot?.contains(elem) && // native input is not focused in the shadow DOM of another component
+
+        // And element has been touched or is untouched but has a value
+        ( elem.touched || (!elem.touched && typeof elem.value !== "undefined") )
+      );
 
     if (elem.hasAttribute('error')) {
       elem.validity = 'customError';
@@ -1052,10 +1069,10 @@ class AuroFormValidation {
       if (!hasValue && elem.required && elem.touched) {
         elem.validity = 'valueMissing';
         elem.errorMessage = elem.setCustomValidityValueMissing || elem.setCustomValidity || '';
-      } else if (this.runtimeUtils.elementMatch(elem, 'auro-input')) {
+      } else if (hasValue && this.runtimeUtils.elementMatch(elem, 'auro-input')) {
         this.validateType(elem);
         this.validateElementAttributes(elem);
-      } else if (this.runtimeUtils.elementMatch(elem, 'auro-counter') || this.runtimeUtils.elementMatch(elem, 'auro-counter-group')) {
+      } else if (hasValue && (this.runtimeUtils.elementMatch(elem, 'auro-counter') || this.runtimeUtils.elementMatch(elem, 'auro-counter-group'))) {
         this.validateElementAttributes(elem);
       }
     }
@@ -1064,7 +1081,9 @@ class AuroFormValidation {
       elem.validity = this.auroInputElements[0].validity;
       elem.errorMessage = this.auroInputElements[0].errorMessage;
 
-      if (elem.validity === 'valid' && this.auroInputElements.length > 1) {
+      // combobox has 2 inputs but no need to check validity on the 2nd one which is in fullscreen bib. 
+      // combobox's 2nd input will have noValidate set true.
+      if (elem.validity === 'valid' && this.auroInputElements.length > 1 && !this.auroInputElements[1].noValidate) {
         elem.validity = this.auroInputElements[1].validity;
         elem.errorMessage = this.auroInputElements[1].errorMessage;
       }
@@ -1184,9 +1203,9 @@ class AuroDependencyVersioning {
   }
 }
 
-var colorCss = css`:host([error]){--ds-auro-helptext-color: var(--ds-basic-color-status-error, #e31f26)}:host([onDark]){--ds-auro-helptext-color: var(--ds-basic-color-texticon-inverse-muted, #ccd2db)}:host([onDark][error]){--ds-auro-helptext-color: var(--ds-advanced-color-state-error-inverse, #f9a4a8)}.helptext-wrapper{color:var(--ds-auro-helptext-color)}`;
+var colorCss = css`:host([error]){--ds-auro-helptext-color: var(--ds-basic-color-status-error, #e31f26)}:host([onDark]){--ds-auro-helptext-color: var(--ds-basic-color-texticon-inverse-muted, #ccd2db)}:host([onDark][error]){--ds-auro-helptext-color: var(--ds-basic-color-status-error-subtle, #fbc6c6)}.helptext-wrapper{color:var(--ds-auro-helptext-color)}`;
 
-var styleCss = css`.helptext-wrapper{display:none;font-size:var(--ds-basic-text-body-xs-font-size, 12px);font-weight:var(--ds-basic-text-body-xs-font-weight, 450);letter-spacing:var(--ds-basic-text-body-xs-letter-spacing, 0);line-height:var(--ds-basic-text-body-xs-line-height, 16px)}:host([large]) .helptext-wrapper{font-size:var(--ds-basic-text-body-default-font-size, 16px);font-weight:var(--ds-basic-text-body-default-font-weight, 450);letter-spacing:var(--ds-basic-text-body-default-letter-spacing, 0);line-height:var(--ds-basic-text-body-default-line-height, 24px)}.helptext-wrapper[visible]{display:block}::slotted(*:not(:empty)){margin-top:var(--ds-size-50, 0.25rem);margin-bottom:0}::slotted(p){margin-block:0}`;
+var styleCss = css`:host{position:relative;display:block}.helptext-wrapper{display:none;font-size:12px;font-weight:450;letter-spacing:0;line-height:16px}:host([large]) .helptext-wrapper{font-size:16px;font-weight:450;letter-spacing:0;line-height:24px}.helptext-wrapper[visible]{display:block}::slotted(*:not(:empty)){margin-top:var(--ds-size-50, 0.25rem);margin-bottom:0}::slotted(p){margin-block:0}`;
 
 var tokensCss = css`:host{--ds-auro-helptext-color: var(--ds-basic-color-texticon-muted, #676767)}`;
 
@@ -1412,7 +1431,7 @@ var helpTextVersion = '1.0.0';
  * @attr {Object} optionSelected - Specifies the current selected radio button.
  * @csspart radio-group - Apply css to the fieldset element in the shadow DOM
  * @slot {HTMLSlotElement} legend - Allows for the legend to be overridden.
- * @slot {HTMLSlotElement} optionalLabel - Allows for the optional label to be overridden.
+ * @slot {HTMLSlotElement} optionalLabel - Allows overriding the optional display text "(optional)", which appears next to the label.
  * @slot {HTMLSlotElement} helpText - Allows for the helper text to be overridden.
  * @event auroFormElement-validated - Notifies that the element has been validated.
  * @event input - Notifies every time the value prop of the element is changed.
@@ -1568,7 +1587,7 @@ class AuroRadioGroup extends LitElement {
 
     this.optionSelected = event.target;
 
-    this.validation.validate(this);
+    this.validation.validate(this, this.optionSelected !== undefined);
   }
 
   /**
@@ -1667,15 +1686,6 @@ class AuroRadioGroup extends LitElement {
     if (this.items.length === 0) {
       this.handleItems();
     }
-
-    // handle tab index
-    this.items.forEach((item) => {
-      item.tabIndex = -1;
-    });
-
-    if (!this.disabled) {
-      this.items[this.index].tabIndex = 0;
-    }
   }
 
   /**
@@ -1719,10 +1729,7 @@ class AuroRadioGroup extends LitElement {
       const nextEnabledIndex = this.items.findIndex((item) => !item.hasAttribute('disabled'));
 
       this.index = index >= 0 ? index : nextEnabledIndex;
-
-      if (this.index >= 0) {
-        this.items[this.index].tabIndex = 0;
-      }
+      this.items[this.index].setAttribute('tabindex', 0);
     }
   }
 
@@ -1736,20 +1743,10 @@ class AuroRadioGroup extends LitElement {
     this.index = this.items.indexOf(event.target);
 
     this.items.forEach((item) => {
-      if (item === event.target) {
-        item.tabIndex = 0;
-        if (event.target.value) {
-          this.value = event.target.value;
-        }
-      } else {
-        const sdInput = item.shadowRoot.querySelector('input');
-
-        sdInput.checked = false;
-        item.checked = false;
-        item.tabIndex = -1;
-      }
+      item.checked = item === event.target;
     });
 
+    this.value = event.target.value;
     this.optionSelected = event.target;
 
     this.validation.validate(this);
@@ -1762,7 +1759,7 @@ class AuroRadioGroup extends LitElement {
    * @returns {void}
    */
   selectItem(index) {
-    const sdItem = this.items[index].shadowRoot.querySelector('input');
+    const sdItem = this.items[index];
 
     sdItem.click();
     sdItem.focus();
@@ -1781,17 +1778,18 @@ class AuroRadioGroup extends LitElement {
 
     for (currIndex; currIndex < this.items.length; moveDirection === "Down" ? currIndex += 1 : currIndex -= 1) {
       currIndex = currIndex === -1 ? this.items.length - 1 : currIndex;
-      const sdItem = this.items[currIndex].shadowRoot.querySelector('input');
-
-      if (this.disabled || this.items.every((item) => item.disabled === true)) {
-        sdItem.focus();
-        break;
-      }
-      if (!sdItem.disabled) {
-        sdItem.click();
-        sdItem.focus();
-        this.index = currIndex;
-        break;
+      const sdItem = this.items[currIndex];
+      if (sdItem) {
+        if (this.disabled || this.items.every((item) => item.disabled === true)) {
+          sdItem.focus();
+          break;
+        }
+        if (!sdItem.disabled) {
+          sdItem.click();
+          sdItem.focus();
+          this.index = currIndex;
+          break;
+        }
       }
     }
   }
@@ -1834,21 +1832,21 @@ class AuroRadioGroup extends LitElement {
     };
 
     return html$1`
-      <fieldset class="${classMap(groupClasses)}" part="radio-group">
-        ${this.required
-        ? html$1`<legend><slot name="legend"></slot></legend>`
-        : html$1`<legend><slot name="legend"></slot> <slot name="optionalLabel">(optional)</slot></legend>`
-      }
+      <fieldset class="${classMap(groupClasses)}" part="radio-group" role="radiogroup">
+        <legend>
+          <slot name="legend"></slot>
+          ${this.required ? undefined : html$1`<slot name="optionalLabel"> (optional)</slot>`}
+        </legend>
         <slot @slotchange=${this.handleSlotChange}></slot>
       </fieldset>
 
       ${!this.validity || this.validity === undefined || this.validity === 'valid'
         ? html$1`
-          <${this.helpTextTag} large ?onDark="${this.onDark}" part="helpText">
+          <${this.helpTextTag} ?onDark="${this.onDark}" part="helpText">
             <slot name="helpText"></slot>
           </${this.helpTextTag}>`
         : html$1`
-          <${this.helpTextTag} large ?onDark="${this.onDark}" role="alert" error aria-live="assertive" part="helpText">
+          <${this.helpTextTag} ?onDark="${this.onDark}" role="alert" error aria-live="assertive" part="helpText">
             ${this.errorMessage}
           </${this.helpTextTag}>`
       }