Skip to content

Commit

Permalink
[Fix] sort-prop-types: Fix sorting props with numeric keys
Browse files Browse the repository at this point in the history
  • Loading branch information
pawelnvk authored and ljharb committed Apr 9, 2019
1 parent 35de81b commit b37a504
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 4 deletions.
12 changes: 8 additions & 4 deletions lib/rules/sort-prop-types.js
Expand Up @@ -85,6 +85,10 @@ module.exports = {
return node.arguments && node.arguments[0] && node.arguments[0].properties;
}

function toLowerCase(item) {
return String(item).toLowerCase();
}

function sorter(a, b) {
let aKey = getKey(a);
let bKey = getKey(b);
Expand All @@ -107,8 +111,8 @@ module.exports = {
}

if (ignoreCase) {
aKey = aKey.toLowerCase();
bKey = bKey.toLowerCase();
aKey = toLowerCase(aKey);
bKey = toLowerCase(bKey);
}

if (aKey < bKey) {
Expand Down Expand Up @@ -188,8 +192,8 @@ module.exports = {
const currentIsCallback = isCallbackPropName(currentPropName);

if (ignoreCase) {
prevPropName = prevPropName.toLowerCase();
currentPropName = currentPropName.toLowerCase();
prevPropName = toLowerCase(prevPropName);
currentPropName = toLowerCase(currentPropName);
}

if (requiredFirst) {
Expand Down
47 changes: 47 additions & 0 deletions tests/lib/rules/sort-prop-types.js
Expand Up @@ -410,6 +410,21 @@ ruleTester.run('sort-prop-types', rule, {
options: [{
noSortAlphabetically: true
}]
}, {
code: `
class Component extends React.Component {
render() {
return <div />;
}
}
Component.propTypes = {
0: PropTypes.any,
1: PropTypes.any,
};
`,
options: [{
ignoreCase: true
}]
}],

invalid: [{
Expand Down Expand Up @@ -1565,5 +1580,37 @@ ruleTester.run('sort-prop-types', rule, {
' }',
'});'
].join('\n')
}, {
code: `
class Component extends React.Component {
render() {
return <div />;
}
}
Component.propTypes = {
1: PropTypes.any,
0: PropTypes.any,
};
`,
options: [{
ignoreCase: true
}],
errors: [{
message: ERROR_MESSAGE,
line: 9,
column: 9,
type: 'Property'
}],
output: `
class Component extends React.Component {
render() {
return <div />;
}
}
Component.propTypes = {
0: PropTypes.any,
1: PropTypes.any,
};
`
}]
});

0 comments on commit b37a504

Please sign in to comment.