From: Evan You <yyx990803@gmail.com>
Date: Thu, 11 Jan 2024 13:07:41 +0000 (+0800)
Subject: fix(hydration): should not warn on falsy bindings of non-property keys
X-Git-Tag: v3.4.10~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3907c87ce23cc6ef4a739b5a66ddb553e8723114;p=thirdparty%2Fvuejs%2Fcore.git

fix(hydration): should not warn on falsy bindings of non-property keys
---

diff --git a/packages/runtime-core/__tests__/hydration.spec.ts b/packages/runtime-core/__tests__/hydration.spec.ts
index 17d7b8dbce..3b2bdbf35c 100644
--- a/packages/runtime-core/__tests__/hydration.spec.ts
+++ b/packages/runtime-core/__tests__/hydration.spec.ts
@@ -1516,5 +1516,10 @@ describe('SSR hydration', () => {
       mountWithHydration(`<input />`, () => h('input', { from: {} }))
       expect(`Hydration attribute mismatch`).not.toHaveBeenWarned()
     })
+
+    test('should not warn on falsy bindings of non-property keys', () => {
+      mountWithHydration(`<button />`, () => h('button', { href: undefined }))
+      expect(`Hydration attribute mismatch`).not.toHaveBeenWarned()
+    })
   })
 })
diff --git a/packages/runtime-core/src/hydration.ts b/packages/runtime-core/src/hydration.ts
index 4df4eecece..8ac4fbb75f 100644
--- a/packages/runtime-core/src/hydration.ts
+++ b/packages/runtime-core/src/hydration.ts
@@ -759,18 +759,18 @@ function propHasMismatch(
       actual = el.hasAttribute(key)
       expected = includeBooleanAttr(clientValue)
     } else {
-      // #10000 some attrs such as textarea.value can't be get by `hasAttribute`
       if (el.hasAttribute(key)) {
         actual = el.getAttribute(key)
-      } else if (key in el) {
+      } else {
+        // #10000 some attrs such as textarea.value can't be retrieved by `hasAttribute`
         const serverValue = el[key as keyof typeof el]
-        if (!isObject(serverValue)) {
-          actual = serverValue == null ? '' : String(serverValue)
-        }
-      }
-      if (!isObject(clientValue)) {
-        expected = clientValue == null ? '' : String(clientValue)
+        actual =
+          isObject(serverValue) || serverValue == null
+            ? ''
+            : String(serverValue)
       }
+      expected =
+        isObject(clientValue) || clientValue == null ? '' : String(clientValue)
     }
     if (actual !== expected) {
       mismatchType = `attribute`