Skip to content
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

Jump to bottom

Refactor DOM Bindings Completely Off of DOMProperty Meta Programming #26546

Merged
merged 16 commits into from
Apr 4, 2023
Merged

Refactor DOM Bindings Completely Off of DOMProperty Meta Programming #26546

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
916f2d9
Split setProp into separate one for Custom Elements
sebmarkbage Mar 31, 2023
02f9629
Make autoFocus fully a special case
sebmarkbage Mar 31, 2023
c6afab9
Move BOOLEANISH_STRING properties to each of the switch statements
sebmarkbage Mar 31, 2023
6e6543b
Inline SVG attribute special cases
sebmarkbage Apr 2, 2023
e105c2d
Move comparison in just to save some code
sebmarkbage Apr 2, 2023
715194a
Lower case HTML attributes don't need to be special cased when emitting
sebmarkbage Apr 2, 2023
afba313
Inline special cases for case-sensitive cases where the React name do…
sebmarkbage Apr 2, 2023
d1084cf
Pass propKey separately from attribute name for error messages
sebmarkbage Apr 2, 2023
740294e
More aliases
sebmarkbage Apr 2, 2023
b26affd
Inline sanitizeURL and removeEmptyString special cases
sebmarkbage Apr 2, 2023
ba3bbee
Inline special cases for XML namespaces
sebmarkbage Apr 3, 2023
e099728
Inline plain booleans
sebmarkbage Apr 3, 2023
cb4fa91
Inline overloaded booleans
sebmarkbage Apr 4, 2023
79f03f5
Inline numeric properties
sebmarkbage Apr 4, 2023
37f3fe7
Inline numeric properties
sebmarkbage Apr 4, 2023
69fa0d8
Rm copypasta comment
sebmarkbage Apr 4, 2023
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
39 changes: 39 additions & 0 deletions packages/react-dom-bindings/src/client/ReactDOMComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,45 @@ function setProp(
}
break;
}
case 'cols':
case 'rows':
case 'size':
case 'span': {
// These are HTML attributes that must be positive numbers.
if (
value != null &&
typeof value !== 'function' &&
typeof value !== 'symbol' &&
!isNaN(value) &&
(value: any) >= 1
) {
if (__DEV__) {
checkAttributeStringCoercion(value, key);
}
domElement.setAttribute(key, (value: any));
} else {
domElement.removeAttribute(key);
}
break;
}
case 'rowSpan':
case 'start': {
// These are HTML attributes that must be numbers.
if (
value != null &&
typeof value !== 'function' &&
typeof value !== 'symbol' &&
!isNaN(value)
) {
if (__DEV__) {
checkAttributeStringCoercion(value, key);
}
domElement.setAttribute(key, (value: any));
} else {
domElement.removeAttribute(key);
}
break;
}
// A few React string attributes have a different name.
// This is a mapping from React prop names to the attribute names.
case 'acceptCharset':
Expand Down
46 changes: 40 additions & 6 deletions packages/react-dom-bindings/src/server/ReactDOMServerFormatConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,6 @@ function pushAttribute(
}
case 'xlinkHref': {
if (
value == null ||
typeof value === 'function' ||
typeof value === 'symbol' ||
typeof value === 'boolean'
Expand Down Expand Up @@ -748,11 +747,7 @@ function pushAttribute(
// These are "enumerated" attributes that accept "true" and "false".
// In React, we let users pass `true` and `false` even though technically
// these aren't boolean attributes (they are coerced to strings).
if (
value != null &&
typeof value !== 'function' &&
typeof value !== 'symbol'
) {
if (typeof value !== 'function' && typeof value !== 'symbol') {
target.push(
attributeSeparator,
stringToChunk(name),
Expand Down Expand Up @@ -817,6 +812,45 @@ function pushAttribute(
}
break;
}
case 'cols':
case 'rows':
case 'size':
case 'span': {
// These are HTML attributes that must be positive numbers.
if (
typeof value !== 'function' &&
typeof value !== 'symbol' &&
!isNaN(value) &&
(value: any) >= 1
) {
target.push(
attributeSeparator,
stringToChunk(name),
attributeAssign,
stringToChunk(escapeTextForBrowser(value)),
attributeEnd,
);
}
break;
}
case 'rowSpan':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait why do we have special behavior for rowSpan and not colSpan

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You tell me. Turns out you added rowSpan as a numeric but not colSpan. Probably just an oversight?

6269ef6

case 'start': {
// These are HTML attributes that must be numbers.
if (
typeof value !== 'function' &&
typeof value !== 'symbol' &&
!isNaN(value)
) {
target.push(
attributeSeparator,
stringToChunk(name),
attributeAssign,
stringToChunk(escapeTextForBrowser(value)),
attributeEnd,
);
}
break;
}
// A few React string attributes have a different name.
// This is a mapping from React prop names to the attribute names.
case 'acceptCharset':
Expand Down