cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2972 from spicyj/inline2

Browse Source 
Use a helper function for React "inlining"
This commit is contained in:
Sebastian McKenzie
2015-11-11 12:39:54 -08:00
parent e75f2ef5bb 3cad287233
commit 26abba9880
19 changed files with 68 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/babel-plugin-transform-react-inline-elements/src/index.js
View File

@@ -24,7 +24,6 @@ export default function ({ types: t }) {
// init
let isComponent = true;
let props = t.objectExpression([]);
let obj = t.objectExpression([]);
let key = t.nullLiteral();
let type = open.name;
@@ -33,10 +32,6 @@ export default function ({ types: t }) {
isComponent = false;
}
function pushElemProp(key, value) {
pushProp(obj.properties, t.identifier(key), value);
}
function pushProp(objProps, key, value) {
if (t.isJSXExpressionContainer(value)) value = value.expression;
objProps.push(t.objectProperty(key, value));
@@ -70,16 +65,8 @@ export default function ({ types: t }) {
}
}
// metadata
pushElemProp("$$typeof", file.addHelper("typeofReactElement"));
pushElemProp("type", type);
pushElemProp("key", key);
pushElemProp("ref", t.nullLiteral());
pushElemProp("props", props);
pushElemProp("_owner", t.nullLiteral());
path.replaceWith(obj);
let el = t.callExpression(file.addHelper("createRawReactElement"), [type, key, props]);
path.replaceWith(el);
}
}
};

15
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/children-exists/expected.js vendored
View File

@@ -1,11 +1,4 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: "div",
key: null,
ref: null,
props: {
children: "foo",
children: "bar"
},
_owner: null
});
babelHelpers.createRawReactElement("div", null, {
children: "foo",
children: "bar"
});

13
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/component-with-props/expected.js vendored
View File

@@ -1,10 +1,3 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: babelHelpers.defaultProps(Baz.defaultProps, {
foo: "bar"
}),
_owner: null
});
babelHelpers.createRawReactElement(Baz, null, babelHelpers.defaultProps(Baz.defaultProps, {
foo: "bar"
}));

9
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/component/expected.js vendored
View File

@@ -1,8 +1 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: Baz.defaultProps,
_owner: null
});
babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps);

15
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/expression-container/expected.js vendored
View File

@@ -1,14 +1,7 @@
var TestComponent = React.createClass({
render: function () {
return {
$$typeof: babelHelpers.typeofReactElement,
type: "span",
key: null,
ref: null,
props: {
className: this.props.someProp
},
_owner: null
};
return babelHelpers.createRawReactElement("span", null, {
className: this.props.someProp
});
}
});
});

11
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/html-element-with-props/expected.js vendored
View File

@@ -1,10 +1,3 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {
bar: "foo"
},
_owner: null
babelHelpers.createRawReactElement("foo", null, {
bar: "foo"
});

9
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/html-element/expected.js vendored
View File

@@ -1,8 +1 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {},
_owner: null
});
babelHelpers.createRawReactElement("foo", null, {});

13
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/key/expected.js vendored
View File

@@ -1,10 +1,3 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: Foo,
key: "foo",
ref: null,
props: babelHelpers.defaultProps(Foo.defaultProps, {
"data-value": "bar"
}),
_owner: null
});
babelHelpers.createRawReactElement(Foo, "foo", babelHelpers.defaultProps(Foo.defaultProps, {
"data-value": "bar"
}));

9
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/multiline/expected.js vendored
View File

@@ -1,8 +1 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: Baz.defaultProps,
_owner: null
});
babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps);

22
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested-components/expected.js vendored
View File

@@ -1,18 +1,4 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: Foo,
key: null,
ref: null,
props: babelHelpers.defaultProps(Foo.defaultProps, {
className: "foo",
children: [bar, {
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: "baz",
ref: null,
props: Baz.defaultProps,
_owner: null
}]
}),
_owner: null
});
babelHelpers.createRawReactElement(Foo, null, babelHelpers.defaultProps(Foo.defaultProps, {
className: "foo",
children: [bar, babelHelpers.createRawReactElement(Baz, "baz", Baz.defaultProps)]
}));

15
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested-html-elements/expected.js vendored
View File

@@ -1,11 +1,4 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: "div",
key: null,
ref: null,
props: {
className: "foo",
children: bar
},
_owner: null
});
babelHelpers.createRawReactElement("div", null, {
className: "foo",
children: bar
});

22
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/nested/expected.js vendored
View File

@@ -1,18 +1,4 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: "div",
key: null,
ref: null,
props: {
className: "foo",
children: [bar, {
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: "baz",
ref: null,
props: Baz.defaultProps,
_owner: null
}]
},
_owner: null
});
babelHelpers.createRawReactElement("div", null, {
className: "foo",
children: [bar, babelHelpers.createRawReactElement(Baz, "baz", Baz.defaultProps)]
});

13
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/self-closing-component-with-props/expected.js vendored
View File

@@ -1,10 +1,3 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: babelHelpers.defaultProps(Baz.defaultProps, {
foo: "bar"
}),
_owner: null
});
babelHelpers.createRawReactElement(Baz, null, babelHelpers.defaultProps(Baz.defaultProps, {
foo: "bar"
}));

9
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/self-closing-component/expected.js vendored
View File

@@ -1,8 +1 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: Baz,
key: null,
ref: null,
props: Baz.defaultProps,
_owner: null
});
babelHelpers.createRawReactElement(Baz, null, Baz.defaultProps);

11
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/self-closing-html-element-with-props/expected.js vendored
View File

@@ -1,10 +1,3 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {
bar: "foo"
},
_owner: null
babelHelpers.createRawReactElement("foo", null, {
bar: "foo"
});

9
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/self-closing-html-element/expected.js vendored
View File

@@ -1,8 +1 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: "foo",
key: null,
ref: null,
props: {},
_owner: null
});
babelHelpers.createRawReactElement("foo", null, {});

13
packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/shorthand-attributes/expected.js vendored
View File

@@ -1,10 +1,3 @@
({
$$typeof: babelHelpers.typeofReactElement,
type: Foo,
key: null,
ref: null,
props: babelHelpers.defaultProps(Foo.defaultProps, {
bar: true
}),
_owner: null
});
babelHelpers.createRawReactElement(Foo, null, babelHelpers.defaultProps(Foo.defaultProps, {
bar: true
}));