mirror of https://github.com/vuejs/core.git
fix(ssr): avoid hydration mismatch warning for classes with different order
This commit is contained in:
parent
048dffd7ee
commit
e585b0db43
|
@ -1406,6 +1406,14 @@ describe('SSR hydration', () => {
|
|||
mountWithHydration(`<div class="foo bar"></div>`, () =>
|
||||
h('div', { class: 'foo bar' })
|
||||
)
|
||||
// SVG classes
|
||||
mountWithHydration(`<svg class="foo bar"></svg>`, () =>
|
||||
h('svg', { class: 'foo bar' })
|
||||
)
|
||||
// class with different order
|
||||
mountWithHydration(`<div class="foo bar"></svg>`, () =>
|
||||
h('div', { class: 'bar foo' })
|
||||
)
|
||||
expect(`Hydration class mismatch`).not.toHaveBeenWarned()
|
||||
mountWithHydration(`<div class="foo bar"></div>`, () =>
|
||||
h('div', { class: 'foo' })
|
||||
|
|
|
@ -718,9 +718,11 @@ function propHasMismatch(el: Element, key: string, clientValue: any): boolean {
|
|||
let actual: any
|
||||
let expected: any
|
||||
if (key === 'class') {
|
||||
actual = el.getAttribute('class')
|
||||
expected = normalizeClass(clientValue)
|
||||
if (actual !== expected) {
|
||||
// classes might be in different order, but that doesn't affect cascade
|
||||
// so we just need to check if the class lists contain the same classes.
|
||||
actual = toClassSet(el.getAttribute('class') || '')
|
||||
expected = toClassSet(normalizeClass(clientValue))
|
||||
if (!isSetEqual(actual, expected)) {
|
||||
mismatchType = mismatchKey = `class`
|
||||
}
|
||||
} else if (key === 'style') {
|
||||
|
@ -765,3 +767,19 @@ function propHasMismatch(el: Element, key: string, clientValue: any): boolean {
|
|||
}
|
||||
return false
|
||||
}
|
||||
|
||||
function toClassSet(str: string): Set<string> {
|
||||
return new Set(str.trim().split(/\s+/))
|
||||
}
|
||||
|
||||
function isSetEqual(a: Set<string>, b: Set<string>): boolean {
|
||||
if (a.size !== b.size) {
|
||||
return false
|
||||
}
|
||||
for (const s of a) {
|
||||
if (!b.has(s)) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue