shineout 3.9.5-beta.1 → 3.9.5-beta.3

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.5-beta.1'
+  version: '3.9.5-beta.3'
 };

package/dist/shineout.js

@@ -12401,7 +12401,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.5-beta.1');
+/* harmony default export */ var version = ('3.9.5-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -31586,50 +31586,46 @@ function shallowEqualExceptFalsely(objA, objB) {
 }
 /* harmony default export */ var shallow_equal = (shallowEqual);
 ;// CONCATENATED MODULE: ../hooks/src/utils/dom/document.ts
-var cachedZoom = 0;
-var getCurrentCSSZoom = function getCurrentCSSZoom() {
-  if (cachedZoom) return cachedZoom;
-  if (typeof window === 'undefined' || typeof navigator === 'undefined' || !document.body) {
-    return 1;
-  }
-  var currentCSSZoom = Math.round(document.body.getBoundingClientRect().width) / document.body.clientWidth;
-  if (window.ResizeObserver) {
-    // 监听document.body的变化，更新缓存的zoom
-    var resizeObserver = new ResizeObserver(function () {
-      cachedZoom = Math.round(document.body.getBoundingClientRect().width) / document.body.clientWidth;
-    });
-    resizeObserver.observe(document.body);
-  }
-  cachedZoom = currentCSSZoom;
-  return currentCSSZoom;
-};
+// 缓存容器的 zoom 值，避免重复计算
+// 使用 WeakMap 确保容器元素被销毁时缓存也会被清理
+var zoomCache = new WeakMap();
 
-// export const getZoomBoundingClientRect = (element: HTMLElement) => {
-//   const currentCSSZoom = getCurrentCSSZoom()
-//   if (currentCSSZoom === 1 || !currentCSSZoom) {
-//     return element.getBoundingClientRect()
-//   }
-//   const isNotZoom = currentCSSZoom === 1 || !currentCSSZoom
-
-//   if (isNotZoom) {
-//     return element.getBoundingClientRect()
-//   }
+/**
+ * 计算容器的累积 zoom 值
+ * 当弹出层通过 position: absolute 定位在容器内时，需要用容器的 zoom 值来修正坐标
+ * 因为 getBoundingClientRect() 返回的是应用 zoom 后的视口坐标，
+ * 但 CSS 的 left/top 值会在容器的 zoom 坐标系中解释
+ * @param container - 容器元素，默认为 document.body
+ * @returns 容器的累积 zoom 值
+ */
+var getRelativeZoom = function getRelativeZoom(_element) {
+  var container = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : document.body;
+  if (!container || typeof window === 'undefined') return 1;
 
-//   const zoomRatio = 1 / currentCSSZoom
-//   const rect = element.getBoundingClientRect()
+  // 检查缓存
+  var cached = zoomCache.get(container);
+  if (cached !== undefined) {
+    return cached;
+  }
+  var zoom = 1;
+  var current = container;
 
-//   return {
-//     x: rect.x * zoomRatio,
-//     y: rect.y * zoomRatio,
-//     top: rect.top * zoomRatio,
-//     right: rect.right * zoomRatio,
-//     bottom: rect.bottom * zoomRatio,
-//     left: rect.left * zoomRatio,
-//     width: rect.width * zoomRatio,
-//     height: rect.height * zoomRatio,
-//   }
-// }
+  // 从容器向上遍历到 document，累积所有的 zoom 值
+  while (current && current !== document.documentElement) {
+    var computedStyle = window.getComputedStyle(current);
+    // zoom 不是标准 CSS 属性，需要通过索引访问
+    var zoomValue = computedStyle.zoom || '1';
+    var currentZoom = parseFloat(zoomValue);
+    if (!isNaN(currentZoom) && currentZoom !== 0) {
+      zoom *= currentZoom;
+    }
+    current = current.parentElement;
+  }
 
+  // 缓存计算结果
+  zoomCache.set(container, zoom);
+  return zoom;
+};
 var getScrollPosition = function getScrollPosition(element) {
   if (!element) return {
     scrollTop: 0,
@@ -31812,7 +31808,8 @@ var usePositionStyle = function usePositionStyle(config) {
       var _position$split3 = position.split('-'),
         _position$split4 = slicedToArray_default()(_position$split3, 2),
         _horizontalPosition = _position$split4[1];
-      if (_horizontalPosition === 'left' && context.parentRect.left + (popupElWidth || context.popUpWidth) > docSize.width) {
+      var bodyZoom = getRelativeZoom(document.body);
+      if (_horizontalPosition === 'left' && context.parentRect.left + (popupElWidth || context.popUpWidth) > docSize.width * bodyZoom) {
         newPosition = newPosition.replace('left', 'right');
       }
     }
@@ -31967,19 +31964,23 @@ var usePositionStyle = function usePositionStyle(config) {
     }
     var _getAbsolutePositionS = getAbsolutePositionStyle(rect, position),
       style = _getAbsolutePositionS.style;
-    var currentCSSZoom = getCurrentCSSZoom();
-    if (currentCSSZoom && currentCSSZoom !== 1) {
+
+    // 计算从触发元素到挂载容器之间的相对 zoom 值
+    var rootContainer = getContainer() || document.body;
+    var relativeZoom = getRelativeZoom(parentElRef.current, rootContainer);
+    if (relativeZoom && relativeZoom !== 1) {
+      var zoomRatio = 1 / relativeZoom;
       if (style.left && typeof style.left === 'number') {
-        style.left = style.left * (1 / currentCSSZoom);
+        style.left = style.left * zoomRatio;
       }
       if (style.top && typeof style.top === 'number') {
-        style.top = style.top * (1 / currentCSSZoom);
+        style.top = style.top * zoomRatio;
       }
       if (style.right && typeof style.right === 'number') {
-        style.right = style.right * (1 / currentCSSZoom);
+        style.right = style.right * zoomRatio;
       }
       if (style.bottom && typeof style.bottom === 'number') {
-        style.bottom = style.bottom * (1 / currentCSSZoom);
+        style.bottom = style.bottom * zoomRatio;
       }
     }
     return {
@@ -74772,7 +74773,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.5-beta.1'
+  version: '3.9.5-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;