Only pass through children prop if there are children (#4756)
This commit is contained in:
parent
098c76717a
commit
c271ed35ee
5 changed files with 22 additions and 1 deletions
5
.changeset/spotty-berries-grow.md
Normal file
5
.changeset/spotty-berries-grow.md
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
'@astrojs/react': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Only pass through children prop if there are children
|
6
packages/astro/test/fixtures/react-component/src/components/CloneElement.jsx
vendored
Normal file
6
packages/astro/test/fixtures/react-component/src/components/CloneElement.jsx
vendored
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
import { cloneElement } from 'react';
|
||||||
|
|
||||||
|
const ClonedWithProps = (element) => (props) =>
|
||||||
|
cloneElement(element, props);
|
||||||
|
|
||||||
|
export default ClonedWithProps(<div id="cloned">Cloned With Props</div>);
|
|
@ -6,6 +6,7 @@ import PropsSpread from '../components/PropsSpread.jsx';
|
||||||
import {Research2} from '../components/Research.jsx';
|
import {Research2} from '../components/Research.jsx';
|
||||||
import Pure from '../components/Pure.jsx';
|
import Pure from '../components/Pure.jsx';
|
||||||
import TypeScriptComponent from '../components/TypeScriptComponent';
|
import TypeScriptComponent from '../components/TypeScriptComponent';
|
||||||
|
import CloneElement from '../components/CloneElement';
|
||||||
|
|
||||||
const someProps = {
|
const someProps = {
|
||||||
text: 'Hello world!',
|
text: 'Hello world!',
|
||||||
|
@ -29,5 +30,6 @@ const someProps = {
|
||||||
<Research2 client:idle />
|
<Research2 client:idle />
|
||||||
<TypeScriptComponent client:load />
|
<TypeScriptComponent client:load />
|
||||||
<Pure />
|
<Pure />
|
||||||
|
<CloneElement />
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -83,6 +83,12 @@ describe('React Components', () => {
|
||||||
expect($('#client #lazy')).to.have.lengthOf(1);
|
expect($('#client #lazy')).to.have.lengthOf(1);
|
||||||
expect($('#server #lazy')).to.have.lengthOf(1);
|
expect($('#server #lazy')).to.have.lengthOf(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('Can pass through props with cloneElement', async () => {
|
||||||
|
const html = await fixture.readFile('/index.html');
|
||||||
|
const $ = cheerioLoad(html);
|
||||||
|
expect($('#cloned').text()).to.equal('Cloned With Props');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
if (isWindows) return;
|
if (isWindows) return;
|
||||||
|
|
|
@ -68,8 +68,10 @@ async function renderToStaticMarkup(Component, props, { default: children, ...sl
|
||||||
const newProps = {
|
const newProps = {
|
||||||
...props,
|
...props,
|
||||||
...slots,
|
...slots,
|
||||||
children: children != null ? React.createElement(StaticHtml, { value: children }) : undefined,
|
|
||||||
};
|
};
|
||||||
|
if(children != null) {
|
||||||
|
newProps.children = React.createElement(StaticHtml, { value: children });
|
||||||
|
}
|
||||||
const vnode = React.createElement(Component, newProps);
|
const vnode = React.createElement(Component, newProps);
|
||||||
let html;
|
let html;
|
||||||
if (metadata && metadata.hydrate) {
|
if (metadata && metadata.hydrate) {
|
||||||
|
|
Loading…
Reference in a new issue