Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 10 deletions src/compiler/factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1677,16 +1677,10 @@ namespace ts {

function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression {
if (isQualifiedName(jsxFactory)) {
return createPropertyAccess(
createJsxFactoryExpressionFromEntityName(
jsxFactory.left,
parent
),
setEmitFlags(
getMutableClone(jsxFactory.right),
EmitFlags.NoSourceMap
)
);
const left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent);
const right = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
right.text = jsxFactory.right.text;
return createPropertyAccess(left, right);
}
else {
return createReactNamespace(jsxFactory.text, parent);
Expand Down
27 changes: 27 additions & 0 deletions tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//// [index.tsx]

import "./jsx";

var skate: any;
const React = { createElement: skate.h };

class Component {
renderCallback() {
return <div>test</div>;
}
};

//// [index.js]
"use strict";
require("./jsx");
var skate;
var React = { createElement: skate.h };
var Component = (function () {
function Component() {
}
Component.prototype.renderCallback = function () {
return skate.h("div", null, "test");
};
return Component;
}());
;
23 changes: 23 additions & 0 deletions tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
=== tests/cases/compiler/index.tsx ===

import "./jsx";

var skate: any;
>skate : Symbol(skate, Decl(index.tsx, 3, 3))

const React = { createElement: skate.h };
>React : Symbol(React, Decl(index.tsx, 4, 5))
>createElement : Symbol(createElement, Decl(index.tsx, 4, 15))
>skate : Symbol(skate, Decl(index.tsx, 3, 3))

class Component {
>Component : Symbol(Component, Decl(index.tsx, 4, 41))

renderCallback() {
>renderCallback : Symbol(Component.renderCallback, Decl(index.tsx, 6, 17))

return <div>test</div>;
>div : Symbol(unknown)
>div : Symbol(unknown)
}
};
27 changes: 27 additions & 0 deletions tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
=== tests/cases/compiler/index.tsx ===

import "./jsx";

var skate: any;
>skate : any

const React = { createElement: skate.h };
>React : { createElement: any; }
>{ createElement: skate.h } : { createElement: any; }
>createElement : any
>skate.h : any
>skate : any
>h : any

class Component {
>Component : Component

renderCallback() {
>renderCallback : () => any

return <div>test</div>;
><div>test</div> : any
>div : any
>div : any
}
};
17 changes: 17 additions & 0 deletions tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//@module: commonjs
//@target: es5
//@jsx: react
//@jsxFactory: skate.h
//@noEmit: false

// @filename: index.tsx
import "./jsx";

var skate: any;
const React = { createElement: skate.h };

class Component {
renderCallback() {
return <div>test</div>;
}
};