mirror of
https://github.com/shoelace-style/webawesome.git
synced 2026-01-18 06:59:13 +00:00
Compare commits
2 Commits
id-fixes
...
1566-fix-c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cbd82ab79a | ||
|
|
b14624b60a |
@@ -252,9 +252,8 @@ wa-button.delete {
|
||||
padding-bottom: 1rem;
|
||||
}
|
||||
|
||||
wa-page::part(drawer__dialog),
|
||||
wa-page::part(menu) {
|
||||
overflow: clip;
|
||||
scrollbar-width: thin;
|
||||
}
|
||||
|
||||
/* smaller viewports-based navigation */
|
||||
|
||||
@@ -36,7 +36,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]
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -462,7 +462,7 @@
|
||||
&::after {
|
||||
content: '';
|
||||
background-color: var(--wa-color-text-quiet);
|
||||
mask: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!--! Font Awesome Free 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M311.1 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L243.2 256 73.9 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"/></svg>')
|
||||
mask: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="16" width="10" viewBox="0 0 320 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M311.1 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L243.2 256 73.9 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"/></svg>')
|
||||
center no-repeat;
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
@@ -874,6 +874,7 @@
|
||||
input[type='radio'] {
|
||||
appearance: none;
|
||||
|
||||
position: relative;
|
||||
flex: 0 0 auto;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@@ -921,18 +922,21 @@
|
||||
|
||||
&:checked::after,
|
||||
&:indeterminate::after {
|
||||
position: absolute;
|
||||
|
||||
width: round(calc(100% - var(--wa-form-control-border-width) * 2), 1px);
|
||||
height: round(calc(100% - var(--wa-form-control-border-width) * 2), 1px);
|
||||
|
||||
content: '';
|
||||
|
||||
width: var(--wa-form-control-toggle-size);
|
||||
height: var(--wa-form-control-toggle-size);
|
||||
scale: var(--checked-icon-scale);
|
||||
|
||||
background-color: currentColor;
|
||||
|
||||
scale: var(--checked-icon-scale);
|
||||
}
|
||||
|
||||
&:checked::after {
|
||||
mask: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M434.8 70.1c14.3 10.4 17.5 30.4 7.1 44.7l-256 352c-5.5 7.6-14 12.3-23.4 13.1s-18.5-2.7-25.1-9.3l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l101.5 101.5 234-321.7c10.4-14.3 30.4-17.5 44.7-7.1z"/></svg>')
|
||||
center / 1em 1em no-repeat;
|
||||
mask: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M434.8 70.1c14.3 10.4 17.5 30.4 7.1 44.7l-256 352c-5.5 7.6-14 12.3-23.4 13.1s-18.5-2.7-25.1-9.3l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l101.5 101.5 234-321.7c10.4-14.3 30.4-17.5 44.7-7.1z"/></svg>')
|
||||
center no-repeat;
|
||||
}
|
||||
|
||||
&:indeterminate::after {
|
||||
@@ -960,8 +964,7 @@
|
||||
content: '';
|
||||
|
||||
aspect-ratio: 1;
|
||||
width: 100%;
|
||||
scale: var(--checked-icon-scale);
|
||||
width: round(calc(100% * var(--checked-icon-scale)), 1px);
|
||||
|
||||
background-color: currentColor;
|
||||
border-radius: 50%;
|
||||
@@ -1062,7 +1065,9 @@
|
||||
|
||||
/* Select */
|
||||
select {
|
||||
--icon-caret: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc. --><path fill="rgb(180 180 200)" d="M201.4 406.6c12.5 12.5 32.8 12.5 45.3 0l192-192c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L224 338.7 54.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l192 192z"/></svg>');
|
||||
--icon-caret: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 512 512"><path fill="rgb(180 180 200)" d="M233.4 406.6c12.5 12.5 32.8 12.5 45.3 0l192-192c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L256 338.7 86.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l192 192z"/></svg>');
|
||||
|
||||
--icon-caret: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 448 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="rgb(180 180 200)" d="M201.4 406.6c12.5 12.5 32.8 12.5 45.3 0l192-192c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L224 338.7 54.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l192 192z"/></svg>');
|
||||
|
||||
appearance: none;
|
||||
|
||||
@@ -1075,7 +1080,6 @@
|
||||
background-repeat: no-repeat;
|
||||
background-position: center right var(--wa-form-control-padding-inline);
|
||||
background-blend-mode: hue, difference;
|
||||
background-size: 1rem 1rem;
|
||||
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@@ -457,7 +457,7 @@
|
||||
border-color: var(--wa-color-gray-50);
|
||||
}
|
||||
|
||||
&:state(checked)::part(control) {
|
||||
&[checked]::part(control) {
|
||||
background-color: var(--wa-form-control-activated-color);
|
||||
border-color: var(--wa-form-control-activated-color);
|
||||
}
|
||||
@@ -466,7 +466,7 @@
|
||||
background-color: var(--wa-color-surface-default);
|
||||
border: var(--wa-border-width-s) var(--wa-border-style) var(--wa-color-gray-50);
|
||||
}
|
||||
&:state(checked)::part(thumb) {
|
||||
&[checked]::part(thumb) {
|
||||
border-color: var(--wa-form-control-activated-color);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user