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.

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

feat(compiler): condenses staticClass whitespace (fix #12113) #12195

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 1 addition & 1 deletion src/platforms/web/compiler/modules/class.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function transformNode (el: ASTElement, options: CompilerOptions) {
}
}
if (staticClass) {
el.staticClass = JSON.stringify(staticClass)
el.staticClass = JSON.stringify(staticClass.replace(/\s+/g, " ").trim())
posva marked this conversation as resolved.
Show resolved Hide resolved
}
const classBinding = getBindingAttr(el, 'class', false /* getStatic */)
if (classBinding) {
Expand Down
2 changes: 1 addition & 1 deletion test/ssr/ssr-string.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@ describe('SSR: renderToString', () => {
</div>
`
}, result => {
expect(result).toContain(`<div class="a\nb"></div>`)
expect(result).toContain(`<div class="a b"></div>`)
done()
})
})
Expand Down
33 changes: 33 additions & 0 deletions test/unit/features/directives/class.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,39 @@ describe('Directive v-bind:class', () => {
}).then(done)
})

// css static classes should only contain a single space in between,
// as all the text inside of classes is shipped as a JS string
// and this could lead to useless spacing in static classes
it('corrects whitespace in staticClass', done => {
posva marked this conversation as resolved.
Show resolved Hide resolved
const vm = new Vue({
template: '<div class=" test1\ntest2\ttest3 test4 test5 \n \n \ntest6\t"></div>',
}).$mount()
expect(vm.$el.className).toBe('test1 test2 test3 test4 test5 test6')
done()
})

it('corrects whitespace in staticClass merge in a component', done => {
posva marked this conversation as resolved.
Show resolved Hide resolved
const vm = new Vue({
template: `
<component1 class="\n\t staticClass \t\n" :class="componentClass1">
</component1>
`,
data: {
componentClass1: 'componentClass1',
},
components: {
component1: {
template: '<div class="\n\t test \t\n"></div>'
},
}
}).$mount()
expect(vm.$el.className).toBe('test staticClass componentClass1')
vm.componentClass1 = 'c1'
waitForUpdate(() => {
expect(vm.$el.className).toBe('test staticClass c1')
}).then(done)
})

// a vdom patch edge case where the user has several un-keyed elements of the
// same tag next to each other, and toggling them.
it('properly remove staticClass for toggling un-keyed children', done => {
Expand Down