Skip to content

[LiveComponent] Fix checkbox/radio value matching #2401

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

Merged
merged 1 commit into from
Nov 23, 2024
Merged

[LiveComponent] Fix checkbox/radio value matching #2401

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
20 changes: 6 additions & 14 deletions src/LiveComponent/assets/dist/live_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,26 +250,18 @@ function setValueOnElement(element, value) {
return;
}
if (element.type === 'radio') {
element.checked = element.value === value;
element.checked = element.value == value;
return;
}
if (element.type === 'checkbox') {
if (Array.isArray(value)) {
let valueFound = false;
value.forEach((val) => {
if (val === element.value) {
valueFound = true;
}
});
element.checked = valueFound;
element.checked = value.some((val) => val == element.value);
}
else if (element.hasAttribute('value')) {
element.checked = element.value == value;
}
else {
if (element.hasAttribute('value')) {
element.checked = element.value === value;
}
else {
element.checked = value;
}
element.checked = value;
}
return;
}
Expand Down
32 changes: 12 additions & 20 deletions src/LiveComponent/assets/src/dom_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,34 +79,26 @@ export function setValueOnElement(element: HTMLElement, value: any): void {
}

if (element.type === 'radio') {
element.checked = element.value === value;
// biome-ignore lint/suspicious/noDoubleEquals: need fuzzy matching
element.checked = element.value == value;

return;
}

if (element.type === 'checkbox') {
if (Array.isArray(value)) {
// I'm purposely not using Array.includes here because it's
// strict, and because of Numeric/String mis-casting, I
// want the "includes" to be "fuzzy".
let valueFound = false;
value.forEach((val) => {
if (val === element.value) {
valueFound = true;
}
});

element.checked = valueFound;
// Because of Numeric/String mis-casting,
// we want the "includes" to be "fuzzy".
// biome-ignore lint/suspicious/noDoubleEquals: need fuzzy matching
element.checked = value.some((val) => val == element.value);
} else if (element.hasAttribute('value')) {
// if the checkbox has a value="", then check if it matches
// biome-ignore lint/suspicious/noDoubleEquals: need fuzzy matching
element.checked = element.value == value;
} else {
if (element.hasAttribute('value')) {
// if the checkbox has a value="", then check if it matches
element.checked = element.value === value;
} else {
// no value, treat it like a boolean
element.checked = value;
}
// no value, treat it like a boolean
element.checked = value;
}

return;
}
}
Expand Down