Skip to content

Handle empty class attributes #17

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

Merged
bradlc merged 2 commits into from
Jan 25, 2022
Merged

Handle empty class attributes #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a396464
Handle empty class attributes
bradlc Jan 25, 2022
2ae2305
Add test cases
bradlc Jan 25, 2022
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
7 changes: 7 additions & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ function sortClasses(
classStr,
{ env, ignoreFirst = false, ignoreLast = false }
) {
if (typeof classStr !== 'string' || classStr === '') {
return classStr
}

// Ignore class attributes containing `{{`, to match Prettier behaviour:
// https://github.com/prettier/prettier/blob/main/src/language-html/embed.js#L83-L88
if (classStr.includes('{{')) {
Expand Down Expand Up @@ -268,6 +272,9 @@ function sortTemplateLiteral(node, { env }) {
function transformJavaScript(ast, { env }) {
visit(ast, {
JSXAttribute(node) {
if (!node.value) {
return
}
if (['class', 'className'].includes(node.name.name)) {
if (isStringLiteral(node.value)) {
sortStringLiteral(node.value, { env })
Expand Down
10 changes: 9 additions & 1 deletion tests/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ let html = [
t`<div class="${no} {{ 'p-0 sm:p-0 m-0' }}"></div>`,
t`<div not-class="${no}"></div>`,
['<div class=" sm:p-0 p-0 "></div>', '<div class="p-0 sm:p-0"></div>'],
t`<div class></div>`,
t`<div class=""></div>`,
]

let css = [
Expand All @@ -72,6 +74,8 @@ let javascript = [
t`;<div class={clsx('${yes}', ['${yes}'])} />`,
t`;<div class={clsx({ '${yes}': '${yes}' })} />`,
t`;<div class={{ '${yes}': '${yes}' }['${yes}']} />`,
t`;<div class />`,
t`;<div class="" />`,
[
`;<div class={\`sm:block inline flex\${someVar}\`} />`,
`;<div class={\`inline sm:block flex\${someVar}\`} />`,
Expand All @@ -86,13 +90,15 @@ let javascript = [
],
]
javascript = javascript.concat(
javascript.map((test) => test.map((t) => t.replace(/class=/g, 'className=')))
javascript.map((test) => test.map((t) => t.replace(/class/g, 'className')))
)

let vue = [
...html,
t`<div :class="'${yes}'"></div>`,
t`<!-- <div :class="'${no}'"></div> -->`,
t`<div :class></div>`,
t`<div :class=""></div>`,
t`<div :class="'${yes}' + '${yes}'"></div>`,
t`<div :class="['${yes}', '${yes}']"></div>`,
t`<div :class="[cond ? '${yes}' : '${yes}']"></div>`,
Expand Down Expand Up @@ -138,6 +144,8 @@ let tests = {
meriyah: javascript,
svelte: [
t`<div class="${yes}" />`,
t`<div class />`,
t`<div class="" />`,
t`<div class="${yes} {someVar}" />`,
t`<div class="{someVar} ${yes}" />`,
t`<div class="${yes} {someVar} ${yes}" />`,
Expand Down