vant 4.9.18 → 4.9.20

package/lib/share-sheet/index.d.ts

@@ -16,6 +16,7 @@ export declare const ShareSheet: import("../utils").WithInstall<import("vue").De
         default: true;
     };
     beforeClose: import("vue").PropType<import("../utils").Interceptor>;
+    overlayProps: import("vue").PropType<Partial<import("..").OverlayProps>>;
     overlayStyle: import("vue").PropType<import("vue").CSSProperties>;
     overlayClass: import("vue").PropType<unknown>;
     transitionAppear: BooleanConstructor;
@@ -61,6 +62,7 @@ export declare const ShareSheet: import("../utils").WithInstall<import("vue").De
         default: true;
     };
     beforeClose: import("vue").PropType<import("../utils").Interceptor>;
+    overlayProps: import("vue").PropType<Partial<import("..").OverlayProps>>;
     overlayStyle: import("vue").PropType<import("vue").CSSProperties>;
     overlayClass: import("vue").PropType<unknown>;
     transitionAppear: BooleanConstructor;

package/lib/tabbar-item/TabbarItem.js

@@ -73,7 +73,7 @@ var stdin_default = (0, import_vue.defineComponent)({
         const config = (0, import_utils.isObject)(to) ? to : {
           path: to
         };
-        return !!$route.matched.find((val) => {
+        return $route.matched.some((val) => {
           const pathMatched = "path" in config && config.path === val.path;
           const nameMatched = "name" in config && config.name === val.name;
           return pathMatched || nameMatched;

package/lib/tabs/Tabs.js

@@ -196,9 +196,8 @@ var stdin_default = (0, import_vue.defineComponent)({
       }
     };
     const setCurrentIndexByName = (name2, skipScrollIntoView) => {
-      const matched = children.find((tab, index2) => getTabName(tab, index2) === name2);
-      const index = matched ? children.indexOf(matched) : 0;
-      setCurrentIndex(index, skipScrollIntoView);
+      const index = children.findIndex((tab, index2) => getTabName(tab, index2) === name2);
+      setCurrentIndex(index === -1 ? 0 : index, skipScrollIntoView);
     };
     const scrollToCurrentContent = (immediate = false) => {
       if (props.scrollspy) {

package/lib/vant.cjs.js

@@ -1128,6 +1128,8 @@ const popupSharedProps = {
   lazyRender: truthProp,
   // callback function before close
   beforeClose: Function,
+  // overlay props
+  overlayProps: Object,
   // overlay custom style
   overlayStyle: Object,
   // overlay custom class name
@@ -1285,8 +1287,10 @@ const overlayProps = {
 };
 var stdin_default$1L = vue.defineComponent({
   name: name$1C,
+  inheritAttrs: false,
   props: overlayProps,
   setup(props2, {
+    attrs,
     slots
   }) {
     const root = vue.ref();
@@ -1302,11 +1306,11 @@ var stdin_default$1L = vue.defineComponent({
       if (isDef(props2.duration)) {
         style.animationDuration = `${props2.duration}s`;
       }
-      return vue.withDirectives(vue.createVNode("div", {
+      return vue.withDirectives(vue.createVNode("div", vue.mergeProps({
         "ref": root,
         "style": style,
         "class": [bem$1x(), props2.className]
-      }, [(_a = slots.default) == null ? void 0 : _a.call(slots)]), [[vue.vShow, props2.show]]);
+      }, attrs), [(_a = slots.default) == null ? void 0 : _a.call(slots)]), [[vue.vShow, props2.show]]);
     });
     use.useEventListener("touchmove", onTouchMove, {
       target: root
@@ -1395,15 +1399,16 @@ var stdin_default$1K = vue.defineComponent({
     };
     const renderOverlay = () => {
       if (props2.overlay) {
-        return vue.createVNode(Overlay, vue.mergeProps({
-          "show": props2.show,
-          "class": props2.overlayClass,
-          "zIndex": zIndex.value,
-          "duration": props2.duration,
-          "customStyle": props2.overlayStyle,
-          "role": props2.closeOnClickOverlay ? "button" : void 0,
-          "tabindex": props2.closeOnClickOverlay ? 0 : void 0
-        }, useScopeId(), {
+        const overlayProps2 = extend({
+          show: props2.show,
+          class: props2.overlayClass,
+          zIndex: zIndex.value,
+          duration: props2.duration,
+          customStyle: props2.overlayStyle,
+          role: props2.closeOnClickOverlay ? "button" : void 0,
+          tabindex: props2.closeOnClickOverlay ? 0 : void 0
+        }, props2.overlayProps);
+        return vue.createVNode(Overlay, vue.mergeProps(overlayProps2, useScopeId(), {
           "onClick": onClickOverlay
         }), {
           default: slots["overlay-content"]
@@ -1689,7 +1694,7 @@ function findIndexOfEnabledOption(options, index) {
   }
   return 0;
 }
-const isOptionExist = (options, value, fields) => value !== void 0 && !!options.find((option) => option[fields.value] === value);
+const isOptionExist = (options, value, fields) => value !== void 0 && options.some((option) => option[fields.value] === value);
 function findOptionByValue(options, value, fields) {
   const index = options.findIndex((option) => option[fields.value] === value);
   const enabledIndex = findIndexOfEnabledOption(options, index);
@@ -2029,7 +2034,7 @@ function scrollTopTo(scroller, to, duration, callback) {
     setScrollTop(scroller, current2);
     if (isDown && current2 < to || !isDown && current2 > to) {
       rafId = use.raf(animate);
-    } else {
+    } else if (callback) {
       rafId = use.raf(callback);
     }
   }
@@ -2793,9 +2798,8 @@ var stdin_default$1D = vue.defineComponent({
       }
     };
     const setCurrentIndexByName = (name2, skipScrollIntoView) => {
-      const matched = children.find((tab, index2) => getTabName(tab, index2) === name2);
-      const index = matched ? children.indexOf(matched) : 0;
-      setCurrentIndex(index, skipScrollIntoView);
+      const index = children.findIndex((tab, index2) => getTabName(tab, index2) === name2);
+      setCurrentIndex(index === -1 ? 0 : index, skipScrollIntoView);
     };
     const scrollToCurrentContent = (immediate = false) => {
       if (props2.scrollspy) {
@@ -3443,7 +3447,8 @@ var stdin_default$1z = vue.defineComponent({
       children.forEach((child) => child.stopMomentum());
       const params = getEventParams();
       vue.nextTick(() => {
-        emit("confirm", params);
+        const params2 = getEventParams();
+        emit("confirm", params2);
       });
       return params;
     };
@@ -3507,13 +3512,14 @@ var stdin_default$1z = vue.defineComponent({
         }), pick(slots, pickerToolbarSlots));
       }
     };
-    vue.watch(currentColumns, (columns) => {
+    const resetSelectedValues = (columns) => {
       columns.forEach((options, index) => {
         if (options.length && !isOptionExist(options, selectedValues.value[index], fields.value)) {
           setValue(index, getFirstEnabledOption(options)[fields.value.value]);
         }
       });
-    }, {
+    };
+    vue.watch(currentColumns, (columns) => resetSelectedValues(columns), {
       immediate: true
     });
     let lastEmittedModelValue;
@@ -3522,6 +3528,9 @@ var stdin_default$1z = vue.defineComponent({
         selectedValues.value = newValues.slice(0);
         lastEmittedModelValue = newValues.slice(0);
       }
+      if (props2.modelValue.length === 0) {
+        resetSelectedValues(currentColumns.value);
+      }
     }, {
       deep: true
     });
@@ -6293,7 +6302,7 @@ var stdin_default$1h = vue.defineComponent({
       deep: true
     });
     const rootStyle = vue.ref({});
-    vue.onMounted(() => __async(this, null, function* () {
+    vue.onMounted(() => __async(null, null, function* () {
       var _a;
       rootStyle.value["--move-distance"] = `-${(_a = barrageWrapper.value) == null ? void 0 : _a.offsetWidth}px`;
       yield vue.nextTick();
@@ -7321,7 +7330,8 @@ const imageProps = {
   showLoading: truthProp,
   loadingIcon: makeStringProp("photo"),
   crossorigin: String,
-  referrerpolicy: String
+  referrerpolicy: String,
+  decoding: String
 };
 var stdin_default$1c = vue.defineComponent({
   name: name$13,
@@ -7401,6 +7411,7 @@ var stdin_default$1c = vue.defineComponent({
       const attrs = {
         alt: props2.alt,
         class: bem$12("img"),
+        decoding: props2.decoding,
         style: {
           objectFit: props2.fit,
           objectPosition: props2.position
@@ -9925,12 +9936,14 @@ var stdin_default$U = vue.defineComponent({
       }, [item.renderTitle()])])]);
     };
     useExpose({
-      close
+      close,
+      opened
     });
     linkChildren({
       id,
       props: props2,
       offset,
+      opened,
       updateOffset
     });
     use.useClickAway(root, onClickAway);
@@ -10106,6 +10119,9 @@ var stdin_default$T = vue.defineComponent({
         "role": "menu",
         "class": bem$K("content"),
         "overlay": overlay,
+        "overlayProps": {
+          duration: state.transition && !parent.opened.value ? duration : 0
+        },
         "position": direction === "down" ? "top" : "bottom",
         "duration": state.transition ? duration : 0,
         "lazyRender": props2.lazyRender,
@@ -10146,7 +10162,10 @@ var stdin_default$T = vue.defineComponent({
 const DropdownItem = withInstall(stdin_default$T);
 const DropdownMenu = withInstall(stdin_default$U);
 const floatingBubbleProps = {
-  gap: makeNumberProp(24),
+  gap: {
+    type: [Number, Object],
+    default: 24
+  },
   icon: String,
   axis: makeStringProp("y"),
   magnetic: String,
@@ -10180,11 +10199,13 @@ var stdin_default$S = vue.defineComponent({
       width: 0,
       height: 0
     });
+    const gapX = vue.computed(() => isObject(props2.gap) ? props2.gap.x : props2.gap);
+    const gapY = vue.computed(() => isObject(props2.gap) ? props2.gap.y : props2.gap);
     const boundary = vue.computed(() => ({
-      top: props2.gap,
-      right: windowWidth.value - state.value.width - props2.gap,
-      bottom: windowHeight.value - state.value.height - props2.gap,
-      left: props2.gap
+      top: gapY.value,
+      right: windowWidth.value - state.value.width - gapX.value,
+      bottom: windowHeight.value - state.value.height - gapY.value,
+      left: gapX.value
     }));
     const dragging = vue.ref(false);
     let initialized = false;
@@ -10208,8 +10229,8 @@ var stdin_default$S = vue.defineComponent({
         offset
       } = props2;
       state.value = {
-        x: offset.x > -1 ? offset.x : windowWidth.value - width - props2.gap,
-        y: offset.y > -1 ? offset.y : windowHeight.value - height - props2.gap,
+        x: offset.x > -1 ? offset.x : windowWidth.value - width - gapX.value,
+        y: offset.y > -1 ? offset.y : windowHeight.value - height - gapY.value,
         width,
         height
       };
@@ -10277,7 +10298,7 @@ var stdin_default$S = vue.defineComponent({
         initialized = true;
       });
     });
-    vue.watch([windowWidth, windowHeight, () => props2.gap, () => props2.offset], updateState, {
+    vue.watch([windowWidth, windowHeight, gapX, gapY, () => props2.offset], updateState, {
       deep: true
     });
     const show = vue.ref(true);
@@ -15199,7 +15220,7 @@ var stdin_default$a = vue.defineComponent({
         const config = isObject(to) ? to : {
           path: to
         };
-        return !!$route.matched.find((val) => {
+        return $route.matched.some((val) => {
           const pathMatched = "path" in config && config.path === val.path;
           const nameMatched = "name" in config && config.name === val.name;
           return pathMatched || nameMatched;
@@ -16178,28 +16199,28 @@ var stdin_default$4 = vue.defineComponent({
       });
       return URL.createObjectURL(svgBlob);
     };
+    const revokeWatermarkUrl = () => {
+      if (watermarkUrl.value) {
+        URL.revokeObjectURL(watermarkUrl.value);
+      }
+    };
+    const generateWatermarkUrl = () => {
+      if (svgElRef.value) {
+        revokeWatermarkUrl();
+        watermarkUrl.value = makeSvgToBlobUrl(svgElRef.value.innerHTML);
+      }
+    };
     vue.watchEffect(() => {
       if (props2.image) {
         makeImageToBase64(props2.image);
       }
     });
-    vue.watch(() => [imageBase64.value, props2.content, props2.textColor, props2.height, props2.width, props2.rotate, props2.gapX, props2.gapY], () => {
-      vue.nextTick(() => {
-        if (svgElRef.value) {
-          if (watermarkUrl.value) {
-            URL.revokeObjectURL(watermarkUrl.value);
-          }
-          watermarkUrl.value = makeSvgToBlobUrl(svgElRef.value.innerHTML);
-        }
-      });
-    }, {
-      immediate: true
-    });
-    vue.onUnmounted(() => {
-      if (watermarkUrl.value) {
-        URL.revokeObjectURL(watermarkUrl.value);
-      }
+    vue.watch(() => [props2.content, props2.textColor, props2.height, props2.width, props2.rotate, props2.gapX, props2.gapY], generateWatermarkUrl);
+    vue.watch(imageBase64, () => {
+      vue.nextTick(generateWatermarkUrl);
     });
+    vue.onMounted(generateWatermarkUrl);
+    vue.onUnmounted(revokeWatermarkUrl);
     return () => {
       const style = extend({
         backgroundImage: `url(${watermarkUrl.value})`
@@ -17080,7 +17101,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.9.18";
+const version = "4.9.20";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.js

@@ -1,7 +1,7 @@
 import { unref, ref, reactive, inject, watch, onMounted, nextTick, createVNode, defineComponent, getCurrentInstance, computed, onActivated, onDeactivated, onBeforeUnmount, provide, watchEffect, mergeProps, Transition, Teleport, withDirectives, vShow, Fragment, onBeforeUpdate, Comment, createTextVNode, onUnmounted, createApp, resolveDirective, withKeys, onUpdated, Text, h } from "vue";
-import { useWindowSize, useRect, useChildren, useParent, onMountedOrActivated, getScrollParent, useEventListener, cancelRaf, raf, useScrollParent, usePageVisibility, doubleRaf, CUSTOM_FIELD_INJECTION_KEY, useCustomFieldValue, inBrowser as inBrowser$1, useToggle, useCountDown, useClickAway } from "@vant/use";
+import { useWindowSize, useRect, useChildren, useParent, onMountedOrActivated, getScrollParent, useEventListener, raf, cancelRaf, useScrollParent, usePageVisibility, doubleRaf, CUSTOM_FIELD_INJECTION_KEY, useCustomFieldValue, inBrowser as inBrowser$1, useToggle, useCountDown, useClickAway } from "@vant/use";
 import { normalizeClass, stringifyStyle, normalizeStyle } from "@vue/shared";
-import { offsetModifier, createPopper } from "@vant/popperjs";
+import { createPopper, offsetModifier } from "@vant/popperjs";
 function noop() {
 }
 const extend = Object.assign;
@@ -1126,6 +1126,8 @@ const popupSharedProps = {
   lazyRender: truthProp,
   // callback function before close
   beforeClose: Function,
+  // overlay props
+  overlayProps: Object,
   // overlay custom style
   overlayStyle: Object,
   // overlay custom class name
@@ -1283,8 +1285,10 @@ const overlayProps = {
 };
 var stdin_default$1L = defineComponent({
   name: name$1C,
+  inheritAttrs: false,
   props: overlayProps,
   setup(props2, {
+    attrs,
     slots
   }) {
     const root = ref();
@@ -1300,11 +1304,11 @@ var stdin_default$1L = defineComponent({
       if (isDef(props2.duration)) {
         style.animationDuration = `${props2.duration}s`;
       }
-      return withDirectives(createVNode("div", {
+      return withDirectives(createVNode("div", mergeProps({
         "ref": root,
         "style": style,
         "class": [bem$1x(), props2.className]
-      }, [(_a = slots.default) == null ? void 0 : _a.call(slots)]), [[vShow, props2.show]]);
+      }, attrs), [(_a = slots.default) == null ? void 0 : _a.call(slots)]), [[vShow, props2.show]]);
     });
     useEventListener("touchmove", onTouchMove, {
       target: root
@@ -1393,15 +1397,16 @@ var stdin_default$1K = defineComponent({
     };
     const renderOverlay = () => {
       if (props2.overlay) {
-        return createVNode(Overlay, mergeProps({
-          "show": props2.show,
-          "class": props2.overlayClass,
-          "zIndex": zIndex.value,
-          "duration": props2.duration,
-          "customStyle": props2.overlayStyle,
-          "role": props2.closeOnClickOverlay ? "button" : void 0,
-          "tabindex": props2.closeOnClickOverlay ? 0 : void 0
-        }, useScopeId(), {
+        const overlayProps2 = extend({
+          show: props2.show,
+          class: props2.overlayClass,
+          zIndex: zIndex.value,
+          duration: props2.duration,
+          customStyle: props2.overlayStyle,
+          role: props2.closeOnClickOverlay ? "button" : void 0,
+          tabindex: props2.closeOnClickOverlay ? 0 : void 0
+        }, props2.overlayProps);
+        return createVNode(Overlay, mergeProps(overlayProps2, useScopeId(), {
           "onClick": onClickOverlay
         }), {
           default: slots["overlay-content"]
@@ -1687,7 +1692,7 @@ function findIndexOfEnabledOption(options, index) {
   }
   return 0;
 }
-const isOptionExist = (options, value, fields) => value !== void 0 && !!options.find((option) => option[fields.value] === value);
+const isOptionExist = (options, value, fields) => value !== void 0 && options.some((option) => option[fields.value] === value);
 function findOptionByValue(options, value, fields) {
   const index = options.findIndex((option) => option[fields.value] === value);
   const enabledIndex = findIndexOfEnabledOption(options, index);
@@ -2027,7 +2032,7 @@ function scrollTopTo(scroller, to, duration, callback) {
     setScrollTop(scroller, current2);
     if (isDown && current2 < to || !isDown && current2 > to) {
       rafId = raf(animate);
-    } else {
+    } else if (callback) {
       rafId = raf(callback);
     }
   }
@@ -2791,9 +2796,8 @@ var stdin_default$1D = defineComponent({
       }
     };
     const setCurrentIndexByName = (name2, skipScrollIntoView) => {
-      const matched = children.find((tab, index2) => getTabName(tab, index2) === name2);
-      const index = matched ? children.indexOf(matched) : 0;
-      setCurrentIndex(index, skipScrollIntoView);
+      const index = children.findIndex((tab, index2) => getTabName(tab, index2) === name2);
+      setCurrentIndex(index === -1 ? 0 : index, skipScrollIntoView);
     };
     const scrollToCurrentContent = (immediate = false) => {
       if (props2.scrollspy) {
@@ -3441,7 +3445,8 @@ var stdin_default$1z = defineComponent({
       children.forEach((child) => child.stopMomentum());
       const params = getEventParams();
       nextTick(() => {
-        emit("confirm", params);
+        const params2 = getEventParams();
+        emit("confirm", params2);
       });
       return params;
     };
@@ -3505,13 +3510,14 @@ var stdin_default$1z = defineComponent({
         }), pick(slots, pickerToolbarSlots));
       }
     };
-    watch(currentColumns, (columns) => {
+    const resetSelectedValues = (columns) => {
       columns.forEach((options, index) => {
         if (options.length && !isOptionExist(options, selectedValues.value[index], fields.value)) {
           setValue(index, getFirstEnabledOption(options)[fields.value.value]);
         }
       });
-    }, {
+    };
+    watch(currentColumns, (columns) => resetSelectedValues(columns), {
       immediate: true
     });
     let lastEmittedModelValue;
@@ -3520,6 +3526,9 @@ var stdin_default$1z = defineComponent({
         selectedValues.value = newValues.slice(0);
         lastEmittedModelValue = newValues.slice(0);
       }
+      if (props2.modelValue.length === 0) {
+        resetSelectedValues(currentColumns.value);
+      }
     }, {
       deep: true
     });
@@ -6291,7 +6300,7 @@ var stdin_default$1h = defineComponent({
       deep: true
     });
     const rootStyle = ref({});
-    onMounted(() => __async(this, null, function* () {
+    onMounted(() => __async(null, null, function* () {
       var _a;
       rootStyle.value["--move-distance"] = `-${(_a = barrageWrapper.value) == null ? void 0 : _a.offsetWidth}px`;
       yield nextTick();
@@ -7319,7 +7328,8 @@ const imageProps = {
   showLoading: truthProp,
   loadingIcon: makeStringProp("photo"),
   crossorigin: String,
-  referrerpolicy: String
+  referrerpolicy: String,
+  decoding: String
 };
 var stdin_default$1c = defineComponent({
   name: name$13,
@@ -7399,6 +7409,7 @@ var stdin_default$1c = defineComponent({
       const attrs = {
         alt: props2.alt,
         class: bem$12("img"),
+        decoding: props2.decoding,
         style: {
           objectFit: props2.fit,
           objectPosition: props2.position
@@ -9923,12 +9934,14 @@ var stdin_default$U = defineComponent({
       }, [item.renderTitle()])])]);
     };
     useExpose({
-      close
+      close,
+      opened
     });
     linkChildren({
       id,
       props: props2,
       offset,
+      opened,
       updateOffset
     });
     useClickAway(root, onClickAway);
@@ -10104,6 +10117,9 @@ var stdin_default$T = defineComponent({
         "role": "menu",
         "class": bem$K("content"),
         "overlay": overlay,
+        "overlayProps": {
+          duration: state.transition && !parent.opened.value ? duration : 0
+        },
         "position": direction === "down" ? "top" : "bottom",
         "duration": state.transition ? duration : 0,
         "lazyRender": props2.lazyRender,
@@ -10144,7 +10160,10 @@ var stdin_default$T = defineComponent({
 const DropdownItem = withInstall(stdin_default$T);
 const DropdownMenu = withInstall(stdin_default$U);
 const floatingBubbleProps = {
-  gap: makeNumberProp(24),
+  gap: {
+    type: [Number, Object],
+    default: 24
+  },
   icon: String,
   axis: makeStringProp("y"),
   magnetic: String,
@@ -10178,11 +10197,13 @@ var stdin_default$S = defineComponent({
       width: 0,
       height: 0
     });
+    const gapX = computed(() => isObject(props2.gap) ? props2.gap.x : props2.gap);
+    const gapY = computed(() => isObject(props2.gap) ? props2.gap.y : props2.gap);
     const boundary = computed(() => ({
-      top: props2.gap,
-      right: windowWidth.value - state.value.width - props2.gap,
-      bottom: windowHeight.value - state.value.height - props2.gap,
-      left: props2.gap
+      top: gapY.value,
+      right: windowWidth.value - state.value.width - gapX.value,
+      bottom: windowHeight.value - state.value.height - gapY.value,
+      left: gapX.value
     }));
     const dragging = ref(false);
     let initialized = false;
@@ -10206,8 +10227,8 @@ var stdin_default$S = defineComponent({
         offset
       } = props2;
       state.value = {
-        x: offset.x > -1 ? offset.x : windowWidth.value - width - props2.gap,
-        y: offset.y > -1 ? offset.y : windowHeight.value - height - props2.gap,
+        x: offset.x > -1 ? offset.x : windowWidth.value - width - gapX.value,
+        y: offset.y > -1 ? offset.y : windowHeight.value - height - gapY.value,
         width,
         height
       };
@@ -10275,7 +10296,7 @@ var stdin_default$S = defineComponent({
         initialized = true;
       });
     });
-    watch([windowWidth, windowHeight, () => props2.gap, () => props2.offset], updateState, {
+    watch([windowWidth, windowHeight, gapX, gapY, () => props2.offset], updateState, {
       deep: true
     });
     const show = ref(true);
@@ -15197,7 +15218,7 @@ var stdin_default$a = defineComponent({
         const config = isObject(to) ? to : {
           path: to
         };
-        return !!$route.matched.find((val) => {
+        return $route.matched.some((val) => {
           const pathMatched = "path" in config && config.path === val.path;
           const nameMatched = "name" in config && config.name === val.name;
           return pathMatched || nameMatched;
@@ -16176,28 +16197,28 @@ var stdin_default$4 = defineComponent({
       });
       return URL.createObjectURL(svgBlob);
     };
+    const revokeWatermarkUrl = () => {
+      if (watermarkUrl.value) {
+        URL.revokeObjectURL(watermarkUrl.value);
+      }
+    };
+    const generateWatermarkUrl = () => {
+      if (svgElRef.value) {
+        revokeWatermarkUrl();
+        watermarkUrl.value = makeSvgToBlobUrl(svgElRef.value.innerHTML);
+      }
+    };
     watchEffect(() => {
       if (props2.image) {
         makeImageToBase64(props2.image);
       }
     });
-    watch(() => [imageBase64.value, props2.content, props2.textColor, props2.height, props2.width, props2.rotate, props2.gapX, props2.gapY], () => {
-      nextTick(() => {
-        if (svgElRef.value) {
-          if (watermarkUrl.value) {
-            URL.revokeObjectURL(watermarkUrl.value);
-          }
-          watermarkUrl.value = makeSvgToBlobUrl(svgElRef.value.innerHTML);
-        }
-      });
-    }, {
-      immediate: true
-    });
-    onUnmounted(() => {
-      if (watermarkUrl.value) {
-        URL.revokeObjectURL(watermarkUrl.value);
-      }
+    watch(() => [props2.content, props2.textColor, props2.height, props2.width, props2.rotate, props2.gapX, props2.gapY], generateWatermarkUrl);
+    watch(imageBase64, () => {
+      nextTick(generateWatermarkUrl);
     });
+    onMounted(generateWatermarkUrl);
+    onUnmounted(revokeWatermarkUrl);
     return () => {
       const style = extend({
         backgroundImage: `url(${watermarkUrl.value})`
@@ -17078,7 +17099,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.9.18";
+const version = "4.9.20";
 function install(app) {
   const components = [
     ActionBar,