Skip to content

Allow jsx to write tags with bracket, instead of dot, notation. #1240

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

Closed
wants to merge 3 commits into from
Closed

Allow jsx to write tags with bracket, instead of dot, notation. #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f0ef38
Allow jsx to write tags with bracket, instead of dot, notation.
actionnick Mar 10, 2014
fe540ed
Only use bracket notation if tag is invalid.
actionnick Mar 10, 2014
6899fce
Address @spicyj PR comments.
actionnick Mar 11, 2014
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
18 changes: 14 additions & 4 deletions vendor/fbtransform/transforms/react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var renderXJSExpressionContainer =
require('./xjs').renderXJSExpressionContainer;
var renderXJSLiteral = require('./xjs').renderXJSLiteral;
var quoteAttrName = require('./xjs').quoteAttrName;
var isValidIdentifier = require('./xjs').isValidIdentifier;

/**
* Customized desugar processor.
Expand Down Expand Up @@ -61,10 +62,19 @@ function visitReactTag(traverse, object, path, state) {
}

var isFallbackTag = FALLBACK_TAGS.hasOwnProperty(nameObject.name);
utils.append(
(isFallbackTag ? jsxObjIdent + '.' : '') + (nameObject.name) + '(',
state
);
var tagOpening;
if (isFallbackTag) {
tagOpening = jsxObjIdent;
if (isValidIdentifier(nameObject.name)) {
tagOpening += '.' + nameObject.name;
} else {
tagOpening += '[' + JSON.stringify(nameObject.name) + ']';
}
} else {
tagOpening = nameObject.name;
}
tagOpening += '(';
utils.append(tagOpening, state);

utils.move(nameObject.range[1], state);

Expand Down
7 changes: 6 additions & 1 deletion vendor/fbtransform/transforms/xjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,13 @@ function renderXJSExpressionContainer(traverse, object, isLast, path, state) {
return false;
}

function isValidIdentifier(attr) {
return (/^[a-z_$][a-z\d_$]*$/i.test(attr));
}

function quoteAttrName(attr) {
// Quote invalid JS identifiers.
if (!/^[a-z_$][a-z\d_$]*$/i.test(attr)) {
if (!isValidIdentifier(attr)) {
return "'" + attr + "'";
}
return attr;
Expand All @@ -239,3 +243,4 @@ exports.knownTags = knownTags;
exports.renderXJSExpressionContainer = renderXJSExpressionContainer;
exports.renderXJSLiteral = renderXJSLiteral;
exports.quoteAttrName = quoteAttrName;
exports.isValidIdentifier = isValidIdentifier;