Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2025-02-25 03:47:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix boolean attributes with raw boolean values

Browse source
This commit is contained in:
Evan Almloff 2023-06-19 10:19:35 -05:00
parent 6e5fbcff63
commit 4f672ff4bb
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/interpreter/src/common.js
View file

@ -48,17 +48,17 @@ export function setAttributeInner(node, field, value, ns) {
node.defaultValue = value; node.defaultValue = value;
break; break;
case "checked": case "checked":
node.checked = value === "true" || value === true; node.checked = truthy(value);
break; break;
case "selected": case "selected":
node.selected = value === "true" || value === true; node.selected = truthy(value);
break; break;
case "dangerous_inner_html": case "dangerous_inner_html":
node.innerHTML = value; node.innerHTML = value;
break; break;
default: default:
// https://github.com/facebook/react/blob/8b88ac2592c5f555f315f9440cbb665dd1e7457a/packages/react-dom/src/shared/DOMProperty.js#L352-L364 // https://github.com/facebook/react/blob/8b88ac2592c5f555f315f9440cbb665dd1e7457a/packages/react-dom/src/shared/DOMProperty.js#L352-L364
if (value === "false" && bool_attrs.hasOwnProperty(name)) { if (!truthy(value) && bool_attrs.hasOwnProperty(name)) {
node.removeAttribute(name); node.removeAttribute(name);
} else { } else {
node.setAttribute(name, value); node.setAttribute(name, value);
@ -66,3 +66,7 @@ export function setAttributeInner(node, field, value, ns) {
} }
} }
} }
function truthy(val) {
return val === "true" || val === true;
}

9
packages/interpreter/src/sledgehammer_bindings.rs
View file

@ -78,17 +78,17 @@ mod js {
node.defaultValue = value; node.defaultValue = value;
break; break;
case "checked": case "checked":
node.checked = value === "true"; node.checked = truthy(value);
break; break;
case "selected": case "selected":
node.selected = value === "true"; node.selected = truthy(value);
break; break;
case "dangerous_inner_html": case "dangerous_inner_html":
node.innerHTML = value; node.innerHTML = value;
break; break;
default: default:
// https://github.com/facebook/react/blob/8b88ac2592c5f555f315f9440cbb665dd1e7457a/packages/react-dom/src/shared/DOMProperty.js#L352-L364 // https://github.com/facebook/react/blob/8b88ac2592c5f555f315f9440cbb665dd1e7457a/packages/react-dom/src/shared/DOMProperty.js#L352-L364
if (value === "false" && bool_attrs.hasOwnProperty(name)) { if (!truthy(value) && bool_attrs.hasOwnProperty(name)) {
node.removeAttribute(name); node.removeAttribute(name);
} else { } else {
node.setAttribute(name, value); node.setAttribute(name, value);
@ -164,6 +164,9 @@ mod js {
selected: true, selected: true,
truespeed: true, truespeed: true,
}; };
function truthy(val) {
return val === "true" || val === true;
}
"#; "#;
extern "C" { extern "C" {