fix(54411): transform spread JSX attribute containing jsx tags

typescript-bot · May 27, 2023 · 761ca29 · 761ca29
1 parent ca0fafd
commit 761ca29
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 1 deletion.
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
@@ -480,7 +480,7 @@ export function transformJsx(context: TransformationContext): (x: SourceFile | B
                     continue;
                 }
                 finishObjectLiteralIfNeeded();
-                expressions.push(attr.expression);
+                expressions.push(Debug.checkDefined(visitNode(attr.expression, visitor, isExpression)));
                 continue;
             }
             properties.push(transformJsxAttributeToObjectLiteralElement(attr));

diff --git a/tests/baselines/reference/jsxSpreadTag.js b/tests/baselines/reference/jsxSpreadTag.js
@@ -0,0 +1,10 @@
+//// [a.tsx]
+declare const React: any;
+
+const t1 = <div {...<span />} />;
+const t2 = <div {...<span className="foo" />} />;
+
+
+//// [a.js]
+const t1 = React.createElement("div", Object.assign({}, React.createElement("span", null)));
+const t2 = React.createElement("div", Object.assign({}, React.createElement("span", { className: "foo" })));
diff --git a/tests/baselines/reference/jsxSpreadTag.symbols b/tests/baselines/reference/jsxSpreadTag.symbols
@@ -0,0 +1,11 @@
+=== /a.tsx ===
+declare const React: any;
+>React : Symbol(React, Decl(a.tsx, 0, 13))
+
+const t1 = <div {...<span />} />;
+>t1 : Symbol(t1, Decl(a.tsx, 2, 5))
+
+const t2 = <div {...<span className="foo" />} />;
+>t2 : Symbol(t2, Decl(a.tsx, 3, 5))
+>className : Symbol(className, Decl(a.tsx, 3, 25))
+
diff --git a/tests/baselines/reference/jsxSpreadTag.types b/tests/baselines/reference/jsxSpreadTag.types
@@ -0,0 +1,19 @@
+=== /a.tsx ===
+declare const React: any;
+>React : any
+
+const t1 = <div {...<span />} />;
+>t1 : error
+><div {...<span />} /> : error
+>div : any
+><span /> : error
+>span : any
+
+const t2 = <div {...<span className="foo" />} />;
+>t2 : error
+><div {...<span className="foo" />} /> : error
+>div : any
+><span className="foo" /> : error
+>span : any
+>className : string
+
diff --git a/tests/cases/compiler/jsxSpreadTag.ts b/tests/cases/compiler/jsxSpreadTag.ts
@@ -0,0 +1,8 @@
+// @jsx: react
+// @target: es2015
+// @filename: /a.tsx
+
+declare const React: any;
+
+const t1 = <div {...<span />} />;
+const t2 = <div {...<span className="foo" />} />;