@rc-component/trigger 1.4.1 → 1.5.0

package/es/hooks/useAlign.js

@@ -145,11 +145,6 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
           eleInnerWidth = ele.clientWidth;
         var scaleX = toNum(Math.round(eleRect.width / eleOutWidth * 1000) / 1000);
         var scaleY = toNum(Math.round(eleRect.height / eleOutHeight * 1000) / 1000);
-
-        // No need to align since it's not visible in view
-        if (scaleX === 0 || scaleY === 0) {
-          return;
-        }
         var eleScrollWidth = (eleOutWidth - eleInnerWidth) * scaleX;
         var eleScrollHeight = (eleOutHeight - eleInnerHeight) * scaleY;
         var eleRight = eleRect.x + eleRect.width - eleScrollWidth;
@@ -168,6 +163,11 @@ export default function useAlign(open, popupEle, target, placement, builtinPlace
       var _scaleX = toNum(Math.round(popupWidth / parseFloat(width) * 1000) / 1000);
       var _scaleY = toNum(Math.round(popupHeight / parseFloat(height) * 1000) / 1000);
 
+      // No need to align since it's not visible in view
+      if (_scaleX === 0 || _scaleY === 0) {
+        return;
+      }
+
       // Offset
       var offset = placementInfo.offset,
         targetOffset = placementInfo.targetOffset;

package/es/index.js

@@ -399,7 +399,13 @@ export function generateTrigger() {
     var triggerNode = /*#__PURE__*/React.cloneElement(child, _objectSpread(_objectSpread({}, mergedChildrenProps), passedProps));
 
     // Render
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TriggerContext.Provider, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ResizeObserver, {
+      disabled: !mergedOpen,
+      ref: setTargetRef,
+      onResize: onTargetResize
+    }, /*#__PURE__*/React.createElement(TriggerWrapper, {
+      getTriggerDOMNode: getTriggerDOMNode
+    }, triggerNode)), /*#__PURE__*/React.createElement(TriggerContext.Provider, {
       value: context
     }, /*#__PURE__*/React.createElement(Popup, {
       portal: PortalComponent,
@@ -450,13 +456,7 @@ export function generateTrigger() {
       stretch: stretch,
       targetWidth: targetWidth / scaleX,
       targetHeight: targetHeight / scaleY
-    })), /*#__PURE__*/React.createElement(ResizeObserver, {
-      disabled: !mergedOpen,
-      ref: setTargetRef,
-      onResize: onTargetResize
-    }, /*#__PURE__*/React.createElement(TriggerWrapper, {
-      getTriggerDOMNode: getTriggerDOMNode
-    }, triggerNode)));
+    })));
   });
   if (process.env.NODE_ENV !== 'production') {
     Trigger.displayName = 'Trigger';

package/lib/hooks/useAlign.js

@@ -153,11 +153,6 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
           eleInnerWidth = ele.clientWidth;
         var scaleX = toNum(Math.round(eleRect.width / eleOutWidth * 1000) / 1000);
         var scaleY = toNum(Math.round(eleRect.height / eleOutHeight * 1000) / 1000);
-
-        // No need to align since it's not visible in view
-        if (scaleX === 0 || scaleY === 0) {
-          return;
-        }
         var eleScrollWidth = (eleOutWidth - eleInnerWidth) * scaleX;
         var eleScrollHeight = (eleOutHeight - eleInnerHeight) * scaleY;
         var eleRight = eleRect.x + eleRect.width - eleScrollWidth;
@@ -176,6 +171,11 @@ function useAlign(open, popupEle, target, placement, builtinPlacements, popupAli
       var _scaleX = toNum(Math.round(popupWidth / parseFloat(width) * 1000) / 1000);
       var _scaleY = toNum(Math.round(popupHeight / parseFloat(height) * 1000) / 1000);
 
+      // No need to align since it's not visible in view
+      if (_scaleX === 0 || _scaleY === 0) {
+        return;
+      }
+
       // Offset
       var offset = placementInfo.offset,
         targetOffset = placementInfo.targetOffset;

package/lib/index.js

@@ -408,7 +408,13 @@ function generateTrigger() {
     var triggerNode = /*#__PURE__*/React.cloneElement(child, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, mergedChildrenProps), passedProps));
 
     // Render
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_context.default.Provider, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_rcResizeObserver.default, {
+      disabled: !mergedOpen,
+      ref: setTargetRef,
+      onResize: onTargetResize
+    }, /*#__PURE__*/React.createElement(_TriggerWrapper.default, {
+      getTriggerDOMNode: getTriggerDOMNode
+    }, triggerNode)), /*#__PURE__*/React.createElement(_context.default.Provider, {
       value: context
     }, /*#__PURE__*/React.createElement(_Popup.default, {
       portal: PortalComponent,
@@ -459,13 +465,7 @@ function generateTrigger() {
       stretch: stretch,
       targetWidth: targetWidth / scaleX,
       targetHeight: targetHeight / scaleY
-    })), /*#__PURE__*/React.createElement(_rcResizeObserver.default, {
-      disabled: !mergedOpen,
-      ref: setTargetRef,
-      onResize: onTargetResize
-    }, /*#__PURE__*/React.createElement(_TriggerWrapper.default, {
-      getTriggerDOMNode: getTriggerDOMNode
-    }, triggerNode)));
+    })));
   });
   if (process.env.NODE_ENV !== 'production') {
     Trigger.displayName = 'Trigger';

package/package.json

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