@v-c/trigger 0.0.10 → 0.0.11

package/dist/util.cjs

@@ -1 +1,101 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function j(e=[],o=[],t){return t?e[0]===o[0]:e[0]===o[0]&&e[1]===o[1]}function I(e,o,t,n){const{points:s}=t,i=Object.keys(e);for(let r=0;r<i.length;r+=1){const l=i[r];if(j(e[l]?.points,s,n))return`${o}-placement-${l}`}return""}function m(e){return e.ownerDocument.defaultView}function X(e){const o=[];let t=e?.parentElement;const n=["hidden","scroll","clip","auto"];for(;t;){const{overflowX:s,overflowY:i,overflow:r}=m(t).getComputedStyle(t);[s,i,r].some(l=>n.includes(l))&&o.push(t),t=t.parentElement}return o}function a(e,o=1){return Number.isNaN(e)?o:e}function d(e){return a(parseFloat(e),0)}function Y(e,o){const t={...e};return(o||[]).forEach(n=>{if(n instanceof HTMLBodyElement||n instanceof HTMLHtmlElement)return;const{overflow:s,overflowClipMargin:i,borderTopWidth:r,borderBottomWidth:l,borderLeftWidth:L,borderRightWidth:T}=m(n).getComputedStyle(n),c=n.getBoundingClientRect(),{offsetHeight:p,clientHeight:C,offsetWidth:b,clientWidth:E}=n,W=d(r),M=d(l),N=d(L),w=d(T),h=a(Math.round(c.width/b*1e3)/1e3),u=a(Math.round(c.height/p*1e3)/1e3),R=(b-E-N-w)*h,A=(p-C-W-M)*u,B=W*u,x=M*u,H=N*h,O=w*h;let f=0,g=0;if(s==="clip"){const v=d(i);f=v*h,g=v*u}const S=c.x+H-f,y=c.y+B-g,P=S+c.width+2*f-H-O-R,V=y+c.height+2*g-B-x-A;t.left=Math.max(t.left,S),t.top=Math.max(t.top,y),t.right=Math.min(t.right,P),t.bottom=Math.min(t.bottom,V)}),t}exports.collectScroller=X;exports.getAlignPopupClassName=I;exports.getVisibleArea=Y;exports.getWin=m;exports.toNum=a;
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+function isPointsEq(a1 = [], a2 = [], isAlignPoint) {
+  if (isAlignPoint) {
+    return a1[0] === a2[0];
+  }
+  return a1[0] === a2[0] && a1[1] === a2[1];
+}
+function getAlignPopupClassName(builtinPlacements, prefixCls, align, isAlignPoint) {
+  const { points } = align;
+  const placements = Object.keys(builtinPlacements);
+  for (let i = 0; i < placements.length; i += 1) {
+    const placement = placements[i];
+    if (isPointsEq(builtinPlacements[placement]?.points, points, isAlignPoint)) {
+      return `${prefixCls}-placement-${placement}`;
+    }
+  }
+  return "";
+}
+function getWin(ele) {
+  return ele.ownerDocument.defaultView;
+}
+function collectScroller(ele) {
+  const scrollerList = [];
+  let current = ele?.parentElement;
+  const scrollStyle = ["hidden", "scroll", "clip", "auto"];
+  while (current) {
+    const { overflowX, overflowY, overflow } = getWin(current).getComputedStyle(current);
+    if ([overflowX, overflowY, overflow].some((o) => scrollStyle.includes(o))) {
+      scrollerList.push(current);
+    }
+    current = current.parentElement;
+  }
+  return scrollerList;
+}
+function toNum(num, defaultValue = 1) {
+  return Number.isNaN(num) ? defaultValue : num;
+}
+function getPxValue(val) {
+  return toNum(parseFloat(val), 0);
+}
+function getVisibleArea(initArea, scrollerList) {
+  const visibleArea = { ...initArea };
+  (scrollerList || []).forEach((ele) => {
+    if (ele instanceof HTMLBodyElement || ele instanceof HTMLHtmlElement) {
+      return;
+    }
+    const {
+      overflow,
+      overflowClipMargin,
+      borderTopWidth,
+      borderBottomWidth,
+      borderLeftWidth,
+      borderRightWidth
+    } = getWin(ele).getComputedStyle(ele);
+    const eleRect = ele.getBoundingClientRect();
+    const {
+      offsetHeight: eleOutHeight,
+      clientHeight: eleInnerHeight,
+      offsetWidth: eleOutWidth,
+      clientWidth: eleInnerWidth
+    } = ele;
+    const borderTopNum = getPxValue(borderTopWidth);
+    const borderBottomNum = getPxValue(borderBottomWidth);
+    const borderLeftNum = getPxValue(borderLeftWidth);
+    const borderRightNum = getPxValue(borderRightWidth);
+    const scaleX = toNum(
+      Math.round(eleRect.width / eleOutWidth * 1e3) / 1e3
+    );
+    const scaleY = toNum(
+      Math.round(eleRect.height / eleOutHeight * 1e3) / 1e3
+    );
+    const eleScrollWidth = (eleOutWidth - eleInnerWidth - borderLeftNum - borderRightNum) * scaleX;
+    const eleScrollHeight = (eleOutHeight - eleInnerHeight - borderTopNum - borderBottomNum) * scaleY;
+    const scaledBorderTopWidth = borderTopNum * scaleY;
+    const scaledBorderBottomWidth = borderBottomNum * scaleY;
+    const scaledBorderLeftWidth = borderLeftNum * scaleX;
+    const scaledBorderRightWidth = borderRightNum * scaleX;
+    let clipMarginWidth = 0;
+    let clipMarginHeight = 0;
+    if (overflow === "clip") {
+      const clipNum = getPxValue(overflowClipMargin);
+      clipMarginWidth = clipNum * scaleX;
+      clipMarginHeight = clipNum * scaleY;
+    }
+    const eleLeft = eleRect.x + scaledBorderLeftWidth - clipMarginWidth;
+    const eleTop = eleRect.y + scaledBorderTopWidth - clipMarginHeight;
+    const eleRight = eleLeft + eleRect.width + 2 * clipMarginWidth - scaledBorderLeftWidth - scaledBorderRightWidth - eleScrollWidth;
+    const eleBottom = eleTop + eleRect.height + 2 * clipMarginHeight - scaledBorderTopWidth - scaledBorderBottomWidth - eleScrollHeight;
+    visibleArea.left = Math.max(visibleArea.left, eleLeft);
+    visibleArea.top = Math.max(visibleArea.top, eleTop);
+    visibleArea.right = Math.min(visibleArea.right, eleRight);
+    visibleArea.bottom = Math.min(visibleArea.bottom, eleBottom);
+  });
+  return visibleArea;
+}
+exports.collectScroller = collectScroller;
+exports.getAlignPopupClassName = getAlignPopupClassName;
+exports.getVisibleArea = getVisibleArea;
+exports.getWin = getWin;
+exports.toNum = toNum;

package/dist/util.js

@@ -1,69 +1,101 @@
-function P(e = [], o = [], t) {
-  return t ? e[0] === o[0] : e[0] === o[0] && e[1] === o[1];
+function isPointsEq(a1 = [], a2 = [], isAlignPoint) {
+  if (isAlignPoint) {
+    return a1[0] === a2[0];
+  }
+  return a1[0] === a2[0] && a1[1] === a2[1];
 }
-function X(e, o, t, n) {
-  const { points: s } = t, i = Object.keys(e);
-  for (let r = 0; r < i.length; r += 1) {
-    const c = i[r];
-    if (P(e[c]?.points, s, n))
-      return `${o}-placement-${c}`;
+function getAlignPopupClassName(builtinPlacements, prefixCls, align, isAlignPoint) {
+  const { points } = align;
+  const placements = Object.keys(builtinPlacements);
+  for (let i = 0; i < placements.length; i += 1) {
+    const placement = placements[i];
+    if (isPointsEq(builtinPlacements[placement]?.points, points, isAlignPoint)) {
+      return `${prefixCls}-placement-${placement}`;
+    }
   }
   return "";
 }
-function y(e) {
-  return e.ownerDocument.defaultView;
+function getWin(ele) {
+  return ele.ownerDocument.defaultView;
 }
-function Y(e) {
-  const o = [];
-  let t = e?.parentElement;
-  const n = ["hidden", "scroll", "clip", "auto"];
-  for (; t; ) {
-    const { overflowX: s, overflowY: i, overflow: r } = y(t).getComputedStyle(t);
-    [s, i, r].some((c) => n.includes(c)) && o.push(t), t = t.parentElement;
+function collectScroller(ele) {
+  const scrollerList = [];
+  let current = ele?.parentElement;
+  const scrollStyle = ["hidden", "scroll", "clip", "auto"];
+  while (current) {
+    const { overflowX, overflowY, overflow } = getWin(current).getComputedStyle(current);
+    if ([overflowX, overflowY, overflow].some((o) => scrollStyle.includes(o))) {
+      scrollerList.push(current);
+    }
+    current = current.parentElement;
   }
-  return o;
+  return scrollerList;
 }
-function m(e, o = 1) {
-  return Number.isNaN(e) ? o : e;
+function toNum(num, defaultValue = 1) {
+  return Number.isNaN(num) ? defaultValue : num;
 }
-function h(e) {
-  return m(parseFloat(e), 0);
+function getPxValue(val) {
+  return toNum(parseFloat(val), 0);
 }
-function $(e, o) {
-  const t = { ...e };
-  return (o || []).forEach((n) => {
-    if (n instanceof HTMLBodyElement || n instanceof HTMLHtmlElement)
+function getVisibleArea(initArea, scrollerList) {
+  const visibleArea = { ...initArea };
+  (scrollerList || []).forEach((ele) => {
+    if (ele instanceof HTMLBodyElement || ele instanceof HTMLHtmlElement) {
       return;
+    }
+    const {
+      overflow,
+      overflowClipMargin,
+      borderTopWidth,
+      borderBottomWidth,
+      borderLeftWidth,
+      borderRightWidth
+    } = getWin(ele).getComputedStyle(ele);
+    const eleRect = ele.getBoundingClientRect();
     const {
-      overflow: s,
-      overflowClipMargin: i,
-      borderTopWidth: r,
-      borderBottomWidth: c,
-      borderLeftWidth: E,
-      borderRightWidth: R
-    } = y(n).getComputedStyle(n), l = n.getBoundingClientRect(), {
-      offsetHeight: g,
-      clientHeight: S,
-      offsetWidth: p,
-      clientWidth: T
-    } = n, W = h(r), b = h(c), M = h(E), w = h(R), d = m(
-      Math.round(l.width / p * 1e3) / 1e3
-    ), u = m(
-      Math.round(l.height / g * 1e3) / 1e3
-    ), x = (p - T - M - w) * d, C = (g - S - W - b) * u, B = W * u, A = b * u, N = M * d, O = w * d;
-    let f = 0, a = 0;
-    if (s === "clip") {
-      const v = h(i);
-      f = v * d, a = v * u;
+      offsetHeight: eleOutHeight,
+      clientHeight: eleInnerHeight,
+      offsetWidth: eleOutWidth,
+      clientWidth: eleInnerWidth
+    } = ele;
+    const borderTopNum = getPxValue(borderTopWidth);
+    const borderBottomNum = getPxValue(borderBottomWidth);
+    const borderLeftNum = getPxValue(borderLeftWidth);
+    const borderRightNum = getPxValue(borderRightWidth);
+    const scaleX = toNum(
+      Math.round(eleRect.width / eleOutWidth * 1e3) / 1e3
+    );
+    const scaleY = toNum(
+      Math.round(eleRect.height / eleOutHeight * 1e3) / 1e3
+    );
+    const eleScrollWidth = (eleOutWidth - eleInnerWidth - borderLeftNum - borderRightNum) * scaleX;
+    const eleScrollHeight = (eleOutHeight - eleInnerHeight - borderTopNum - borderBottomNum) * scaleY;
+    const scaledBorderTopWidth = borderTopNum * scaleY;
+    const scaledBorderBottomWidth = borderBottomNum * scaleY;
+    const scaledBorderLeftWidth = borderLeftNum * scaleX;
+    const scaledBorderRightWidth = borderRightNum * scaleX;
+    let clipMarginWidth = 0;
+    let clipMarginHeight = 0;
+    if (overflow === "clip") {
+      const clipNum = getPxValue(overflowClipMargin);
+      clipMarginWidth = clipNum * scaleX;
+      clipMarginHeight = clipNum * scaleY;
     }
-    const H = l.x + N - f, L = l.y + B - a, V = H + l.width + 2 * f - N - O - x, I = L + l.height + 2 * a - B - A - C;
-    t.left = Math.max(t.left, H), t.top = Math.max(t.top, L), t.right = Math.min(t.right, V), t.bottom = Math.min(t.bottom, I);
-  }), t;
+    const eleLeft = eleRect.x + scaledBorderLeftWidth - clipMarginWidth;
+    const eleTop = eleRect.y + scaledBorderTopWidth - clipMarginHeight;
+    const eleRight = eleLeft + eleRect.width + 2 * clipMarginWidth - scaledBorderLeftWidth - scaledBorderRightWidth - eleScrollWidth;
+    const eleBottom = eleTop + eleRect.height + 2 * clipMarginHeight - scaledBorderTopWidth - scaledBorderBottomWidth - eleScrollHeight;
+    visibleArea.left = Math.max(visibleArea.left, eleLeft);
+    visibleArea.top = Math.max(visibleArea.top, eleTop);
+    visibleArea.right = Math.min(visibleArea.right, eleRight);
+    visibleArea.bottom = Math.min(visibleArea.bottom, eleBottom);
+  });
+  return visibleArea;
 }
 export {
-  Y as collectScroller,
-  X as getAlignPopupClassName,
-  $ as getVisibleArea,
-  y as getWin,
-  m as toNum
+  collectScroller,
+  getAlignPopupClassName,
+  getVisibleArea,
+  getWin,
+  toNum
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/trigger",
   "type": "module",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
   "dependencies": {
     "@v-c/portal": "0.0.3",
     "@v-c/resize-observer": "0.0.2",
-    "@v-c/util": "0.0.12"
+    "@v-c/util": "0.0.13"
   },
   "scripts": {
     "build": "vite build",