vue-devui 1.6.14 → 1.6.15

package/vue-devui.es.js

@@ -37,7 +37,7 @@ var _a;
 import { createVNode, getCurrentInstance, defineComponent, toRefs, inject, computed, Fragment, mergeProps, resolveComponent, isVNode, ref, reactive, createTextVNode, provide, onMounted, watch, Transition, withDirectives, vShow, nextTick, onUnmounted, unref, withModifiers, Comment as Comment$1, Text, h, cloneVNode, Teleport, onBeforeUnmount, render as render$1, resolveDirective, resolveDynamicComponent, toRef, shallowRef, onBeforeMount, onUpdated, readonly, toRaw, watchEffect, renderSlot, useSlots, createApp, shallowReactive, effect, TransitionGroup } from "vue";
 import { useRoute } from "vue-router";
 import Clipboard from "clipboard";
-import { offset, autoPlacement, arrow, shift, computePosition, flip } from "@floating-ui/dom";
+import { offset, flip, arrow, computePosition } from "@floating-ui/dom";
 import { onClickOutside, toRefs as toRefs$1, useResizeObserver } from "@vueuse/core";
 import * as Diff2Html from "diff2html";
 import { Diff2HtmlUI } from "diff2html/lib/ui/js/diff2html-ui";
@@ -7855,16 +7855,6 @@ const flexibleOverlayProps = {
     default: false
   }
 };
-function getScrollParent(element) {
-  const overflowRegex = /(auto|scroll|hidden)/;
-  for (let parent = element; parent = parent.parentElement; parent.parentElement !== document.body) {
-    const style = window.getComputedStyle(parent);
-    if (overflowRegex.test(style.overflow + style.overflowX + style.overflowY)) {
-      return parent;
-    }
-  }
-  return window;
-}
 function adjustArrowPosition(isArrowCenter, point, placement, originRect) {
   let { x, y } = point;
   if (!isArrowCenter) {
@@ -7885,9 +7875,9 @@ function adjustArrowPosition(isArrowCenter, point, placement, originRect) {
   return { x, y };
 }
 function useOverlay(props, emit) {
+  const { position, showArrow } = toRefs(props);
   const overlayRef = ref();
   const arrowRef = ref();
-  let originParent = null;
   const updateArrowPosition = (arrowEl, placement, point, overlayEl) => {
     const { x, y } = adjustArrowPosition(props.isArrowCenter, point, placement, overlayEl.getBoundingClientRect());
     const staticSide = {
@@ -7908,51 +7898,42 @@ function useOverlay(props, emit) {
     const hostEl = props.origin;
     const overlayEl = unref(overlayRef.value);
     const arrowEl = unref(arrowRef.value);
-    const middleware = [
-      offset(props.offset),
-      autoPlacement({
-        alignment: props.align,
-        allowedPlacements: props.position
-      })
-    ];
-    props.showArrow && middleware.push(arrow({ element: arrowEl }));
-    props.shiftOffset !== void 0 && middleware.push(shift());
-    if (!overlayEl) {
-      return;
+    const [mainPosition, ...fallbackPosition] = position.value;
+    const middleware = [offset(props.offset)];
+    middleware.push(fallbackPosition.length ? flip({ fallbackPlacements: fallbackPosition }) : flip());
+    if (showArrow.value) {
+      middleware.push(arrow({ element: arrowRef.value }));
     }
     const { x, y, placement, middlewareData } = await computePosition(hostEl, overlayEl, {
       strategy: "fixed",
+      placement: mainPosition,
       middleware
     });
     let applyX = x;
     let applyY = y;
-    if (props.shiftOffset !== void 0) {
-      const { x: shiftX, y: shiftY } = middlewareData.shift;
-      shiftX < 0 && (applyX -= props.shiftOffset);
-      shiftX > 0 && (applyX += props.shiftOffset);
-      shiftY < 0 && (applyY -= props.shiftOffset);
-      shiftY > 0 && (applyY += props.shiftOffset);
-    }
     emit("positionChange", placement);
     Object.assign(overlayEl.style, { top: `${applyY}px`, left: `${applyX}px` });
     props.showArrow && updateArrowPosition(arrowEl, placement, middlewareData.arrow, overlayEl);
   };
+  const scrollCallback = (e) => {
+    var _a2, _b;
+    const scrollElement = e.target;
+    if (scrollElement == null ? void 0 : scrollElement.contains((_b = (_a2 = props.origin) == null ? void 0 : _a2.$el) != null ? _b : props.origin)) {
+      updatePosition();
+    }
+  };
   watch(() => props.modelValue, () => {
     if (props.modelValue && props.origin) {
-      originParent = getScrollParent(props.origin);
       nextTick(updatePosition);
-      originParent == null ? void 0 : originParent.addEventListener("scroll", updatePosition);
-      originParent !== window && window.addEventListener("scroll", updatePosition);
+      window.addEventListener("scroll", scrollCallback, true);
       window.addEventListener("resize", updatePosition);
     } else {
-      originParent == null ? void 0 : originParent.removeEventListener("scroll", updatePosition);
-      originParent !== window && window.removeEventListener("scroll", updatePosition);
+      window.removeEventListener("scroll", scrollCallback, true);
       window.removeEventListener("resize", updatePosition);
     }
   });
   onUnmounted(() => {
-    originParent == null ? void 0 : originParent.removeEventListener("scroll", updatePosition);
-    originParent !== window && window.removeEventListener("scroll", updatePosition);
+    window.removeEventListener("scroll", scrollCallback, true);
     window.removeEventListener("resize", updatePosition);
   });
   return { arrowRef, overlayRef, updatePosition };
@@ -54375,7 +54356,7 @@ const installs = [
   VirtualListInstall
 ];
 var vueDevui = {
-  version: "1.6.14",
+  version: "1.6.15",
   install(app) {
     installs.forEach((p) => app.use(p));
   }