shineout 3.7.4-beta.1 → 3.7.4-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.7.4-beta.1'
+  version: '3.7.4-beta.3'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.7.4-beta.1');
+/* harmony default export */ var version = ('3.7.4-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30845,14 +30845,14 @@ var useCheckElementBorderWidth = function useCheckElementBorderWidth(elementRef)
 
   // 获取指定方向上的border宽度之和
   var getBorderWidth = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(function () {
-    if (elementRef.current) {
+    if (elementRef.current && options.enable) {
       var _options$direction = options.direction,
         direction = _options$direction === void 0 ? 'horizontal' : _options$direction;
       var style = window.getComputedStyle(elementRef.current);
       var _borderWidth = direction === 'horizontal' ? parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth) : parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);
       setBorderWidth(_borderWidth);
     }
-  }, [elementRef]);
+  }, [elementRef, options.enable]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     getBorderWidth();
   }, [getBorderWidth]);
@@ -31100,7 +31100,8 @@ var usePositionStyle = function usePositionStyle(config) {
     enable: show && adjust
   });
   var parentElBorderWidth = useCheckElementBorderWidth(parentElRef, {
-    direction: 'horizontal'
+    direction: 'horizontal',
+    enable: show
   });
   var popupElSize = useCheckElementSize(popupElRef, {
     enable: show
@@ -31279,16 +31280,18 @@ var usePositionStyle = function usePositionStyle(config) {
     };
   };
   var getAbsoluteStyle = function getAbsoluteStyle(position) {
-    var _scrollElRef$current;
+    var _scrollElRef$current, _scrollElRef$current2, _scrollElRef$current3;
     if (!parentElRef.current) return {
       style: hideStyle
     };
     var rect = context.parentRect;
     var needCheck = !show || !shallow_equal(context.prevParentPosition, parentElNewPosition);
-    if (needCheck && 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) {
+    var scrollTop = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current = scrollElRef.current) === null || _scrollElRef$current === void 0 ? void 0 : _scrollElRef$current.scrollTop) || 0;
+    var scrollLeft = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.scrollLeft) || 0;
+    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current3 = scrollElRef.current) !== null && _scrollElRef$current3 !== void 0 && _scrollElRef$current3.contains(parentElRef.current)) {
+      var _scrollElRef$current4;
+      var visibleRect = ((_scrollElRef$current4 = scrollElRef.current) === null || _scrollElRef$current4 === void 0 ? void 0 : _scrollElRef$current4.getBoundingClientRect()) || {};
+      if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom + scrollTop || rect.right < visibleRect.left || rect.left > visibleRect.right + scrollLeft) {
         return {
           style: hideStyle
         };
@@ -32043,12 +32046,12 @@ var AbsoluteList = function AbsoluteList(props) {
     return scrollElRefProp || scrollElRefContext || closestScrollContainerRef;
   }, [scrollElRefProp, scrollElRefContext]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (scrollElRefProp || scrollElRefContext) return;
+    if (scrollElRefProp || scrollElRefContext || !focus) return;
     var closestScrollContainer = getClosestScrollContainer(parentElRef.current);
     if (closestScrollContainer) {
       closestScrollContainerRef.current = closestScrollContainer;
     }
-  }, [parentElRef, scrollElRefProp, scrollElRefContext]);
+  }, [parentElRef, scrollElRefProp, scrollElRefContext, focus]);
   var _usePositionStyle = usePositionStyle({
       getContainer: getRoot,
       position: position,
@@ -71617,7 +71620,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.4-beta.1'
+  version: '3.7.4-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;