targetj 1.1.1 → 1.1.2

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.
@@ -957,11 +957,10 @@ var ParticleRenderer = /*#__PURE__*/function () {
957
957
  key: "getParticlePosition",
958
958
  value: function getParticlePosition(child) {
959
959
  var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : child === null || child === void 0 ? void 0 : child.actualValues;
960
- var layoutScrollLeft = Number(this.tmodel.getScrollLeft()) || 0;
961
- var layoutScrollTop = Number(this.tmodel.getScrollTop()) || 0;
960
+ var scroll = this.tmodel.getUnappliedScroll();
962
961
  return {
963
- x: child.allTargetMap.x ? values.x : child.x + layoutScrollLeft,
964
- y: child.allTargetMap.y ? values.y : child.y + layoutScrollTop
962
+ x: child.allTargetMap.x ? values.x : child.x + scroll.x,
963
+ y: child.allTargetMap.y ? values.y : child.y + scroll.y
965
964
  };
966
965
  }
967
966
  }, {
@@ -40,7 +40,7 @@ import { ParticleChild } from "./ParticleChild.js";
40
40
  import { TargetParser } from "./TargetParser.js";
41
41
  import { TargetUtil } from "./TargetUtil.js";
42
42
  import { TUtil } from "./TUtil.js";
43
- import { getRunScheduler } from "./App.js";
43
+ import { App, getRunScheduler } from "./App.js";
44
44
 
45
45
  /**
46
46
  * It provides a TModel that can render instanced addChildren values on the GPU.
@@ -662,6 +662,7 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
662
662
  var index = this.childHandles.length;
663
663
  this.gpuChildrenEnabled = true;
664
664
  var handle = new ParticleChild(this, index);
665
+ handle.oid = "".concat(this.oid, "_").concat(this.childGeneration);
665
666
  this.childHandles[index] = handle;
666
667
  this.childActualValues[index] = handle.actualValues;
667
668
  this.childTargetMaps[index] = handle.allTargetMap;
@@ -689,6 +690,7 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
689
690
  this.childGeneration++;
690
691
  this.childrenUpdateFlag = true;
691
692
  this.markLayoutDirty("addGpuChild");
693
+ App.tmodelIdMap[handle.oid] = handle;
692
694
  return true;
693
695
  } catch (error) {
694
696
  this.childHandles.pop();
@@ -765,6 +767,9 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
765
767
  if (index < 0) {
766
768
  return;
767
769
  }
770
+ if (App.tmodelIdMap[child.oid] === child) {
771
+ delete App.tmodelIdMap[child.oid];
772
+ }
768
773
  this.particleRuntime.removeChild(index);
769
774
  this.childHandles.splice(index, 1);
770
775
  this.childActualValues.splice(index, 1);
@@ -1465,6 +1470,7 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
1465
1470
  return {
1466
1471
  childHandleRuntimeStates: this.childHandles.map(function (child) {
1467
1472
  return {
1473
+ oid: child.oid,
1468
1474
  x: child.x,
1469
1475
  y: child.y,
1470
1476
  targets: child.targets,
@@ -1492,10 +1498,11 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
1492
1498
  this.childTargetMaps || (this.childTargetMaps = []);
1493
1499
  var childHandleRuntimeStates = this.childHandleRuntimeStates || [];
1494
1500
  this.childHandles = this.childActualValues.map(function (values, index) {
1495
- var _runtimeState$x, _runtimeState$y;
1501
+ var _runtimeState$oid, _runtimeState$x, _runtimeState$y;
1496
1502
  var child = new ParticleChild(_this9, index);
1497
- var targetMap = _this9.childTargetMaps[index] || {};
1498
1503
  var runtimeState = childHandleRuntimeStates[index];
1504
+ child.oid = (_runtimeState$oid = runtimeState === null || runtimeState === void 0 ? void 0 : runtimeState.oid) !== null && _runtimeState$oid !== void 0 ? _runtimeState$oid : child.oid;
1505
+ var targetMap = _this9.childTargetMaps[index] || {};
1499
1506
  Object.assign(child.actualValues, values);
1500
1507
  Object.assign(child.allTargetMap, targetMap);
1501
1508
  child.x = (_runtimeState$x = runtimeState === null || runtimeState === void 0 ? void 0 : runtimeState.x) !== null && _runtimeState$x !== void 0 ? _runtimeState$x : child.x;
@@ -124,7 +124,13 @@ var ParticleUtil = /*#__PURE__*/function () {
124
124
  if (!TargetParser.isTargetSpecObject(target)) {
125
125
  return false;
126
126
  }
127
- return typeof target.value === "function" || typeof target.steps === "function" || TUtil.isDefined(target.interval) || TUtil.isDefined(target.easing) || TUtil.isDefined(target.cycles) || TUtil.isDefined(target.loop) || TUtil.isDefined(target.pauseOn);
127
+ var value = target.value;
128
+ var steps = target.steps;
129
+ var hasValues = Array.isArray(value) && value.length > 1;
130
+ var hasSteps = Array.isArray(steps) ? steps.some(function (step) {
131
+ return Number(step) > 0;
132
+ }) : Number(steps) > 0;
133
+ return hasValues || hasSteps || typeof value === "function" || typeof steps === "function" || TUtil.isDefined(target.interval) || TUtil.isDefined(target.easing) || TUtil.isDefined(target.cycles) || TUtil.isDefined(target.loop) || TUtil.isDefined(target.pauseOn);
128
134
  }
129
135
  }, {
130
136
  key: "compileChildDefinition",
@@ -602,7 +602,7 @@ var StateUtil = /*#__PURE__*/function () {
602
602
  }
603
603
  return {
604
604
  root: root,
605
- tmodelIdMap: tmodelIdMap,
605
+ tmodelIdMap: runtimeReferenceMap,
606
606
  models: models
607
607
  };
608
608
  }
package/build/TModel.js CHANGED
@@ -74,11 +74,17 @@ var TModel = /*#__PURE__*/function (_BaseModel) {
74
74
  }
75
75
  _inherits(TModel, _BaseModel);
76
76
  return _createClass(TModel, [{
77
+ key: "getUnappliedScroll",
78
+ value: function getUnappliedScroll() {
79
+ return VisibilityUtil.getUnappliedScroll(this);
80
+ }
81
+ }, {
77
82
  key: "createViewport",
78
83
  value: function createViewport() {
79
84
  this.viewport = this.viewport || new Viewport();
80
- var scrollTop = this.getScrollTop();
81
- var scrollLeft = this.getScrollLeft();
85
+ var scroll = this.getUnappliedScroll();
86
+ var scrollTop = scroll.y;
87
+ var scrollLeft = scroll.x;
82
88
  var x = -scrollLeft,
83
89
  y = -scrollTop;
84
90
  this.viewport.xNext = x;
@@ -353,7 +353,7 @@ var TModelManager = /*#__PURE__*/function () {
353
353
  }, {
354
354
  key: "addDeletedTree",
355
355
  value: function addDeletedTree(tmodel) {
356
- var _tmodel$disposeRuntim;
356
+ var _tmodel$disposeRuntim, _tmodel$childHandles;
357
357
  if (tmodel.isLightweightChild) {
358
358
  return;
359
359
  }
@@ -364,17 +364,13 @@ var TModelManager = /*#__PURE__*/function () {
364
364
  if (App.tmodelIdMap[tmodel.oid] === tmodel) {
365
365
  delete App.tmodelIdMap[tmodel.oid];
366
366
  }
367
- getLocationManager().domIslandSet.delete(tmodel);
368
- if (tmodel.hasDom() && !this.lists.deletedDom.includes(tmodel)) {
369
- this.lists.deletedDom.push(tmodel);
370
- }
371
- var _iterator3 = _createForOfIteratorHelper(tmodel.getChildren()),
367
+ var _iterator3 = _createForOfIteratorHelper((_tmodel$childHandles = tmodel.childHandles) !== null && _tmodel$childHandles !== void 0 ? _tmodel$childHandles : []),
372
368
  _step3;
373
369
  try {
374
370
  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
375
371
  var child = _step3.value;
376
- if (!child.isLightweightChild) {
377
- this.addDeletedTree(child);
372
+ if (App.tmodelIdMap[child.oid] === child) {
373
+ delete App.tmodelIdMap[child.oid];
378
374
  }
379
375
  }
380
376
  } catch (err) {
@@ -382,6 +378,24 @@ var TModelManager = /*#__PURE__*/function () {
382
378
  } finally {
383
379
  _iterator3.f();
384
380
  }
381
+ getLocationManager().domIslandSet.delete(tmodel);
382
+ if (tmodel.hasDom() && !this.lists.deletedDom.includes(tmodel)) {
383
+ this.lists.deletedDom.push(tmodel);
384
+ }
385
+ var _iterator4 = _createForOfIteratorHelper(tmodel.getChildren()),
386
+ _step4;
387
+ try {
388
+ for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
389
+ var _child = _step4.value;
390
+ if (!_child.isLightweightChild) {
391
+ this.addDeletedTree(_child);
392
+ }
393
+ }
394
+ } catch (err) {
395
+ _iterator4.e(err);
396
+ } finally {
397
+ _iterator4.f();
398
+ }
385
399
  }
386
400
  }, {
387
401
  key: "getVisibles",
@@ -433,32 +447,32 @@ var TModelManager = /*#__PURE__*/function () {
433
447
  }, {
434
448
  key: "renderTModels",
435
449
  value: function renderTModels() {
436
- var _iterator4 = _createForOfIteratorHelper(this.lists.rerender),
437
- _step4;
450
+ var _iterator5 = _createForOfIteratorHelper(this.lists.rerender),
451
+ _step5;
438
452
  try {
439
- for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
453
+ for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
440
454
  var _tmodel$$dom, _tmodel$$dom2;
441
- var tmodel = _step4.value;
455
+ var tmodel = _step5.value;
442
456
  tmodel.isTextOnly() ? (_tmodel$$dom = tmodel.$dom) === null || _tmodel$$dom === void 0 ? void 0 : _tmodel$$dom.text(tmodel.getHtml()) : (_tmodel$$dom2 = tmodel.$dom) === null || _tmodel$$dom2 === void 0 ? void 0 : _tmodel$$dom2.html(tmodel.getHtml());
443
457
  tmodel.setLastUpdate('html');
444
458
  tmodel.domHeightTimestamp = 0;
445
459
  tmodel.domWidthTimestamp = 0;
446
460
  }
447
461
  } catch (err) {
448
- _iterator4.e(err);
462
+ _iterator5.e(err);
449
463
  } finally {
450
- _iterator4.f();
464
+ _iterator5.f();
451
465
  }
452
466
  }
453
467
  }, {
454
468
  key: "reattachTModels",
455
469
  value: function reattachTModels() {
456
470
  var reattached = [];
457
- var _iterator5 = _createForOfIteratorHelper(this.lists.reattach),
458
- _step5;
471
+ var _iterator6 = _createForOfIteratorHelper(this.lists.reattach),
472
+ _step6;
459
473
  try {
460
- for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
461
- var tmodel = _step5.value;
474
+ for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
475
+ var tmodel = _step6.value;
462
476
  var changed = tmodel.hasBaseElementChanged();
463
477
  var domParent = tmodel.getDomParent();
464
478
  if (!domParent || !domParent.$dom) {
@@ -482,9 +496,9 @@ var TModelManager = /*#__PURE__*/function () {
482
496
  }
483
497
  }
484
498
  } catch (err) {
485
- _iterator5.e(err);
499
+ _iterator6.e(err);
486
500
  } finally {
487
- _iterator5.f();
501
+ _iterator6.f();
488
502
  }
489
503
  this.activatePendingTargetsAfterDom(reattached);
490
504
  }
@@ -494,11 +508,11 @@ var TModelManager = /*#__PURE__*/function () {
494
508
  this.lists.relocation.sort(function (a, b) {
495
509
  return b.domOrderIndex - a.domOrderIndex;
496
510
  });
497
- var _iterator6 = _createForOfIteratorHelper(this.lists.relocation),
498
- _step6;
511
+ var _iterator7 = _createForOfIteratorHelper(this.lists.relocation),
512
+ _step7;
499
513
  try {
500
- for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
501
- var tmodel = _step6.value;
514
+ for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
515
+ var tmodel = _step7.value;
502
516
  var domParent = tmodel.getDomParent();
503
517
  if (!domParent || !domParent.$dom) {
504
518
  continue;
@@ -507,9 +521,9 @@ var TModelManager = /*#__PURE__*/function () {
507
521
  tmodel.domOrderIndex = undefined;
508
522
  }
509
523
  } catch (err) {
510
- _iterator6.e(err);
524
+ _iterator7.e(err);
511
525
  } finally {
512
- _iterator6.f();
526
+ _iterator7.f();
513
527
  }
514
528
  }
515
529
  }, {
@@ -524,75 +538,72 @@ var TModelManager = /*#__PURE__*/function () {
524
538
  }, {
525
539
  key: "deleteDoms",
526
540
  value: function deleteDoms() {
527
- var _iterator7 = _createForOfIteratorHelper(this.lists.deletedDom),
528
- _step7;
541
+ var _iterator8 = _createForOfIteratorHelper(this.lists.deletedDom),
542
+ _step8;
529
543
  try {
530
- for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
531
- var tmodel = _step7.value;
544
+ for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
545
+ var tmodel = _step8.value;
532
546
  if (tmodel.val('sourceDom')) {
533
547
  continue;
534
548
  }
535
549
  this.deleteDom(tmodel);
536
550
  }
537
551
  } catch (err) {
538
- _iterator7.e(err);
552
+ _iterator8.e(err);
539
553
  } finally {
540
- _iterator7.f();
554
+ _iterator8.f();
541
555
  }
542
556
  this.lists.deletedDom.length = 0;
543
557
  }
544
558
  }, {
545
559
  key: "deleteDom",
546
560
  value: function deleteDom(tmodel) {
547
- var _tmodel$particleRende;
561
+ var _tmodel$$dom3, _tmodel$particleRende;
562
+ var element = (_tmodel$$dom3 = tmodel.$dom) === null || _tmodel$$dom3 === void 0 ? void 0 : _tmodel$$dom3.element;
563
+ var canvas = (_tmodel$particleRende = tmodel.particleRenderer) === null || _tmodel$particleRende === void 0 ? void 0 : _tmodel$particleRende.canvasLayer;
548
564
  if (tmodel.hasAnimatingTargets()) {
549
565
  AnimationUtil.detachAnimationsOnDeleteDom(tmodel);
550
566
  }
551
-
552
- // Remove the GPU layer, which may be mounted as a sibling of the model's DOM.
553
- (_tmodel$particleRende = tmodel.particleRenderer) === null || _tmodel$particleRende === void 0 || (_tmodel$particleRende = _tmodel$particleRende.canvasLayer) === null || _tmodel$particleRende === void 0 || _tmodel$particleRende.remove();
554
- var domParent = tmodel.getDomParent();
555
- if (domParent && domParent.$dom) {
556
- domParent.$dom.removeElement(tmodel.$dom.element);
557
- }
567
+ canvas === null || canvas === void 0 || canvas.remove();
568
+ element === null || element === void 0 || element.remove();
558
569
  this.resetTModelDom(tmodel);
559
570
  }
560
571
  }, {
561
572
  key: "fixStyles",
562
573
  value: function fixStyles() {
563
- var _iterator8 = _createForOfIteratorHelper(this.lists.restyle),
564
- _step8;
574
+ var _iterator9 = _createForOfIteratorHelper(this.lists.restyle),
575
+ _step9;
565
576
  try {
566
- for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
567
- var tmodel = _step8.value;
577
+ for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
578
+ var tmodel = _step9.value;
568
579
  if (tmodel.hasDom()) {
569
580
  TModelUtil.fixStyle(tmodel);
570
581
  this.retryPendingTargetsAfterStyle(tmodel);
571
582
  }
572
583
  }
573
584
  } catch (err) {
574
- _iterator8.e(err);
585
+ _iterator9.e(err);
575
586
  } finally {
576
- _iterator8.f();
587
+ _iterator9.f();
577
588
  }
578
589
  }
579
590
  }, {
580
591
  key: "fixAsyncStyles",
581
592
  value: function fixAsyncStyles() {
582
- var _iterator9 = _createForOfIteratorHelper(this.lists.reasyncStyle),
583
- _step9;
593
+ var _iterator10 = _createForOfIteratorHelper(this.lists.reasyncStyle),
594
+ _step10;
584
595
  try {
585
- for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
586
- var tmodel = _step9.value;
596
+ for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
597
+ var tmodel = _step10.value;
587
598
  if (tmodel.hasDom()) {
588
599
  TModelUtil.fixAsyncStyle(tmodel);
589
600
  this.retryPendingTargetsAfterStyle(tmodel);
590
601
  }
591
602
  }
592
603
  } catch (err) {
593
- _iterator9.e(err);
604
+ _iterator10.e(err);
594
605
  } finally {
595
- _iterator9.f();
606
+ _iterator10.f();
596
607
  }
597
608
  }
598
609
  }, {
@@ -613,11 +624,11 @@ var TModelManager = /*#__PURE__*/function () {
613
624
  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
614
625
  _ref$restoredDoneTarg = _ref.restoredDoneTargets,
615
626
  restoredDoneTargets = _ref$restoredDoneTarg === void 0 ? true : _ref$restoredDoneTarg;
616
- var _iterator10 = _createForOfIteratorHelper(tmodels),
617
- _step10;
627
+ var _iterator11 = _createForOfIteratorHelper(tmodels),
628
+ _step11;
618
629
  try {
619
- for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
620
- var tmodel = _step10.value;
630
+ for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
631
+ var tmodel = _step11.value;
621
632
  if (!tmodel.hasDom()) {
622
633
  tmodel.markLayoutDirty('noDom');
623
634
  continue;
@@ -655,9 +666,9 @@ var TModelManager = /*#__PURE__*/function () {
655
666
  }
656
667
  }
657
668
  } catch (err) {
658
- _iterator10.e(err);
669
+ _iterator11.e(err);
659
670
  } finally {
660
- _iterator10.f();
671
+ _iterator11.f();
661
672
  }
662
673
  }
663
674
  }, {
@@ -695,12 +706,12 @@ var TModelManager = /*#__PURE__*/function () {
695
706
  this.lists.noDom.sort(function (a, b) {
696
707
  return a.getUIDepth() - b.getUIDepth();
697
708
  });
698
- var _iterator11 = _createForOfIteratorHelper(this.lists.noDom),
699
- _step11;
709
+ var _iterator12 = _createForOfIteratorHelper(this.lists.noDom),
710
+ _step12;
700
711
  try {
701
- for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
712
+ for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
702
713
  var _tmodel4$domId;
703
- var _tmodel4 = _step11.value;
714
+ var _tmodel4 = _step12.value;
704
715
  var domId = (_tmodel4$domId = _tmodel4.domId) !== null && _tmodel4$domId !== void 0 ? _tmodel4$domId : _tmodel4.oid;
705
716
  if ($Dom.query("#".concat(domId))) {
706
717
  _tmodel4.$dom = new $Dom("#".concat(domId));
@@ -722,9 +733,9 @@ var TModelManager = /*#__PURE__*/function () {
722
733
  }
723
734
  }
724
735
  } catch (err) {
725
- _iterator11.e(err);
736
+ _iterator12.e(err);
726
737
  } finally {
727
- _iterator11.f();
738
+ _iterator12.f();
728
739
  }
729
740
  for (var _i6 = 0, _needsDom = needsDom; _i6 < _needsDom.length; _i6++) {
730
741
  var tmodel = _needsDom[_i6];
@@ -758,19 +769,19 @@ var TModelManager = /*#__PURE__*/function () {
758
769
  entry.fragment.appendChild(tmodel.$dom.element);
759
770
  entry.tmodels.push(tmodel);
760
771
  }
761
- var _iterator12 = _createForOfIteratorHelper(holdersMap.values()),
762
- _step12;
772
+ var _iterator13 = _createForOfIteratorHelper(holdersMap.values()),
773
+ _step13;
763
774
  try {
764
- for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
765
- var _step12$value = _step12.value,
766
- _domHolder = _step12$value.domHolder,
767
- fragment = _step12$value.fragment;
775
+ for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
776
+ var _step13$value = _step13.value,
777
+ _domHolder = _step13$value.domHolder,
778
+ fragment = _step13$value.fragment;
768
779
  _domHolder.appendElement(fragment);
769
780
  }
770
781
  } catch (err) {
771
- _iterator12.e(err);
782
+ _iterator13.e(err);
772
783
  } finally {
773
- _iterator12.f();
784
+ _iterator13.f();
774
785
  }
775
786
  for (var _i7 = 0, _attached = attached; _i7 < _attached.length; _i7++) {
776
787
  var _tmodel = _attached[_i7];
@@ -100,16 +100,14 @@ var VisibilityUtil = /*#__PURE__*/function () {
100
100
  }, {
101
101
  key: "getParentClip",
102
102
  value: function getParentClip(parent) {
103
- var _parent$$dom, _parent$$dom2;
104
- var domScrollLeft = ((_parent$$dom = parent.$dom) === null || _parent$$dom === void 0 ? void 0 : _parent$$dom.getScrollLeft()) || 0;
105
- var domScrollTop = ((_parent$$dom2 = parent.$dom) === null || _parent$$dom2 === void 0 ? void 0 : _parent$$dom2.getScrollTop()) || 0;
106
- var height = parent.getHeight();
107
- var width = parent.getWidth();
103
+ var _parent$$dom$getScrol, _parent$$dom, _parent$$dom$getScrol2, _parent$$dom2;
104
+ var domScrollLeft = (_parent$$dom$getScrol = (_parent$$dom = parent.$dom) === null || _parent$$dom === void 0 ? void 0 : _parent$$dom.getScrollLeft()) !== null && _parent$$dom$getScrol !== void 0 ? _parent$$dom$getScrol : 0;
105
+ var domScrollTop = (_parent$$dom$getScrol2 = (_parent$$dom2 = parent.$dom) === null || _parent$$dom2 === void 0 ? void 0 : _parent$$dom2.getScrollTop()) !== null && _parent$$dom$getScrol2 !== void 0 ? _parent$$dom$getScrol2 : 0;
108
106
  return {
109
107
  x: parent.absX + domScrollLeft,
110
108
  y: parent.absY + domScrollTop,
111
- r: parent.absX + width + domScrollLeft,
112
- b: parent.absY + height + domScrollTop,
109
+ r: parent.absX + parent.getWidth() + domScrollLeft,
110
+ b: parent.absY + parent.getHeight() + domScrollTop,
113
111
  source: parent
114
112
  };
115
113
  }
@@ -122,17 +120,30 @@ var VisibilityUtil = /*#__PURE__*/function () {
122
120
  }, {
123
121
  key: "intersectRects",
124
122
  value: function intersectRects(parent, a, b) {
125
- var _parent$$dom3, _parent$$dom4;
126
- var domScrollLeft = ((_parent$$dom3 = parent.$dom) === null || _parent$$dom3 === void 0 ? void 0 : _parent$$dom3.getScrollLeft()) || 0;
127
- var domScrollTop = ((_parent$$dom4 = parent.$dom) === null || _parent$$dom4 === void 0 ? void 0 : _parent$$dom4.getScrollTop()) || 0;
123
+ var _parent$$dom$getScrol3, _parent$$dom3, _parent$$dom$getScrol4, _parent$$dom4;
124
+ var scrollLeft = (_parent$$dom$getScrol3 = (_parent$$dom3 = parent.$dom) === null || _parent$$dom3 === void 0 ? void 0 : _parent$$dom3.getScrollLeft()) !== null && _parent$$dom$getScrol3 !== void 0 ? _parent$$dom$getScrol3 : 0;
125
+ var scrollTop = (_parent$$dom$getScrol4 = (_parent$$dom4 = parent.$dom) === null || _parent$$dom4 === void 0 ? void 0 : _parent$$dom4.getScrollTop()) !== null && _parent$$dom$getScrol4 !== void 0 ? _parent$$dom$getScrol4 : 0;
128
126
  return {
129
- x: Math.max(a.x - domScrollLeft, b.x - domScrollLeft),
130
- y: Math.max(a.y - domScrollTop, b.y - domScrollTop),
131
- r: Math.min(a.r - domScrollLeft, b.r - domScrollLeft),
132
- b: Math.min(a.b - domScrollTop, b.b - domScrollTop),
127
+ x: Math.max(a.x, b.x) - scrollLeft,
128
+ y: Math.max(a.y, b.y) - scrollTop,
129
+ r: Math.min(a.r, b.r) - scrollLeft,
130
+ b: Math.min(a.b, b.b) - scrollTop,
133
131
  source: b.source
134
132
  };
135
133
  }
134
+ }, {
135
+ key: "getUnappliedScroll",
136
+ value: function getUnappliedScroll(tmodel) {
137
+ var _tmodel$$dom$getScrol, _tmodel$$dom, _tmodel$$dom$getScrol2, _tmodel$$dom2, _tmodel$getScrollTop, _tmodel$getScrollLeft;
138
+ var domTop = (_tmodel$$dom$getScrol = (_tmodel$$dom = tmodel.$dom) === null || _tmodel$$dom === void 0 ? void 0 : _tmodel$$dom.getScrollTop()) !== null && _tmodel$$dom$getScrol !== void 0 ? _tmodel$$dom$getScrol : 0;
139
+ var domLeft = (_tmodel$$dom$getScrol2 = (_tmodel$$dom2 = tmodel.$dom) === null || _tmodel$$dom2 === void 0 ? void 0 : _tmodel$$dom2.getScrollLeft()) !== null && _tmodel$$dom$getScrol2 !== void 0 ? _tmodel$$dom$getScrol2 : 0;
140
+ var modelTop = (_tmodel$getScrollTop = tmodel.getScrollTop()) !== null && _tmodel$getScrollTop !== void 0 ? _tmodel$getScrollTop : 0;
141
+ var modelLeft = (_tmodel$getScrollLeft = tmodel.getScrollLeft()) !== null && _tmodel$getScrollLeft !== void 0 ? _tmodel$getScrollLeft : 0;
142
+ return {
143
+ x: Math.max(0, domLeft - modelLeft),
144
+ y: Math.max(0, domTop - modelTop)
145
+ };
146
+ }
136
147
  }]);
137
148
  }();
138
149
  export { VisibilityUtil };