shineout 3.5.0-beta.8 → 3.5.0-beta.9

package/cjs/index.js

@@ -500,5 +500,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.5.0-beta.8'
+  version: '3.5.0-beta.9'
 };

package/dist/shineout.js

@@ -6535,9 +6535,9 @@ __webpack_require__.d(detect_namespaceObject, {
 });
 
 // NAMESPACE OBJECT: ./src/utils/dom/document.ts
-var dom_document_namespaceObject = {};
-__webpack_require__.r(dom_document_namespaceObject);
-__webpack_require__.d(dom_document_namespaceObject, {
+var utils_dom_document_namespaceObject = {};
+__webpack_require__.r(utils_dom_document_namespaceObject);
+__webpack_require__.d(utils_dom_document_namespaceObject, {
   addEventListener: function() { return addEventListener; },
   docScroll: function() { return document_docScroll; },
   docSize: function() { return document_docSize; }
@@ -6577,7 +6577,7 @@ __webpack_require__.d(src_utils_namespaceObject, {
   cssAccessors: function() { return cssAccessors; },
   cssInject: function() { return cssInject; },
   detect: function() { return detect_namespaceObject; },
-  doc: function() { return dom_document_namespaceObject; },
+  doc: function() { return utils_dom_document_namespaceObject; },
   element: function() { return dom_element_namespaceObject; },
   flat: function() { return utils_flat_namespaceObject; },
   func: function() { return utils_func_namespaceObject; },
@@ -11993,7 +11993,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.5.0-beta.8');
+/* harmony default export */ var version = ('3.5.0-beta.9');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -28465,15 +28465,6 @@ var isFirefox = function isFirefox() {
   if (!is_isBrowser()) return false;
   return navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
 };
-var isChromeLowerThan = function isChromeLowerThan(version) {
-  // 服务器端渲染时，不执行版本检查
-  if (typeof window === 'undefined' || typeof navigator === 'undefined') {
-    return false;
-  }
-  var ua = navigator.userAgent;
-  var chrome = ua.match(/chrome\/(\d+)/i);
-  return Boolean(chrome && chrome[1] && parseInt(chrome[1], 10) < version);
-};
 function isDomElement(element) {
   return (typeof HTMLElement === "undefined" ? "undefined" : typeof_default()(HTMLElement)) === 'object' ? element instanceof HTMLElement // DOM2
   : element && typeof_default()(element) === 'object' && element !== null && element.nodeType === 1 && typeof element.nodeName === 'string';
@@ -29229,6 +29220,50 @@ function shallowEqual(objA, objB) {
   return true;
 }
 /* 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;
+};
+
+// 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()
+//   }
+
+//   const zoomRatio = 1 / currentCSSZoom
+//   const rect = element.getBoundingClientRect()
+
+//   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,
+//   }
+// }
 ;// CONCATENATED MODULE: ../hooks/src/common/use-position-style/index.ts
 
 
@@ -29237,6 +29272,7 @@ function shallowEqual(objA, objB) {
 
 
 
+
 var horizontalPosition = ['left-bottom', 'left-top', 'right-bottom', 'right-top', 'left', 'right'];
 var verticalPosition = ['bottom-left', 'bottom-right', 'top-left', 'top-right', 'bottom', 'top'];
 var hideStyle = {
@@ -29473,13 +29509,14 @@ var usePositionStyle = function usePositionStyle(config) {
     };
   };
   var getAbsoluteStyle = function getAbsoluteStyle(position) {
+    var _scrollElRef$current;
     if (!parentElRef.current) return {
       style: hideStyle
     };
     var rect = context.parentRect;
-    if (scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current) {
-      var _scrollElRef$current;
-      var visibleRect = ((_scrollElRef$current = scrollElRef.current) === null || _scrollElRef$current === void 0 ? void 0 : _scrollElRef$current.getBoundingClientRect()) || {};
+    if (scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
+      var _scrollElRef$current2;
+      var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom || rect.right < visibleRect.left || rect.left > visibleRect.right) {
         return {
           style: hideStyle
@@ -29489,15 +29526,8 @@ var usePositionStyle = function usePositionStyle(config) {
     var _getAbsolutePositionS = getAbsolutePositionStyle(rect, position),
       style = _getAbsolutePositionS.style,
       arrayStyle = _getAbsolutePositionS.arrayStyle;
-
-    // TODO: 如果是版本大于chrome128，需要根据currentCSSZoom处理chrome的bug
-    if (!isChromeLowerThan(128)) {
-      // @ts-ignore currentCSSZoom
-      var currentCSSZoom = document.body.currentCSSZoom;
-      if (currentCSSZoom === 1 || !currentCSSZoom) return {
-        style: style,
-        arrayStyle: arrayStyle
-      };
+    var currentCSSZoom = getCurrentCSSZoom();
+    if (currentCSSZoom && currentCSSZoom !== 1) {
       if (style.left && typeof style.left === 'number') {
         style.left = style.left * (1 / currentCSSZoom);
       }
@@ -66146,7 +66176,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.0-beta.8'
+  version: '3.5.0-beta.9'
 });
 }();
 /******/ 	return __webpack_exports__;