@vue/runtime-dom 3.4.7 → 3.4.9

package/dist/runtime-dom.cjs.js

@@ -1,3 +1,8 @@
+/**
+* @vue/runtime-dom v3.4.9
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -413,6 +418,7 @@ function useCssVars(getter) {
 
 function patchStyle(el, prev, next) {
   const style = el.style;
+  const currentDisplay = style.display;
   const isCssString = shared.isString(next);
   if (next && !isCssString) {
     if (prev && !shared.isString(prev)) {
@@ -426,7 +432,6 @@ function patchStyle(el, prev, next) {
       setStyle(style, key, next[key]);
     }
   } else {
-    const currentDisplay = style.display;
     if (isCssString) {
       if (prev !== next) {
         const cssVarText = style[CSS_VAR_TEXT];
@@ -438,9 +443,9 @@ function patchStyle(el, prev, next) {
     } else if (prev) {
       el.removeAttribute("style");
     }
-    if (vShowOldKey in el) {
-      style.display = currentDisplay;
-    }
+  }
+  if (vShowOldKey in el) {
+    style.display = currentDisplay;
   }
 }
 const semicolonRE = /[^\\];\s*$/;

package/dist/runtime-dom.cjs.prod.js

@@ -1,3 +1,8 @@
+/**
+* @vue/runtime-dom v3.4.9
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -407,6 +412,7 @@ function useCssVars(getter) {
 
 function patchStyle(el, prev, next) {
   const style = el.style;
+  const currentDisplay = style.display;
   const isCssString = shared.isString(next);
   if (next && !isCssString) {
     if (prev && !shared.isString(prev)) {
@@ -420,7 +426,6 @@ function patchStyle(el, prev, next) {
       setStyle(style, key, next[key]);
     }
   } else {
-    const currentDisplay = style.display;
     if (isCssString) {
       if (prev !== next) {
         const cssVarText = style[CSS_VAR_TEXT];
@@ -432,9 +437,9 @@ function patchStyle(el, prev, next) {
     } else if (prev) {
       el.removeAttribute("style");
     }
-    if (vShowOldKey in el) {
-      style.display = currentDisplay;
-    }
+  }
+  if (vShowOldKey in el) {
+    style.display = currentDisplay;
   }
 }
 const importantRE = /\s*!important$/;

package/dist/runtime-dom.esm-browser.js

@@ -1,3 +1,8 @@
+/**
+* @vue/runtime-dom v3.4.9
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
 function makeMap(str, expectsLowerCase) {
   const set = new Set(str.split(","));
   return expectsLowerCase ? (val) => set.has(val.toLowerCase()) : (val) => set.has(val);
@@ -2577,8 +2582,6 @@ function hasPropsChanged(prevProps, nextProps, emitsOptions) {
   return false;
 }
 function updateHOCHostEl({ vnode, parent }, el) {
-  if (!el)
-    return;
   while (parent) {
     const root = parent.subTree;
     if (root.suspense && root.suspense.activeBranch === vnode) {
@@ -2670,6 +2673,10 @@ const SuspenseImpl = {
         rendererInternals
       );
     } else {
+      if (parentSuspense && parentSuspense.deps > 0) {
+        n2.suspense = n1.suspense;
+        return;
+      }
       patchSuspense(
         n1,
         n2,
@@ -3219,7 +3226,12 @@ function queueEffectWithSuspense(fn, suspense) {
 function setActiveBranch(suspense, branch) {
   suspense.activeBranch = branch;
   const { vnode, parentComponent } = suspense;
-  const el = vnode.el = branch.el;
+  let el = branch.el;
+  while (!el && branch.component) {
+    branch = branch.component.subTree;
+    el = branch.el;
+  }
+  vnode.el = el;
   if (parentComponent && parentComponent.subTree === vnode) {
     parentComponent.vnode.el = el;
     updateHOCHostEl(parentComponent, el);
@@ -4738,58 +4750,6 @@ function useSlots() {
 function useAttrs() {
   return getContext().attrs;
 }
-function useModel(props, name, options = EMPTY_OBJ) {
-  const i = getCurrentInstance();
-  if (!i) {
-    warn$1(`useModel() called without active instance.`);
-    return ref();
-  }
-  if (!i.propsOptions[0][name]) {
-    warn$1(`useModel() called with prop "${name}" which is not declared.`);
-    return ref();
-  }
-  const camelizedName = camelize(name);
-  const hyphenatedName = hyphenate(name);
-  const res = customRef((track, trigger) => {
-    let localValue;
-    watchSyncEffect(() => {
-      const propValue = props[name];
-      if (hasChanged(localValue, propValue)) {
-        localValue = propValue;
-        trigger();
-      }
-    });
-    return {
-      get() {
-        track();
-        return options.get ? options.get(localValue) : localValue;
-      },
-      set(value) {
-        const rawProps = i.vnode.props;
-        if (!(rawProps && // check if parent has passed v-model
-        (name in rawProps || camelizedName in rawProps || hyphenatedName in rawProps) && (`onUpdate:${name}` in rawProps || `onUpdate:${camelizedName}` in rawProps || `onUpdate:${hyphenatedName}` in rawProps)) && hasChanged(value, localValue)) {
-          localValue = value;
-          trigger();
-        }
-        i.emit(`update:${name}`, options.set ? options.set(value) : value);
-      }
-    };
-  });
-  const modifierKey = name === "modelValue" ? "modelModifiers" : `${name}Modifiers`;
-  res[Symbol.iterator] = () => {
-    let i2 = 0;
-    return {
-      next() {
-        if (i2 < 2) {
-          return { value: i2++ ? props[modifierKey] || {} : res, done: false };
-        } else {
-          return { done: true };
-        }
-      }
-    };
-  };
-  return res;
-}
 function getContext() {
   const i = getCurrentInstance();
   if (!i) {
@@ -6551,29 +6511,43 @@ function propHasMismatch(el, key, clientValue, vnode) {
   let actual;
   let expected;
   if (key === "class") {
-    actual = toClassSet(el.getAttribute("class") || "");
-    expected = toClassSet(normalizeClass(clientValue));
-    if (!isSetEqual(actual, expected)) {
+    actual = el.getAttribute("class");
+    expected = normalizeClass(clientValue);
+    if (!isSetEqual(toClassSet(actual || ""), toClassSet(expected))) {
       mismatchType = mismatchKey = `class`;
     }
   } else if (key === "style") {
-    actual = toStyleMap(el.getAttribute("style") || "");
-    expected = toStyleMap(
-      isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue))
-    );
+    actual = el.getAttribute("style");
+    expected = isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue));
+    const actualMap = toStyleMap(actual);
+    const expectedMap = toStyleMap(expected);
     if (vnode.dirs) {
       for (const { dir, value } of vnode.dirs) {
         if (dir.name === "show" && !value) {
-          expected.set("display", "none");
+          expectedMap.set("display", "none");
         }
       }
     }
-    if (!isMapEqual(actual, expected)) {
+    if (!isMapEqual(actualMap, expectedMap)) {
       mismatchType = mismatchKey = "style";
     }
   } else if (el instanceof SVGElement && isKnownSvgAttr(key) || el instanceof HTMLElement && (isBooleanAttr(key) || isKnownHtmlAttr(key))) {
-    actual = el.hasAttribute(key) ? el.getAttribute(key) : key in el ? el[key] : "";
-    expected = isBooleanAttr(key) ? includeBooleanAttr(clientValue) ? "" : false : clientValue == null ? "" : String(clientValue);
+    if (isBooleanAttr(key)) {
+      actual = el.hasAttribute(key);
+      expected = includeBooleanAttr(clientValue);
+    } else {
+      if (el.hasAttribute(key)) {
+        actual = el.getAttribute(key);
+      } else if (key in el) {
+        const serverValue = el[key];
+        if (!isObject(serverValue)) {
+          actual = serverValue == null ? "" : String(serverValue);
+        }
+      }
+      if (!isObject(clientValue)) {
+        expected = clientValue == null ? "" : String(clientValue);
+      }
+    }
     if (actual !== expected) {
       mismatchType = `attribute`;
       mismatchKey = key;
@@ -6581,15 +6555,15 @@ function propHasMismatch(el, key, clientValue, vnode) {
   }
   if (mismatchType) {
     const format = (v) => v === false ? `(not rendered)` : `${mismatchKey}="${v}"`;
-    warn$1(
-      `Hydration ${mismatchType} mismatch on`,
-      el,
-      `
+    const preSegment = `Hydration ${mismatchType} mismatch on`;
+    const postSegment = `
   - rendered on server: ${format(actual)}
   - expected on client: ${format(expected)}
   Note: this mismatch is check-only. The DOM will not be rectified in production due to performance overhead.
-  You should fix the source of the mismatch.`
-    );
+  You should fix the source of the mismatch.`;
+    {
+      warn$1(preSegment, el, postSegment);
+    }
     return true;
   }
   return false;
@@ -9245,6 +9219,59 @@ const computed = (getterOrOptions, debugOptions) => {
   return computed$1(getterOrOptions, debugOptions, isInSSRComponentSetup);
 };
 
+function useModel(props, name, options = EMPTY_OBJ) {
+  const i = getCurrentInstance();
+  if (!i) {
+    warn$1(`useModel() called without active instance.`);
+    return ref();
+  }
+  if (!i.propsOptions[0][name]) {
+    warn$1(`useModel() called with prop "${name}" which is not declared.`);
+    return ref();
+  }
+  const camelizedName = camelize(name);
+  const hyphenatedName = hyphenate(name);
+  const res = customRef((track, trigger) => {
+    let localValue;
+    watchSyncEffect(() => {
+      const propValue = props[name];
+      if (hasChanged(localValue, propValue)) {
+        localValue = propValue;
+        trigger();
+      }
+    });
+    return {
+      get() {
+        track();
+        return options.get ? options.get(localValue) : localValue;
+      },
+      set(value) {
+        const rawProps = i.vnode.props;
+        if (!(rawProps && // check if parent has passed v-model
+        (name in rawProps || camelizedName in rawProps || hyphenatedName in rawProps) && (`onUpdate:${name}` in rawProps || `onUpdate:${camelizedName}` in rawProps || `onUpdate:${hyphenatedName}` in rawProps)) && hasChanged(value, localValue)) {
+          localValue = value;
+          trigger();
+        }
+        i.emit(`update:${name}`, options.set ? options.set(value) : value);
+      }
+    };
+  });
+  const modifierKey = name === "modelValue" ? "modelModifiers" : `${name}Modifiers`;
+  res[Symbol.iterator] = () => {
+    let i2 = 0;
+    return {
+      next() {
+        if (i2 < 2) {
+          return { value: i2++ ? props[modifierKey] || {} : res, done: false };
+        } else {
+          return { done: true };
+        }
+      }
+    };
+  };
+  return res;
+}
+
 function h(type, propsOrChildren, children) {
   const l = arguments.length;
   if (l === 2) {
@@ -9467,7 +9494,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.4.7";
+const version = "3.4.9";
 const warn = warn$1 ;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = devtools$1 ;
@@ -9936,6 +9963,7 @@ function setVarsOnNode(el, vars) {
 
 function patchStyle(el, prev, next) {
   const style = el.style;
+  const currentDisplay = style.display;
   const isCssString = isString(next);
   if (next && !isCssString) {
     if (prev && !isString(prev)) {
@@ -9949,7 +9977,6 @@ function patchStyle(el, prev, next) {
       setStyle(style, key, next[key]);
     }
   } else {
-    const currentDisplay = style.display;
     if (isCssString) {
       if (prev !== next) {
         const cssVarText = style[CSS_VAR_TEXT];
@@ -9961,9 +9988,9 @@ function patchStyle(el, prev, next) {
     } else if (prev) {
       el.removeAttribute("style");
     }
-    if (vShowOldKey in el) {
-      style.display = currentDisplay;
-    }
+  }
+  if (vShowOldKey in el) {
+    style.display = currentDisplay;
   }
 }
 const semicolonRE = /[^\\];\s*$/;