vue-devui 1.6.14 → 1.6.16

package/code-review/index.es.js

@@ -14,8 +14,8 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-import { watch, onUnmounted, defineComponent, toRefs, createVNode, Transition, mergeProps, ref, unref, nextTick, withModifiers, Comment, Text, h, Fragment, inject, withDirectives, cloneVNode, computed, onMounted, provide, Teleport, createTextVNode, vShow } from "vue";
-import { offset, autoPlacement, arrow, shift, computePosition } from "@floating-ui/dom";
+import { watch, onUnmounted, defineComponent, toRefs, createVNode, Transition, mergeProps, ref, computed, unref, nextTick, withModifiers, Comment, Text, h, Fragment, inject, withDirectives, cloneVNode, onMounted, provide, Teleport, createTextVNode, vShow } from "vue";
+import { offset, flip, arrow, computePosition } from "@floating-ui/dom";
 import Clipboard from "clipboard";
 import * as Diff2Html from "diff2html";
 import { Diff2HtmlUI } from "diff2html/lib/ui/js/diff2html-ui";
@@ -160,18 +160,12 @@ const flexibleOverlayProps = {
   clickEventBubble: {
     type: Boolean,
     default: false
+  },
+  fitOriginWidth: {
+    type: Boolean,
+    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) {
@@ -192,9 +186,18 @@ function adjustArrowPosition(isArrowCenter, point, placement, originRect) {
   return { x, y };
 }
 function useOverlay(props, emit) {
+  const { fitOriginWidth, position, showArrow } = toRefs(props);
   const overlayRef = ref();
   const arrowRef = ref();
-  let originParent = null;
+  const overlayWidth = ref(0);
+  let originObserver;
+  const styles = computed(() => {
+    if (fitOriginWidth.value) {
+      return { width: overlayWidth.value + "px" };
+    } else {
+      return {};
+    }
+  });
   const updateArrowPosition = (arrowEl, placement, point, overlayEl) => {
     const { x, y } = adjustArrowPosition(props.isArrowCenter, point, placement, overlayEl.getBoundingClientRect());
     const staticSide = {
@@ -215,54 +218,67 @@ 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 _a, _b;
+    const scrollElement = e.target;
+    if (scrollElement == null ? void 0 : scrollElement.contains((_b = (_a = props.origin) == null ? void 0 : _a.$el) != null ? _b : props.origin)) {
+      updatePosition();
+    }
+  };
+  const updateWidth = (originEl) => {
+    overlayWidth.value = originEl.getBoundingClientRect().width;
+    updatePosition();
+  };
+  const observeOrigin = () => {
+    var _a, _b;
+    if (fitOriginWidth.value && typeof window !== "undefined") {
+      const originEl = (_b = (_a = props.origin) == null ? void 0 : _a.$el) != null ? _b : props.origin;
+      if (originEl) {
+        originObserver = new window.ResizeObserver(() => updateWidth(originEl));
+        originObserver.observe(originEl);
+      }
+    }
+  };
+  const unobserveOrigin = () => {
+    var _a, _b;
+    const originEl = (_b = (_a = props.origin) == null ? void 0 : _a.$el) != null ? _b : props.origin;
+    originEl && (originObserver == null ? void 0 : originObserver.unobserve(originEl));
+  };
   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);
+      observeOrigin();
     } else {
-      originParent == null ? void 0 : originParent.removeEventListener("scroll", updatePosition);
-      originParent !== window && window.removeEventListener("scroll", updatePosition);
+      window.removeEventListener("scroll", scrollCallback, true);
       window.removeEventListener("resize", updatePosition);
+      unobserveOrigin();
     }
   });
   onUnmounted(() => {
-    originParent == null ? void 0 : originParent.removeEventListener("scroll", updatePosition);
-    originParent !== window && window.removeEventListener("scroll", updatePosition);
+    window.removeEventListener("scroll", scrollCallback, true);
     window.removeEventListener("resize", updatePosition);
+    unobserveOrigin();
   });
-  return { arrowRef, overlayRef, updatePosition };
+  return { arrowRef, overlayRef, styles, updatePosition };
 }
 var flexibleOverlay = "";
 const FlexibleOverlay = defineComponent({
@@ -283,6 +299,7 @@ const FlexibleOverlay = defineComponent({
     const {
       arrowRef,
       overlayRef,
+      styles,
       updatePosition
     } = useOverlay(props, emit);
     expose({
@@ -292,7 +309,8 @@ const FlexibleOverlay = defineComponent({
       var _a;
       return props.modelValue && createVNode("div", mergeProps({
         "ref": overlayRef,
-        "class": ns2.b()
+        "class": ns2.b(),
+        "style": styles.value
       }, attrs, {
         "onClick": withModifiers(() => ({}), [clickEventBubble.value ? "" : "stop"]),
         "onPointerup": withModifiers(() => ({}), ["stop"])
@@ -4253,7 +4271,7 @@ var lodash = { exports: {} };
       var delay = baseRest(function(func, wait, args) {
         return baseDelay(func, toNumber(wait) || 0, args);
       });
-      function flip(func) {
+      function flip2(func) {
         return createWrap(func, WRAP_FLIP_FLAG);
       }
       function memoize(func, resolver) {
@@ -5377,7 +5395,7 @@ var lodash = { exports: {} };
       lodash2.flatten = flatten;
       lodash2.flattenDeep = flattenDeep;
       lodash2.flattenDepth = flattenDepth;
-      lodash2.flip = flip;
+      lodash2.flip = flip2;
       lodash2.flow = flow;
       lodash2.flowRight = flowRight;
       lodash2.fromPairs = fromPairs;