ng-virtual-list 15.12.3 → 15.12.4
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/esm2020/lib/utils/animator/animator.mjs +13 -11
- package/fesm2015/ng-virtual-list.mjs +12 -10
- package/fesm2015/ng-virtual-list.mjs.map +1 -1
- package/fesm2020/ng-virtual-list.mjs +12 -10
- package/fesm2020/ng-virtual-list.mjs.map +1 -1
- package/lib/utils/animator/animator.d.ts +2 -1
- package/package.json +1 -1
|
@@ -13,6 +13,7 @@ export class Animator {
|
|
|
13
13
|
this._diff = 0;
|
|
14
14
|
this._startValue = 0;
|
|
15
15
|
this._endValue = 0;
|
|
16
|
+
this._prevPos = 0;
|
|
16
17
|
}
|
|
17
18
|
get animated() { return this._animationId > -1; }
|
|
18
19
|
get isAnimated() { return this.hasAnimation(this._currentId); }
|
|
@@ -21,8 +22,8 @@ export class Animator {
|
|
|
21
22
|
return Animator._nextId = Animator._nextId === Number.MAX_SAFE_INTEGER
|
|
22
23
|
? 0 : Animator._nextId + 1;
|
|
23
24
|
}
|
|
24
|
-
updateTo(
|
|
25
|
-
this._endValue =
|
|
25
|
+
updateTo(end) {
|
|
26
|
+
this._endValue = end;
|
|
26
27
|
this._diff = this._endValue - this._startValue;
|
|
27
28
|
return this.hasAnimation();
|
|
28
29
|
}
|
|
@@ -34,7 +35,8 @@ export class Animator {
|
|
|
34
35
|
this._startValue = startValue;
|
|
35
36
|
this._endValue = endValue;
|
|
36
37
|
const startTime = performance.now();
|
|
37
|
-
let isCanceled = false,
|
|
38
|
+
let isCanceled = false, startPosDelta = 0, delta = 0, prevTime = startTime, isFinished = false;
|
|
39
|
+
this._prevPos = startValue;
|
|
38
40
|
this._diff = this._endValue - this._startValue;
|
|
39
41
|
const step = (currentTime) => {
|
|
40
42
|
if (id !== this._currentId) {
|
|
@@ -45,22 +47,22 @@ export class Animator {
|
|
|
45
47
|
}
|
|
46
48
|
const cPos = getPropValue?.() || 0;
|
|
47
49
|
let startDelta = 0;
|
|
48
|
-
if (cPos !==
|
|
49
|
-
startDelta = cPos -
|
|
50
|
+
if (cPos !== this._prevPos) {
|
|
51
|
+
startDelta = cPos - this._prevPos;
|
|
50
52
|
startPosDelta += startDelta;
|
|
51
53
|
}
|
|
52
|
-
const elapsed = currentTime - startTime, progress = this._startValue ===
|
|
54
|
+
const elapsed = currentTime - startTime, progress = this._startValue === this._endValue ? 1 : Math.min(duration > 0 ? elapsed / duration : 0, 1), easedProgress = easingFunction(progress), val = (withDelta ? startPosDelta : 0) + this._startValue + this._diff * easedProgress, currentValue = val, t = performance.now();
|
|
53
55
|
isFinished = progress === 1;
|
|
54
|
-
delta = currentValue - startDelta -
|
|
56
|
+
delta = currentValue - startDelta - this._prevPos;
|
|
55
57
|
const frameTimestamp = t - prevTime, actualFrameTimestamp = frameTimestamp < ANIMATOR_MIN_TIMESTAMP ? ANIMATOR_MIN_TIMESTAMP : frameTimestamp;
|
|
56
58
|
prevTime = t;
|
|
57
|
-
|
|
59
|
+
this._prevPos = currentValue;
|
|
58
60
|
if (onUpdate !== undefined) {
|
|
59
61
|
const data = {
|
|
60
62
|
id,
|
|
61
63
|
delta,
|
|
62
64
|
elapsed,
|
|
63
|
-
value:
|
|
65
|
+
value: currentValue,
|
|
64
66
|
timestamp: actualFrameTimestamp,
|
|
65
67
|
};
|
|
66
68
|
onUpdate(data);
|
|
@@ -72,7 +74,7 @@ export class Animator {
|
|
|
72
74
|
id,
|
|
73
75
|
delta,
|
|
74
76
|
elapsed,
|
|
75
|
-
value:
|
|
77
|
+
value: currentValue,
|
|
76
78
|
timestamp: actualFrameTimestamp,
|
|
77
79
|
};
|
|
78
80
|
onComplete(data);
|
|
@@ -100,4 +102,4 @@ export class Animator {
|
|
|
100
102
|
}
|
|
101
103
|
}
|
|
102
104
|
Animator._nextId = 0;
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"animator.js","sourceRoot":"","sources":["../../../../../../projects/ng-virtual-list/src/lib/utils/animator/animator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ANIMATOR_MIN_TIMESTAMP, DEFAULT_ANIMATION_DURATION, DEFAULT_WITH_DELTA } from './const';\r\nimport { easeLinear } from './ease';\r\nimport { IAnimatorParams, IAnimatorUpdateData } from './interfaces';\r\n\r\n/**\r\n * Animator\r\n * @link https://github.com/DjonnyX/ng-virtual-list/blob/main/library/src/utils/animator/animator.ts\r\n * @author Evgenii Alexandrovich Grebennikov\r\n * @email djonnyx@gmail.com\r\n */\r\nexport class Animator {\r\n  private static _nextId: number = 0;\r\n\r\n  private _animationId: number = 0;\r\n\r\n  get animated() { return this._animationId > -1; }\r\n\r\n  get isAnimated() { return this.hasAnimation(this._currentId); }\r\n\r\n  private _currentId: number = Animator._nextId;\r\n\r\n  get id() { return this._currentId; }\r\n\r\n  private generateId() {\r\n    return Animator._nextId = Animator._nextId === Number.MAX_SAFE_INTEGER\r\n      ? 0 : Animator._nextId + 1;\r\n  }\r\n\r\n  private _diff: number = 0;\r\n\r\n  private _startValue: number = 0;\r\n\r\n  private _endValue: number = 0;\r\n\r\n  updateTo(value: number): boolean {\r\n    this._endValue = value;\r\n    this._diff = this._endValue - this._startValue;\r\n    return this.hasAnimation();\r\n  }\r\n\r\n  animate(params: IAnimatorParams) {\r\n    this.stop();\r\n\r\n    const id = this.generateId();\r\n    this._currentId = id;\r\n\r\n    const {\r\n      withDelta = DEFAULT_WITH_DELTA, startValue, endValue, duration = DEFAULT_ANIMATION_DURATION,\r\n      getPropValue, easingFunction = easeLinear, onUpdate, onComplete,\r\n    } = params;\r\n\r\n    this._startValue = startValue;\r\n    this._endValue = endValue;\r\n\r\n    const startTime = performance.now();\r\n    let isCanceled = false, prevPos = startValue, startPosDelta = 0, delta = 0, prevTime = startTime, isFinished = false;\r\n    this._diff = this._endValue - this._startValue;\r\n\r\n    const step = (currentTime: number) => {\r\n      if (id !== this._currentId) {\r\n        isCanceled = true;\r\n      }\r\n\r\n      if (!!isCanceled) {\r\n        return;\r\n      }\r\n\r\n      const cPos = getPropValue?.() || 0;\r\n      let startDelta = 0;\r\n      if (cPos !== prevPos) {\r\n        startDelta = cPos - prevPos;\r\n        startPosDelta += startDelta;\r\n      }\r\n\r\n      const elapsed = currentTime - startTime,\r\n        progress = this._startValue === endValue ? 1 : Math.min(duration > 0 ? elapsed / duration : 0, 1),\r\n        easedProgress = easingFunction(progress),\r\n        val = (withDelta ? startPosDelta : 0) + this._startValue + this._diff * easedProgress,\r\n        currentValue = val,\r\n        t = performance.now();\r\n\r\n      isFinished = progress === 1;\r\n\r\n      delta = currentValue - startDelta - prevPos;\r\n\r\n      const frameTimestamp = t - prevTime,\r\n        actualFrameTimestamp = frameTimestamp < ANIMATOR_MIN_TIMESTAMP ? ANIMATOR_MIN_TIMESTAMP : frameTimestamp;\r\n\r\n      prevTime = t;\r\n      prevPos = currentValue;\r\n\r\n      if (onUpdate !== undefined) {\r\n        const data: IAnimatorUpdateData = {\r\n          id,\r\n          delta,\r\n          elapsed,\r\n          value: !withDelta && isFinished ? endValue : currentValue,\r\n          timestamp: actualFrameTimestamp,\r\n        };\r\n        onUpdate(data);\r\n      }\r\n\r\n      if (isFinished) {\r\n        this._animationId = -1;\r\n        if (onComplete !== undefined) {\r\n          const data: IAnimatorUpdateData = {\r\n            id,\r\n            delta,\r\n            elapsed,\r\n            value: withDelta ? currentValue : endValue,\r\n            timestamp: actualFrameTimestamp,\r\n          };\r\n          onComplete(data);\r\n        }\r\n      } else {\r\n        this._animationId = requestAnimationFrame(step);\r\n      }\r\n    }\r\n\r\n    this._animationId = requestAnimationFrame(step);\r\n\r\n    return this._currentId;\r\n  }\r\n\r\n  hasAnimation(id: number = -1) {\r\n    if ((this._currentId === id || id === -1) && this.animated) {\r\n      return true;\r\n    }\r\n    return false;\r\n  }\r\n\r\n  stop(id: number = -1) {\r\n    cancelAnimationFrame(id === -1 ? this._animationId : id);\r\n    this._animationId = -1;\r\n  }\r\n\r\n  dispose() {\r\n    this.stop();\r\n  }\r\n}\r\n"]}
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"animator.js","sourceRoot":"","sources":["../../../../../../projects/ng-virtual-list/src/lib/utils/animator/animator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ANIMATOR_MIN_TIMESTAMP, DEFAULT_ANIMATION_DURATION, DEFAULT_WITH_DELTA } from './const';\r\nimport { easeLinear } from './ease';\r\nimport { IAnimatorParams, IAnimatorUpdateData } from './interfaces';\r\n\r\n/**\r\n * Animator\r\n * @link https://github.com/DjonnyX/ng-virtual-list/blob/main/library/src/utils/animator/animator.ts\r\n * @author Evgenii Alexandrovich Grebennikov\r\n * @email djonnyx@gmail.com\r\n */\r\nexport class Animator {\r\n  private static _nextId: number = 0;\r\n\r\n  private _animationId: number = 0;\r\n\r\n  get animated() { return this._animationId > -1; }\r\n\r\n  get isAnimated() { return this.hasAnimation(this._currentId); }\r\n\r\n  private _currentId: number = Animator._nextId;\r\n\r\n  get id() { return this._currentId; }\r\n\r\n  private generateId() {\r\n    return Animator._nextId = Animator._nextId === Number.MAX_SAFE_INTEGER\r\n      ? 0 : Animator._nextId + 1;\r\n  }\r\n\r\n  private _diff: number = 0;\r\n\r\n  private _startValue: number = 0;\r\n\r\n  private _endValue: number = 0;\r\n\r\n  private _prevPos: number = 0;\r\n\r\n  updateTo(end: number): boolean {\r\n    this._endValue = end;\r\n    this._diff = this._endValue - this._startValue;\r\n    return this.hasAnimation();\r\n  }\r\n\r\n  animate(params: IAnimatorParams) {\r\n    this.stop();\r\n\r\n    const id = this.generateId();\r\n    this._currentId = id;\r\n\r\n    const {\r\n      withDelta = DEFAULT_WITH_DELTA, startValue, endValue, duration = DEFAULT_ANIMATION_DURATION,\r\n      getPropValue, easingFunction = easeLinear, onUpdate, onComplete,\r\n    } = params;\r\n\r\n    this._startValue = startValue;\r\n    this._endValue = endValue;\r\n\r\n    const startTime = performance.now();\r\n    let isCanceled = false, startPosDelta = 0, delta = 0, prevTime = startTime, isFinished = false;\r\n    this._prevPos = startValue;\r\n    this._diff = this._endValue - this._startValue;\r\n\r\n    const step = (currentTime: number) => {\r\n      if (id !== this._currentId) {\r\n        isCanceled = true;\r\n      }\r\n\r\n      if (!!isCanceled) {\r\n        return;\r\n      }\r\n\r\n      const cPos = getPropValue?.() || 0;\r\n      let startDelta = 0;\r\n      if (cPos !== this._prevPos) {\r\n        startDelta = cPos - this._prevPos;\r\n        startPosDelta += startDelta;\r\n      }\r\n\r\n      const elapsed = currentTime - startTime,\r\n        progress = this._startValue === this._endValue ? 1 : Math.min(duration > 0 ? elapsed / duration : 0, 1),\r\n        easedProgress = easingFunction(progress),\r\n        val = (withDelta ? startPosDelta : 0) + this._startValue + this._diff * easedProgress,\r\n        currentValue = val,\r\n        t = performance.now();\r\n\r\n      isFinished = progress === 1;\r\n\r\n      delta = currentValue - startDelta - this._prevPos;\r\n\r\n      const frameTimestamp = t - prevTime,\r\n        actualFrameTimestamp = frameTimestamp < ANIMATOR_MIN_TIMESTAMP ? ANIMATOR_MIN_TIMESTAMP : frameTimestamp;\r\n\r\n      prevTime = t;\r\n      this._prevPos = currentValue;\r\n\r\n      if (onUpdate !== undefined) {\r\n        const data: IAnimatorUpdateData = {\r\n          id,\r\n          delta,\r\n          elapsed,\r\n          value: currentValue,\r\n          timestamp: actualFrameTimestamp,\r\n        };\r\n        onUpdate(data);\r\n      }\r\n\r\n      if (isFinished) {\r\n        this._animationId = -1;\r\n        if (onComplete !== undefined) {\r\n          const data: IAnimatorUpdateData = {\r\n            id,\r\n            delta,\r\n            elapsed,\r\n            value: currentValue,\r\n            timestamp: actualFrameTimestamp,\r\n          };\r\n          onComplete(data);\r\n        }\r\n      } else {\r\n        this._animationId = requestAnimationFrame(step);\r\n      }\r\n    }\r\n\r\n    this._animationId = requestAnimationFrame(step);\r\n\r\n    return this._currentId;\r\n  }\r\n\r\n  hasAnimation(id: number = -1) {\r\n    if ((this._currentId === id || id === -1) && this.animated) {\r\n      return true;\r\n    }\r\n    return false;\r\n  }\r\n\r\n  stop(id: number = -1) {\r\n    cancelAnimationFrame(id === -1 ? this._animationId : id);\r\n    this._animationId = -1;\r\n  }\r\n\r\n  dispose() {\r\n    this.stop();\r\n  }\r\n}\r\n"]}
|
|
@@ -3956,6 +3956,7 @@ class Animator {
|
|
|
3956
3956
|
this._diff = 0;
|
|
3957
3957
|
this._startValue = 0;
|
|
3958
3958
|
this._endValue = 0;
|
|
3959
|
+
this._prevPos = 0;
|
|
3959
3960
|
}
|
|
3960
3961
|
get animated() { return this._animationId > -1; }
|
|
3961
3962
|
get isAnimated() { return this.hasAnimation(this._currentId); }
|
|
@@ -3964,8 +3965,8 @@ class Animator {
|
|
|
3964
3965
|
return Animator._nextId = Animator._nextId === Number.MAX_SAFE_INTEGER
|
|
3965
3966
|
? 0 : Animator._nextId + 1;
|
|
3966
3967
|
}
|
|
3967
|
-
updateTo(
|
|
3968
|
-
this._endValue =
|
|
3968
|
+
updateTo(end) {
|
|
3969
|
+
this._endValue = end;
|
|
3969
3970
|
this._diff = this._endValue - this._startValue;
|
|
3970
3971
|
return this.hasAnimation();
|
|
3971
3972
|
}
|
|
@@ -3977,7 +3978,8 @@ class Animator {
|
|
|
3977
3978
|
this._startValue = startValue;
|
|
3978
3979
|
this._endValue = endValue;
|
|
3979
3980
|
const startTime = performance.now();
|
|
3980
|
-
let isCanceled = false,
|
|
3981
|
+
let isCanceled = false, startPosDelta = 0, delta = 0, prevTime = startTime, isFinished = false;
|
|
3982
|
+
this._prevPos = startValue;
|
|
3981
3983
|
this._diff = this._endValue - this._startValue;
|
|
3982
3984
|
const step = (currentTime) => {
|
|
3983
3985
|
if (id !== this._currentId) {
|
|
@@ -3988,22 +3990,22 @@ class Animator {
|
|
|
3988
3990
|
}
|
|
3989
3991
|
const cPos = (getPropValue === null || getPropValue === void 0 ? void 0 : getPropValue()) || 0;
|
|
3990
3992
|
let startDelta = 0;
|
|
3991
|
-
if (cPos !==
|
|
3992
|
-
startDelta = cPos -
|
|
3993
|
+
if (cPos !== this._prevPos) {
|
|
3994
|
+
startDelta = cPos - this._prevPos;
|
|
3993
3995
|
startPosDelta += startDelta;
|
|
3994
3996
|
}
|
|
3995
|
-
const elapsed = currentTime - startTime, progress = this._startValue ===
|
|
3997
|
+
const elapsed = currentTime - startTime, progress = this._startValue === this._endValue ? 1 : Math.min(duration > 0 ? elapsed / duration : 0, 1), easedProgress = easingFunction(progress), val = (withDelta ? startPosDelta : 0) + this._startValue + this._diff * easedProgress, currentValue = val, t = performance.now();
|
|
3996
3998
|
isFinished = progress === 1;
|
|
3997
|
-
delta = currentValue - startDelta -
|
|
3999
|
+
delta = currentValue - startDelta - this._prevPos;
|
|
3998
4000
|
const frameTimestamp = t - prevTime, actualFrameTimestamp = frameTimestamp < ANIMATOR_MIN_TIMESTAMP ? ANIMATOR_MIN_TIMESTAMP : frameTimestamp;
|
|
3999
4001
|
prevTime = t;
|
|
4000
|
-
|
|
4002
|
+
this._prevPos = currentValue;
|
|
4001
4003
|
if (onUpdate !== undefined) {
|
|
4002
4004
|
const data = {
|
|
4003
4005
|
id,
|
|
4004
4006
|
delta,
|
|
4005
4007
|
elapsed,
|
|
4006
|
-
value:
|
|
4008
|
+
value: currentValue,
|
|
4007
4009
|
timestamp: actualFrameTimestamp,
|
|
4008
4010
|
};
|
|
4009
4011
|
onUpdate(data);
|
|
@@ -4015,7 +4017,7 @@ class Animator {
|
|
|
4015
4017
|
id,
|
|
4016
4018
|
delta,
|
|
4017
4019
|
elapsed,
|
|
4018
|
-
value:
|
|
4020
|
+
value: currentValue,
|
|
4019
4021
|
timestamp: actualFrameTimestamp,
|
|
4020
4022
|
};
|
|
4021
4023
|
onComplete(data);
|