images/babel-plugin-jsx
2
0
Fork 0
mirror of https://github.com/vuejs/babel-plugin-jsx.git synced 2024-11-10 09:39:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: merge static and dynamic class / style attributes into array

Browse Source
This commit is contained in:
Amour1688 2020-09-08 12:58:01 +08:00
parent bf59811f43
commit 94b4f3aa80
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/babel-plugin-jsx/src/buildProps.ts
View File

@ -272,9 +272,12 @@ const buildProps = (path: NodePath<t.JSXElement>, state: State) => {
attributeValue || t.booleanLiteral(true),
));
}
mergeArgs.push(t.objectExpression(dedupeProperties(properties)));
properties = [];
} else {
if (properties.length) {
mergeArgs.push(t.objectExpression(dedupeProperties(properties)));
properties = [];
}
// JSXSpreadAttribute
hasDynamicKeys = true;
transformJSXSpreadAttribute(
@ -313,6 +316,9 @@ const buildProps = (path: NodePath<t.JSXElement>, state: State) => {
let propsExpression: t.Expression | t.ObjectProperty | t.Literal = t.nullLiteral();
if (mergeArgs.length) {
if (properties.length) {
mergeArgs.push(t.objectExpression(dedupeProperties(properties)));
}
if (mergeArgs.length > 1) {
propsExpression = t.callExpression(
createIdentifier(state, 'mergeProps'),
@ -322,6 +328,8 @@ const buildProps = (path: NodePath<t.JSXElement>, state: State) => {
// single no need for a mergeProps call
propsExpression = mergeArgs[0];
}
} else if (properties.length) {
propsExpression = t.objectExpression(dedupeProperties(properties));
}
return {