@rc-component/trigger 1.15.4 → 1.15.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/es/index.js CHANGED
@@ -263,6 +263,27 @@ export function generateTrigger() {
263
263
  };
264
264
  });
265
265
 
266
+ // ========================== Stretch ===========================
267
+ var _React$useState15 = React.useState(0),
268
+ _React$useState16 = _slicedToArray(_React$useState15, 2),
269
+ targetWidth = _React$useState16[0],
270
+ setTargetWidth = _React$useState16[1];
271
+ var _React$useState17 = React.useState(0),
272
+ _React$useState18 = _slicedToArray(_React$useState17, 2),
273
+ targetHeight = _React$useState18[0],
274
+ setTargetHeight = _React$useState18[1];
275
+ var syncTargetSize = function syncTargetSize() {
276
+ if (stretch && targetEle) {
277
+ var rect = targetEle.getBoundingClientRect();
278
+ setTargetWidth(rect.width);
279
+ setTargetHeight(rect.height);
280
+ }
281
+ };
282
+ var onTargetResize = function onTargetResize() {
283
+ syncTargetSize();
284
+ triggerAlign();
285
+ };
286
+
266
287
  // ========================== Motion ============================
267
288
  var onVisibleChanged = function onVisibleChanged(visible) {
268
289
  setInMotion(false);
@@ -273,6 +294,7 @@ export function generateTrigger() {
273
294
  // We will trigger align when motion is in prepare
274
295
  var onPrepare = function onPrepare() {
275
296
  return new Promise(function (resolve) {
297
+ syncTargetSize();
276
298
  setMotionPrepareResolve(function () {
277
299
  return resolve;
278
300
  });
@@ -286,24 +308,6 @@ export function generateTrigger() {
286
308
  }
287
309
  }, [motionPrepareResolve]);
288
310
 
289
- // ========================== Stretch ===========================
290
- var _React$useState15 = React.useState(0),
291
- _React$useState16 = _slicedToArray(_React$useState15, 2),
292
- targetWidth = _React$useState16[0],
293
- setTargetWidth = _React$useState16[1];
294
- var _React$useState17 = React.useState(0),
295
- _React$useState18 = _slicedToArray(_React$useState17, 2),
296
- targetHeight = _React$useState18[0],
297
- setTargetHeight = _React$useState18[1];
298
- var onTargetResize = function onTargetResize(_, ele) {
299
- triggerAlign();
300
- if (stretch) {
301
- var rect = ele.getBoundingClientRect();
302
- setTargetWidth(rect.width);
303
- setTargetHeight(rect.height);
304
- }
305
- };
306
-
307
311
  // =========================== Action ===========================
308
312
  /**
309
313
  * Util wrapper for trigger action
package/es/util.js CHANGED
@@ -97,7 +97,7 @@ function getPxValue(val) {
97
97
  export function getVisibleArea(initArea, scrollerList) {
98
98
  var visibleArea = _objectSpread({}, initArea);
99
99
  (scrollerList || []).forEach(function (ele) {
100
- if (ele instanceof HTMLBodyElement) {
100
+ if (ele instanceof HTMLBodyElement || ele instanceof HTMLHtmlElement) {
101
101
  return;
102
102
  }
103
103
 
package/lib/index.js CHANGED
@@ -273,6 +273,27 @@ function generateTrigger() {
273
273
  };
274
274
  });
275
275
 
276
+ // ========================== Stretch ===========================
277
+ var _React$useState15 = React.useState(0),
278
+ _React$useState16 = (0, _slicedToArray2.default)(_React$useState15, 2),
279
+ targetWidth = _React$useState16[0],
280
+ setTargetWidth = _React$useState16[1];
281
+ var _React$useState17 = React.useState(0),
282
+ _React$useState18 = (0, _slicedToArray2.default)(_React$useState17, 2),
283
+ targetHeight = _React$useState18[0],
284
+ setTargetHeight = _React$useState18[1];
285
+ var syncTargetSize = function syncTargetSize() {
286
+ if (stretch && targetEle) {
287
+ var rect = targetEle.getBoundingClientRect();
288
+ setTargetWidth(rect.width);
289
+ setTargetHeight(rect.height);
290
+ }
291
+ };
292
+ var onTargetResize = function onTargetResize() {
293
+ syncTargetSize();
294
+ triggerAlign();
295
+ };
296
+
276
297
  // ========================== Motion ============================
277
298
  var onVisibleChanged = function onVisibleChanged(visible) {
278
299
  setInMotion(false);
@@ -283,6 +304,7 @@ function generateTrigger() {
283
304
  // We will trigger align when motion is in prepare
284
305
  var onPrepare = function onPrepare() {
285
306
  return new Promise(function (resolve) {
307
+ syncTargetSize();
286
308
  setMotionPrepareResolve(function () {
287
309
  return resolve;
288
310
  });
@@ -296,24 +318,6 @@ function generateTrigger() {
296
318
  }
297
319
  }, [motionPrepareResolve]);
298
320
 
299
- // ========================== Stretch ===========================
300
- var _React$useState15 = React.useState(0),
301
- _React$useState16 = (0, _slicedToArray2.default)(_React$useState15, 2),
302
- targetWidth = _React$useState16[0],
303
- setTargetWidth = _React$useState16[1];
304
- var _React$useState17 = React.useState(0),
305
- _React$useState18 = (0, _slicedToArray2.default)(_React$useState17, 2),
306
- targetHeight = _React$useState18[0],
307
- setTargetHeight = _React$useState18[1];
308
- var onTargetResize = function onTargetResize(_, ele) {
309
- triggerAlign();
310
- if (stretch) {
311
- var rect = ele.getBoundingClientRect();
312
- setTargetWidth(rect.width);
313
- setTargetHeight(rect.height);
314
- }
315
- };
316
-
317
321
  // =========================== Action ===========================
318
322
  /**
319
323
  * Util wrapper for trigger action
package/lib/util.js CHANGED
@@ -109,7 +109,7 @@ function getPxValue(val) {
109
109
  function getVisibleArea(initArea, scrollerList) {
110
110
  var visibleArea = (0, _objectSpread2.default)({}, initArea);
111
111
  (scrollerList || []).forEach(function (ele) {
112
- if (ele instanceof HTMLBodyElement) {
112
+ if (ele instanceof HTMLBodyElement || ele instanceof HTMLHtmlElement) {
113
113
  return;
114
114
  }
115
115
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rc-component/trigger",
3
- "version": "1.15.4",
3
+ "version": "1.15.6",
4
4
  "description": "base abstract trigger component for react",
5
5
  "engines": {
6
6
  "node": ">=8.x"