Skip to content

Limit the meaning of "custom element" to not include is #26524

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
sebmarkbage merged 7 commits into from
Mar 30, 2023
Merged

Limit the meaning of "custom element" to not include is #26524

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dbaf987
Reuse setValueForAttribute for custom properties
sebmarkbage Mar 30, 2023
63119e7
Inline createX functions into createInstance in HostConfig
sebmarkbage Mar 30, 2023
99daab9
Simplify custom element logic for warnings
sebmarkbage Mar 30, 2023
c25c735
Warn for updating the `is` prop in DEV
sebmarkbage Mar 30, 2023
a09a9ca
Rename isCustomComponent to isCustomElement
sebmarkbage Mar 30, 2023
3499590
Limit the meaning of "custom element" to not include `is`
sebmarkbage Mar 30, 2023
d4e2063
Fix className hydration warning for custom elements
sebmarkbage Mar 30, 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
Prev Previous commit
Fix className hydration warning for custom elements
  • Loading branch information
@sebmarkbage
sebmarkbage committed Mar 30, 2023
commit d4e2063509a3460e63f7d89c2c7c7a1f575129ec
4 changes: 0 additions & 4 deletions packages/react-dom-bindings/src/client/DOMPropertyOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,6 @@ export function getValueForAttributeOnCustomComponent(
}
return expected === undefined ? undefined : null;
}
if (enableCustomElementPropertySupport && name === 'className') {
// className is a special cased property on the server to render as an attribute.
name = 'class';
}
const value = node.getAttribute(name);

if (enableCustomElementPropertySupport) {
Expand Down
15 changes: 15 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 @@ -1064,6 +1064,21 @@ function diffHydratedCustomComponent(
continue;
}
// eslint-disable-next-line no-fallthrough
case 'className':
if (enableCustomElementPropertySupport) {
// className is a special cased property on the server to render as an attribute.
extraAttributeNames.delete('class');
const serverValue = getValueForAttributeOnCustomComponent(
domElement,
'class',
nextProp,
);
if (nextProp !== serverValue) {
warnForPropDifference('className', serverValue, nextProp);
}
continue;
}
// eslint-disable-next-line no-fallthrough
default: {
let ownNamespaceDev = parentNamespaceDev;
if (ownNamespaceDev === HTML_NAMESPACE) {
Expand Down
9 changes: 3 additions & 6 deletions packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function initModules() {
};
}

const {resetModules, itRenders, clientCleanRender, clientRenderOnServerString} =
const {resetModules, itRenders, clientCleanRender} =
ReactDOMServerIntegrationUtils(initModules);

describe('ReactDOMServerIntegration', () => {
Expand Down Expand Up @@ -662,16 +662,13 @@ describe('ReactDOMServerIntegration', () => {
});

itRenders('className for custom elements', async render => {
const e = await render(<custom-element className="test" />, 0);
if (ReactFeatureFlags.enableCustomElementPropertySupport) {
const e = await render(
<custom-element className="test" />,
render === clientRenderOnServerString ? 1 : 0,
);
expect(e.getAttribute('className')).toBe(null);
expect(e.getAttribute('class')).toBe('test');
} else {
const e = await render(<custom-element className="test" />, 0);
expect(e.getAttribute('className')).toBe('test');
expect(e.getAttribute('class')).toBe(null);
}
});

Expand Down