@vue/runtime-dom 3.4.5 → 3.4.7

package/dist/runtime-dom.global.js

@@ -1827,7 +1827,9 @@ var VueRuntimeDOM = (function (exports) {
   }
   function flushPostFlushCbs(seen) {
     if (pendingPostFlushCbs.length) {
-      const deduped = [...new Set(pendingPostFlushCbs)];
+      const deduped = [...new Set(pendingPostFlushCbs)].sort(
+        (a, b) => getId(a) - getId(b)
+      );
       pendingPostFlushCbs.length = 0;
       if (activePostFlushCbs) {
         activePostFlushCbs.push(...deduped);
@@ -1837,7 +1839,6 @@ var VueRuntimeDOM = (function (exports) {
       {
         seen = seen || /* @__PURE__ */ new Map();
       }
-      activePostFlushCbs.sort((a, b) => getId(a) - getId(b));
       for (postFlushIndex = 0; postFlushIndex < activePostFlushCbs.length; postFlushIndex++) {
         if (checkRecursiveUpdates(seen, activePostFlushCbs[postFlushIndex])) {
           continue;
@@ -2930,6 +2931,7 @@ If this is a native custom element, make sure to exclude it from component resol
     {
       assertNumber(timeout, `Suspense timeout`);
     }
+    const initialAnchor = anchor;
     const suspense = {
       vnode,
       parent: parentSuspense,
@@ -2937,7 +2939,6 @@ If this is a native custom element, make sure to exclude it from component resol
       namespace,
       container,
       hiddenContainer,
-      anchor,
       deps: 0,
       pendingId: suspenseId++,
       timeout: typeof timeout === "number" ? timeout : -1,
@@ -2980,20 +2981,21 @@ If this is a native custom element, make sure to exclude it from component resol
                 move(
                   pendingBranch,
                   container2,
-                  next(activeBranch),
+                  anchor === initialAnchor ? next(activeBranch) : anchor,
                   0
                 );
                 queuePostFlushCb(effects);
               }
             };
           }
-          let { anchor: anchor2 } = suspense;
           if (activeBranch) {
-            anchor2 = next(activeBranch);
+            if (parentNode(activeBranch.el) !== suspense.hiddenContainer) {
+              anchor = next(activeBranch);
+            }
             unmount(activeBranch, parentComponent2, suspense, true);
           }
           if (!delayEnter) {
-            move(pendingBranch, container2, anchor2, 0);
+            move(pendingBranch, container2, anchor, 0);
           }
         }
         setActiveBranch(suspense, pendingBranch);
@@ -3440,14 +3442,9 @@ If this is a native custom element, make sure to exclude it from component resol
       cb = value.handler;
       options = value;
     }
-    const cur = currentInstance;
-    setCurrentInstance(this);
+    const reset = setCurrentInstance(this);
     const res = doWatch(getter, cb.bind(publicThis), options);
-    if (cur) {
-      setCurrentInstance(cur);
-    } else {
-      unsetCurrentInstance();
-    }
+    reset();
     return res;
   }
   function createPathGetter(ctx, path) {
@@ -3499,12 +3496,11 @@ If this is a native custom element, make sure to exclude it from component resol
     }
   }
   function withDirectives(vnode, directives) {
-    const internalInstance = currentRenderingInstance;
-    if (internalInstance === null) {
+    if (currentRenderingInstance === null) {
       warn$1(`withDirectives can only be used inside render functions.`);
       return vnode;
     }
-    const instance = getExposeProxy(internalInstance) || internalInstance.proxy;
+    const instance = getExposeProxy(currentRenderingInstance) || currentRenderingInstance.proxy;
     const bindings = vnode.dirs || (vnode.dirs = []);
     for (let i = 0; i < directives.length; i++) {
       let [dir, value, arg, modifiers = EMPTY_OBJ] = directives[i];
@@ -4284,9 +4280,9 @@ If this is a native custom element, make sure to exclude it from component resol
           return;
         }
         pauseTracking();
-        setCurrentInstance(target);
+        const reset = setCurrentInstance(target);
         const res = callWithAsyncErrorHandling(hook, target, type, args);
-        unsetCurrentInstance();
+        reset();
         resetTracking();
         return res;
       });
@@ -5671,12 +5667,12 @@ If you want to remount the same app, move your app creation logic into a factory
           if (key in propsDefaults) {
             value = propsDefaults[key];
           } else {
-            setCurrentInstance(instance);
+            const reset = setCurrentInstance(instance);
             value = propsDefaults[key] = defaultValue.call(
               null,
               props
             );
-            unsetCurrentInstance();
+            reset();
           }
         } else {
           value = defaultValue;
@@ -6371,7 +6367,7 @@ Server rendered element contains more child nodes than client vdom.`
         if (props) {
           {
             for (const key in props) {
-              if (propHasMismatch(el, key, props[key])) {
+              if (propHasMismatch(el, key, props[key], vnode)) {
                 hasMismatch = true;
               }
               if (forcePatch && (key.endsWith("value") || key === "indeterminate") || isOn(key) && !isReservedProp(key) || // force hydrate v-bind with .prop modifiers
@@ -6546,7 +6542,7 @@ Server rendered element contains fewer child nodes than client vdom.`
     };
     return [hydrate, hydrateNode];
   }
-  function propHasMismatch(el, key, clientValue) {
+  function propHasMismatch(el, key, clientValue, vnode) {
     let mismatchType;
     let mismatchKey;
     let actual;
@@ -6558,14 +6554,23 @@ Server rendered element contains fewer child nodes than client vdom.`
         mismatchType = mismatchKey = `class`;
       }
     } else if (key === "style") {
-      actual = el.getAttribute("style");
-      expected = isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue));
-      if (actual !== expected) {
+      actual = toStyleMap(el.getAttribute("style") || "");
+      expected = toStyleMap(
+        isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue))
+      );
+      if (vnode.dirs) {
+        for (const { dir, value } of vnode.dirs) {
+          if (dir.name === "show" && !value) {
+            expected.set("display", "none");
+          }
+        }
+      }
+      if (!isMapEqual(actual, expected)) {
         mismatchType = mismatchKey = "style";
       }
     } else if (el instanceof SVGElement && isKnownSvgAttr(key) || el instanceof HTMLElement && (isBooleanAttr(key) || isKnownHtmlAttr(key))) {
-      actual = el.hasAttribute(key) && el.getAttribute(key);
-      expected = isBooleanAttr(key) ? includeBooleanAttr(clientValue) ? "" : false : clientValue == null ? false : String(clientValue);
+      actual = el.hasAttribute(key) ? el.getAttribute(key) : key in el ? el[key] : "";
+      expected = isBooleanAttr(key) ? includeBooleanAttr(clientValue) ? "" : false : clientValue == null ? "" : String(clientValue);
       if (actual !== expected) {
         mismatchType = `attribute`;
         mismatchKey = key;
@@ -6600,6 +6605,29 @@ Server rendered element contains fewer child nodes than client vdom.`
     }
     return true;
   }
+  function toStyleMap(str) {
+    const styleMap = /* @__PURE__ */ new Map();
+    for (const item of str.split(";")) {
+      let [key, value] = item.split(":");
+      key = key == null ? void 0 : key.trim();
+      value = value == null ? void 0 : value.trim();
+      if (key && value) {
+        styleMap.set(key, value);
+      }
+    }
+    return styleMap;
+  }
+  function isMapEqual(a, b) {
+    if (a.size !== b.size) {
+      return false;
+    }
+    for (const [key, value] of a) {
+      if (value !== b.get(key)) {
+        return false;
+      }
+    }
+    return true;
+  }
 
   let supported;
   let perf;
@@ -7188,7 +7216,11 @@ Server rendered element contains fewer child nodes than client vdom.`
         hostInsert(fragmentStartAnchor, container, anchor);
         hostInsert(fragmentEndAnchor, container, anchor);
         mountChildren(
-          n2.children,
+          // #10007
+          // such fragment like `<></>` will be compiled into
+          // a fragment which doesn't have a children.
+          // In this case fallback to an empty array
+          n2.children || [],
           container,
           fragmentEndAnchor,
           parentComponent,
@@ -8022,6 +8054,7 @@ Server rendered element contains fewer child nodes than client vdom.`
       }
       return hostNextSibling(vnode.anchor || vnode.el);
     };
+    let isFlushing = false;
     const render = (vnode, container, namespace) => {
       if (vnode == null) {
         if (container._vnode) {
@@ -8038,8 +8071,12 @@ Server rendered element contains fewer child nodes than client vdom.`
           namespace
         );
       }
-      flushPreFlushCbs();
-      flushPostFlushCbs();
+      if (!isFlushing) {
+        isFlushing = true;
+        flushPreFlushCbs();
+        flushPostFlushCbs();
+        isFlushing = false;
+      }
       container._vnode = vnode;
     };
     const internals = {
@@ -8894,8 +8931,13 @@ Component that was made reactive: `,
     };
   }
   const setCurrentInstance = (instance) => {
+    const prev = currentInstance;
     internalSetCurrentInstance(instance);
     instance.scope.on();
+    return () => {
+      instance.scope.off();
+      internalSetCurrentInstance(prev);
+    };
   };
   const unsetCurrentInstance = () => {
     currentInstance && currentInstance.scope.off();
@@ -8957,7 +8999,7 @@ Component that was made reactive: `,
     const { setup } = Component;
     if (setup) {
       const setupContext = instance.setupContext = setup.length > 1 ? createSetupContext(instance) : null;
-      setCurrentInstance(instance);
+      const reset = setCurrentInstance(instance);
       pauseTracking();
       const setupResult = callWithErrorHandling(
         setup,
@@ -8969,7 +9011,7 @@ Component that was made reactive: `,
         ]
       );
       resetTracking();
-      unsetCurrentInstance();
+      reset();
       if (isPromise(setupResult)) {
         setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
         if (isSSR) {
@@ -9063,13 +9105,13 @@ Component that was made reactive: `,
       }
     }
     {
-      setCurrentInstance(instance);
+      const reset = setCurrentInstance(instance);
       pauseTracking();
       try {
         applyOptions(instance);
       } finally {
         resetTracking();
-        unsetCurrentInstance();
+        reset();
       }
     }
     if (!Component.render && instance.render === NOOP && !isSSR) {
@@ -9422,7 +9464,7 @@ Component that was made reactive: `,
     return true;
   }
 
-  const version = "3.4.5";
+  const version = "3.4.7";
   const warn = warn$1 ;
   const ErrorTypeStrings = ErrorTypeStrings$1 ;
   const devtools = devtools$1 ;
@@ -9819,6 +9861,9 @@ Component that was made reactive: `,
       setDisplay(el, value);
     }
   };
+  {
+    vShow.name = "show";
+  }
   function setDisplay(el, value) {
     el.style.display = value ? el[vShowOldKey] : "none";
   }