vevet 3.14.0 → 3.15.0
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/lib/cjs/components/SlideProgress/index.js +5 -1
- package/lib/cjs/components/SlideProgress/index.js.map +1 -1
- package/lib/cjs/utils/scroll/isPageScrolling.js +37 -15
- package/lib/cjs/utils/scroll/isPageScrolling.js.map +1 -1
- package/lib/cjs/version.js +1 -1
- package/lib/esm/components/SlideProgress/index.js +6 -2
- package/lib/esm/components/SlideProgress/index.js.map +1 -1
- package/lib/esm/utils/scroll/isPageScrolling.js +35 -13
- package/lib/esm/utils/scroll/isPageScrolling.js.map +1 -1
- package/lib/esm/version.js +1 -1
- package/lib/types/components/SlideProgress/index.d.ts +3 -0
- package/lib/types/components/SlideProgress/index.d.ts.map +1 -1
- package/lib/types/utils/scroll/isPageScrolling.d.ts +4 -1
- package/lib/types/utils/scroll/isPageScrolling.d.ts.map +1 -1
- package/lib/types/version.d.ts +1 -1
- package/package.json +1 -1
- package/src/components/SlideProgress/index.ts +12 -2
- package/src/utils/scroll/isPageScrolling.ts +42 -13
- package/src/version.ts +1 -1
|
@@ -70,6 +70,8 @@ var SlideProgress = /** @class */ (function (_super) {
|
|
|
70
70
|
_this.addEventListener(container, 'wheel', function (event) {
|
|
71
71
|
return _this._handleWheel(event);
|
|
72
72
|
});
|
|
73
|
+
// create is page scrolling
|
|
74
|
+
_this._createIsPageScrolling = (0, isPageScrolling_1.createIsPageScrolling)();
|
|
73
75
|
// initialize the class
|
|
74
76
|
if (canInit) {
|
|
75
77
|
_this.init();
|
|
@@ -151,7 +153,8 @@ var SlideProgress = /** @class */ (function (_super) {
|
|
|
151
153
|
};
|
|
152
154
|
/** Handle drag move event */
|
|
153
155
|
SlideProgress.prototype._handleDrag = function (data) {
|
|
154
|
-
|
|
156
|
+
var isPageScrolling = this._createIsPageScrolling.get();
|
|
157
|
+
if (this._timelineTo || !this.props.hasDrag || isPageScrolling) {
|
|
155
158
|
return;
|
|
156
159
|
}
|
|
157
160
|
if (!this._checkCanDragMove(data.absDiff)) {
|
|
@@ -281,6 +284,7 @@ var SlideProgress = /** @class */ (function (_super) {
|
|
|
281
284
|
SlideProgress.prototype._destroy = function () {
|
|
282
285
|
var _a;
|
|
283
286
|
_super.prototype._destroy.call(this);
|
|
287
|
+
this._createIsPageScrolling.destroy();
|
|
284
288
|
this._animationFrame.destroy();
|
|
285
289
|
this._dragger.destroy();
|
|
286
290
|
(_a = this._timelineTo) === null || _a === void 0 ? void 0 : _a.destroy();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/SlideProgress/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA+D;AAE/D,qCAA2C;AAC3C,gEAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/SlideProgress/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.createIsPageScrolling = void 0;
|
|
4
|
+
var vevet_dom_1 = require("vevet-dom");
|
|
5
|
+
var common_1 = require("../common");
|
|
6
|
+
var ids = [];
|
|
7
|
+
var timeout = null;
|
|
8
|
+
var listener;
|
|
4
9
|
var isScrolling = false;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
10
|
+
function createListener() {
|
|
11
|
+
if (!listener) {
|
|
12
|
+
listener = (0, vevet_dom_1.addEventListener)(window, 'scroll', function () {
|
|
13
|
+
if (timeout) {
|
|
14
|
+
clearTimeout(timeout);
|
|
15
|
+
}
|
|
16
|
+
isScrolling = true;
|
|
17
|
+
timeout = setTimeout(function () {
|
|
18
|
+
isScrolling = false;
|
|
19
|
+
}, 150);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
16
22
|
}
|
|
17
|
-
function
|
|
18
|
-
|
|
23
|
+
function destroyListener() {
|
|
24
|
+
if (ids.length === 0) {
|
|
25
|
+
listener === null || listener === void 0 ? void 0 : listener.remove();
|
|
26
|
+
listener = undefined;
|
|
27
|
+
}
|
|
19
28
|
}
|
|
20
|
-
|
|
29
|
+
function createIsPageScrolling() {
|
|
30
|
+
var id = (0, common_1.uid)('is-page-scrolling');
|
|
31
|
+
ids.push(id);
|
|
32
|
+
createListener();
|
|
33
|
+
function destroy() {
|
|
34
|
+
ids = ids.filter(function (item) { return item !== id; });
|
|
35
|
+
destroyListener();
|
|
36
|
+
}
|
|
37
|
+
return {
|
|
38
|
+
get: function () { return isScrolling; },
|
|
39
|
+
destroy: destroy,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
exports.createIsPageScrolling = createIsPageScrolling;
|
|
21
43
|
//# sourceMappingURL=isPageScrolling.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isPageScrolling.js","sourceRoot":"","sources":["../../../../src/utils/scroll/isPageScrolling.ts"],"names":[],"mappings":";;;AAAA,IAAI,
|
|
1
|
+
{"version":3,"file":"isPageScrolling.js","sourceRoot":"","sources":["../../../../src/utils/scroll/isPageScrolling.ts"],"names":[],"mappings":";;;AAAA,uCAA6C;AAE7C,oCAAgC;AAEhC,IAAI,GAAG,GAAa,EAAE,CAAC;AAEvB,IAAI,OAAO,GAA0B,IAAI,CAAC;AAC1C,IAAI,QAAgC,CAAC;AAErC,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB,SAAS,cAAc;IACrB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,4BAAgB,EAAC,MAAM,EAAE,QAAQ,EAAE;YAC5C,IAAI,OAAO,EAAE;gBACX,YAAY,CAAC,OAAO,CAAC,CAAC;aACvB;YAED,WAAW,GAAG,IAAI,CAAC;YAEnB,OAAO,GAAG,UAAU,CAAC;gBACnB,WAAW,GAAG,KAAK,CAAC;YACtB,CAAC,EAAE,GAAG,CAAC,CAAC;QACV,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,eAAe;IACtB,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAE,CAAC;QACnB,QAAQ,GAAG,SAAS,CAAC;KACtB;AACH,CAAC;AAED,SAAgB,qBAAqB;IACnC,IAAM,EAAE,GAAG,IAAA,YAAG,EAAC,mBAAmB,CAAC,CAAC;IACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEb,cAAc,EAAE,CAAC;IAEjB,SAAS,OAAO;QACd,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,KAAK,EAAE,EAAX,CAAW,CAAC,CAAC;QACxC,eAAe,EAAE,CAAC;IACpB,CAAC;IAED,OAAO;QACL,GAAG,EAAE,cAAM,OAAA,WAAW,EAAX,CAAW;QACtB,OAAO,SAAA;KACR,CAAC;AACJ,CAAC;AAfD,sDAeC"}
|
package/lib/cjs/version.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Component as ComponentClass } from '../../base/Component';
|
|
2
2
|
import { clamp, lerp } from '../../utils/math';
|
|
3
3
|
import { normalizeWheel } from '../../utils/scroll/normalizeWheel';
|
|
4
|
-
import {
|
|
4
|
+
import { createIsPageScrolling } from '../../utils/scroll/isPageScrolling';
|
|
5
5
|
import { AnimationFrame } from '../AnimationFrame';
|
|
6
6
|
import { DraggerMove } from '../DraggerMove';
|
|
7
7
|
import { Timeline } from '../Timeline';
|
|
@@ -43,6 +43,8 @@ export class SlideProgress extends ComponentClass {
|
|
|
43
43
|
this._dragger.addCallback('end', () => this._handleDragEnd());
|
|
44
44
|
// add wheel event
|
|
45
45
|
this.addEventListener(container, 'wheel', (event) => this._handleWheel(event));
|
|
46
|
+
// create is page scrolling
|
|
47
|
+
this._createIsPageScrolling = createIsPageScrolling();
|
|
46
48
|
// initialize the class
|
|
47
49
|
if (canInit) {
|
|
48
50
|
this.init();
|
|
@@ -103,7 +105,8 @@ export class SlideProgress extends ComponentClass {
|
|
|
103
105
|
}
|
|
104
106
|
/** Handle drag move event */
|
|
105
107
|
_handleDrag(data) {
|
|
106
|
-
|
|
108
|
+
const isPageScrolling = this._createIsPageScrolling.get();
|
|
109
|
+
if (this._timelineTo || !this.props.hasDrag || isPageScrolling) {
|
|
107
110
|
return;
|
|
108
111
|
}
|
|
109
112
|
if (!this._checkCanDragMove(data.absDiff)) {
|
|
@@ -231,6 +234,7 @@ export class SlideProgress extends ComponentClass {
|
|
|
231
234
|
_destroy() {
|
|
232
235
|
var _a;
|
|
233
236
|
super._destroy();
|
|
237
|
+
this._createIsPageScrolling.destroy();
|
|
234
238
|
this._animationFrame.destroy();
|
|
235
239
|
this._dragger.destroy();
|
|
236
240
|
(_a = this._timelineTo) === null || _a === void 0 ? void 0 : _a.destroy();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/SlideProgress/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/SlideProgress/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,39 @@
|
|
|
1
|
+
import { addEventListener } from 'vevet-dom';
|
|
2
|
+
import { uid } from '../common';
|
|
3
|
+
let ids = [];
|
|
4
|
+
let timeout = null;
|
|
5
|
+
let listener;
|
|
1
6
|
let isScrolling = false;
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
function createListener() {
|
|
8
|
+
if (!listener) {
|
|
9
|
+
listener = addEventListener(window, 'scroll', () => {
|
|
10
|
+
if (timeout) {
|
|
11
|
+
clearTimeout(timeout);
|
|
12
|
+
}
|
|
13
|
+
isScrolling = true;
|
|
14
|
+
timeout = setTimeout(() => {
|
|
15
|
+
isScrolling = false;
|
|
16
|
+
}, 150);
|
|
17
|
+
});
|
|
18
|
+
}
|
|
13
19
|
}
|
|
14
|
-
|
|
15
|
-
|
|
20
|
+
function destroyListener() {
|
|
21
|
+
if (ids.length === 0) {
|
|
22
|
+
listener === null || listener === void 0 ? void 0 : listener.remove();
|
|
23
|
+
listener = undefined;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
export function createIsPageScrolling() {
|
|
27
|
+
const id = uid('is-page-scrolling');
|
|
28
|
+
ids.push(id);
|
|
29
|
+
createListener();
|
|
30
|
+
function destroy() {
|
|
31
|
+
ids = ids.filter((item) => item !== id);
|
|
32
|
+
destroyListener();
|
|
33
|
+
}
|
|
34
|
+
return {
|
|
35
|
+
get: () => isScrolling,
|
|
36
|
+
destroy,
|
|
37
|
+
};
|
|
16
38
|
}
|
|
17
39
|
//# sourceMappingURL=isPageScrolling.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isPageScrolling.js","sourceRoot":"","sources":["../../../../src/utils/scroll/isPageScrolling.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"isPageScrolling.js","sourceRoot":"","sources":["../../../../src/utils/scroll/isPageScrolling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAEhC,IAAI,GAAG,GAAa,EAAE,CAAC;AAEvB,IAAI,OAAO,GAA0B,IAAI,CAAC;AAC1C,IAAI,QAAgC,CAAC;AAErC,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB,SAAS,cAAc;IACrB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE;YACjD,IAAI,OAAO,EAAE;gBACX,YAAY,CAAC,OAAO,CAAC,CAAC;aACvB;YAED,WAAW,GAAG,IAAI,CAAC;YAEnB,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBACxB,WAAW,GAAG,KAAK,CAAC;YACtB,CAAC,EAAE,GAAG,CAAC,CAAC;QACV,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,eAAe;IACtB,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAE,CAAC;QACnB,QAAQ,GAAG,SAAS,CAAC;KACtB;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB;IACnC,MAAM,EAAE,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEb,cAAc,EAAE,CAAC;IAEjB,SAAS,OAAO;QACd,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;QACxC,eAAe,EAAE,CAAC;IACpB,CAAC;IAED,OAAO;QACL,GAAG,EAAE,GAAG,EAAE,CAAC,WAAW;QACtB,OAAO;KACR,CAAC;AACJ,CAAC"}
|
package/lib/esm/version.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Component as ComponentClass } from '../../base/Component';
|
|
3
3
|
import { NSlideProgress } from './types';
|
|
4
|
+
import { createIsPageScrolling } from '../../utils/scroll/isPageScrolling';
|
|
4
5
|
import { AnimationFrame } from '../AnimationFrame';
|
|
5
6
|
import { DraggerMove, NDraggerMove } from '../DraggerMove';
|
|
6
7
|
import { Timeline } from '../Timeline';
|
|
@@ -47,6 +48,8 @@ export declare class SlideProgress<StaticProps extends NSlideProgress.IStaticPro
|
|
|
47
48
|
protected _wheelIntensity: number;
|
|
48
49
|
/** Current handler */
|
|
49
50
|
protected _currentHandler: 'wheel' | 'drag';
|
|
51
|
+
/** If page is scrolling */
|
|
52
|
+
protected _createIsPageScrolling: ReturnType<typeof createIsPageScrolling>;
|
|
50
53
|
constructor(initialProps?: StaticProps & ChangeableProps, canInit?: boolean);
|
|
51
54
|
protected _onPropsMutate(): void;
|
|
52
55
|
/** Handle wheel event */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/SlideProgress/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/SlideProgress/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,YAAY,EAAE,cAAc,EAAE,CAAC;AAE/B;;GAEG;AACH,qBAAa,aAAa,CACxB,WAAW,SAAS,cAAc,CAAC,YAAY,GAAG,cAAc,CAAC,YAAY,EAC7E,eAAe,SACb,cAAc,CAAC,gBAAgB,GAAG,cAAc,CAAC,gBAAgB,EACnE,cAAc,SACZ,cAAc,CAAC,eAAe,GAAG,cAAc,CAAC,eAAe,CACjE,SAAQ,cAAc,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,CAAC;IACpE,SAAS,CAAC,gBAAgB;;;;;;;;;;;;;;;IAmB1B,sBAAsB;IACtB,SAAS,CAAC,eAAe,EAAE,cAAc,CAAC;IAE1C,qBAAqB;IACrB,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC;IAEhC,oCAAoC;IACpC,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC,SAAS,CAA6B;IAE9E,eAAe;IACf,IAAI,QAAQ,WAEX;IAED,uBAAuB;IACvB,IAAI,eAAe,WAElB;IAED,wBAAwB;IACxB,SAAS,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC;IAEjC,qBAAqB;IACrB,SAAS,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAE7C,eAAe;IACf,SAAS,CAAC,YAAY,UAAS;IAE/B,gBAAgB;IAChB,SAAS,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAK;IAEjC,sBAAsB;IACtB,SAAS,CAAC,eAAe,SAAK;IAE9B,sBAAsB;IACtB,SAAS,CAAC,eAAe,EAAE,OAAO,GAAG,MAAM,CAAW;IAEtD,2BAA2B;IAC3B,SAAS,CAAC,sBAAsB,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;gBAE/D,YAAY,CAAC,EAAE,WAAW,GAAG,eAAe,EAAE,OAAO,UAAO;IA+BxE,SAAS,CAAC,cAAc;IAMxB,yBAAyB;IACzB,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,UAAU;IAwCxC,wBAAwB;IACxB,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,QAAQ;IAsB1D,6BAA6B;IAC7B,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,CAAC,cAAc;IAyCvD,6BAA6B;IAC7B,OAAO,CAAC,cAAc;IAMtB,kDAAkD;IAClD,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM;IAyBvC,kCAAkC;IAClC,SAAS,CAAC,qBAAqB;IA4B/B,mBAAmB;IACZ,MAAM;IAIb,gEAAgE;IAChE,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM;IAc7C,iCAAiC;IACjC,SAAS,CAAC,YAAY;IAuBtB,0CAA0C;IACnC,EAAE,CAAC,EACR,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,YAAkB,EAC5B,UAAU,EACV,KAAK,GACN,EAAE,cAAc,CAAC,QAAQ;IAoC1B,yBAAyB;IACzB,SAAS,CAAC,QAAQ;CAenB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isPageScrolling.d.ts","sourceRoot":"","sources":["../../../../src/utils/scroll/isPageScrolling.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"isPageScrolling.d.ts","sourceRoot":"","sources":["../../../../src/utils/scroll/isPageScrolling.ts"],"names":[],"mappings":"AAkCA,wBAAgB,qBAAqB;;;EAepC"}
|
package/lib/types/version.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@ import { Component as ComponentClass } from '@/base/Component';
|
|
|
2
2
|
import { NSlideProgress } from './types';
|
|
3
3
|
import { clamp, lerp } from '@/utils/math';
|
|
4
4
|
import { normalizeWheel } from '@/utils/scroll/normalizeWheel';
|
|
5
|
-
import {
|
|
5
|
+
import { createIsPageScrolling } from '@/utils/scroll/isPageScrolling';
|
|
6
6
|
import { AnimationFrame } from '../AnimationFrame';
|
|
7
7
|
import { DraggerMove, NDraggerMove } from '../DraggerMove';
|
|
8
8
|
import { Timeline } from '../Timeline';
|
|
@@ -76,6 +76,9 @@ export class SlideProgress<
|
|
|
76
76
|
/** Current handler */
|
|
77
77
|
protected _currentHandler: 'wheel' | 'drag' = 'wheel';
|
|
78
78
|
|
|
79
|
+
/** If page is scrolling */
|
|
80
|
+
protected _createIsPageScrolling: ReturnType<typeof createIsPageScrolling>;
|
|
81
|
+
|
|
79
82
|
constructor(initialProps?: StaticProps & ChangeableProps, canInit = true) {
|
|
80
83
|
super(initialProps, false);
|
|
81
84
|
|
|
@@ -98,6 +101,9 @@ export class SlideProgress<
|
|
|
98
101
|
this._handleWheel(event),
|
|
99
102
|
);
|
|
100
103
|
|
|
104
|
+
// create is page scrolling
|
|
105
|
+
this._createIsPageScrolling = createIsPageScrolling();
|
|
106
|
+
|
|
101
107
|
// initialize the class
|
|
102
108
|
if (canInit) {
|
|
103
109
|
this.init();
|
|
@@ -176,7 +182,9 @@ export class SlideProgress<
|
|
|
176
182
|
|
|
177
183
|
/** Handle drag move event */
|
|
178
184
|
protected _handleDrag(data: NDraggerMove.IMoveParameter) {
|
|
179
|
-
|
|
185
|
+
const isPageScrolling = this._createIsPageScrolling.get();
|
|
186
|
+
|
|
187
|
+
if (this._timelineTo || !this.props.hasDrag || isPageScrolling) {
|
|
180
188
|
return;
|
|
181
189
|
}
|
|
182
190
|
|
|
@@ -366,6 +374,8 @@ export class SlideProgress<
|
|
|
366
374
|
protected _destroy() {
|
|
367
375
|
super._destroy();
|
|
368
376
|
|
|
377
|
+
this._createIsPageScrolling.destroy();
|
|
378
|
+
|
|
369
379
|
this._animationFrame.destroy();
|
|
370
380
|
this._dragger.destroy();
|
|
371
381
|
|
|
@@ -1,21 +1,50 @@
|
|
|
1
|
+
import { addEventListener } from 'vevet-dom';
|
|
2
|
+
import { IRemovable } from '@/types/general';
|
|
3
|
+
import { uid } from '../common';
|
|
4
|
+
|
|
5
|
+
let ids: string[] = [];
|
|
6
|
+
|
|
7
|
+
let timeout: NodeJS.Timeout | null = null;
|
|
8
|
+
let listener: IRemovable | undefined;
|
|
9
|
+
|
|
1
10
|
let isScrolling = false;
|
|
2
11
|
|
|
3
|
-
|
|
4
|
-
|
|
12
|
+
function createListener() {
|
|
13
|
+
if (!listener) {
|
|
14
|
+
listener = addEventListener(window, 'scroll', () => {
|
|
15
|
+
if (timeout) {
|
|
16
|
+
clearTimeout(timeout);
|
|
17
|
+
}
|
|
5
18
|
|
|
6
|
-
|
|
7
|
-
if (timeout) {
|
|
8
|
-
clearTimeout(timeout);
|
|
9
|
-
}
|
|
19
|
+
isScrolling = true;
|
|
10
20
|
|
|
11
|
-
|
|
21
|
+
timeout = setTimeout(() => {
|
|
22
|
+
isScrolling = false;
|
|
23
|
+
}, 150);
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
}
|
|
12
27
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
28
|
+
function destroyListener() {
|
|
29
|
+
if (ids.length === 0) {
|
|
30
|
+
listener?.remove();
|
|
31
|
+
listener = undefined;
|
|
32
|
+
}
|
|
17
33
|
}
|
|
18
34
|
|
|
19
|
-
export function
|
|
20
|
-
|
|
35
|
+
export function createIsPageScrolling() {
|
|
36
|
+
const id = uid('is-page-scrolling');
|
|
37
|
+
ids.push(id);
|
|
38
|
+
|
|
39
|
+
createListener();
|
|
40
|
+
|
|
41
|
+
function destroy() {
|
|
42
|
+
ids = ids.filter((item) => item !== id);
|
|
43
|
+
destroyListener();
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
return {
|
|
47
|
+
get: () => isScrolling,
|
|
48
|
+
destroy,
|
|
49
|
+
};
|
|
21
50
|
}
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
const version = '3.
|
|
1
|
+
const version = '3.15.0';
|
|
2
2
|
export default version;
|