Skip to content

fix(web-components): isolate radio option label targets #4614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sylvesterkaczmarek wants to merge 1 commit into
base: develop
Choose a base branch
from
+54 −2
Open

fix(web-components): isolate radio option label targets #4614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions packages/web-components/src/components/ic-radio-group/test/basic/ic-radio-group.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,3 +552,39 @@ describe("ic-radio-group", () => {
expect(fieldset?.hasAttribute("aria-label")).toBe(false);
});
});

describe("ic-radio-group option ids", () => {
it("keeps label targets unique across repeated radio groups", async () => {
const page = await newSpecPage({
components: [RadioGroup, RadioOption],
html: `<div>
<ic-radio-group label="Test" name="test-0">
<ic-radio-option label="Option A" value="a"></ic-radio-option>
<ic-radio-option label="Option B" value="b"></ic-radio-option>
</ic-radio-group>
<ic-radio-group label="Test" name="test-1">
<ic-radio-option label="Option A" value="a"></ic-radio-option>
<ic-radio-option label="Option B" value="b"></ic-radio-option>
</ic-radio-group>
</div>`,
});

await page.waitForChanges();

const radioOptions = Array.from(
page.doc.querySelectorAll("ic-radio-option")
);
const inputs = radioOptions.map((option) =>
option.querySelector<HTMLInputElement>('input[type="radio"]')
);
const labels = radioOptions.map((option) =>
option.querySelector<HTMLLabelElement>("label")
);
const ids = inputs.map((input) => input?.id);

expect(new Set(ids).size).toBe(ids.length);
labels.forEach((label, index) => {
expect(label?.getAttribute("htmlfor")).toBe(inputs[index]?.id);
});
});
});
20 changes: 18 additions & 2 deletions packages/web-components/src/components/ic-radio-option/ic-radio-option.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,29 @@ export class RadioOption {
this.selected = this.initiallySelected;
};

private getRadioOptionId = (): string => {
const radioGroups = Array.from(
this.el.ownerDocument.querySelectorAll("ic-radio-group")
) as HTMLIcRadioGroupElement[];
const matchingGroupLabels = radioGroups.filter(
(radioGroup) => radioGroup.label === this.groupLabel
).length;
const groupIdentifier =
matchingGroupLabels > 1 && this.name
? `${this.groupLabel}-${this.name}`
: this.groupLabel;

return `ic-radio-option-${
isPropDefined(this.label) || this.value
}-${groupIdentifier}`;
};

render() {
const {
additionalFieldDisplay,
disabled,
dynamicText,
form,
groupLabel,
handleClick,
handleKeyDown,
hasAdditionalField,
Expand All @@ -264,7 +280,7 @@ export class RadioOption {
theme,
} = this;

const id = `ic-radio-option-${isPropDefined(label) || value}-${groupLabel}`;
const id = this.getRadioOptionId();

return (
<Host
Expand Down