Skip to content
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

Handle all types of white space in class lists, not just spaces #4419

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle all types of white space in class lists, not just spaces #4419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions packages/alpinejs/src/utils/classes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ export function setClasses(el, value) {
return setClassesFromString(el, value)
}

function setClassesFromString(el, classString) {
let split = classString => classString.split(' ').filter(Boolean)
function splitClasses(classString) {
return classString.split(/\s/).filter(Boolean)
}

let missingClasses = classString => classString.split(' ').filter(i => ! el.classList.contains(i)).filter(Boolean)
function setClassesFromString(el, classString) {
let missingClasses = classString => splitClasses(classString).filter(i => ! el.classList.contains(i)).filter(Boolean)

let addClassesAndReturnUndo = classes => {
el.classList.add(...classes)
Expand All @@ -29,10 +31,8 @@ function setClassesFromString(el, classString) {
}

function setClassesFromObject(el, classObject) {
let split = classString => classString.split(' ').filter(Boolean)

let forAdd = Object.entries(classObject).flatMap(([classString, bool]) => bool ? split(classString) : false).filter(Boolean)
let forRemove = Object.entries(classObject).flatMap(([classString, bool]) => ! bool ? split(classString) : false).filter(Boolean)
let forAdd = Object.entries(classObject).flatMap(([classString, bool]) => bool ? splitClasses(classString) : false).filter(Boolean)
let forRemove = Object.entries(classObject).flatMap(([classString, bool]) => ! bool ? splitClasses(classString) : false).filter(Boolean)

let added = []
let removed = []
Expand Down
6 changes: 3 additions & 3 deletions tests/cypress/integration/directives/x-bind-class.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ test('classes are removed before being added',
}
)

test('extra whitespace in class binding string syntax is ignored',
test.only('extra whitespace in class binding string syntax is ignored',
html`
<div x-data>
<span x-bind:class="' foo bar '"></span>
<span x-bind:class="' foo bar \n baz '"></span>
</div>
`,
({ get }) => get('span').should(haveClasses(['foo', 'bar']))
({ get }) => get('span').should(haveClasses(['foo', 'bar', 'baz']))
)

test('undefined class binding resolves to empty string',
Expand Down
23 changes: 23 additions & 0 deletions tests/cypress/integration/directives/x-transition.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,29 @@ test('transition:enter in nested x-show visually runs',
}
)

test('extra whitespace in transition string syntax is ignored',
html`
<style>
.transition { transition-property: background-color, border-color, color, fill, stroke; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 150ms; }
.duration-100 { transition-duration: 100ms; }
</style>
<div x-data="{ show: false }">
<button x-on:click="show = ! show"></button>

<span
x-show="show"
x-transition:enter="transition duration-100 \n \n some-class-on-newline-with-lotsa-whitespace "
>thing</span>
</div>
`,
({ get }) => {
get('span').should(beHidden())
get('button').click()
get('span').should(beVisible())
get('span').should(haveClasses(['transition', 'duration-100', 'some-class-on-newline-with-lotsa-whitespace']))
}
)

test('transition duration and delay with and without ms syntax',
html`
<div x-data="{ showMs: false, showBlank: false }">
Expand Down
Loading