vevet 2.0.1-dev.11 → 2.0.1-dev.15
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/build/cdn/index.js +1 -1
- package/build/cjs/components/canvas/Ctx2DPrerender.js +16 -2
- package/build/cjs/components/loading/ProgressPreloader.js +14 -2
- package/build/cjs/components/scroll/smooth-scroll/SmoothScroll.js +5 -3
- package/build/cjs/utils/listeners/onScroll.js +3 -1
- package/build/es/components/canvas/Ctx2DPrerender.js +16 -2
- package/build/es/components/loading/ProgressPreloader.js +14 -2
- package/build/es/components/scroll/smooth-scroll/SmoothScroll.js +5 -3
- package/build/es/utils/listeners/onScroll.js +3 -1
- package/build/types/components/canvas/Ctx2DPrerender.d.ts +1 -1
- package/build/types/components/canvas/Ctx2DPrerender.d.ts.map +1 -1
- package/build/types/components/loading/ProgressPreloader.d.ts +7 -0
- package/build/types/components/loading/ProgressPreloader.d.ts.map +1 -1
- package/build/types/components/scroll/smooth-scroll/SmoothScroll.d.ts.map +1 -1
- package/build/types/utils/listeners/onScroll.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/ts/components/canvas/Ctx2DPrerender.ts +17 -3
- package/src/ts/components/loading/ProgressPreloader.ts +21 -2
- package/src/ts/components/scroll/smooth-scroll/SmoothScroll.ts +5 -3
- package/src/ts/utils/listeners/onScroll.ts +4 -1
|
@@ -57,9 +57,23 @@ var Ctx2DPrerender = /** @class */ (function (_super) {
|
|
|
57
57
|
if (!media) {
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
+
// get source info
|
|
61
|
+
var source;
|
|
62
|
+
var sourceWidth;
|
|
63
|
+
var sourceHeight;
|
|
64
|
+
if (media instanceof Ctx2D_1.Ctx2D) {
|
|
65
|
+
source = media.canvas;
|
|
66
|
+
sourceWidth = media.width;
|
|
67
|
+
sourceHeight = media.height;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
source = media;
|
|
71
|
+
}
|
|
60
72
|
// get media sizes
|
|
61
73
|
var size = get_image_pos_1.getPos({
|
|
62
|
-
source:
|
|
74
|
+
source: source,
|
|
75
|
+
sourceWidth: sourceWidth,
|
|
76
|
+
sourceHeight: sourceHeight,
|
|
63
77
|
rule: this.prop.posRule,
|
|
64
78
|
scale: 1,
|
|
65
79
|
width: this.width,
|
|
@@ -67,7 +81,7 @@ var Ctx2DPrerender = /** @class */ (function (_super) {
|
|
|
67
81
|
});
|
|
68
82
|
this._ctx.clearRect(0, 0, this.width, this.height);
|
|
69
83
|
// render the media
|
|
70
|
-
this._ctx.drawImage(
|
|
84
|
+
this._ctx.drawImage(source, 0, 0, size.sourceWidth, size.sourceHeight, size.x, size.y, size.width, size.height);
|
|
71
85
|
// launch callbacks on prerender
|
|
72
86
|
this.callbacks.tbt('prerender', false);
|
|
73
87
|
};
|
|
@@ -62,6 +62,7 @@ var ProgressPreloader = /** @class */ (function (_super) {
|
|
|
62
62
|
img: true,
|
|
63
63
|
video: true,
|
|
64
64
|
custom: '.js-preload',
|
|
65
|
+
ignoreClassName: 'js-preload-ignore',
|
|
65
66
|
}, calc: {
|
|
66
67
|
lerp: 0.1,
|
|
67
68
|
forceEnd: 500,
|
|
@@ -192,6 +193,9 @@ var ProgressPreloader = /** @class */ (function (_super) {
|
|
|
192
193
|
if (loaders.img) {
|
|
193
194
|
var imgs = vevet_dom_1.selectAll('img');
|
|
194
195
|
imgs.forEach(function (img) {
|
|
196
|
+
if (img.classList.contains(loaders.ignoreClassName)) {
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
195
199
|
_this._imgs.push(img);
|
|
196
200
|
_this._resourcesTotal += 1;
|
|
197
201
|
});
|
|
@@ -200,13 +204,21 @@ var ProgressPreloader = /** @class */ (function (_super) {
|
|
|
200
204
|
if (loaders.video) {
|
|
201
205
|
var videos = vevet_dom_1.selectAll('video');
|
|
202
206
|
videos.forEach(function (video) {
|
|
207
|
+
if (video.classList.contains(loaders.ignoreClassName)) {
|
|
208
|
+
return;
|
|
209
|
+
}
|
|
203
210
|
_this._videos.push(video);
|
|
204
211
|
_this._resourcesTotal += 1;
|
|
205
212
|
});
|
|
206
213
|
}
|
|
207
214
|
// get custom resources
|
|
208
215
|
if (loaders.custom) {
|
|
209
|
-
this._customResources = Array.from(vevet_dom_1.selectAll(loaders.custom))
|
|
216
|
+
this._customResources = Array.from(vevet_dom_1.selectAll(loaders.custom)).filter(function (el) {
|
|
217
|
+
if (el.classList.contains(loaders.ignoreClassName)) {
|
|
218
|
+
return false;
|
|
219
|
+
}
|
|
220
|
+
return true;
|
|
221
|
+
});
|
|
210
222
|
this._resourcesTotal += this._customResources.length;
|
|
211
223
|
}
|
|
212
224
|
};
|
|
@@ -233,7 +245,7 @@ var ProgressPreloader = /** @class */ (function (_super) {
|
|
|
233
245
|
img.addEventListener('error', function () {
|
|
234
246
|
_this._handleLoadedResource();
|
|
235
247
|
});
|
|
236
|
-
image.src = img.src;
|
|
248
|
+
image.src = img.currentSrc || img.src;
|
|
237
249
|
}
|
|
238
250
|
});
|
|
239
251
|
// preload videos
|
|
@@ -87,9 +87,11 @@ var SmoothScroll = /** @class */ (function (_super) {
|
|
|
87
87
|
}
|
|
88
88
|
_this._elementsLength = _this._elements.length;
|
|
89
89
|
// add will-change
|
|
90
|
-
_this.
|
|
91
|
-
|
|
92
|
-
|
|
90
|
+
if (_this.prop.useWillChange) {
|
|
91
|
+
_this._elements.forEach(function (el) {
|
|
92
|
+
el.style.willChange = 'transform';
|
|
93
|
+
});
|
|
94
|
+
}
|
|
93
95
|
// initialize the class
|
|
94
96
|
if (init) {
|
|
95
97
|
_this.init();
|
|
@@ -7,8 +7,9 @@ var SmoothScroll_1 = require("../../components/scroll/smooth-scroll/SmoothScroll
|
|
|
7
7
|
*/
|
|
8
8
|
function onScroll(selector, callback, props) {
|
|
9
9
|
var listeners = [];
|
|
10
|
+
var smoothScrollEvent;
|
|
10
11
|
if (selector instanceof SmoothScroll_1.SmoothScroll) {
|
|
11
|
-
selector.addCallback('scroll', function () {
|
|
12
|
+
smoothScrollEvent = selector.addCallback('scroll', function () {
|
|
12
13
|
callback({
|
|
13
14
|
scrollTop: selector.scrollTop,
|
|
14
15
|
scrollLeft: selector.scrollLeft,
|
|
@@ -43,6 +44,7 @@ function onScroll(selector, callback, props) {
|
|
|
43
44
|
listeners.forEach(function (listener) {
|
|
44
45
|
listener.remove();
|
|
45
46
|
});
|
|
47
|
+
smoothScrollEvent === null || smoothScrollEvent === void 0 ? void 0 : smoothScrollEvent.remove();
|
|
46
48
|
},
|
|
47
49
|
};
|
|
48
50
|
}
|
|
@@ -24,9 +24,23 @@ export class Ctx2DPrerender extends Ctx2D {
|
|
|
24
24
|
if (!media) {
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
|
+
// get source info
|
|
28
|
+
let source;
|
|
29
|
+
let sourceWidth;
|
|
30
|
+
let sourceHeight;
|
|
31
|
+
if (media instanceof Ctx2D) {
|
|
32
|
+
source = media.canvas;
|
|
33
|
+
sourceWidth = media.width;
|
|
34
|
+
sourceHeight = media.height;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
source = media;
|
|
38
|
+
}
|
|
27
39
|
// get media sizes
|
|
28
40
|
const size = getPos({
|
|
29
|
-
source
|
|
41
|
+
source,
|
|
42
|
+
sourceWidth,
|
|
43
|
+
sourceHeight,
|
|
30
44
|
rule: this.prop.posRule,
|
|
31
45
|
scale: 1,
|
|
32
46
|
width: this.width,
|
|
@@ -34,7 +48,7 @@ export class Ctx2DPrerender extends Ctx2D {
|
|
|
34
48
|
});
|
|
35
49
|
this._ctx.clearRect(0, 0, this.width, this.height);
|
|
36
50
|
// render the media
|
|
37
|
-
this._ctx.drawImage(
|
|
51
|
+
this._ctx.drawImage(source, 0, 0, size.sourceWidth, size.sourceHeight, size.x, size.y, size.width, size.height);
|
|
38
52
|
// launch callbacks on prerender
|
|
39
53
|
this.callbacks.tbt('prerender', false);
|
|
40
54
|
}
|
|
@@ -27,6 +27,7 @@ export class ProgressPreloader extends Preloader {
|
|
|
27
27
|
img: true,
|
|
28
28
|
video: true,
|
|
29
29
|
custom: '.js-preload',
|
|
30
|
+
ignoreClassName: 'js-preload-ignore',
|
|
30
31
|
}, calc: {
|
|
31
32
|
lerp: 0.1,
|
|
32
33
|
forceEnd: 500,
|
|
@@ -126,6 +127,9 @@ export class ProgressPreloader extends Preloader {
|
|
|
126
127
|
if (loaders.img) {
|
|
127
128
|
const imgs = selectAll('img');
|
|
128
129
|
imgs.forEach((img) => {
|
|
130
|
+
if (img.classList.contains(loaders.ignoreClassName)) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
129
133
|
this._imgs.push(img);
|
|
130
134
|
this._resourcesTotal += 1;
|
|
131
135
|
});
|
|
@@ -134,13 +138,21 @@ export class ProgressPreloader extends Preloader {
|
|
|
134
138
|
if (loaders.video) {
|
|
135
139
|
const videos = selectAll('video');
|
|
136
140
|
videos.forEach((video) => {
|
|
141
|
+
if (video.classList.contains(loaders.ignoreClassName)) {
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
137
144
|
this._videos.push(video);
|
|
138
145
|
this._resourcesTotal += 1;
|
|
139
146
|
});
|
|
140
147
|
}
|
|
141
148
|
// get custom resources
|
|
142
149
|
if (loaders.custom) {
|
|
143
|
-
this._customResources = Array.from(selectAll(loaders.custom))
|
|
150
|
+
this._customResources = Array.from(selectAll(loaders.custom)).filter((el) => {
|
|
151
|
+
if (el.classList.contains(loaders.ignoreClassName)) {
|
|
152
|
+
return false;
|
|
153
|
+
}
|
|
154
|
+
return true;
|
|
155
|
+
});
|
|
144
156
|
this._resourcesTotal += this._customResources.length;
|
|
145
157
|
}
|
|
146
158
|
}
|
|
@@ -166,7 +178,7 @@ export class ProgressPreloader extends Preloader {
|
|
|
166
178
|
img.addEventListener('error', () => {
|
|
167
179
|
this._handleLoadedResource();
|
|
168
180
|
});
|
|
169
|
-
image.src = img.src;
|
|
181
|
+
image.src = img.currentSrc || img.src;
|
|
170
182
|
}
|
|
171
183
|
});
|
|
172
184
|
// preload videos
|
|
@@ -53,9 +53,11 @@ export class SmoothScroll extends Component {
|
|
|
53
53
|
}
|
|
54
54
|
this._elementsLength = this._elements.length;
|
|
55
55
|
// add will-change
|
|
56
|
-
this.
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
if (this.prop.useWillChange) {
|
|
57
|
+
this._elements.forEach((el) => {
|
|
58
|
+
el.style.willChange = 'transform';
|
|
59
|
+
});
|
|
60
|
+
}
|
|
59
61
|
// initialize the class
|
|
60
62
|
if (init) {
|
|
61
63
|
this.init();
|
|
@@ -5,8 +5,9 @@ import { SmoothScroll } from '../../components/scroll/smooth-scroll/SmoothScroll
|
|
|
5
5
|
*/
|
|
6
6
|
export default function onScroll(selector, callback, props) {
|
|
7
7
|
const listeners = [];
|
|
8
|
+
let smoothScrollEvent;
|
|
8
9
|
if (selector instanceof SmoothScroll) {
|
|
9
|
-
selector.addCallback('scroll', () => {
|
|
10
|
+
smoothScrollEvent = selector.addCallback('scroll', () => {
|
|
10
11
|
callback({
|
|
11
12
|
scrollTop: selector.scrollTop,
|
|
12
13
|
scrollLeft: selector.scrollLeft,
|
|
@@ -41,6 +42,7 @@ export default function onScroll(selector, callback, props) {
|
|
|
41
42
|
listeners.forEach((listener) => {
|
|
42
43
|
listener.remove();
|
|
43
44
|
});
|
|
45
|
+
smoothScrollEvent === null || smoothScrollEvent === void 0 ? void 0 : smoothScrollEvent.remove();
|
|
44
46
|
},
|
|
45
47
|
};
|
|
46
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Ctx2DPrerender.d.ts","sourceRoot":"","sources":["../../../../src/ts/components/canvas/Ctx2DPrerender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,QAAQ,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIxC,yBAAiB,eAAe,CAAC;IAE7B;;OAEG;IACH,UAAiB,UAAW,SAAQ,MAAM,CAAC,UAAU;QACjD;;WAEG;QACH,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"Ctx2DPrerender.d.ts","sourceRoot":"","sources":["../../../../src/ts/components/canvas/Ctx2DPrerender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,QAAQ,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIxC,yBAAiB,eAAe,CAAC;IAE7B;;OAEG;IACH,UAAiB,UAAW,SAAQ,MAAM,CAAC,UAAU;QACjD;;WAEG;QACH,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,cAAc,GAAG,KAAK,CAAC;KACtD;IAED;;OAEG;IACH,UAAiB,cAAe,SAAQ,MAAM,CAAC,cAAc;QACzD;;WAEG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;KACrB;IAED;;OAEG;IACH,UAAiB,cAAe,SAAQ,MAAM,CAAC,cAAc;QACzD,WAAW,EAAE,KAAK,CAAA;KACrB;CAEJ;AAID;;GAEG;AACH,qBAAa,cAAc,CACvB,UAAU,SAAS,eAAe,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,EAC1E,cAAc,SAAS,eAAe,CAAC,cAAc,GAAG,eAAe,CAAC,cAAc,EACtF,cAAc,SAAS,eAAe,CAAC,cAAc,GAAG,eAAe,CAAC,cAAc,CACxF,SAAQ,KAAK,CACX,UAAU,EACV,cAAc,EACd,cAAc,CACjB;IACG,SAAS,CAAC,eAAe,CACrB,CAAC,SAAS,kBAAkB,CAAC,UAAU,GAAG,cAAc,CAAC,KACvD,CAAC;IAQP;;OAEG;IACI,MAAM;IAKb,SAAS,CAAC,UAAU;CA4CvB"}
|
|
@@ -34,6 +34,13 @@ export declare namespace NProgressPreloader {
|
|
|
34
34
|
* @default '.js-preload'
|
|
35
35
|
*/
|
|
36
36
|
custom?: string | false;
|
|
37
|
+
/**
|
|
38
|
+
* If you enable images, video, or custom loaders,
|
|
39
|
+
* all these resources will be preloaded. In cases when you may want not
|
|
40
|
+
* to preload a certain resource, you can add to it the class name specified here.
|
|
41
|
+
* @default 'js-preload-ignore'
|
|
42
|
+
*/
|
|
43
|
+
ignoreClassName?: string;
|
|
37
44
|
};
|
|
38
45
|
/**
|
|
39
46
|
* Smooth calculation settings
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProgressPreloader.d.ts","sourceRoot":"","sources":["../../../../src/ts/components/loading/ProgressPreloader.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAIhD,yBAAiB,kBAAkB,CAAC;IAEhC;;OAEG;IACH,UAAiB,UAAW,SAAQ,UAAU,CAAC,UAAU;QACrD;;;WAGG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB;;WAEG;QACH,OAAO,CAAC,EAAE;YACN;;;eAGG;YACH,GAAG,CAAC,EAAE,OAAO,CAAC;YACd;;;eAGG;YACH,KAAK,CAAC,EAAE,OAAO,CAAC;YAChB;;;;;eAKG;YACH,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"ProgressPreloader.d.ts","sourceRoot":"","sources":["../../../../src/ts/components/loading/ProgressPreloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmoothScroll.d.ts","sourceRoot":"","sources":["../../../../../src/ts/components/scroll/smooth-scroll/SmoothScroll.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SmoothScroll.d.ts","sourceRoot":"","sources":["../../../../../src/ts/components/scroll/smooth-scroll/SmoothScroll.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKrD,yBAAiB,aAAa,CAAC;IAE3B;;OAEG;IACH,UAAiB,UAAW,SAAQ,UAAU,CAAC,UAAU;QACrD;;WAEG;QACH,SAAS,CAAC,EAAE;YACR;;;;eAIG;YACH,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;YAC7B;;;;eAIG;YACH,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,WAAW,GAAG,WAAW,EAAE,CAAC;SACrF,CAAC;QACF;;;;WAIG;QACH,cAAc,CAAC,EAAE,KAAK,GAAG,cAAc,CAAC;KAC3C;IAED;;OAEG;IACH,UAAiB,cAAe,SAAQ,UAAU,CAAC,cAAc;QAC7D;;;WAGG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;;WAGG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;;WAGG;QACH,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;WAEG;QACH,MAAM,CAAC,EAAE;YACL;;;eAGG;YACH,IAAI,CAAC,EAAE,MAAM,CAAC;YACd;;;;;eAKG;YACH,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;YAC7B;;eAEG;YACH,aAAa,CAAC,EAAE,GAAG,CAAC;YACpB;;;;eAIG;YACH,aAAa,CAAC,EAAE,OAAO,CAAC;SAC3B,CAAA;QACD;;WAEG;QACH,UAAU,CAAC,EAAE,KAAK,GAAG;YACjB;;;eAGG;YACH,GAAG,CAAC,EAAE,MAAM,CAAC;YACb;;;eAGG;YACH,QAAQ,CAAC,EAAE,MAAM,CAAC;SACrB,CAAA;KACJ;IAED;;OAEG;IACH,UAAiB,cAAe,SAAQ,UAAU,CAAC,cAAc;QAC7D,QAAQ,EAAE,KAAK,CAAC;QAChB,QAAQ,EAAE,KAAK,CAAC;QAChB,aAAa,EAAE,KAAK,CAAC;QACrB,OAAO,EAAE,UAAU,CAAC;KACvB;CAEJ;AAED,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACnD,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;CAChC;AAID;;GAEG;AACH,qBAAa,YAAY,CACrB,UAAU,SAAS,aAAa,CAAC,UAAU,GAAG,aAAa,CAAC,UAAU,EACtE,cAAc,SAAS,aAAa,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,EAClF,cAAc,SAAS,aAAa,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CACpF,SAAQ,SAAS,CACf,UAAU,EACV,cAAc,EACd,cAAc,CAChB,YAAW,iBAAiB;IAC1B,IAAI,MAAM,WAET;IAED;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,IAAI,KAAK,gBAER;IAED;;;OAGG;IACH,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC;IAClC,IAAI,SAAS,gBAEZ;IACD;;OAEG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAC1C,IAAI,QAAQ,yBAEX;IACD,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAElC;;OAEG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAC9B,IAAI,UAAU,IAIL,MAAM,CAFd;IACD,IAAI,UAAU,CACV,GAAG,EAAE,MAAM,EAId;IACD;;OAEG;IACH,SAAS,KAAK,eAAe,CACzB,GAAG,EAAE,MAAM,EAUd;IACD,SAAS,KAAK,eAAe,IAXpB,MAAM,CAad;IAED;;OAEG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAC7B,IAAI,SAAS,IAIJ,MAAM,CAFd;IACD,IAAI,SAAS,CACT,GAAG,EAAE,MAAM,EAId;IACD;;OAEG;IACH,SAAS,KAAK,cAAc,CACxB,GAAG,EAAE,MAAM,EAUd;IACD,SAAS,KAAK,cAAc,IAXnB,MAAM,CAad;IAED;;OAEG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAC9B,IAAI,UAAU,IAIL,MAAM,CAFd;IACD,IAAI,UAAU,CACV,GAAG,EAAE,MAAM,EAKd;IACD;;OAEG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAC7B,IAAI,SAAS,IAIJ,MAAM,CAFd;IACD,IAAI,SAAS,CACT,GAAG,EAAE,MAAM,EAKd;IAED;;OAEG;IACH,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,IAAI,WAAW,WAEd;IACD;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC;IAChC,IAAI,YAAY,WAEf;IAED;;OAEG;IACH,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAC/B,IAAI,WAAW,WAEd;IACD;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC;IAChC,IAAI,YAAY,WAEf;IAED;;OAEG;IACH,IAAI,kBAAkB,WAErB;IACD;;OAEG;IACH,IAAI,mBAAmB,WAEtB;IAED;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE5B;;;OAGG;IACH,SAAS,CAAC,eAAe,CAAC,EAAE,cAAc,CAAC;IAC3C;;OAEG;IACH,SAAS,CAAC,yBAAyB,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC;IAC/D;;OAEG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;gBAK1B,WAAW,CAAC,EAAE,CAAC,UAAU,GAAG,cAAc,CAAC,EAC3C,IAAI,UAAO;IA8Df,SAAS,CAAC,eAAe,CACrB,CAAC,SAAS,kBAAkB,CAAC,UAAU,GAAG,cAAc,CAAC,KACvD,CAAC;IA6BP,SAAS,CAAC,YAAY;IAMtB,SAAS,CAAC,UAAU;IAmBpB,SAAS,CAAC,aAAa;IAQvB;;OAEG;IACI,MAAM;IACT;;OAEG;IACH,MAAM,UAAQ;IAsClB;;OAEG;IACH,SAAS,CAAC,iBAAiB;IAS3B;;OAEG;IACH,SAAS,CAAC,mBAAmB;IAoB7B;;OAEG;IACH,SAAS,CAAC,YAAY,CAClB,GAAG,EAAE,UAAU;IA2CnB;;OAEG;IACH,SAAS,CAAC,OAAO;IAQjB;;OAEG;IACH,SAAS,CAAC,OAAO;IAuBjB;;OAEG;IACH,SAAS,CAAC,QAAQ;IAWlB;;OAEG;IACI,MAAM;IAiCb;;OAEG;IACH,SAAS,CAAC,WAAW;IA0BrB;;OAEG;IACH,SAAS,CAAC,aAAa;IAiBvB;;OAEG;IACH,SAAS,CAAC,KAAK,CACX,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,IAAI,SAAsB;IAa9B;;OAEG;IACH,SAAS,CAAC,YAAY,CAClB,EAAE,GAAE,kBAAkB,GAAG,KAAa;IAU1C;;OAEG;IACH,SAAS,CAAC,eAAe;IAgBzB;;OAEG;IACI,QAAQ;IA2Cf;;OAEG;IACH,SAAS,CAAC,QAAQ;CA0BrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onScroll.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/listeners/onScroll.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"onScroll.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/listeners/onScroll.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oDAAoD,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,UAAU,KAAK;IACX,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC5B,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,GAAG,MAAM,EAClD,QAAQ,EAAE,CAAC,GAAG,EAAE;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAA;CACrB,KAAK,IAAI,EACV,KAAK,CAAC,EAAE,KAAK,GACd,UAAU,CA+CZ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vevet",
|
|
3
|
-
"version": "2.0.1-dev.
|
|
3
|
+
"version": "2.0.1-dev.15",
|
|
4
4
|
"description": "VEVET - A JavaScript library",
|
|
5
5
|
"browserslist": [
|
|
6
6
|
"since 2015"
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
"dependencies": {
|
|
100
100
|
"detect-browser": "^5.2.0",
|
|
101
101
|
"easing-progress": "0.0.4",
|
|
102
|
-
"get-image-pos": "0.0.
|
|
102
|
+
"get-image-pos": "0.0.11",
|
|
103
103
|
"ismobilejs": "^1.1.1",
|
|
104
104
|
"lodash.mergewith": "^4.6.2",
|
|
105
105
|
"normalize-wheel": "^1.0.1",
|
|
@@ -13,7 +13,7 @@ export namespace NCtx2DPrerender {
|
|
|
13
13
|
/**
|
|
14
14
|
* Media element
|
|
15
15
|
*/
|
|
16
|
-
media: BaseProp['source'] | false;
|
|
16
|
+
media: BaseProp['source'] | Ctx2DPrerender | false;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
/**
|
|
@@ -78,9 +78,23 @@ export class Ctx2DPrerender <
|
|
|
78
78
|
return;
|
|
79
79
|
}
|
|
80
80
|
|
|
81
|
+
// get source info
|
|
82
|
+
let source: BaseProp['source'];
|
|
83
|
+
let sourceWidth: number | undefined;
|
|
84
|
+
let sourceHeight: number | undefined;
|
|
85
|
+
if (media instanceof Ctx2D) {
|
|
86
|
+
source = media.canvas;
|
|
87
|
+
sourceWidth = media.width;
|
|
88
|
+
sourceHeight = media.height;
|
|
89
|
+
} else {
|
|
90
|
+
source = media;
|
|
91
|
+
}
|
|
92
|
+
|
|
81
93
|
// get media sizes
|
|
82
94
|
const size = getPos({
|
|
83
|
-
source
|
|
95
|
+
source,
|
|
96
|
+
sourceWidth,
|
|
97
|
+
sourceHeight,
|
|
84
98
|
rule: this.prop.posRule,
|
|
85
99
|
scale: 1,
|
|
86
100
|
width: this.width,
|
|
@@ -89,7 +103,7 @@ export class Ctx2DPrerender <
|
|
|
89
103
|
this._ctx.clearRect(0, 0, this.width, this.height);
|
|
90
104
|
// render the media
|
|
91
105
|
this._ctx.drawImage(
|
|
92
|
-
|
|
106
|
+
source,
|
|
93
107
|
0, 0,
|
|
94
108
|
size.sourceWidth, size.sourceHeight,
|
|
95
109
|
size.x, size.y, size.width, size.height,
|
|
@@ -40,6 +40,13 @@ export namespace NProgressPreloader {
|
|
|
40
40
|
* @default '.js-preload'
|
|
41
41
|
*/
|
|
42
42
|
custom?: string | false;
|
|
43
|
+
/**
|
|
44
|
+
* If you enable images, video, or custom loaders,
|
|
45
|
+
* all these resources will be preloaded. In cases when you may want not
|
|
46
|
+
* to preload a certain resource, you can add to it the class name specified here.
|
|
47
|
+
* @default 'js-preload-ignore'
|
|
48
|
+
*/
|
|
49
|
+
ignoreClassName?: string;
|
|
43
50
|
};
|
|
44
51
|
/**
|
|
45
52
|
* Smooth calculation settings
|
|
@@ -107,6 +114,7 @@ export class ProgressPreloader <
|
|
|
107
114
|
img: true,
|
|
108
115
|
video: true,
|
|
109
116
|
custom: '.js-preload',
|
|
117
|
+
ignoreClassName: 'js-preload-ignore',
|
|
110
118
|
},
|
|
111
119
|
calc: {
|
|
112
120
|
lerp: 0.1,
|
|
@@ -275,6 +283,9 @@ export class ProgressPreloader <
|
|
|
275
283
|
if (loaders.img) {
|
|
276
284
|
const imgs = selectAll('img');
|
|
277
285
|
imgs.forEach((img) => {
|
|
286
|
+
if (img.classList.contains(loaders.ignoreClassName)) {
|
|
287
|
+
return;
|
|
288
|
+
}
|
|
278
289
|
this._imgs.push(img);
|
|
279
290
|
this._resourcesTotal += 1;
|
|
280
291
|
});
|
|
@@ -284,6 +295,9 @@ export class ProgressPreloader <
|
|
|
284
295
|
if (loaders.video) {
|
|
285
296
|
const videos = selectAll('video');
|
|
286
297
|
videos.forEach((video) => {
|
|
298
|
+
if (video.classList.contains(loaders.ignoreClassName)) {
|
|
299
|
+
return;
|
|
300
|
+
}
|
|
287
301
|
this._videos.push(video);
|
|
288
302
|
this._resourcesTotal += 1;
|
|
289
303
|
});
|
|
@@ -291,7 +305,12 @@ export class ProgressPreloader <
|
|
|
291
305
|
|
|
292
306
|
// get custom resources
|
|
293
307
|
if (loaders.custom) {
|
|
294
|
-
this._customResources = Array.from(selectAll(loaders.custom))
|
|
308
|
+
this._customResources = Array.from(selectAll(loaders.custom)).filter((el) => {
|
|
309
|
+
if (el.classList.contains(loaders.ignoreClassName)) {
|
|
310
|
+
return false;
|
|
311
|
+
}
|
|
312
|
+
return true;
|
|
313
|
+
});
|
|
295
314
|
this._resourcesTotal += this._customResources.length;
|
|
296
315
|
}
|
|
297
316
|
}
|
|
@@ -318,7 +337,7 @@ export class ProgressPreloader <
|
|
|
318
337
|
img.addEventListener('error', () => {
|
|
319
338
|
this._handleLoadedResource();
|
|
320
339
|
});
|
|
321
|
-
image.src = img.src;
|
|
340
|
+
image.src = img.currentSrc || img.src;
|
|
322
341
|
}
|
|
323
342
|
});
|
|
324
343
|
|
|
@@ -401,9 +401,11 @@ export class SmoothScroll <
|
|
|
401
401
|
}
|
|
402
402
|
this._elementsLength = this._elements.length;
|
|
403
403
|
// add will-change
|
|
404
|
-
this.
|
|
405
|
-
|
|
406
|
-
|
|
404
|
+
if (this.prop.useWillChange) {
|
|
405
|
+
this._elements.forEach((el) => {
|
|
406
|
+
el.style.willChange = 'transform';
|
|
407
|
+
});
|
|
408
|
+
}
|
|
407
409
|
|
|
408
410
|
// initialize the class
|
|
409
411
|
if (init) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { addEventListener, IAddEventListener, selectOne } from 'vevet-dom';
|
|
2
|
+
import { NCallbacks } from '../..';
|
|
2
3
|
import { SmoothScroll } from '../../components/scroll/smooth-scroll/SmoothScroll';
|
|
3
4
|
import { IRemovable } from '../types/general';
|
|
4
5
|
|
|
@@ -18,9 +19,10 @@ export default function onScroll (
|
|
|
18
19
|
props?: Props,
|
|
19
20
|
): IRemovable {
|
|
20
21
|
const listeners: IAddEventListener[] = [];
|
|
22
|
+
let smoothScrollEvent: NCallbacks.AddedCallback | undefined;
|
|
21
23
|
|
|
22
24
|
if (selector instanceof SmoothScroll) {
|
|
23
|
-
selector.addCallback('scroll', () => {
|
|
25
|
+
smoothScrollEvent = selector.addCallback('scroll', () => {
|
|
24
26
|
callback({
|
|
25
27
|
scrollTop: selector.scrollTop,
|
|
26
28
|
scrollLeft: selector.scrollLeft,
|
|
@@ -59,6 +61,7 @@ export default function onScroll (
|
|
|
59
61
|
listeners.forEach((listener) => {
|
|
60
62
|
listener.remove();
|
|
61
63
|
});
|
|
64
|
+
smoothScrollEvent?.remove();
|
|
62
65
|
},
|
|
63
66
|
};
|
|
64
67
|
}
|