shineout 3.6.4-beta.7 → 3.6.4-beta.8

package/cjs/index.js

@@ -514,5 +514,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.6.4-beta.7'
+  version: '3.6.4-beta.8'
 };

package/dist/shineout.js

@@ -12217,7 +12217,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.6.4-beta.7');
+/* harmony default export */ var version = ('3.6.4-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30383,6 +30383,61 @@ var useCheckElementBorderWidth = function useCheckElementBorderWidth(elementRef)
   }, [getBorderWidth]);
   return borderWidth;
 };
+;// CONCATENATED MODULE: ../hooks/src/common/use-position-style/check-element-size.ts
+
+
+var useCheckElementSize = function useCheckElementSize(targetElementRef) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var enable = options.enable;
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
+      width: 0,
+      height: 0
+    }),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    size = _useState2[0],
+    setSize = _useState2[1];
+  var lastSize = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
+    width: 0,
+    height: 0
+  });
+  var checkSize = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(function () {
+    if (targetElementRef.current) {
+      var rect = targetElementRef.current.getBoundingClientRect();
+      var newSize = {
+        width: rect.width,
+        height: rect.height
+      };
+      if (newSize.width !== lastSize.current.width || newSize.height !== lastSize.current.height) {
+        setSize(newSize);
+        lastSize.current = newSize;
+      }
+    }
+  }, [targetElementRef]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    var _window;
+    if (!enable) return;
+    var element = targetElementRef.current;
+    if (!element) return;
+
+    // 初始检查
+    checkSize();
+    var resizeObserver = null;
+    if ((_window = window) !== null && _window !== void 0 && _window.ResizeObserver) {
+      resizeObserver = new ResizeObserver(checkSize);
+      resizeObserver.observe(element);
+    }
+
+    // 清理函数
+    return function () {
+      var _resizeObserver;
+      (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 || _resizeObserver.disconnect();
+    };
+  }, [enable, targetElementRef, checkSize]);
+  if (!enable || !targetElementRef) {
+    return null;
+  }
+  return size;
+};
 // EXTERNAL MODULE: ../../node_modules/.pnpm/react-fast-compare@3.2.2/node_modules/react-fast-compare/index.js
 var react_fast_compare = __webpack_require__(5284);
 var react_fast_compare_default = /*#__PURE__*/__webpack_require__.n(react_fast_compare);
@@ -30509,6 +30564,7 @@ var getCurrentCSSZoom = function getCurrentCSSZoom() {
 
 
 
+
 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 = {
@@ -30563,6 +30619,9 @@ var usePositionStyle = function usePositionStyle(config) {
   var parentElBorderWidth = useCheckElementBorderWidth(parentElRef, {
     direction: 'horizontal'
   });
+  var popupElSize = useCheckElementSize(popupElRef, {
+    enable: show
+  });
   var adjustPosition = function adjustPosition(position) {
     var winHeight = docSize.height;
     if (!verticalPosition.includes(position)) return position;
@@ -30799,7 +30858,7 @@ var usePositionStyle = function usePositionStyle(config) {
     // 当父元素的滚动容器滚动时，判断是否需要更新弹出层位置，包括是否隐藏弹出层（通过hideStyle隐藏，不是show状态）
     context.prevParentPosition = parentElNewPosition;
   });
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition, popupElSize]);
   return {
     style: style
   };
@@ -31592,11 +31651,11 @@ var Popover = function Popover(props) {
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     updateKey = _React$useState2[0],
     setUpdateKey = _React$useState2[1];
-  var handleUpdateKey = function handleUpdateKey() {
+  var handleUpdateKey = usePersistFn(function () {
     setUpdateKey(function (prev) {
       return (prev + 1) % 2;
     });
-  };
+  });
   var bindEvents = function bindEvents() {
     var _window;
     var targetEl = targetRef.current;
@@ -31609,9 +31668,9 @@ var Popover = function Popover(props) {
       targetEl.addEventListener('click', closePop);
     }
     (_window = window) === null || _window === void 0 || _window.addEventListener('resize', handleUpdateKey);
-    var scrollContainer = getClosestScrollContainer(targetEl);
-    if (scrollContainer) {
-      scrollContainer.addEventListener('scroll', handleUpdateKey);
+    if (props.adjust) {
+      var scrollContainer = getClosestScrollContainer(targetEl);
+      if (scrollContainer) scrollContainer.addEventListener('scroll', handleUpdateKey);
     }
   };
   var unbindEvents = function unbindEvents() {
@@ -31624,9 +31683,9 @@ var Popover = function Popover(props) {
     if (events.onClick) targetEl.removeEventListener('click', events.onClick);
     targetEl.removeEventListener('click', closePop);
     (_window2 = window) === null || _window2 === void 0 || _window2.removeEventListener('resize', handleUpdateKey);
-    var scrollContainer = getClosestScrollContainer(targetEl);
-    if (scrollContainer) {
-      scrollContainer.addEventListener('scroll', handleUpdateKey);
+    if (props.adjust) {
+      var scrollContainer = getClosestScrollContainer(targetEl);
+      if (scrollContainer) scrollContainer.removeEventListener('scroll', handleUpdateKey);
     }
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
@@ -50235,11 +50294,11 @@ var Tooltip = function Tooltip(props) {
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     updateKey = _React$useState2[0],
     setUpdateKey = _React$useState2[1];
-  var handleUpdateKey = function handleUpdateKey() {
+  var handleUpdateKey = usePersistFn(function () {
     setUpdateKey(function (prev) {
       return (prev + 1) % 2;
     });
-  };
+  });
   var bindEvents = function bindEvents() {
     var _window;
     var targetEl = targetRef.current;
@@ -50248,10 +50307,6 @@ var Tooltip = function Tooltip(props) {
     if (events.onMouseLeave) targetEl.addEventListener('mouseleave', events.onMouseLeave);
     if (events.onClick) targetEl.addEventListener('click', events.onClick);
     (_window = window) === null || _window === void 0 || _window.addEventListener('resize', handleUpdateKey);
-    var scrollContainer = getClosestScrollContainer(targetEl);
-    if (scrollContainer) {
-      scrollContainer.addEventListener('scroll', handleUpdateKey);
-    }
   };
   var unbindEvents = function unbindEvents() {
     var _window2;
@@ -50263,10 +50318,6 @@ var Tooltip = function Tooltip(props) {
     if (events.onClick) targetEl.removeEventListener('click', events.onClick);
     targetEl.removeEventListener('click', closePop);
     (_window2 = window) === null || _window2 === void 0 || _window2.removeEventListener('resize', handleUpdateKey);
-    var scrollContainer = getClosestScrollContainer(targetEl);
-    if (scrollContainer) {
-      scrollContainer.addEventListener('scroll', handleUpdateKey);
-    }
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (!persistent) return;
@@ -69924,7 +69975,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.4-beta.7'
+  version: '3.6.4-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;