fix: reorder check for special attrs (#2528)

marko-js · Feb 20, 2025 · 136bb14 · 136bb14
1 parent f56fb10
commit 136bb14
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/.changeset/dull-turkeys-wonder.md b/.changeset/dull-turkeys-wonder.md
@@ -0,0 +1,5 @@
+---
+"marko": patch
+---
+
+Fix special attrs
diff --git a/packages/runtime-class/src/runtime/vdom/VElement.js b/packages/runtime-class/src/runtime/vdom/VElement.js
@@ -326,23 +326,22 @@ VElement.___morphAttrs = function (fromEl, vFromEl, toEl) {
   // them to the value in the old map. However, if the value is
   // null/undefined/false then we want to remove the attribute
   for (attrName in attrs) {
-    if (
-      !preserve[attrName] &&
-      normalizeValue(oldAttrs[attrName]) !==
-        (attrValue = normalizeValue(attrs[attrName]))
-    ) {
+    if (!preserve[attrName]) {
+      attrValue = normalizeValue(attrs[attrName]);
       if ((specialAttr = specialAttrs[attrName])) {
         specialAttr(fromEl, attrValue);
-      } else if (attrName === ATTR_XLINK_HREF) {
-        if (attrValue === undefined) {
-          fromEl.removeAttributeNS(NS_XLINK, ATTR_HREF);
+      } else if (normalizeValue(oldAttrs[attrName]) !== attrValue) {
+        if (attrName === ATTR_XLINK_HREF) {
+          if (attrValue === undefined) {
+            fromEl.removeAttributeNS(NS_XLINK, ATTR_HREF);
+          } else {
+            fromEl.setAttributeNS(NS_XLINK, ATTR_HREF, attrValue);
+          }
+        } else if (attrValue === undefined) {
+          fromEl.removeAttribute(attrName);
         } else {
-          fromEl.setAttributeNS(NS_XLINK, ATTR_HREF, attrValue);
+          fromEl.setAttribute(attrName, attrValue);
         }
-      } else if (attrValue === undefined) {
-        fromEl.removeAttribute(attrName);
-      } else {
-        fromEl.setAttribute(attrName, attrValue);
       }
     }
   }