@algorisys/tinyfly 0.82.0 → 0.86.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.
- package/README.md +11 -4
- package/lib/addons/adapters.js +363 -248
- package/lib/addons/characters.js +1652 -1470
- package/lib/addons/dom-adapter-Cphr2HZn.js +372 -0
- package/lib/addons/gsap-compat.js +197 -187
- package/lib/addons/load-scene-vp14_Jj-.js +324 -0
- package/lib/addons/scene-3d-webgl.js +237 -0
- package/lib/addons/scene-3d.js +306 -0
- package/lib/addons/shading-ByG9UXd0.js +85 -0
- package/lib/browser/tinyfly-scene-3d-webgl.iife.js +114 -0
- package/lib/browser/tinyfly-scene-3d.iife.js +3 -0
- package/lib/browser/tinyfly.iife.js +4 -4
- package/lib/browser/tinyfly.js +3028 -2480
- package/lib/browser/tinyfly.umd.js +4 -4
- package/lib/cli/tools.js +137 -22
- package/lib/embed/tinyfly-embed.iife.js +4 -4
- package/lib/embed/tinyfly-embed.js +921 -833
- package/lib/engine/tinyfly-engine.js +1022 -776
- package/lib/engine/tinyfly-engine.umd.cjs +2 -2
- package/lib/headless/headless.js +264 -7
- package/lib/player/tinyfly-player.es.js +459 -371
- package/lib/player/tinyfly-player.iife.js +2 -2
- package/lib/player/tinyfly-player.umd.js +2 -2
- package/lib/types/adapters/canvas/canvas-adapter.d.ts +36 -0
- package/lib/types/adapters/transform-3d.d.ts +99 -0
- package/lib/types/adapters/webgl/webgl-adapter.d.ts +17 -0
- package/lib/types/characters/character.d.ts +20 -1
- package/lib/types/characters/index.d.ts +2 -0
- package/lib/types/characters/rig/body-plan.d.ts +3 -1
- package/lib/types/characters/rig/skeleton.d.ts +57 -0
- package/lib/types/characters/scene-objects.d.ts +2 -0
- package/lib/types/compat/gsap/vars.d.ts +8 -0
- package/lib/types/engine/core/bake.d.ts +3 -1
- package/lib/types/engine/index.d.ts +1 -0
- package/lib/types/engine/interpolation/interpolators.d.ts +10 -3
- package/lib/types/engine/math/index.d.ts +11 -0
- package/lib/types/engine/math/mat4.d.ts +37 -0
- package/lib/types/engine/math/quat.d.ts +39 -0
- package/lib/types/engine/math/vec3.d.ts +16 -0
- package/lib/types/engine/types.d.ts +23 -2
- package/lib/types/scene-3d/camera.d.ts +27 -0
- package/lib/types/scene-3d/canvas-2d-renderer.d.ts +21 -0
- package/lib/types/scene-3d/geometry/extrude.d.ts +17 -0
- package/lib/types/scene-3d/geometry/mesh.d.ts +36 -0
- package/lib/types/scene-3d/geometry/primitives.d.ts +16 -0
- package/lib/types/scene-3d/geometry/triangulate.d.ts +24 -0
- package/lib/types/scene-3d/index.d.ts +20 -0
- package/lib/types/scene-3d/load-scene.d.ts +31 -0
- package/lib/types/scene-3d/object-kind.d.ts +54 -0
- package/lib/types/scene-3d/resolve-scene.d.ts +122 -0
- package/lib/types/scene-3d/scene-3d-adapter.d.ts +46 -0
- package/lib/types/scene-3d/scene-types.d.ts +191 -0
- package/lib/types/scene-3d/shading.d.ts +20 -0
- package/lib/types/scene-3d/validate-scene.d.ts +11 -0
- package/lib/types/scene-3d/webgl/gl-data.d.ts +28 -0
- package/lib/types/scene-3d/webgl/index.d.ts +16 -0
- package/lib/types/scene-3d/webgl/shaders.d.ts +29 -0
- package/lib/types/scene-3d/webgl/webgl2-renderer.d.ts +33 -0
- package/package.json +10 -2
- package/lib/addons/dom-adapter-CrNwoomd.js +0 -243
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { getEasingFunction as F, staggerOffset as qt, maxStaggerDistance as Bt, getInterpolator as at, pointsToPath as Ut, isPathData as
|
|
2
|
-
import { backOut as
|
|
3
|
-
import { D as St } from "./dom-adapter-
|
|
1
|
+
import { getEasingFunction as F, staggerOffset as qt, maxStaggerDistance as Bt, getInterpolator as at, pointsToPath as Ut, isPathData as _, naturalRest as H, SPRING_PRESETS as z, Timeline as Wt, createTrack as ct, springDuration as _t, inertiaDuration as zt, inertiaRest as Yt, staggerSpan as Gt, isParametricEasing as Xt, bakeEasing as Ht, shapeToPathData as et, customBounce as Kt, customEase as Zt, customWiggle as Jt, playheadCrossings as Qt, staggerOffsets as lt } from "@algorisys/tinyfly";
|
|
2
|
+
import { backOut as Ar, bounceOut as Cr, elasticOut as Rr, playheadCrossings as Fr, stepsEasing as Pr } from "@algorisys/tinyfly";
|
|
3
|
+
import { D as St } from "./dom-adapter-Cphr2HZn.js";
|
|
4
4
|
import { a as Mt, d as ht } from "./smooth-scroll-DaSacemU.js";
|
|
5
5
|
import { Draggable as te } from "./interaction.js";
|
|
6
6
|
const q = {
|
|
@@ -46,7 +46,7 @@ function ee(n) {
|
|
|
46
46
|
const e = /^([a-z]+\d?)(\(.*\))?$/.exec(t);
|
|
47
47
|
return e && e[1] !== "steps" && t !== "none" && t !== "linear" && (t = `${e[1]}.out${e[2] ?? ""}`), t;
|
|
48
48
|
}
|
|
49
|
-
const
|
|
49
|
+
const yr = (n = 1, t = 0.3) => F({ type: "elastic", mode: "in", amplitude: n, period: t }), gr = (n = 1, t = 0.3) => F({ type: "elastic", mode: "in-out", amplitude: n, period: t }), wr = F({ type: "bounce", mode: "in" }), br = F({ type: "bounce", mode: "in-out" }), vr = (n) => F({ type: "steps", count: Math.max(1, Math.floor(n)) + 1, position: "none" });
|
|
50
50
|
function V(n) {
|
|
51
51
|
const t = Et.get(n.trim().toLowerCase());
|
|
52
52
|
if (t) return t;
|
|
@@ -65,7 +65,7 @@ function V(n) {
|
|
|
65
65
|
}
|
|
66
66
|
return e in ut ? { easing: ut[e] } : e in q ? { easing: { type: "cubic-bezier", points: q[e] } } : { easing: "ease-out" };
|
|
67
67
|
}
|
|
68
|
-
function
|
|
68
|
+
function kr(n) {
|
|
69
69
|
return V(n).requiresBaking !== void 0;
|
|
70
70
|
}
|
|
71
71
|
const Et = /* @__PURE__ */ new Map();
|
|
@@ -256,11 +256,18 @@ const nt = /* @__PURE__ */ new Set([
|
|
|
256
256
|
"paused",
|
|
257
257
|
"scrollTrigger",
|
|
258
258
|
"spring"
|
|
259
|
-
])
|
|
259
|
+
]), ce = {
|
|
260
|
+
rotation: "rotate",
|
|
261
|
+
rotationZ: "rotate",
|
|
262
|
+
rotationX: "rotateX",
|
|
263
|
+
rotationY: "rotateY",
|
|
264
|
+
transformPerspective: "perspective",
|
|
265
|
+
perspective: "childPerspective"
|
|
266
|
+
};
|
|
260
267
|
function B(n) {
|
|
261
268
|
const t = {}, e = {};
|
|
262
269
|
for (const [r, i] of Object.entries(n))
|
|
263
|
-
nt.has(r) ? t[r] = i : e[r] = i;
|
|
270
|
+
nt.has(r) ? t[r] = i : e[ce[r] ?? r] = i;
|
|
264
271
|
return { config: t, properties: e };
|
|
265
272
|
}
|
|
266
273
|
function U(n, t) {
|
|
@@ -274,7 +281,7 @@ function Z(n, t) {
|
|
|
274
281
|
...n.from !== void 0 && { from: n.from }
|
|
275
282
|
};
|
|
276
283
|
}
|
|
277
|
-
const
|
|
284
|
+
const le = {
|
|
278
285
|
opacity: 1,
|
|
279
286
|
x: 0,
|
|
280
287
|
y: 0,
|
|
@@ -283,7 +290,6 @@ const ce = {
|
|
|
283
290
|
rotateX: 0,
|
|
284
291
|
rotateY: 0,
|
|
285
292
|
rotateZ: 0,
|
|
286
|
-
rotation: 0,
|
|
287
293
|
scale: 1,
|
|
288
294
|
scaleX: 1,
|
|
289
295
|
scaleY: 1,
|
|
@@ -301,16 +307,16 @@ const ce = {
|
|
|
301
307
|
clipLeft: 0
|
|
302
308
|
};
|
|
303
309
|
function Rt(n) {
|
|
304
|
-
return
|
|
310
|
+
return le[n];
|
|
305
311
|
}
|
|
306
|
-
function
|
|
312
|
+
function he(n) {
|
|
307
313
|
const t = typeof n == "string" || Array.isArray(n) ? { path: n } : n;
|
|
308
314
|
if (!t || typeof t.path != "string" && !Array.isArray(t.path))
|
|
309
315
|
throw new Error("gsap-compat: motionPath needs a path — SVG path data or an array of { x, y } points.");
|
|
310
316
|
let e;
|
|
311
317
|
if (Array.isArray(t.path))
|
|
312
318
|
e = Ut(t.path, { curviness: t.curviness });
|
|
313
|
-
else if (
|
|
319
|
+
else if (_(t.path))
|
|
314
320
|
e = t.path;
|
|
315
321
|
else
|
|
316
322
|
throw new Error(
|
|
@@ -319,23 +325,23 @@ function le(n) {
|
|
|
319
325
|
const r = { pathData: e };
|
|
320
326
|
return t.autoRotate !== void 0 && t.autoRotate !== !1 && (r.autoRotate = !0, typeof t.autoRotate == "number" && (r.rotateOffset = t.autoRotate)), t.matrix && (r.matrix = t.matrix), { config: r, start: t.start ?? 0, end: t.end ?? 1 };
|
|
321
327
|
}
|
|
322
|
-
function
|
|
328
|
+
function ue(n) {
|
|
323
329
|
const t = typeof n == "string" || Array.isArray(n) ? { path: n } : { ...n };
|
|
324
330
|
return { ...t, start: t.end ?? 1, end: t.start ?? 0 };
|
|
325
331
|
}
|
|
326
332
|
function Ft(n) {
|
|
327
333
|
return typeof n == "object" && n !== null && "shape" in n ? n.shape : n;
|
|
328
334
|
}
|
|
329
|
-
function
|
|
335
|
+
function fe(n) {
|
|
330
336
|
if (n.morphSVG === void 0) return n;
|
|
331
337
|
const { morphSVG: t, ...e } = n, r = Ft(t);
|
|
332
|
-
if (typeof r != "string" || !
|
|
338
|
+
if (typeof r != "string" || !_(r))
|
|
333
339
|
throw new Error(
|
|
334
340
|
`gsap-compat: morphSVG "${String(r)}" is not path data. Selectors and elements are resolved by live.to(); timeline() and tf need the path data itself.`
|
|
335
341
|
);
|
|
336
342
|
return { ...e, d: r };
|
|
337
343
|
}
|
|
338
|
-
function
|
|
344
|
+
function de(n, t) {
|
|
339
345
|
if (n === !0) return [0, t];
|
|
340
346
|
if (n === !1) return [0, 0];
|
|
341
347
|
if (typeof n == "number") return [0, dt(n, t)];
|
|
@@ -349,16 +355,16 @@ function fe(n, t) {
|
|
|
349
355
|
const i = r(e[0]), o = r(e[1]);
|
|
350
356
|
return i <= o ? [i, o] : [o, i];
|
|
351
357
|
}
|
|
352
|
-
function
|
|
353
|
-
const [e, r] =
|
|
358
|
+
function pe(n, t) {
|
|
359
|
+
const [e, r] = de(n, t);
|
|
354
360
|
return { strokeDasharray: [r - e, t], strokeDashoffset: -e };
|
|
355
361
|
}
|
|
356
|
-
function
|
|
362
|
+
function me(n, t) {
|
|
357
363
|
if (n.drawSVG === void 0) return n;
|
|
358
364
|
const { drawSVG: e, ...r } = n;
|
|
359
|
-
return { ...r, ...
|
|
365
|
+
return { ...r, ...pe(e, t) };
|
|
360
366
|
}
|
|
361
|
-
function
|
|
367
|
+
function ye(n) {
|
|
362
368
|
if (n.drawSVG !== void 0)
|
|
363
369
|
throw new Error(
|
|
364
370
|
"gsap-compat: drawSVG needs the stroke length from the page. Use live.to(), or animate strokeDasharray / strokeDashoffset directly (see drawSvgProperties)."
|
|
@@ -368,12 +374,12 @@ function me(n) {
|
|
|
368
374
|
function dt(n, t) {
|
|
369
375
|
return Math.max(0, Math.min(t, n));
|
|
370
376
|
}
|
|
371
|
-
function
|
|
377
|
+
function ge(n) {
|
|
372
378
|
let t = 2166136261;
|
|
373
379
|
for (let e = 0; e < n.length; e++) t = Math.imul(t ^ n.charCodeAt(e), 16777619);
|
|
374
380
|
return t >>> 0;
|
|
375
381
|
}
|
|
376
|
-
function
|
|
382
|
+
function we(n, t, e) {
|
|
377
383
|
if (n.scrambleText !== void 0) {
|
|
378
384
|
const r = n.scrambleText, i = typeof r == "string" ? { text: r } : r;
|
|
379
385
|
if (typeof i?.text != "string")
|
|
@@ -387,7 +393,7 @@ function ge(n, t, e) {
|
|
|
387
393
|
...o !== void 0 && { revealDelay: Math.min(o, 0.999) },
|
|
388
394
|
...i.tweenLength !== void 0 && { tweenLength: i.tweenLength },
|
|
389
395
|
...i.rightToLeft !== void 0 && { rightToLeft: i.rightToLeft },
|
|
390
|
-
seed: i.seed ??
|
|
396
|
+
seed: i.seed ?? ge(`${t}|${i.text}`)
|
|
391
397
|
};
|
|
392
398
|
}
|
|
393
399
|
if (n.text !== void 0) {
|
|
@@ -404,7 +410,7 @@ function ge(n, t, e) {
|
|
|
404
410
|
function ot(n) {
|
|
405
411
|
return Math.max(0.1, n / 25);
|
|
406
412
|
}
|
|
407
|
-
function
|
|
413
|
+
function be(n, t) {
|
|
408
414
|
const e = typeof t == "number" ? { velocity: t } : t;
|
|
409
415
|
if (typeof e?.velocity != "number" || !Number.isFinite(e.velocity))
|
|
410
416
|
throw new Error("gsap-compat: inertia needs a velocity for each property — a number, or { velocity }.");
|
|
@@ -417,21 +423,21 @@ function we(n, t) {
|
|
|
417
423
|
};
|
|
418
424
|
return typeof e.end == "function" ? i.end = [e.end(H(i))] : e.end !== void 0 && (i.end = Array.isArray(e.end) ? [...e.end] : e.end), i;
|
|
419
425
|
}
|
|
420
|
-
function
|
|
426
|
+
function ve(n) {
|
|
421
427
|
const t = n === !0 ? {} : typeof n == "string" ? { preset: n } : n;
|
|
422
|
-
if (t.preset !== void 0 && !(t.preset in
|
|
428
|
+
if (t.preset !== void 0 && !(t.preset in z))
|
|
423
429
|
throw new Error(
|
|
424
|
-
`gsap-compat: unknown spring preset "${t.preset}" — use one of ${Object.keys(
|
|
430
|
+
`gsap-compat: unknown spring preset "${t.preset}" — use one of ${Object.keys(z).join(", ")}`
|
|
425
431
|
);
|
|
426
432
|
return {
|
|
427
|
-
...t.preset ?
|
|
433
|
+
...t.preset ? z[t.preset] : {},
|
|
428
434
|
...t.stiffness !== void 0 && { stiffness: t.stiffness },
|
|
429
435
|
...t.damping !== void 0 && { damping: t.damping },
|
|
430
436
|
...t.mass !== void 0 && { mass: t.mass },
|
|
431
437
|
...t.restDelta !== void 0 && { restDelta: t.restDelta }
|
|
432
438
|
};
|
|
433
439
|
}
|
|
434
|
-
function
|
|
440
|
+
function ke(n, t) {
|
|
435
441
|
if (n === !0 || typeof n == "string") return;
|
|
436
442
|
const e = n.velocity;
|
|
437
443
|
return typeof e == "number" ? e : e?.[t];
|
|
@@ -473,9 +479,9 @@ class O {
|
|
|
473
479
|
const { config: i, properties: o } = B(N(e)), { motionPath: s, text: c, scrambleText: a, ...l } = o, h = this.targetsOf(t)[0], f = { ...i };
|
|
474
480
|
for (const m of Object.keys(l))
|
|
475
481
|
f[m] = this.resolveStart(h, m);
|
|
476
|
-
s !== void 0 && (f.motionPath =
|
|
482
|
+
s !== void 0 && (f.motionPath = ue(s));
|
|
477
483
|
const u = {}, p = String(this.resolveStart(h, "text"));
|
|
478
|
-
return c !== void 0 && (u.text =
|
|
484
|
+
return c !== void 0 && (u.text = Y(c), f.text = typeof c == "object" ? { ...c, value: p } : p), a !== void 0 && (u.text = Y(a), f.scrambleText = typeof a == "object" ? { ...a, text: p } : p), this.build(t, { ...l, ...u }, f, r);
|
|
479
485
|
}
|
|
480
486
|
/** Animate between two explicit sets of values. */
|
|
481
487
|
fromTo(t, e, r, i) {
|
|
@@ -612,11 +618,11 @@ class O {
|
|
|
612
618
|
if (typeof A != typeof M && (this.warn(
|
|
613
619
|
`no usable start value for "${T}" on "${u[0]}" — it will snap to ${String(M)}. Use fromTo() to animate it.`
|
|
614
620
|
), A = M), w !== void 0 && (typeof A != "number" || typeof M != "number") && this.warn(`spring works on numbers, so "${T}" on "${u[0]}" eases instead`), w !== void 0 && typeof A == "number" && typeof M == "number") {
|
|
615
|
-
const
|
|
616
|
-
...
|
|
621
|
+
const $ = {
|
|
622
|
+
...ve(w),
|
|
617
623
|
from: A,
|
|
618
624
|
to: M,
|
|
619
|
-
velocity:
|
|
625
|
+
velocity: ke(w, T) ?? this.options.startVelocity?.(u[0], T) ?? 0
|
|
620
626
|
}, st = this.nextTrackId(`${u[0]}-${T}-spring`), Vt = {
|
|
621
627
|
id: st,
|
|
622
628
|
target: u[0],
|
|
@@ -624,10 +630,10 @@ class O {
|
|
|
624
630
|
...y && u.length > 1 && { stagger: y },
|
|
625
631
|
property: T,
|
|
626
632
|
kind: "spring",
|
|
627
|
-
spring:
|
|
633
|
+
spring: $,
|
|
628
634
|
delay: p + m
|
|
629
635
|
};
|
|
630
|
-
this.timeline.addTrack(Vt), b.push(st), k = Math.max(k,
|
|
636
|
+
this.timeline.addTrack(Vt), b.push(st), k = Math.max(k, _t($));
|
|
631
637
|
for (const jt of u) this.lastValues.set(`${jt}|${T}`, M);
|
|
632
638
|
continue;
|
|
633
639
|
}
|
|
@@ -641,14 +647,16 @@ class O {
|
|
|
641
647
|
...y && u.length > 1 && { stagger: y },
|
|
642
648
|
property: T,
|
|
643
649
|
delay: p + m,
|
|
644
|
-
keyframes: D
|
|
650
|
+
keyframes: D,
|
|
651
|
+
// A quaternion is a rotation: it turns the short way round (see Track.interpolation).
|
|
652
|
+
...T === "quaternion" && { interpolation: "slerp" }
|
|
645
653
|
})
|
|
646
654
|
), b.push(j);
|
|
647
|
-
for (const
|
|
655
|
+
for (const $ of u) this.lastValues.set(`${$}|${T}`, M);
|
|
648
656
|
}
|
|
649
|
-
const v =
|
|
657
|
+
const v = we({ text: a, scrambleText: l }, u[0], d);
|
|
650
658
|
if (v) {
|
|
651
|
-
const T = e?.text ?? e?.scrambleText, R = T !== void 0 ?
|
|
659
|
+
const T = e?.text ?? e?.scrambleText, R = T !== void 0 ? Y(T) : this.resolveStart(u[0], "text"), M = this.nextTrackId(`${u[0]}-text`), A = {
|
|
652
660
|
id: M,
|
|
653
661
|
target: u[0],
|
|
654
662
|
...u.length > 1 && { targets: u },
|
|
@@ -662,7 +670,7 @@ class O {
|
|
|
662
670
|
for (const D of u) this.lastValues.set(`${D}|text`, v.to);
|
|
663
671
|
}
|
|
664
672
|
if (c !== void 0) {
|
|
665
|
-
const { config: T, start: R, end: M } =
|
|
673
|
+
const { config: T, start: R, end: M } = he(c), A = this.nextTrackId(`${u[0]}-motionPath`), D = {
|
|
666
674
|
id: A,
|
|
667
675
|
target: u[0],
|
|
668
676
|
...u.length > 1 && { targets: u },
|
|
@@ -681,7 +689,7 @@ class O {
|
|
|
681
689
|
this.warn(`inertia on "${T}" needs a numeric start value; skipped`);
|
|
682
690
|
continue;
|
|
683
691
|
}
|
|
684
|
-
const A =
|
|
692
|
+
const A = be(M, R), D = this.nextTrackId(`${u[0]}-${T}-inertia`), j = {
|
|
685
693
|
id: D,
|
|
686
694
|
target: u[0],
|
|
687
695
|
...u.length > 1 && { targets: u },
|
|
@@ -691,10 +699,10 @@ class O {
|
|
|
691
699
|
inertia: A,
|
|
692
700
|
delay: p + m
|
|
693
701
|
};
|
|
694
|
-
this.timeline.addTrack(j), b.push(D), k = Math.max(k,
|
|
695
|
-
for (const
|
|
702
|
+
this.timeline.addTrack(j), b.push(D), k = Math.max(k, zt(A));
|
|
703
|
+
for (const $ of u) this.lastValues.set(`${$}|${T}`, Yt(A));
|
|
696
704
|
}
|
|
697
|
-
const
|
|
705
|
+
const L = ((h !== void 0 || w !== void 0) && !x && !v && c === void 0 ? k : Math.max(d, k)) + (y && u.length > 1 ? Gt(u.length, y) : 0), E = p + m + L;
|
|
698
706
|
return this.previousStart = p + m, this.previousEnd = E, this.cursor = Math.max(this.cursor, E), {
|
|
699
707
|
trackIds: b,
|
|
700
708
|
start: p + m,
|
|
@@ -727,6 +735,7 @@ class O {
|
|
|
727
735
|
const o = this.options.defaults?.[e];
|
|
728
736
|
if (o !== void 0) return o;
|
|
729
737
|
if (e === "text") return "";
|
|
738
|
+
if (e === "quaternion") return [0, 0, 0, 1];
|
|
730
739
|
if (e === "d")
|
|
731
740
|
throw new Error(
|
|
732
741
|
`gsap-compat: no starting shape for "${t}". Use fromTo({ d: … }, { morphSVG: … }), or live.to(), which reads the element's current shape.`
|
|
@@ -766,7 +775,7 @@ class O {
|
|
|
766
775
|
this.options.onWarning?.(`gsap-compat: ${t}`);
|
|
767
776
|
}
|
|
768
777
|
}
|
|
769
|
-
function
|
|
778
|
+
function Y(n) {
|
|
770
779
|
if (typeof n == "string") return n;
|
|
771
780
|
if (n && typeof n == "object") {
|
|
772
781
|
const t = n;
|
|
@@ -774,13 +783,13 @@ function G(n) {
|
|
|
774
783
|
}
|
|
775
784
|
return String(n ?? "");
|
|
776
785
|
}
|
|
777
|
-
function
|
|
786
|
+
function Te(n) {
|
|
778
787
|
return new O(n);
|
|
779
788
|
}
|
|
780
789
|
function N(n) {
|
|
781
|
-
return
|
|
790
|
+
return ye(fe(n));
|
|
782
791
|
}
|
|
783
|
-
function
|
|
792
|
+
function Tr(n) {
|
|
784
793
|
const { timeline: t } = n, e = new St();
|
|
785
794
|
for (const [l, h] of Object.entries(n.targets)) {
|
|
786
795
|
const f = typeof h == "string" ? document.querySelector(h) : h;
|
|
@@ -827,30 +836,30 @@ function Dt(n) {
|
|
|
827
836
|
for (const e of Array.from(n.attributes)) t[e.name] = e.value;
|
|
828
837
|
return t;
|
|
829
838
|
}
|
|
830
|
-
function
|
|
839
|
+
function Lt(n) {
|
|
831
840
|
if (!n) return null;
|
|
832
841
|
const t = et({ tag: n.localName, attributes: Dt(n) });
|
|
833
842
|
return t || (n.querySelector("path")?.getAttribute("d") ?? null);
|
|
834
843
|
}
|
|
835
|
-
function
|
|
844
|
+
function xe(n, t, e) {
|
|
836
845
|
const r = Ft(n);
|
|
837
|
-
if (typeof r == "string" &&
|
|
838
|
-
const i = Pt(r) ? r : typeof r == "string" ? t(r) : null, o =
|
|
846
|
+
if (typeof r == "string" && _(r)) return r;
|
|
847
|
+
const i = Pt(r) ? r : typeof r == "string" ? t(r) : null, o = Lt(i);
|
|
839
848
|
return o || (e(`gsap-compat: morphSVG could not find a shape for "${String(r)}"`), "");
|
|
840
849
|
}
|
|
841
|
-
const
|
|
842
|
-
function
|
|
850
|
+
const Se = /* @__PURE__ */ new Set(["cx", "cy", "r", "rx", "ry", "x", "y", "width", "height", "x1", "y1", "x2", "y2", "points"]);
|
|
851
|
+
function Me(n, t = document) {
|
|
843
852
|
return (typeof n == "string" ? Array.from(t.querySelectorAll(n)) : Pt(n) ? [n] : Array.from(n)).map((r) => {
|
|
844
853
|
if (r.localName === "path") return r;
|
|
845
854
|
const i = et({ tag: r.localName, attributes: Dt(r) });
|
|
846
855
|
if (!i || !r.parentNode) return r;
|
|
847
856
|
const o = r.ownerDocument.createElementNS("http://www.w3.org/2000/svg", "path");
|
|
848
857
|
for (const s of Array.from(r.attributes))
|
|
849
|
-
|
|
858
|
+
Se.has(s.name) || o.setAttribute(s.name, s.value);
|
|
850
859
|
return o.setAttribute("d", i), r.parentNode.replaceChild(o, r), o;
|
|
851
860
|
});
|
|
852
861
|
}
|
|
853
|
-
function
|
|
862
|
+
function Ee(n, t = {}) {
|
|
854
863
|
const e = new Set((t.type ?? "chars,words,lines").split(",").map((d) => d.trim())), r = {
|
|
855
864
|
chars: t.charsClass ?? "char",
|
|
856
865
|
words: t.wordsClass ?? "word",
|
|
@@ -869,7 +878,7 @@ function Me(n, t = {}) {
|
|
|
869
878
|
}, u = () => {
|
|
870
879
|
const d = { chars: [], words: [], lines: [], masks: [] };
|
|
871
880
|
for (const { element: y } of o) {
|
|
872
|
-
const g = (y.textContent ?? "").replace(/\s+/g, " ").trim(), b =
|
|
881
|
+
const g = (y.textContent ?? "").replace(/\s+/g, " ").trim(), b = Ae(y, r.words), w = e.has("chars") ? b.flatMap((v) => Ce(v, r.chars)) : [], k = e.has("lines") ? Fe(y, b, r.lines) : [];
|
|
873
882
|
if (i) {
|
|
874
883
|
!y.hasAttribute("aria-label") && g && y.setAttribute("aria-label", g);
|
|
875
884
|
for (const v of b) v.setAttribute("aria-hidden", "true");
|
|
@@ -878,7 +887,7 @@ function Me(n, t = {}) {
|
|
|
878
887
|
else for (const v of b) v.removeAttribute("class");
|
|
879
888
|
d.chars.push(...w), d.lines.push(...k);
|
|
880
889
|
const x = t.mask === "lines" ? k : t.mask === "words" ? b : t.mask === "chars" ? w : [];
|
|
881
|
-
for (const v of x) d.masks.push(
|
|
890
|
+
for (const v of x) d.masks.push(Pe(v, `${r[t.mask]}-mask`));
|
|
882
891
|
}
|
|
883
892
|
s = d;
|
|
884
893
|
}, p = {
|
|
@@ -930,7 +939,7 @@ function Me(n, t = {}) {
|
|
|
930
939
|
}
|
|
931
940
|
return p;
|
|
932
941
|
}
|
|
933
|
-
function
|
|
942
|
+
function Ae(n, t) {
|
|
934
943
|
const e = n.ownerDocument, r = [], i = e.createTreeWalker(
|
|
935
944
|
n,
|
|
936
945
|
4
|
|
@@ -953,18 +962,18 @@ function Ee(n, t) {
|
|
|
953
962
|
}
|
|
954
963
|
return r;
|
|
955
964
|
}
|
|
956
|
-
function
|
|
957
|
-
const e = n.ownerDocument, r =
|
|
965
|
+
function Ce(n, t) {
|
|
966
|
+
const e = n.ownerDocument, r = Re(n.textContent ?? "").map((i) => {
|
|
958
967
|
const o = e.createElement("span");
|
|
959
968
|
return o.className = t, o.style.display = "inline-block", o.textContent = i, o;
|
|
960
969
|
});
|
|
961
970
|
return n.replaceChildren(...r), r;
|
|
962
971
|
}
|
|
963
|
-
function
|
|
972
|
+
function Re(n) {
|
|
964
973
|
const t = Intl.Segmenter;
|
|
965
974
|
return t ? Array.from(new t(void 0, { granularity: "grapheme" }).segment(n), (e) => e.segment) : Array.from(n);
|
|
966
975
|
}
|
|
967
|
-
function
|
|
976
|
+
function Fe(n, t, e) {
|
|
968
977
|
const r = n.ownerDocument, i = new Map(t.map((m) => [m, m.getBoundingClientRect()])), o = [], s = (m) => {
|
|
969
978
|
for (const d of Array.from(m.childNodes))
|
|
970
979
|
d.nodeType === 3 || i.has(d) || d.tagName === "BR" ? o.push(d) : s(d);
|
|
@@ -996,11 +1005,11 @@ function Re(n, t, e) {
|
|
|
996
1005
|
}
|
|
997
1006
|
return n.replaceChildren(...c), c;
|
|
998
1007
|
}
|
|
999
|
-
function
|
|
1008
|
+
function Pe(n, t) {
|
|
1000
1009
|
const e = n.ownerDocument.createElement("span");
|
|
1001
1010
|
return e.className = t, e.style.display = n.style.display === "block" ? "block" : "inline-block", e.style.overflow = "clip", e.style.paddingBottom = "0.12em", e.style.marginBottom = "-0.12em", n.replaceWith(e), e.appendChild(n), e;
|
|
1002
1011
|
}
|
|
1003
|
-
function
|
|
1012
|
+
function De(n, t) {
|
|
1004
1013
|
switch (t) {
|
|
1005
1014
|
// Play forward from wherever it is; reverse() flips a reversed timeline and plays.
|
|
1006
1015
|
// Neither restarts an animation that is already at that end.
|
|
@@ -1039,8 +1048,8 @@ function it(n, t, e, r, i = () => {
|
|
|
1039
1048
|
const c = t.scrub === void 0 || t.scrub === !1 ? !1 : t.scrub, a = (t.toggleActions ?? "play none none none").trim().split(/\s+/);
|
|
1040
1049
|
let l = 0, h;
|
|
1041
1050
|
const f = (p, m) => () => {
|
|
1042
|
-
m?.(), e && !c &&
|
|
1043
|
-
}, u = t.containerAnimation ?
|
|
1051
|
+
m?.(), e && !c && De(e, a[p] ?? "none"), t.once && p === 0 && queueMicrotask(() => h.destroy());
|
|
1052
|
+
}, u = t.containerAnimation ? Oe(n, t.containerAnimation, s, i) : void 0;
|
|
1044
1053
|
return h = new Mt({
|
|
1045
1054
|
trigger: s,
|
|
1046
1055
|
start: t.start,
|
|
@@ -1051,7 +1060,7 @@ function it(n, t, e, r, i = () => {
|
|
|
1051
1060
|
horizontal: t.horizontal,
|
|
1052
1061
|
pinSpacing: t.pinSpacing,
|
|
1053
1062
|
onRefresh: t.invalidateOnRefresh && e?.invalidate ? () => e.invalidate() : void 0,
|
|
1054
|
-
snap: t.snap === void 0 ? void 0 :
|
|
1063
|
+
snap: t.snap === void 0 ? void 0 : Le(t.snap, e),
|
|
1055
1064
|
markers: t.markers,
|
|
1056
1065
|
container: u,
|
|
1057
1066
|
onUpdate: (p, m) => {
|
|
@@ -1067,7 +1076,7 @@ function it(n, t, e, r, i = () => {
|
|
|
1067
1076
|
onLeaveBack: f(3, t.onLeaveBack)
|
|
1068
1077
|
}), e && c === !1 && e.progress(0), h.start(), n.own(h);
|
|
1069
1078
|
}
|
|
1070
|
-
function
|
|
1079
|
+
function Le(n, t) {
|
|
1071
1080
|
const e = (i) => i === "labels" ? (o) => $e(o, t?.labelProgresses?.() ?? []) : i;
|
|
1072
1081
|
if (typeof n != "object" || Array.isArray(n)) return e(n);
|
|
1073
1082
|
const r = n.ease ? V(n.ease) : void 0;
|
|
@@ -1081,7 +1090,7 @@ function De(n, t) {
|
|
|
1081
1090
|
function $e(n, t) {
|
|
1082
1091
|
return t.reduce((e, r) => Math.abs(r - n) < Math.abs(e - n) ? r : e, t[0] ?? n);
|
|
1083
1092
|
}
|
|
1084
|
-
function
|
|
1093
|
+
function Oe(n, t, e, r) {
|
|
1085
1094
|
const i = () => t.timeline.getTracks({ property: "x" }).map((o) => o.target).filter((o) => {
|
|
1086
1095
|
const s = n.elementFor(o);
|
|
1087
1096
|
return !!s && s !== e && s.contains(e);
|
|
@@ -1103,7 +1112,7 @@ function Le(n, t, e, r) {
|
|
|
1103
1112
|
}
|
|
1104
1113
|
};
|
|
1105
1114
|
}
|
|
1106
|
-
class
|
|
1115
|
+
class $t {
|
|
1107
1116
|
/** For contexts made by matchMedia: which named queries match */
|
|
1108
1117
|
conditions = {};
|
|
1109
1118
|
scope;
|
|
@@ -1146,7 +1155,7 @@ class Lt {
|
|
|
1146
1155
|
this.revert();
|
|
1147
1156
|
}
|
|
1148
1157
|
}
|
|
1149
|
-
class
|
|
1158
|
+
class Ie {
|
|
1150
1159
|
host;
|
|
1151
1160
|
scope;
|
|
1152
1161
|
entries = [];
|
|
@@ -1186,11 +1195,11 @@ class Oe {
|
|
|
1186
1195
|
for (const [s, c] of t.queries) e[s] = c.matches;
|
|
1187
1196
|
const r = Object.values(e).some(Boolean), i = r ? JSON.stringify(e) : void 0;
|
|
1188
1197
|
if (i === t.key || (t.context?.revert(), t.context = void 0, t.key = i, !r)) return;
|
|
1189
|
-
const o = new
|
|
1198
|
+
const o = new $t(this.host, this.scope);
|
|
1190
1199
|
o.conditions = e, o.add(() => t.setup(o)), t.context = o;
|
|
1191
1200
|
}
|
|
1192
1201
|
}
|
|
1193
|
-
class
|
|
1202
|
+
class Ne {
|
|
1194
1203
|
frames;
|
|
1195
1204
|
canvas;
|
|
1196
1205
|
context;
|
|
@@ -1264,13 +1273,13 @@ class Ie {
|
|
|
1264
1273
|
e.onload = () => r(!0), e.onerror = () => r(!1), e.src = this.options.url(t);
|
|
1265
1274
|
}
|
|
1266
1275
|
}
|
|
1267
|
-
const
|
|
1276
|
+
const Ve = {
|
|
1268
1277
|
/** Register a curve from SVG path data or bezier points. Returns the name. */
|
|
1269
1278
|
create: (n, t) => rt(n, Zt(t))
|
|
1270
|
-
},
|
|
1279
|
+
}, je = {
|
|
1271
1280
|
/** Register a bouncing ease that lands and settles on the end value. Returns the name. */
|
|
1272
1281
|
create: (n, t) => rt(n, { fn: Kt(t) })
|
|
1273
|
-
},
|
|
1282
|
+
}, qe = {
|
|
1274
1283
|
/** Register a wiggle that swings around the start value and returns to it. Returns the name. */
|
|
1275
1284
|
create: (n, t) => rt(n, { fn: Jt(t) })
|
|
1276
1285
|
};
|
|
@@ -1282,7 +1291,7 @@ function W(n) {
|
|
|
1282
1291
|
const r = n.getBoundingClientRect();
|
|
1283
1292
|
return t.transform = e, r;
|
|
1284
1293
|
}
|
|
1285
|
-
const
|
|
1294
|
+
const Be = { x: "x", y: "y", "x,y": "both" }, J = (n) => typeof n == "object" && n !== null && n.nodeType === 1;
|
|
1286
1295
|
function pt(n, t) {
|
|
1287
1296
|
const e = W(n), r = t.getBoundingClientRect();
|
|
1288
1297
|
return {
|
|
@@ -1295,12 +1304,12 @@ function pt(n, t) {
|
|
|
1295
1304
|
function mt(n) {
|
|
1296
1305
|
return Array.isArray(n) ? [...n] : n;
|
|
1297
1306
|
}
|
|
1298
|
-
function
|
|
1307
|
+
function Ue(n, t, e, r = {}) {
|
|
1299
1308
|
const [i] = t.resolveTargets(e), o = i ? t.elementFor(i) : void 0;
|
|
1300
1309
|
if (!i || !o)
|
|
1301
1310
|
throw new Error(`gsap-compat: live.draggable could not find ${String(e)}`);
|
|
1302
|
-
if (r.type === "rotation") return
|
|
1303
|
-
const s =
|
|
1311
|
+
if (r.type === "rotation") return We(n, t, i, o, r);
|
|
1312
|
+
const s = Be[r.type ?? "x,y"], c = () => {
|
|
1304
1313
|
const d = t.appliedValue(i, "x"), y = t.appliedValue(i, "y");
|
|
1305
1314
|
return { x: typeof d == "number" ? d : 0, y: typeof y == "number" ? y : 0 };
|
|
1306
1315
|
}, a = typeof r.bounds == "string" ? t.query(r.bounds) : J(r.bounds) ? r.bounds : null, h = { bounds: (!a && r.bounds && !J(r.bounds) ? r.bounds : void 0) ?? (a ? pt(o, a) : void 0) };
|
|
@@ -1312,10 +1321,10 @@ function Be(n, t, e, r = {}) {
|
|
|
1312
1321
|
let k, x;
|
|
1313
1322
|
const v = y.end;
|
|
1314
1323
|
if (Array.isArray(v)) {
|
|
1315
|
-
const C = H({ from: b.x, velocity: s === "y" ? 0 : d.x, friction: g }),
|
|
1324
|
+
const C = H({ from: b.x, velocity: s === "y" ? 0 : d.x, friction: g }), L = H({ from: b.y, velocity: s === "x" ? 0 : d.y, friction: g });
|
|
1316
1325
|
let E = v[0];
|
|
1317
1326
|
for (const T of v)
|
|
1318
|
-
Math.hypot(T.x - C, T.y -
|
|
1327
|
+
Math.hypot(T.x - C, T.y - L) < Math.hypot(E.x - C, E.y - L) && (E = T);
|
|
1319
1328
|
E && (k = [E.x], x = [E.y]);
|
|
1320
1329
|
} else typeof v == "number" ? (k = v, x = v) : v && (k = mt(v.x), x = mt(v.y));
|
|
1321
1330
|
const S = {};
|
|
@@ -1353,7 +1362,7 @@ function Be(n, t, e, r = {}) {
|
|
|
1353
1362
|
}
|
|
1354
1363
|
};
|
|
1355
1364
|
}
|
|
1356
|
-
function
|
|
1365
|
+
function We(n, t, e, r, i) {
|
|
1357
1366
|
const o = typeof i.bounds == "object" && i.bounds !== null && !J(i.bounds) ? i.bounds : {}, s = () => {
|
|
1358
1367
|
const w = t.appliedValue(e, "rotate");
|
|
1359
1368
|
return typeof w == "number" ? w : 0;
|
|
@@ -1380,12 +1389,12 @@ function Ue(n, t, e, r, i) {
|
|
|
1380
1389
|
l = !1;
|
|
1381
1390
|
const k = m[0], x = m[m.length - 1], v = k && x ? (x.time - k.time) / 1e3 : 0, S = v > 0 ? (x.rotation - k.rotation) / v : 0;
|
|
1382
1391
|
if (i.onRelease?.({ x: S, y: 0 }), !i.inertia) return;
|
|
1383
|
-
const C = i.inertia === !0 ? {} : i.inertia,
|
|
1392
|
+
const C = i.inertia === !0 ? {} : i.inertia, L = C.friction ?? (C.resistance !== void 0 ? ot(C.resistance) : 4), E = typeof C.end == "number" || Array.isArray(C.end) ? C.end : void 0;
|
|
1384
1393
|
a = n.to(r, {
|
|
1385
1394
|
inertia: {
|
|
1386
1395
|
rotate: {
|
|
1387
1396
|
velocity: S,
|
|
1388
|
-
friction:
|
|
1397
|
+
friction: L,
|
|
1389
1398
|
min: o.minRotation,
|
|
1390
1399
|
max: o.maxRotation,
|
|
1391
1400
|
end: Array.isArray(E) ? E.filter((T) => typeof T == "number") : E
|
|
@@ -1405,7 +1414,7 @@ function Ue(n, t, e, r, i) {
|
|
|
1405
1414
|
}
|
|
1406
1415
|
};
|
|
1407
1416
|
}
|
|
1408
|
-
const
|
|
1417
|
+
const _e = { opacity: 0, scale: 0.6 };
|
|
1409
1418
|
function ze(n) {
|
|
1410
1419
|
const t = n.getBoundingClientRect();
|
|
1411
1420
|
return t.width === 0 && t.height === 0 ? null : { cx: t.left + t.width / 2, cy: t.top + t.height / 2, width: t.width, height: t.height };
|
|
@@ -1424,9 +1433,9 @@ function Q(n, t) {
|
|
|
1424
1433
|
}
|
|
1425
1434
|
return { elements: r, boxes: i, ids: o };
|
|
1426
1435
|
}
|
|
1427
|
-
const
|
|
1436
|
+
const G = /* @__PURE__ */ new WeakMap();
|
|
1428
1437
|
function tt(n, t, e, r = {}) {
|
|
1429
|
-
const i = r.duration ?? 0.6, o = r.ease ?? "power2.inOut", s = r.stagger ?? 0, c = r.scale !== !1, a = r.enter === void 0 ?
|
|
1438
|
+
const i = r.duration ?? 0.6, o = r.ease ?? "power2.inOut", s = r.stagger ?? 0, c = r.scale !== !1, a = r.enter === void 0 ? _e : r.enter, l = new Set(e.elements);
|
|
1430
1439
|
if (r.targets !== void 0)
|
|
1431
1440
|
for (const p of n.resolveTargets(r.targets)) {
|
|
1432
1441
|
const m = n.elementFor(p);
|
|
@@ -1443,11 +1452,11 @@ function tt(n, t, e, r = {}) {
|
|
|
1443
1452
|
const g = Ot(p), b = !d && g !== void 0 ? e.ids.get(g) : void 0;
|
|
1444
1453
|
b && b.element !== p && (d = b.box, y = b.element);
|
|
1445
1454
|
const [w] = n.resolveTargets(p);
|
|
1446
|
-
|
|
1455
|
+
G.get(p)?.timeline.removeTracks({ target: w });
|
|
1447
1456
|
const k = u * s;
|
|
1448
1457
|
if (!d) {
|
|
1449
1458
|
if (a === !1) continue;
|
|
1450
|
-
f.fromTo(p, { x: 0, y: 0, scaleX: 1, scaleY: 1, ...a }, { ...It(a), x: 0, y: 0, scaleX: 1, scaleY: 1, duration: i, ease: o, delay: k }, 0),
|
|
1459
|
+
f.fromTo(p, { x: 0, y: 0, scaleX: 1, scaleY: 1, ...a }, { ...It(a), x: 0, y: 0, scaleX: 1, scaleY: 1, duration: i, ease: o, delay: k }, 0), G.set(p, f), u++;
|
|
1451
1460
|
continue;
|
|
1452
1461
|
}
|
|
1453
1462
|
const x = d.cx - m.cx, v = d.cy - m.cy, S = c ? d.width / m.width : 1, C = c ? d.height / m.height : 1;
|
|
@@ -1465,7 +1474,7 @@ function tt(n, t, e, r = {}) {
|
|
|
1465
1474
|
{ x, y: v, scaleX: S, scaleY: C, ...E && { opacity: 0 } },
|
|
1466
1475
|
{ x: 0, y: 0, scaleX: 1, scaleY: 1, ...E && { opacity: 1 }, duration: i, ease: o, delay: k },
|
|
1467
1476
|
0
|
|
1468
|
-
), E && y && yt(y) && f.fromTo(y, { opacity: 1 }, { opacity: 0, duration: i, ease: o, delay: k }, 0),
|
|
1477
|
+
), E && y && yt(y) && f.fromTo(y, { opacity: 1 }, { opacity: 0, duration: i, ease: o, delay: k }, 0), G.set(p, f), u++;
|
|
1469
1478
|
}
|
|
1470
1479
|
return f;
|
|
1471
1480
|
}
|
|
@@ -1479,7 +1488,7 @@ function It(n) {
|
|
|
1479
1488
|
return t;
|
|
1480
1489
|
}
|
|
1481
1490
|
const gt = (n) => typeof n == "object" && n !== null && n.nodeType === 1;
|
|
1482
|
-
function
|
|
1491
|
+
function Ye(n) {
|
|
1483
1492
|
const t = {};
|
|
1484
1493
|
for (const e of Array.from(n.attributes)) t[e.name] = e.value;
|
|
1485
1494
|
return t;
|
|
@@ -1490,17 +1499,17 @@ function Ge(n) {
|
|
|
1490
1499
|
const e = n.getBoundingClientRect();
|
|
1491
1500
|
return [1, 0, 0, 1, e.left, e.top];
|
|
1492
1501
|
}
|
|
1493
|
-
function
|
|
1502
|
+
function Xe(n, t) {
|
|
1494
1503
|
const e = typeof n == "string" || Array.isArray(n) || gt(n) ? { path: n } : n, { align: r, alignOrigin: i, path: o, ...s } = e, c = (v) => {
|
|
1495
1504
|
const S = gt(v) ? v : t.query(v);
|
|
1496
1505
|
return S || t.warn(`gsap-compat: motionPath could not find "${String(v)}"`), S;
|
|
1497
1506
|
};
|
|
1498
1507
|
let a = null, l = "";
|
|
1499
|
-
if (Array.isArray(o) || typeof o == "string" &&
|
|
1508
|
+
if (Array.isArray(o) || typeof o == "string" && _(o))
|
|
1500
1509
|
l = o;
|
|
1501
1510
|
else {
|
|
1502
1511
|
a = c(o);
|
|
1503
|
-
const v = a && et({ tag: a.localName, attributes:
|
|
1512
|
+
const v = a && et({ tag: a.localName, attributes: Ye(a) });
|
|
1504
1513
|
a && !v && t.warn(`gsap-compat: motionPath element <${a.localName}> has no path geometry`), l = v ?? "";
|
|
1505
1514
|
}
|
|
1506
1515
|
const h = { ...s, path: l };
|
|
@@ -1520,7 +1529,7 @@ function Ye(n, t) {
|
|
|
1520
1529
|
}
|
|
1521
1530
|
return h.matrix = [p, m, d, y, g - w.left - k * w.width, b - w.top - x * w.height], h;
|
|
1522
1531
|
}
|
|
1523
|
-
const
|
|
1532
|
+
const He = /* @__PURE__ */ new Set([
|
|
1524
1533
|
"keyframes",
|
|
1525
1534
|
"duration",
|
|
1526
1535
|
"delay",
|
|
@@ -1539,20 +1548,20 @@ const Xe = /* @__PURE__ */ new Set([
|
|
|
1539
1548
|
"onRepeat",
|
|
1540
1549
|
"onReverseComplete",
|
|
1541
1550
|
"scrollTrigger"
|
|
1542
|
-
]), wt = 0.5,
|
|
1543
|
-
function
|
|
1551
|
+
]), wt = 0.5, Ke = "power1.inOut";
|
|
1552
|
+
function Ze(n) {
|
|
1544
1553
|
return n.keyframes !== void 0 && n.keyframes !== null;
|
|
1545
1554
|
}
|
|
1546
|
-
function
|
|
1555
|
+
function Je(n) {
|
|
1547
1556
|
const t = n.keyframes, e = {};
|
|
1548
|
-
for (const [l, h] of Object.entries(n))
|
|
1557
|
+
for (const [l, h] of Object.entries(n)) He.has(l) || (e[l] = h);
|
|
1549
1558
|
if (Array.isArray(t))
|
|
1550
1559
|
return t.map((l) => ({
|
|
1551
1560
|
...e,
|
|
1552
1561
|
...l,
|
|
1553
1562
|
duration: l.duration ?? n.duration ?? wt
|
|
1554
1563
|
}));
|
|
1555
|
-
const r = Object.entries(t), i = n.duration ?? wt, o = t.easeEach ?? n.easeEach ??
|
|
1564
|
+
const r = Object.entries(t), i = n.duration ?? wt, o = t.easeEach ?? n.easeEach ?? Ke;
|
|
1556
1565
|
if (r.length > 0 && r.every(([l]) => /^\s*-?\d+(\.\d+)?\s*%\s*$/.test(l) || l === "easeEach")) {
|
|
1557
1566
|
const l = r.filter(([u]) => u !== "easeEach").map(([u, p]) => ({ at: Number.parseFloat(u) / 100, step: p })).sort((u, p) => u.at - p.at), h = [];
|
|
1558
1567
|
let f = 0;
|
|
@@ -1608,7 +1617,7 @@ function bt(n, t, e, r = {}) {
|
|
|
1608
1617
|
if (r.autoKill !== !1) for (const b of p) m.addEventListener(b, d, { passive: !0 });
|
|
1609
1618
|
return g;
|
|
1610
1619
|
}
|
|
1611
|
-
function
|
|
1620
|
+
function Qe(n, t, e) {
|
|
1612
1621
|
const r = n.collector?.scope ?? n.root, i = typeof t == "string" ? [...r.querySelectorAll(t)] : "nodeType" in t ? [t] : Array.from(t), { interval: o = 0.1, batchMax: s, onEnter: c, onLeave: a, onEnterBack: l, onLeaveBack: h, ...f } = e, u = { onEnter: c, onLeave: a, onEnterBack: l, onLeaveBack: h }, p = { onEnter: [], onLeave: [], onEnterBack: [], onLeaveBack: [] }, m = {}, d = (g) => {
|
|
1613
1622
|
m[g] !== void 0 && clearTimeout(m[g]), m[g] = void 0;
|
|
1614
1623
|
const b = p[g].splice(0);
|
|
@@ -1630,11 +1639,11 @@ function Je(n, t, e) {
|
|
|
1630
1639
|
})
|
|
1631
1640
|
).filter((g) => g !== void 0);
|
|
1632
1641
|
}
|
|
1633
|
-
const
|
|
1642
|
+
const tr = {
|
|
1634
1643
|
request: (n) => requestAnimationFrame(n),
|
|
1635
1644
|
cancel: (n) => cancelAnimationFrame(n)
|
|
1636
1645
|
};
|
|
1637
|
-
class
|
|
1646
|
+
class er {
|
|
1638
1647
|
adapter = new St();
|
|
1639
1648
|
scheduler;
|
|
1640
1649
|
rootOption;
|
|
@@ -1670,7 +1679,7 @@ class tr {
|
|
|
1670
1679
|
lastTimestamp = null;
|
|
1671
1680
|
destroyed = !1;
|
|
1672
1681
|
constructor(t = {}) {
|
|
1673
|
-
this.scheduler = t.scheduler ??
|
|
1682
|
+
this.scheduler = t.scheduler ?? tr, this.rootOption = t.root, this.onWarning = t.onWarning;
|
|
1674
1683
|
}
|
|
1675
1684
|
// --- targets ------------------------------------------------------------
|
|
1676
1685
|
/**
|
|
@@ -1867,7 +1876,7 @@ class tr {
|
|
|
1867
1876
|
if (typeof t == "string")
|
|
1868
1877
|
return Array.from(this.selectorRoot.querySelectorAll(t));
|
|
1869
1878
|
if (X(t)) return [t];
|
|
1870
|
-
if (!
|
|
1879
|
+
if (!rr(t)) return [t];
|
|
1871
1880
|
const e = [];
|
|
1872
1881
|
for (const r of Array.from(t))
|
|
1873
1882
|
e.push(...this.targetsOf(r));
|
|
@@ -1899,27 +1908,27 @@ class tr {
|
|
|
1899
1908
|
function X(n) {
|
|
1900
1909
|
return typeof n == "object" && n !== null && n.nodeType === 1;
|
|
1901
1910
|
}
|
|
1902
|
-
function
|
|
1911
|
+
function rr(n) {
|
|
1903
1912
|
if (Array.isArray(n)) return !0;
|
|
1904
1913
|
const t = n;
|
|
1905
1914
|
return typeof t.length == "number" && typeof t.item == "function";
|
|
1906
1915
|
}
|
|
1907
|
-
const
|
|
1908
|
-
async function
|
|
1916
|
+
const nr = { opacity: 0, y: -16 }, or = { opacity: 0, y: 16 };
|
|
1917
|
+
async function ir(n, t, e, r) {
|
|
1909
1918
|
const i = t.collector?.scope ?? t.root, o = i.ownerDocument ?? i, s = () => r.shared ? [...i.querySelectorAll(r.shared)] : [];
|
|
1910
1919
|
if (r.native && typeof o.startViewTransition == "function")
|
|
1911
|
-
return
|
|
1920
|
+
return sr(o, r, s);
|
|
1912
1921
|
const c = r.duration ?? 0.35, a = r.ease ?? "power2.inOut", l = (y) => new Promise((g) => {
|
|
1913
1922
|
y(g) || g();
|
|
1914
1923
|
}), h = s(), f = h.length ? Q(t, h) : void 0, u = r.from !== void 0 ? vt(t, r.from, r.shared) : [];
|
|
1915
1924
|
if (u.length && r.leave !== !1) {
|
|
1916
|
-
const y = r.leave ??
|
|
1925
|
+
const y = r.leave ?? nr;
|
|
1917
1926
|
await l((g) => n.to(u, { ...y, duration: c, ease: a, onComplete: g }));
|
|
1918
1927
|
}
|
|
1919
1928
|
await r.update();
|
|
1920
1929
|
const p = [], m = typeof r.to == "function" ? r.to() : r.to, d = m !== void 0 ? vt(t, m, r.shared) : [];
|
|
1921
1930
|
if (d.length && r.enter !== !1) {
|
|
1922
|
-
const y = r.enter ??
|
|
1931
|
+
const y = r.enter ?? or;
|
|
1923
1932
|
p.push(l((g) => n.fromTo(d, y, { ...It(y), duration: c, ease: a, onComplete: g })));
|
|
1924
1933
|
}
|
|
1925
1934
|
if (f) {
|
|
@@ -1942,7 +1951,7 @@ function vt(n, t, e) {
|
|
|
1942
1951
|
const r = n.resolveTargets(t).map((i) => n.elementFor(i)).filter((i) => !!i);
|
|
1943
1952
|
return e ? r.flatMap((i) => !i.querySelector(e) && !i.matches(e) ? [i] : [...i.children].filter((o) => !o.matches(e) && !o.querySelector(e))) : r;
|
|
1944
1953
|
}
|
|
1945
|
-
async function
|
|
1954
|
+
async function sr(n, t, e) {
|
|
1946
1955
|
const r = (c, a) => {
|
|
1947
1956
|
const l = c.dataset?.flipId;
|
|
1948
1957
|
l && c.style.setProperty("view-transition-name", a ? `tf-${l.replace(/[^\w-]/g, "-")}` : "");
|
|
@@ -1985,10 +1994,10 @@ class P {
|
|
|
1985
1994
|
...r,
|
|
1986
1995
|
startValue: (i, o) => {
|
|
1987
1996
|
const s = t.objectFor(i);
|
|
1988
|
-
if (s) return
|
|
1997
|
+
if (s) return hr(s[o]);
|
|
1989
1998
|
const c = t.appliedValue(i, o);
|
|
1990
1999
|
if (c !== void 0) return c;
|
|
1991
|
-
if (o === "d") return
|
|
2000
|
+
if (o === "d") return Lt(t.elementFor(i)) ?? void 0;
|
|
1992
2001
|
if (o === "text") return t.elementFor(i)?.textContent ?? void 0;
|
|
1993
2002
|
if (o === "strokeDasharray" || o === "strokeDashoffset") {
|
|
1994
2003
|
const a = xt(t.elementFor(i));
|
|
@@ -2020,7 +2029,7 @@ class P {
|
|
|
2020
2029
|
}
|
|
2021
2030
|
// --- building -----------------------------------------------------------
|
|
2022
2031
|
to(t, e, r) {
|
|
2023
|
-
return
|
|
2032
|
+
return Ze(e) ? this.record(() => this.keyframed(t, e, r)) : this.record(() => this.tween(t, [e], r, ([i], o, s) => this.compat.to(o, i, s)));
|
|
2024
2033
|
}
|
|
2025
2034
|
from(t, e, r) {
|
|
2026
2035
|
return this.record(() => this.tween(t, [e], r, ([i], o, s) => this.compat.from(o, i, s)));
|
|
@@ -2277,7 +2286,7 @@ class P {
|
|
|
2277
2286
|
keyframed(t, e, r) {
|
|
2278
2287
|
const i = this.resolve(t);
|
|
2279
2288
|
if (!i) return;
|
|
2280
|
-
const o =
|
|
2289
|
+
const o = Je(e);
|
|
2281
2290
|
if (o.length === 0) return;
|
|
2282
2291
|
const s = i.length > 1 ? Z(e.stagger, this.staggerContext(i)) : void 0, c = i.map((y) => this.targetFor(y)).filter((y) => y !== void 0), a = s ? c.map((y) => [y]) : [c], l = s ? lt(i.length, s).map((y) => y / 1e3) : [0], h = this.compat.timeOf(r) / 1e3 + U(e.delay, 0) / 1e3;
|
|
2283
2292
|
let f = 1 / 0, u = -1 / 0;
|
|
@@ -2299,7 +2308,7 @@ class P {
|
|
|
2299
2308
|
}
|
|
2300
2309
|
buildTween(t, e, r, i) {
|
|
2301
2310
|
const o = t.map((u) => this.targetFor(u));
|
|
2302
|
-
if (!(t.length > 1 && (e.some(
|
|
2311
|
+
if (!(t.length > 1 && (e.some(lr) || t.some((u) => this.stage.objectFor(u) !== void 0)))) {
|
|
2303
2312
|
const u = this.targetFor(t[0]);
|
|
2304
2313
|
i(e.map((p) => this.prepare(kt(p, 0, u, this.stage.utils, o), t)), t, r);
|
|
2305
2314
|
return;
|
|
@@ -2322,7 +2331,7 @@ class P {
|
|
|
2322
2331
|
const r = (s) => this.options.onWarning?.(s), i = (s) => this.stage.query(s);
|
|
2323
2332
|
let o = t;
|
|
2324
2333
|
if (t.motionPath !== void 0) {
|
|
2325
|
-
const s =
|
|
2334
|
+
const s = Xe(t.motionPath, {
|
|
2326
2335
|
query: i,
|
|
2327
2336
|
targets: e.map((c) => this.stage.elementFor(c)).filter((c) => !!c),
|
|
2328
2337
|
warn: r
|
|
@@ -2330,7 +2339,7 @@ class P {
|
|
|
2330
2339
|
o = { ...o, motionPath: s };
|
|
2331
2340
|
}
|
|
2332
2341
|
if (t.morphSVG !== void 0) {
|
|
2333
|
-
const s =
|
|
2342
|
+
const s = xe(t.morphSVG, i, r), { morphSVG: c, ...a } = o;
|
|
2334
2343
|
o = s ? { ...o, morphSVG: s } : a;
|
|
2335
2344
|
}
|
|
2336
2345
|
if (t.drawSVG !== void 0) {
|
|
@@ -2340,20 +2349,20 @@ class P {
|
|
|
2340
2349
|
const { drawSVG: c, ...a } = o;
|
|
2341
2350
|
o = a;
|
|
2342
2351
|
} else
|
|
2343
|
-
o =
|
|
2352
|
+
o = me(o, s);
|
|
2344
2353
|
}
|
|
2345
2354
|
return o;
|
|
2346
2355
|
}
|
|
2347
2356
|
resolve(t) {
|
|
2348
2357
|
const e = this.stage.resolveTargets(t);
|
|
2349
2358
|
if (e.length === 0) {
|
|
2350
|
-
this.options.onWarning?.(`gsap-compat: no elements found for target ${
|
|
2359
|
+
this.options.onWarning?.(`gsap-compat: no elements found for target ${ur(t)}`);
|
|
2351
2360
|
return;
|
|
2352
2361
|
}
|
|
2353
2362
|
return this.firstElement ??= e.map((r) => this.stage.elementFor(r)).find((r) => r !== void 0), e;
|
|
2354
2363
|
}
|
|
2355
2364
|
}
|
|
2356
|
-
function
|
|
2365
|
+
function ar(n = new er()) {
|
|
2357
2366
|
const t = (o) => {
|
|
2358
2367
|
const { config: s } = B(o);
|
|
2359
2368
|
return new P(n, {
|
|
@@ -2383,7 +2392,7 @@ function sr(n = new tr()) {
|
|
|
2383
2392
|
return a ? a[s] : n.appliedValue(c, s) ?? Rt(s);
|
|
2384
2393
|
},
|
|
2385
2394
|
scrollTrigger: (o) => r(it(n, o)),
|
|
2386
|
-
scrollBatch: (o, s) =>
|
|
2395
|
+
scrollBatch: (o, s) => Qe(n, o, s).map((c) => r(c)),
|
|
2387
2396
|
scrollTo: (o, s) => bt(i, n, o, s),
|
|
2388
2397
|
refreshScroll: () => {
|
|
2389
2398
|
Mt.refreshAll(), ht.refreshAll();
|
|
@@ -2393,18 +2402,18 @@ function sr(n = new tr()) {
|
|
|
2393
2402
|
return r(new ht({ ...o, scroller: s }).start());
|
|
2394
2403
|
},
|
|
2395
2404
|
context: (o, s) => {
|
|
2396
|
-
const c = new
|
|
2405
|
+
const c = new $t(n, s);
|
|
2397
2406
|
return o && c.add(() => o(c)), c;
|
|
2398
2407
|
},
|
|
2399
|
-
matchMedia: (o) => new
|
|
2400
|
-
customEase:
|
|
2401
|
-
customBounce:
|
|
2402
|
-
customWiggle:
|
|
2403
|
-
pageTransition: (o) =>
|
|
2408
|
+
matchMedia: (o) => new Ie(n, o),
|
|
2409
|
+
customEase: Ve.create,
|
|
2410
|
+
customBounce: je.create,
|
|
2411
|
+
customWiggle: qe.create,
|
|
2412
|
+
pageTransition: (o) => ir(i, n, (s) => new P(n, s), o),
|
|
2404
2413
|
imageSequence: (o, s) => {
|
|
2405
2414
|
const c = typeof o == "string" ? (n.collector?.scope ?? n.root).querySelector(o) : o;
|
|
2406
2415
|
if (!(c instanceof HTMLCanvasElement)) throw new Error(`gsap-compat: imageSequence needs a <canvas>, got ${String(o)}`);
|
|
2407
|
-
return r(new
|
|
2416
|
+
return r(new Ne(c, s));
|
|
2408
2417
|
},
|
|
2409
2418
|
quickTo: (o, s, c = {}) => {
|
|
2410
2419
|
const a = new P(n, { paused: !0 }), [l] = n.resolveTargets(o);
|
|
@@ -2415,7 +2424,7 @@ function sr(n = new tr()) {
|
|
|
2415
2424
|
[s]: f,
|
|
2416
2425
|
duration: c.duration ?? 0.4,
|
|
2417
2426
|
ease: c.ease ?? "power3.out",
|
|
2418
|
-
...c.spring !== void 0 && { spring:
|
|
2427
|
+
...c.spring !== void 0 && { spring: cr(c.spring, s, u) }
|
|
2419
2428
|
}), a.timeline.stop(), a.timeline.play(), n.activate(a.timeline);
|
|
2420
2429
|
}, { tween: a, kill: () => a.kill() });
|
|
2421
2430
|
},
|
|
@@ -2441,12 +2450,12 @@ function sr(n = new tr()) {
|
|
|
2441
2450
|
const c = n.resolveTargets(o), a = typeof s == "string" ? s.split(",").map((l) => l.trim()).filter(Boolean) : s;
|
|
2442
2451
|
for (const l of [...n.liveTimelines]) l.killTweensOf(c, a);
|
|
2443
2452
|
},
|
|
2444
|
-
convertToPath: (o) =>
|
|
2453
|
+
convertToPath: (o) => Me(o, n.root),
|
|
2445
2454
|
splitText: (o, s) => {
|
|
2446
2455
|
const c = n.collector?.scope ?? n.root, a = typeof o == "string" ? Array.from(c.querySelectorAll(o)) : "nodeType" in o ? [o] : Array.from(o);
|
|
2447
|
-
return r(
|
|
2456
|
+
return r(Ee(a, s));
|
|
2448
2457
|
},
|
|
2449
|
-
draggable: (o, s) => r(
|
|
2458
|
+
draggable: (o, s) => r(Ue(i, n, o, s)),
|
|
2450
2459
|
getFlipState: (o) => Q(n, o),
|
|
2451
2460
|
flipFrom: (o, s) => tt(n, (c) => new P(n, c), o, s),
|
|
2452
2461
|
flip: (o, s, c) => {
|
|
@@ -2456,11 +2465,11 @@ function sr(n = new tr()) {
|
|
|
2456
2465
|
};
|
|
2457
2466
|
return i;
|
|
2458
2467
|
}
|
|
2459
|
-
const
|
|
2460
|
-
function
|
|
2468
|
+
const xr = /* @__PURE__ */ ar();
|
|
2469
|
+
function cr(n, t, e) {
|
|
2461
2470
|
return n === !0 ? { velocity: { [t]: e } } : typeof n == "string" ? { preset: n, velocity: { [t]: e } } : { ...n, velocity: { [t]: e } };
|
|
2462
2471
|
}
|
|
2463
|
-
function
|
|
2472
|
+
function lr(n) {
|
|
2464
2473
|
return n.morphSVG !== void 0 || n.drawSVG !== void 0 || n.text !== void 0 || n.scrambleText !== void 0 || Nt(n);
|
|
2465
2474
|
}
|
|
2466
2475
|
function Nt(n) {
|
|
@@ -2488,14 +2497,14 @@ function xt(n) {
|
|
|
2488
2497
|
if (typeof t?.getTotalLength == "function")
|
|
2489
2498
|
return t.getTotalLength();
|
|
2490
2499
|
}
|
|
2491
|
-
function
|
|
2500
|
+
function hr(n) {
|
|
2492
2501
|
if (typeof n == "number" || typeof n == "string" || Array.isArray(n) && n.every((t) => typeof t == "number")) return n;
|
|
2493
2502
|
}
|
|
2494
|
-
function
|
|
2503
|
+
function ur(n) {
|
|
2495
2504
|
return typeof n == "string" ? `"${n}"` : String(n);
|
|
2496
2505
|
}
|
|
2497
|
-
const
|
|
2498
|
-
timeline:
|
|
2506
|
+
const Sr = {
|
|
2507
|
+
timeline: Te,
|
|
2499
2508
|
to(n, t, e) {
|
|
2500
2509
|
const r = new O(e);
|
|
2501
2510
|
return r.to(n, t), r;
|
|
@@ -2515,66 +2524,67 @@ const xr = {
|
|
|
2515
2524
|
};
|
|
2516
2525
|
export {
|
|
2517
2526
|
O as CompatTimeline,
|
|
2518
|
-
|
|
2519
|
-
|
|
2520
|
-
|
|
2521
|
-
|
|
2522
|
-
|
|
2523
|
-
|
|
2527
|
+
je as CustomBounce,
|
|
2528
|
+
Ve as CustomEase,
|
|
2529
|
+
qe as CustomWiggle,
|
|
2530
|
+
Ne as ImageSequence,
|
|
2531
|
+
$t as LiveContext,
|
|
2532
|
+
Ie as LiveMatchMedia,
|
|
2524
2533
|
P as LiveTimeline,
|
|
2525
|
-
ce as
|
|
2534
|
+
ce as PROPERTY_ALIASES,
|
|
2535
|
+
le as PROPERTY_DEFAULTS,
|
|
2526
2536
|
nt as RESERVED_KEYS,
|
|
2527
|
-
|
|
2528
|
-
|
|
2529
|
-
|
|
2530
|
-
|
|
2531
|
-
|
|
2532
|
-
|
|
2533
|
-
|
|
2534
|
-
|
|
2535
|
-
|
|
2536
|
-
|
|
2537
|
-
|
|
2537
|
+
er as Stage,
|
|
2538
|
+
Ar as backOut,
|
|
2539
|
+
wr as bounceIn,
|
|
2540
|
+
br as bounceInOut,
|
|
2541
|
+
Cr as bounceOut,
|
|
2542
|
+
be as compileInertiaProperty,
|
|
2543
|
+
he as compileMotionPath,
|
|
2544
|
+
we as compileTextVars,
|
|
2545
|
+
Me as convertToPath,
|
|
2546
|
+
ar as createLive,
|
|
2547
|
+
Ue as createLiveDraggable,
|
|
2538
2548
|
it as createScrollTrigger,
|
|
2539
2549
|
re as createUtils,
|
|
2540
2550
|
Rt as defaultFor,
|
|
2541
|
-
|
|
2542
|
-
|
|
2543
|
-
|
|
2544
|
-
|
|
2545
|
-
|
|
2546
|
-
|
|
2547
|
-
|
|
2548
|
-
|
|
2551
|
+
fe as desugarMorph,
|
|
2552
|
+
de as drawSegment,
|
|
2553
|
+
pe as drawSvgProperties,
|
|
2554
|
+
kr as easeRequiresBaking,
|
|
2555
|
+
yr as elasticIn,
|
|
2556
|
+
gr as elasticInOut,
|
|
2557
|
+
Rr as elasticOut,
|
|
2558
|
+
Je as expandKeyframes,
|
|
2549
2559
|
tt as flipFrom,
|
|
2550
2560
|
Q as getFlipState,
|
|
2551
2561
|
ae as gridOffsets,
|
|
2552
2562
|
Ct as isRandomString,
|
|
2553
|
-
|
|
2563
|
+
xr as live,
|
|
2554
2564
|
V as mapEase,
|
|
2555
2565
|
Ft as morphShapeOf,
|
|
2556
2566
|
ee as normaliseEaseName,
|
|
2557
|
-
|
|
2558
|
-
|
|
2559
|
-
|
|
2567
|
+
Lt as pathDataOf,
|
|
2568
|
+
Fr as playheadCrossings,
|
|
2569
|
+
Tr as quickPlay,
|
|
2560
2570
|
rt as registerEase,
|
|
2561
|
-
|
|
2571
|
+
ye as rejectUnresolvedDrawSvg,
|
|
2562
2572
|
ot as resistanceToFriction,
|
|
2563
|
-
|
|
2564
|
-
|
|
2573
|
+
me as resolveDrawSvg,
|
|
2574
|
+
Xe as resolveLiveMotionPath,
|
|
2565
2575
|
I as resolvePosition,
|
|
2566
|
-
|
|
2567
|
-
|
|
2576
|
+
ue as reverseMotionPath,
|
|
2577
|
+
Qe as scrollBatch,
|
|
2568
2578
|
bt as scrollTo,
|
|
2569
2579
|
K as seededRandom,
|
|
2570
|
-
|
|
2580
|
+
Ee as splitText,
|
|
2571
2581
|
B as splitVars,
|
|
2572
|
-
|
|
2573
|
-
|
|
2574
|
-
|
|
2575
|
-
|
|
2576
|
-
|
|
2577
|
-
|
|
2582
|
+
ve as springParameters,
|
|
2583
|
+
ke as springVelocity,
|
|
2584
|
+
vr as steps,
|
|
2585
|
+
Pr as stepsEasing,
|
|
2586
|
+
Sr as tf,
|
|
2587
|
+
Te as timeline,
|
|
2578
2588
|
U as toMs,
|
|
2579
2589
|
Z as toStaggerConfig
|
|
2580
2590
|
};
|