Skip to content

[main] fix regression: computed keys in style objects in SSR resolve to undefined #466

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

Open
titoBouzout wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[main] fix regression: computed keys in style objects in SSR resolve to undefined #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions packages/babel-plugin-jsx-dom-expressions/src/ssr/element.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,20 @@ function transformAttributes(path, results, info) {
t.isObjectExpression(value.expression) &&
!value.expression.properties.some(p => t.isSpreadElement(p))
) {
const props = value.expression.properties.map((p, i) =>
t.callExpression(registerImportMethod(path, "ssrStyleProperty"), [
const props = value.expression.properties.map((p, i) => {
if (p.computed) {
return t.callExpression(registerImportMethod(path, "ssrStyleProperty"), [
t.binaryExpression("+", p.key, t.stringLiteral(":")),
escapeExpression(path, p.value, true, true)
]);
}
return t.callExpression(registerImportMethod(path, "ssrStyleProperty"), [
t.stringLiteral(
(i ? ";" : "") + (t.isIdentifier(p.key) ? p.key.name : p.key.value) + ":"
),
escapeExpression(path, p.value, true, true)
])
);
]);
});

let res = props[0];
for (let i = 1; i < props.length; i++) {
Expand Down
10 changes: 10 additions & 0 deletions packages/babel-plugin-jsx-dom-expressions/test/__ssr_fixtures__/attributeExpressions/code.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,13 @@ const template51 = (
/>
);

function Progress(props) {
return (
<div
class="progress-fill"
style={{
[props.orientation === 'y' ? 'height' : 'width']: `${props.value * 100}%`,
}}
/>
);
}
12 changes: 11 additions & 1 deletion ...ges/babel-plugin-jsx-dom-expressions/test/__ssr_fixtures__/attributeExpressions/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ var _tmpl$ = ['<a href="/" class="', '">Welcome</a>'],
_tmpl$26 = ["<video", "></video>"],
_tmpl$27 = "<video playsinline></video>",
_tmpl$28 = "<video></video>",
_tmpl$29 = ['<div class="bg-(--bg)" style="', '"></div>'];
_tmpl$29 = ['<div class="bg-(--bg)" style="', '"></div>'],
_tmpl$30 = ['<div class="progress-fill" style="', '"></div>'];
import * as styles from "./styles.module.css";
const selected = true;
let id = "my-h1";
Expand Down Expand Up @@ -310,3 +311,12 @@ const template49 = _$ssr(_tmpl$27);
const template50 = _$ssr(_tmpl$28);
const nope = () => undefined;
const template51 = _$ssr(_tmpl$29, _$ssrStyleProperty("--bg:", _$escape(nope(), true)));
function Progress(props) {
return _$ssr(
_tmpl$30,
_$ssrStyleProperty(
(props.orientation === "y" ? "height" : "width") + ":",
`${_$escape(props.value, true) * 100}%`
)
);
}
5 changes: 4 additions & 1 deletion packages/dom-expressions/test/ssr/ssr.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ globalThis.TextEncoder = function () {
return { encode: v => v };
};

const fixture = `<div data-hk="0" id="main" data-id="12" aria-role="button" class="static selected" checked style="color:red" ><h1 custom-attr="1" disabled title="Hello John" style="background-color:red" class="selected"><a href="/">Welcome</a></h1></div>`;
const fixture = `<div data-hk="0" id="main" data-id="12" aria-role="button" class="static selected" checked style="color:red" ><h1 custom-attr="1" disabled title="Hello John" style="background-color:red;width:100%" class="selected"><a href="/">Welcome</a></h1></div>`;
const fixture2 = `<span data-hk="0" class="Hello John" > Hello &lt;div/> </span>`;
const fixture3 = `<span> Hello &lt;div/><script nonce=\"1a2s3d4f5g\">window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute(\"data-hk\")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));[\"click\", \"input\"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs--><link rel=\"modulepreload\" href=\"chunk.js\"></span>`;
const fixture4 = `<span > Hello &lt;div/> </span>`;
Expand All @@ -35,6 +35,8 @@ const Comp1 = () => {
"custom-attr": "1"
});

const props = { something: !!1, value: 1 }

return r.ssrElement(
"div",
{
Expand All @@ -54,6 +56,7 @@ const Comp1 = () => {
"background-color": color(),
"border-color": colorUndefined,
"color": colorUndefinedFn(),
[props.something === true ? "width" : 'height']: `${props.value * 100}%`,
},
classList: {
selected: selected(),
Expand Down
Loading