@rc-component/trigger 1.6.2 → 1.7.0

package/README.md

@@ -2,7 +2,12 @@
 
 React Trigger Component
 
-[![NPM version][npm-image]][npm-url] [![build status][github-actions-image]][github-actions-url] [![Test coverage][coveralls-image]][coveralls-url] [![npm download][download-image]][download-url] [![bundle size][bundlephobia-image]][bundlephobia-url] [![dumi][dumi-image]][dumi-url]
+[![NPM version][npm-image]][npm-url]
+[![npm download][download-image]][download-url]
+[![build status][github-actions-image]][github-actions-url]
+[![Test coverage][codecov-image]][codecov-url]
+[![bundle size][bundlephobia-image]][bundlephobia-url]
+[![dumi][dumi-image]][dumi-url]
 
 [npm-image]: http://img.shields.io/npm/v/@rc-component/trigger.svg?style=flat-square
 [npm-url]: http://npmjs.org/package/@rc-component/trigger
@@ -10,8 +15,8 @@ React Trigger Component
 [github-actions-url]: https://github.com/react-component/trigger/actions
 [circleci-image]: https://img.shields.io/circleci/react-component/trigger/master?style=flat-square
 [circleci-url]: https://circleci.com/gh/react-component/trigger
-[coveralls-image]: https://img.shields.io/coveralls/react-component/trigger.svg?style=flat-square
-[coveralls-url]: https://coveralls.io/r/react-component/trigger?branch=master
+[codecov-image]: https://img.shields.io/codecov/c/github/react-component/trigger/master.svg?style=flat-square
+[codecov-url]: https://app.codecov.io/gh/react-component/trigger
 [david-url]: https://david-dm.org/react-component/trigger
 [david-image]: https://david-dm.org/react-component/trigger/status.svg?style=flat-square
 [david-dev-url]: https://david-dm.org/react-component/trigger?type=dev

package/es/hooks/useAlign.js

@@ -223,7 +223,7 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       }
       var originIntersectionVisibleArea = getIntersectionVisibleArea(nextOffsetX, nextOffsetY);
 
-      // ================ Overflow =================
+      // ========================== Overflow ===========================
       var targetAlignPointTL = getAlignPoint(targetRect, ['t', 'l']);
       var popupAlignPointTL = getAlignPoint(popupRect, ['t', 'l']);
       var targetAlignPointBR = getAlignPoint(targetRect, ['b', 'r']);
@@ -240,9 +240,20 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
         return val >= 0;
       };
 
+      // Prepare position
+      var nextPopupY;
+      var nextPopupBottom;
+      var nextPopupX;
+      var nextPopupRight;
+      function syncNextPopupPosition() {
+        nextPopupY = popupRect.y + nextOffsetY;
+        nextPopupBottom = nextPopupY + popupHeight;
+        nextPopupX = popupRect.x + nextOffsetX;
+        nextPopupRight = nextPopupX + popupWidth;
+      }
+      syncNextPopupPosition();
+
       // >>>>>>>>>> Top & Bottom
-      var nextPopupY = popupRect.y + nextOffsetY;
-      var nextPopupBottom = nextPopupY + popupHeight;
       var needAdjustY = supportAdjust(adjustY);
       var sameTB = popupPoints[0] === targetPoints[0];
 
@@ -275,8 +286,6 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       }
 
       // >>>>>>>>>> Left & Right
-      var nextPopupX = popupRect.x + nextOffsetX;
-      var nextPopupRight = nextPopupX + popupWidth;
       var needAdjustX = supportAdjust(adjustX);
 
       // >>>>> Flip
@@ -310,7 +319,8 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
         }
       }
 
-      // >>>>> Shift
+      // ============================ Shift ============================
+      syncNextPopupPosition();
       var numShiftX = shiftX === true ? 0 : shiftX;
       if (typeof numShiftX === 'number') {
         // Left
@@ -348,6 +358,7 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
         }
       }
 
+      // ============================ Arrow ============================
       // Arrow center align
       var popupLeft = popupRect.x + nextOffsetX;
       var popupRight = popupLeft + popupWidth;

package/es/index.js

@@ -124,7 +124,7 @@ export function generateTrigger() {
       var _childDOM$getRootNode, _popupEle$getRootNode;
       var childDOM = targetEle;
       return (childDOM === null || childDOM === void 0 ? void 0 : childDOM.contains(ele)) || (childDOM === null || childDOM === void 0 ? void 0 : (_childDOM$getRootNode = childDOM.getRootNode()) === null || _childDOM$getRootNode === void 0 ? void 0 : _childDOM$getRootNode.host) === ele || ele === childDOM || (popupEle === null || popupEle === void 0 ? void 0 : popupEle.contains(ele)) || (popupEle === null || popupEle === void 0 ? void 0 : (_popupEle$getRootNode = popupEle.getRootNode()) === null || _popupEle$getRootNode === void 0 ? void 0 : _popupEle$getRootNode.host) === ele || ele === popupEle || Object.values(subPopupElements.current).some(function (subPopupEle) {
-        return subPopupEle.contains(ele) || ele === subPopupEle;
+        return (subPopupEle === null || subPopupEle === void 0 ? void 0 : subPopupEle.contains(ele)) || ele === subPopupEle;
       });
     });
 

package/lib/hooks/useAlign.js

@@ -231,7 +231,7 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       }
       var originIntersectionVisibleArea = getIntersectionVisibleArea(nextOffsetX, nextOffsetY);
 
-      // ================ Overflow =================
+      // ========================== Overflow ===========================
       var targetAlignPointTL = getAlignPoint(targetRect, ['t', 'l']);
       var popupAlignPointTL = getAlignPoint(popupRect, ['t', 'l']);
       var targetAlignPointBR = getAlignPoint(targetRect, ['b', 'r']);
@@ -248,9 +248,20 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
         return val >= 0;
       };
 
+      // Prepare position
+      var nextPopupY;
+      var nextPopupBottom;
+      var nextPopupX;
+      var nextPopupRight;
+      function syncNextPopupPosition() {
+        nextPopupY = popupRect.y + nextOffsetY;
+        nextPopupBottom = nextPopupY + popupHeight;
+        nextPopupX = popupRect.x + nextOffsetX;
+        nextPopupRight = nextPopupX + popupWidth;
+      }
+      syncNextPopupPosition();
+
       // >>>>>>>>>> Top & Bottom
-      var nextPopupY = popupRect.y + nextOffsetY;
-      var nextPopupBottom = nextPopupY + popupHeight;
       var needAdjustY = supportAdjust(adjustY);
       var sameTB = popupPoints[0] === targetPoints[0];
 
@@ -283,8 +294,6 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       }
 
       // >>>>>>>>>> Left & Right
-      var nextPopupX = popupRect.x + nextOffsetX;
-      var nextPopupRight = nextPopupX + popupWidth;
       var needAdjustX = supportAdjust(adjustX);
 
       // >>>>> Flip
@@ -318,7 +327,8 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
         }
       }
 
-      // >>>>> Shift
+      // ============================ Shift ============================
+      syncNextPopupPosition();
       var numShiftX = shiftX === true ? 0 : shiftX;
       if (typeof numShiftX === 'number') {
         // Left
@@ -356,6 +366,7 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
         }
       }
 
+      // ============================ Arrow ============================
       // Arrow center align
       var popupLeft = popupRect.x + nextOffsetX;
       var popupRight = popupLeft + popupWidth;

package/lib/index.js

@@ -133,7 +133,7 @@ function generateTrigger() {
       var _childDOM$getRootNode, _popupEle$getRootNode;
       var childDOM = targetEle;
       return (childDOM === null || childDOM === void 0 ? void 0 : childDOM.contains(ele)) || (childDOM === null || childDOM === void 0 ? void 0 : (_childDOM$getRootNode = childDOM.getRootNode()) === null || _childDOM$getRootNode === void 0 ? void 0 : _childDOM$getRootNode.host) === ele || ele === childDOM || (popupEle === null || popupEle === void 0 ? void 0 : popupEle.contains(ele)) || (popupEle === null || popupEle === void 0 ? void 0 : (_popupEle$getRootNode = popupEle.getRootNode()) === null || _popupEle$getRootNode === void 0 ? void 0 : _popupEle$getRootNode.host) === ele || ele === popupEle || Object.values(subPopupElements.current).some(function (subPopupEle) {
-        return subPopupEle.contains(ele) || ele === subPopupEle;
+        return (subPopupEle === null || subPopupEle === void 0 ? void 0 : subPopupEle.contains(ele)) || ele === subPopupEle;
       });
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"