diff options
author | 2022-06-23 10:10:54 -0500 | |
---|---|---|
committer | 2022-06-23 10:10:54 -0500 | |
commit | 7373d61cdcaedd64bf5fd60521b157cfa4343558 (patch) | |
tree | db7ba617722a58e4b1b6437f1fcabd7f894fd8b1 /packages/integrations/react/server.js | |
parent | 19cd962d0b3433ee305d1d277ca4fc3b93593558 (diff) | |
download | astro-7373d61cdcaedd64bf5fd60521b157cfa4343558.tar.gz astro-7373d61cdcaedd64bf5fd60521b157cfa4343558.tar.zst astro-7373d61cdcaedd64bf5fd60521b157cfa4343558.zip |
Enable named slots in renderers (#3652)
* feat: pass all slots to renderers
* refactor: pass `slots` as top-level props
* test: add named slot test for frameworks
* fix: nested hydration, slots that are not initially rendered
* test: add nested-recursive e2e test
* fix: render unmatched custom element children
* chore: update lockfile
* fix: unrendered slots for client:only
* fix(lit): ensure lit integration uses new slots API
* chore: add changeset
* chore: add changesets
* fix: lit slots
* feat: convert dash-case or snake_case slots to camelCase for JSX
* feat: remove tmpl special logic
* test: add slot components-in-markdown test
* refactor: prefer Object.entries.map() to for/of loop
Co-authored-by: Nate Moore <nate@astro.build>
Diffstat (limited to 'packages/integrations/react/server.js')
-rw-r--r-- | packages/integrations/react/server.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/packages/integrations/react/server.js b/packages/integrations/react/server.js index 776901563..cda839a1c 100644 --- a/packages/integrations/react/server.js +++ b/packages/integrations/react/server.js @@ -2,6 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom/server'; import StaticHtml from './static-html.js'; +const slotName = str => str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase()); const reactTypeof = Symbol.for('react.element'); function errorIsComingFromPreactComponent(err) { @@ -56,12 +57,20 @@ async function getNodeWritable() { return Writable; } -async function renderToStaticMarkup(Component, props, children, metadata) { +async function renderToStaticMarkup(Component, props, { default: children, ...slotted }, metadata) { delete props['class']; - const vnode = React.createElement(Component, { + const slots = {}; + for (const [key, value] of Object.entries(slotted)) { + const name = slotName(key); + slots[name] = React.createElement(StaticHtml, { value, name }); + } + // Note: create newProps to avoid mutating `props` before they are serialized + const newProps = { ...props, + ...slots, children: children != null ? React.createElement(StaticHtml, { value: children }) : undefined, - }); + } + const vnode = React.createElement(Component, newProps); let html; if (metadata && metadata.hydrate) { html = ReactDOM.renderToString(vnode); |