make parts consistent; fixes #1646

packages/webawesome/docs/docs/resources/changelog.md

@@ -21,6 +21,7 @@ Components with the <wa-badge variant="warning">Experimental</wa-badge> badge sh
   - `<wa-select>`
   - `<wa-tag>`
   - `<wa-textarea>`
+- 🚨 BREAKING: Fixed a bug where `base` and `input` parts were swapped in `<wa-input>` [issue:1646]
 - Added the Kazakh translation [pr:1496]
 - Added docs for code completion for VS Code and JetBrains [pr:1550]
 - Added back the missing `form-control-label` part to `<wa-textarea>` for consistency with other form controls [pr:1533]
@@ -36,7 +37,6 @@ Components with the <wa-badge variant="warning">Experimental</wa-badge> badge sh
 - Fixed a bug in `<wa-tooltip>` that prevented tooltips from showing when disconnecting and then reconnecting to the DOM [issue:1595]
 - Fixed a bug that caused the required `*` in form labels to have incorrect spacing in `<wa-checkbox>` and `<wa-switch>` [issue:1472]
 - Fixed a bug in `<wa-dialog>` and `<wa-drawer>` that caused the component to prematurely hide when certain child elements are used [pr:1636]
-- Fixed a bug in `<wa-popover>` and `<wa-tooltip>` that prevented dots and other valid ID characters from being used [issue:1648]
 - Improved autofill styles in `<wa-input>` so they span the entire width of the visual input [issue:1439]
 - Modified `<wa-slider>` to only show the tooltip on the handle being dragged when in range mode [issue:1320]
 - Improved [text utilities](/docs/utilities/text/) so that each size modifier always exactly matches the applied font size [pr:1602]

packages/webawesome/src/components/input/input.ts

@@ -40,8 +40,8 @@ import styles from './input.css';
  *
  * @csspart label - The label
  * @csspart hint - The hint's wrapper.
- * @csspart input - The wrapper being rendered as an input
- * @csspart base - The internal `<input>` control.
+ * @csspart base - The wrapper being rendered as an input
+ * @csspart input - The internal `<input>` control.
  * @csspart start - The container that wraps the `start` slot.
  * @csspart clear-button - The clear button.
  * @csspart password-toggle-button - The password toggle button.
@@ -353,11 +353,11 @@ export default class WaInput extends WebAwesomeFormAssociatedElement {
         <slot name="label">${this.label}</slot>
       </label>
 
-      <div part="input" class="text-field">
+      <div part="base" class="text-field">
         <slot name="start" part="start" class="start"></slot>
 
         <input
-          part="base"
+          part="input"
           id="input"
           class="control"
           type=${this.type === 'password' && this.passwordVisible ? 'text' : this.type}

packages/webawesome/src/components/popover/popover.ts

@@ -230,7 +230,7 @@ export default class WaPopover extends WebAwesomeElement {
       return;
     }
 
-    const newAnchor = this.for ? rootNode.getElementById(this.for) : null;
+    const newAnchor = this.for ? rootNode.querySelector(`#${this.for}`) : null;
     const oldAnchor = this.anchor;
 
     if (newAnchor === oldAnchor) {

packages/webawesome/src/components/slider/slider.ts

@@ -690,8 +690,8 @@ export default class WaSlider extends WebAwesomeFormAssociatedElement {
     if (!this.withTooltip) return;
 
     // Show only the active tooltip, hide the other
-    const tooltipMin = this.shadowRoot?.getElementById('tooltip-thumb-min') as WaTooltip;
-    const tooltipMax = this.shadowRoot?.getElementById('tooltip-thumb-max') as WaTooltip;
+    const tooltipMin = this.shadowRoot?.querySelector('#tooltip-thumb-min') as WaTooltip;
+    const tooltipMax = this.shadowRoot?.querySelector('#tooltip-thumb-max') as WaTooltip;
 
     if (this.activeThumb === 'min') {
       if (tooltipMin) tooltipMin.open = true;
@@ -705,8 +705,8 @@ export default class WaSlider extends WebAwesomeFormAssociatedElement {
   private hideRangeTooltips() {
     if (!this.withTooltip) return;
 
-    const tooltipMin = this.shadowRoot?.getElementById('tooltip-thumb-min') as WaTooltip;
-    const tooltipMax = this.shadowRoot?.getElementById('tooltip-thumb-max') as WaTooltip;
+    const tooltipMin = this.shadowRoot?.querySelector('#tooltip-thumb-min') as WaTooltip;
+    const tooltipMax = this.shadowRoot?.querySelector('#tooltip-thumb-max') as WaTooltip;
 
     if (tooltipMin) tooltipMin.open = false;
     if (tooltipMax) tooltipMax.open = false;

packages/webawesome/src/components/tooltip/tooltip.ts

@@ -137,7 +137,8 @@ export default class WaTooltip extends WebAwesomeElement {
     this.eventController.abort();
 
     if (this.anchor) {
-      this.removeFromAriaLabelledBy(this.anchor, this.id);
+      const label = this.anchor.getAttribute('aria-labelledby') || '';
+      this.anchor.setAttribute('aria-labelledby', label.replace(this.id, ''));
     }
   }
 
@@ -201,34 +202,6 @@ export default class WaTooltip extends WebAwesomeElement {
     return triggers.includes(triggerType);
   }
 
-  /** Adds the tooltip ID to the aria-labelledby attribute */
-  private addToAriaLabelledBy(element: Element, id: string) {
-    const currentLabel = element.getAttribute('aria-labelledby') || '';
-    const labels = currentLabel.split(/\s+/).filter(Boolean);
-
-    // Only add if not already present
-    if (!labels.includes(id)) {
-      labels.push(id);
-      element.setAttribute('aria-labelledby', labels.join(' '));
-    }
-  }
-
-  /** Removes the tooltip ID from the aria-labelledby attribute */
-  private removeFromAriaLabelledBy(element: Element, id: string) {
-    const currentLabel = element.getAttribute('aria-labelledby') || '';
-    const labels = currentLabel.split(/\s+/).filter(Boolean);
-
-    // Remove the ID
-    const filteredLabels = labels.filter(label => label !== id);
-
-    if (filteredLabels.length > 0) {
-      element.setAttribute('aria-labelledby', filteredLabels.join(' '));
-    } else {
-      // Remove the attribute if empty
-      element.removeAttribute('aria-labelledby');
-    }
-  }
-
   @watch('open', { waitUntilFirstUpdate: true })
   async handleOpenChange() {
     if (this.open) {
@@ -279,7 +252,7 @@ export default class WaTooltip extends WebAwesomeElement {
       return;
     }
 
-    const newAnchor = this.for ? rootNode.getElementById(this.for) : null;
+    const newAnchor = this.for ? rootNode.querySelector(`#${this.for}`) : null;
     const oldAnchor = this.anchor;
 
     if (newAnchor === oldAnchor) {
@@ -288,6 +261,9 @@ export default class WaTooltip extends WebAwesomeElement {
 
     const { signal } = this.eventController;
 
+    // "\\b" is a space boundary, used for making sure we don't add the tooltip to aria-labelledby twice.
+    const labelRegex = new RegExp(`\\b${this.id}\\b`);
+
     if (newAnchor) {
       /**
        * We use `aria-labelledby` because it seems to have the most consistent screen reader experience.
@@ -296,7 +272,10 @@ export default class WaTooltip extends WebAwesomeElement {
        * whereas with `aria-labelledby` it'll still read on first focus. The APG does and WAI-ARIA does recommend aria-describedby
        * so perhaps once we have cross-root aria, we can revisit this decision.
        */
-      this.addToAriaLabelledBy(newAnchor, this.id);
+      const currentLabel = newAnchor.getAttribute('aria-labelledby') || '';
+      if (!currentLabel.match(labelRegex)) {
+        newAnchor.setAttribute('aria-labelledby', currentLabel + ' ' + this.id);
+      }
 
       newAnchor.addEventListener('blur', this.handleBlur, { capture: true, signal });
       newAnchor.addEventListener('focus', this.handleFocus, { capture: true, signal });
@@ -306,7 +285,8 @@ export default class WaTooltip extends WebAwesomeElement {
     }
 
     if (oldAnchor) {
-      this.removeFromAriaLabelledBy(oldAnchor, this.id);
+      const label = oldAnchor.getAttribute('aria-labelledby') || '';
+      oldAnchor.setAttribute('aria-labelledby', label.replace(labelRegex, ''));
       oldAnchor.removeEventListener('blur', this.handleBlur, { capture: true });
       oldAnchor.removeEventListener('focus', this.handleFocus, { capture: true });
       oldAnchor.removeEventListener('click', this.handleClick);

packages/webawesome/src/styles/themes/awesome.css

@@ -460,7 +460,7 @@
         wa-textarea
       ):not(:focus):not([appearance='filled']) {
       &:where(:not(wa-input):not(wa-select):not(wa-textarea)),
-      &:where(wa-input)::part(input),
+      &:where(wa-input)::part(base),
       &:where(wa-select)::part(combobox),
       &:where(wa-textarea)::part(base) {
         box-shadow: inset var(--wa-shadow-offset-x-s)