Skip to content

Commit

Permalink
fix(ssr): avoid hydration mismatch warning for classes with different…
Browse files Browse the repository at this point in the history
… order
  • Loading branch information
yyx990803 committed Dec 20, 2023
1 parent 048dffd commit e585b0d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
8 changes: 8 additions & 0 deletions packages/runtime-core/__tests__/hydration.spec.ts
Expand Up @@ -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' })
Expand Down
24 changes: 21 additions & 3 deletions packages/runtime-core/src/hydration.ts
Expand Up @@ -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') {
Expand Down Expand Up @@ -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
}

0 comments on commit e585b0d

Please sign in to comment.