sticky-scroll-trigger 0.9.0 → 0.10.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.
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  * @license
3
- * StickyScrollTrigger v0.9.0
3
+ * StickyScrollTrigger v0.10.0
4
4
  * Copyright (c) 2026 Kuninori Ogino
5
5
  * Released under the MIT License
6
6
  * https://github.com/kuninori-ogino/sticky-scroll-trigger
@@ -48,10 +48,26 @@ var StickyScrollTrigger = (function() {
48
48
  probe.remove();
49
49
  return height;
50
50
  };
51
- const measureDocumentMaxScroll = (viewportHeight) => {
52
- const doc = document.documentElement;
53
- return Math.max(0, (doc.scrollHeight || document.body.scrollHeight) - viewportHeight);
51
+ const measureDocumentHeight = () => document.documentElement.scrollHeight || document.body.scrollHeight;
52
+ const pinRanges = new Set();
53
+ const measureDocumentHeightWithoutPinRanges = () => {
54
+ pinRanges.forEach((inner) => {
55
+ if (!inner.isConnected) pinRanges.delete(inner);
56
+ });
57
+ const saved = [...pinRanges].map((inner) => ({
58
+ inner,
59
+ height: inner.style.height
60
+ }));
61
+ saved.forEach(({ inner }) => {
62
+ inner.style.height = "";
63
+ });
64
+ const height = measureDocumentHeight();
65
+ saved.forEach(({ inner, height: range }) => {
66
+ inner.style.height = range;
67
+ });
68
+ return height;
54
69
  };
70
+ const measureDocumentMaxScroll = (viewportHeight) => Math.max(0, measureDocumentHeight() - viewportHeight);
55
71
  const measureBorderWidth = (borderStyle, width) => borderStyle === "none" || borderStyle === "hidden" ? 0 : parseFloat(width);
56
72
  const measureUsedHeight = (el) => {
57
73
  const rounded = el.offsetHeight;
@@ -122,10 +138,11 @@ var StickyScrollTrigger = (function() {
122
138
  if (!trigger.parentNode) throw new Error(`createStickyPin: trigger ${describeElement(trigger)} is not attached to the document`);
123
139
  const outer = document.createElement("div");
124
140
  const inner = document.createElement("div");
125
- outer.style.contain = "layout";
141
+ outer.style.display = "flow-root";
126
142
  trigger.parentNode.insertBefore(outer, trigger);
127
143
  outer.appendChild(inner);
128
144
  inner.appendChild(trigger);
145
+ pinRanges.add(inner);
129
146
  return {
130
147
  outer,
131
148
  inner
@@ -135,6 +152,7 @@ var StickyScrollTrigger = (function() {
135
152
  const parent = outer.parentNode;
136
153
  restoreInlinePosition(trigger, saved);
137
154
  if (parent) parent.insertBefore(trigger, outer);
155
+ if (outer.firstElementChild instanceof HTMLElement) pinRanges.delete(outer.firstElementChild);
138
156
  outer.remove();
139
157
  };
140
158
  const LIFT_VALUES = {
@@ -178,6 +196,417 @@ var StickyScrollTrigger = (function() {
178
196
  lifted.length = 0;
179
197
  };
180
198
  };
199
+ const resolveMaybeFn = (value) => typeof value === "function" ? value() : value;
200
+ const KEYWORD_FRACTIONS = {
201
+ top: 0,
202
+ center: .5,
203
+ bottom: 1
204
+ };
205
+ const signedPx = (sign, value, unit, refSize) => {
206
+ const magnitude = unit === "%" ? parseFloat(value) / 100 * refSize : parseFloat(value);
207
+ return sign?.startsWith("-") ? -magnitude : magnitude;
208
+ };
209
+ const CLAUSE_TOKEN_RE = /^(top|center|bottom|[+-]?(?:\d+(?:\.\d*)?|\.\d+))?(%|px)?(?:([+-]=?)(\d+(?:\.\d*)?|\.\d+)(%|px)?)?$/;
210
+ const parseClauseToken = (token, refSize) => {
211
+ const match = CLAUSE_TOKEN_RE.exec(token);
212
+ if (!match || !match[1] && !match[3]) {
213
+ if (MAX_TOKEN_RE.test(token)) throw new Error(`StickyScrollTrigger: unsupported position clause "${token}": 'max' is GSAP's end-only keyword for the scroller's maximum scroll position.`);
214
+ throw new Error(`StickyScrollTrigger: unsupported position clause "${token}"`);
215
+ }
216
+ const [, base, baseUnit, sign, offsetValue, offsetUnit] = match;
217
+ if (base !== void 0 && sign && !sign.includes("=")) {
218
+ const suggestion = `${base}${baseUnit ?? ""}${sign}=${offsetValue}${offsetUnit ?? ""}`;
219
+ throw new Error(`StickyScrollTrigger: unsupported position clause "${token}": a signed offset needs an explicit '=' when it follows a keyword or number (GSAP needs it to tell "${base}" from the offset). Did you mean "${suggestion}"?`);
220
+ }
221
+ const isKeyword = base !== void 0 && base in KEYWORD_FRACTIONS;
222
+ const basePercent = baseUnit === "%";
223
+ return {
224
+ fraction: isKeyword ? KEYWORD_FRACTIONS[base] : basePercent ? parseFloat(base) / 100 : 0,
225
+ offsetPx: (!isKeyword && !basePercent && base !== void 0 ? parseFloat(base) : 0) + (sign ? signedPx(sign, offsetValue, offsetUnit, refSize) : 0)
226
+ };
227
+ };
228
+ const isAbsoluteFormat = (resolved) => {
229
+ if (typeof resolved === "number") return true;
230
+ return resolved.trim() !== "" && !Number.isNaN(Number(resolved));
231
+ };
232
+ const resolveAbsolute = (resolved) => typeof resolved === "number" ? resolved : Number(resolved);
233
+ const CLAMP_PREFIX = "clamp(";
234
+ const assertNotClamped = (trimmed) => {
235
+ if (!trimmed.startsWith(CLAMP_PREFIX)) return;
236
+ const inner = trimmed.slice(6).replace(/\)$/, "").trim();
237
+ throw new Error(`StickyScrollTrigger: unsupported position clause "${trimmed}": GSAP's clamp() wrapper isn't supported here.` + (inner ? ` Did you mean "${inner}"?` : ""));
238
+ };
239
+ const resolveElementAnchor = (position, elementHeight) => {
240
+ const trimmed = position.trim();
241
+ assertNotClamped(trimmed);
242
+ const elementClause = parseClauseToken(trimmed.split(/\s+/)[0], elementHeight);
243
+ return elementHeight * elementClause.fraction + elementClause.offsetPx;
244
+ };
245
+ const resolveElementFraction = (position) => resolveElementAnchor(position, 1) - resolveElementAnchor(position, 0);
246
+ const resolveAnchorTop = (position, elementHeight, viewportHeight) => {
247
+ const trimmed = position.trim();
248
+ assertNotClamped(trimmed);
249
+ const viewportToken = trimmed.split(/\s+/)[1] ?? "top";
250
+ const viewportClause = parseClauseToken(viewportToken, viewportHeight);
251
+ return viewportHeight * viewportClause.fraction + viewportClause.offsetPx - resolveElementAnchor(trimmed, elementHeight);
252
+ };
253
+ const DWELL_RELATIVE_RE = /^\+=(\d+(?:\.\d*)?|\.\d+)(%|px)?$/;
254
+ const isDwellFormat = (resolved) => typeof resolved === "string" && DWELL_RELATIVE_RE.test(resolved.trim());
255
+ const prefixSpacedRelativeEnd = (start, endResolved) => {
256
+ if (typeof endResolved !== "string") return endResolved;
257
+ const trimmedEnd = endResolved.trim();
258
+ if (!trimmedEnd.startsWith("+=") || !/\s/.test(trimmedEnd)) return endResolved;
259
+ const startResolved = resolveMaybeFn(start);
260
+ if (typeof startResolved !== "string") return endResolved;
261
+ const trimmedStart = startResolved.trim();
262
+ assertNotClamped(trimmedStart);
263
+ const [elementToken] = trimmedStart.split(/\s+/);
264
+ try {
265
+ parseClauseToken(elementToken, 0);
266
+ } catch (error) {
267
+ if (!isAbsoluteFormat(startResolved)) throw error;
268
+ return endResolved;
269
+ }
270
+ parseClauseToken(trimmedEnd.split(/\s+/)[0], 0);
271
+ if (elementToken.includes("=")) throw new Error(`StickyScrollTrigger: end "${endResolved}" can't be resolved against start "${startResolved}": GSAP reads an end that starts with '+=' and holds a space by prefixing it with the start clause's element token, and "${elementToken}" carries an offset of its own, which GSAP resolves by discarding the end's. Give end a complete position clause instead, such as 'top+=100 bottom'.`);
272
+ return elementToken + trimmedEnd;
273
+ };
274
+ const resolveDwell = (resolved, viewportHeight) => {
275
+ const match = DWELL_RELATIVE_RE.exec(String(resolved).trim());
276
+ if (!match) throw new Error(`StickyScrollTrigger: unsupported end format "${resolved}"`);
277
+ const [, value, unit] = match;
278
+ return signedPx(void 0, value, unit, viewportHeight);
279
+ };
280
+ const MAX_TOKEN_RE = /^max(?:([+-]=)(\d+(?:\.\d*)?|\.\d+)(%|px)?)?$/;
281
+ const isMaxFormat = (resolved) => typeof resolved === "string" && MAX_TOKEN_RE.test(resolved.trim());
282
+ const resolveMaxOffset = (resolved, viewportHeight) => {
283
+ const match = MAX_TOKEN_RE.exec(resolved.trim());
284
+ if (!match) throw new Error(`StickyScrollTrigger: unsupported max-position format "${resolved}"`);
285
+ const [, sign, value, unit] = match;
286
+ return sign ? signedPx(sign, value, unit, viewportHeight) : 0;
287
+ };
288
+ const classifyPosition = (resolved) => {
289
+ if (typeof resolved === "number") return {
290
+ kind: "absolute",
291
+ value: resolved
292
+ };
293
+ if (isDwellFormat(resolved)) return {
294
+ kind: "dwell",
295
+ value: resolved
296
+ };
297
+ if (isMaxFormat(resolved)) return {
298
+ kind: "max",
299
+ value: resolved
300
+ };
301
+ if (isAbsoluteFormat(resolved)) return {
302
+ kind: "absolute",
303
+ value: resolveAbsolute(resolved)
304
+ };
305
+ return {
306
+ kind: "clause",
307
+ value: resolved
308
+ };
309
+ };
310
+ const isHeldIn = (measurements, index, enclosedBy, anchorElement, order) => measurements[index].triggerEnclosedBy.some((m) => m !== index && measurements[m].kind === "scene" && order.isBefore(m, index) && !(enclosedBy.includes(m) && m !== anchorElement));
311
+ const nestedIn = (measurements, index) => measurements.flatMap(({ triggerEnclosedBy }, k) => k !== index && triggerEnclosedBy.includes(index) ? [k] : []);
312
+ const anchorShare = (measurements, windows, index, freezeStart, box, reachedAt, enclosedBy, anchorElement, order, ownIndex) => {
313
+ const measurement = measurements[index];
314
+ if (enclosedBy.includes(index)) return (measurement.start.mode === "absolute" ? freezeStart - windows.reduce((earlier, other) => other.index !== index && other.index !== ownIndex && !(order && order.isBefore(ownIndex, other.index)) && other.freezeEnd <= freezeStart + .05 ? earlier + other.freezeEnd - other.freezeStart : earlier, 0) : measurement.triggerTop - measurement.start.anchorOffset) < reachedAt - .05 ? 1 : 0;
315
+ if (order && isHeldIn(measurements, index, enclosedBy, anchorElement, order)) return 0;
316
+ if (box.nests.includes(index)) return box.fraction;
317
+ return measurement.triggerTop + measurement.triggerHeight <= box.top + .05 ? 1 : 0;
318
+ };
319
+ const gapsBeforeEndAnchor = (measurements, windows, box, reachedAt, enclosedBy, ownIndex, anchorElement, order, counted) => windows.reduce((total, { index, freezeStart, freezeEnd }) => {
320
+ if (index === ownIndex || order && order.isBefore(ownIndex, index)) return total;
321
+ const weight = anchorShare(measurements, windows, index, freezeStart, box, reachedAt, enclosedBy, anchorElement, order, ownIndex);
322
+ if (weight === 0) return total;
323
+ counted?.add(index);
324
+ return total + weight * (freezeEnd - freezeStart);
325
+ }, 0);
326
+ const clauseFreezeStart = (measurements, index, paddingOf) => {
327
+ const reachOf = (k) => {
328
+ const { start, triggerTop } = measurements[k];
329
+ return start.mode === "clause" ? triggerTop - start.anchorOffset : null;
330
+ };
331
+ const scenes = measurements.flatMap(({ kind }, k) => kind === "scene" ? [k] : []);
332
+ const clauses = scenes.filter((k) => reachOf(k) !== null).sort((a, b) => {
333
+ const gap = reachOf(a) - reachOf(b);
334
+ return Math.abs(gap) <= .05 ? a - b : gap;
335
+ });
336
+ const absolutes = scenes.flatMap((k) => {
337
+ const { start } = measurements[k];
338
+ return start.mode === "absolute" ? [{
339
+ k,
340
+ value: start.value
341
+ }] : [];
342
+ }).sort((a, b) => a.value - b.value);
343
+ let dwell = 0;
344
+ let nextAbsolute = 0;
345
+ for (const k of clauses) {
346
+ const reachedAt = reachOf(k);
347
+ while (nextAbsolute < absolutes.length && absolutes[nextAbsolute].value < reachedAt + dwell + .05) {
348
+ dwell += paddingOf(absolutes[nextAbsolute].k);
349
+ nextAbsolute += 1;
350
+ }
351
+ if (k === index) return reachedAt + dwell;
352
+ dwell += paddingOf(k);
353
+ }
354
+ throw new Error("StickyScrollTrigger: internal error: clauseFreezeStart was given a layer without a clause start.");
355
+ };
356
+ const runPass = (measurements, { viewportHeight, measureLiveEndTriggerTop }, previous, order, record) => {
357
+ const fresh = [];
358
+ const knownWindows = () => measurements.flatMap((measurement, k) => {
359
+ if (measurement.kind !== "scene") return [];
360
+ const plan = fresh[k];
361
+ if (plan) return [{
362
+ index: k,
363
+ freezeStart: plan.freezeStart,
364
+ freezeEnd: plan.freezeEnd
365
+ }];
366
+ const freezeStart = previous?.freezeStarts[k] ?? null;
367
+ const paddingHeight = previous?.paddings[k] ?? null;
368
+ return freezeStart === null || paddingHeight === null ? [] : [{
369
+ index: k,
370
+ freezeStart,
371
+ freezeEnd: freezeStart + paddingHeight
372
+ }];
373
+ });
374
+ const paddingOf = (k) => fresh[k]?.paddingHeight ?? previous?.paddings[k] ?? 0;
375
+ const recounts = [];
376
+ const plans = measurements.map((measurement, index) => {
377
+ fresh[index] = null;
378
+ if (measurement.kind === "cover") return null;
379
+ const recount = {
380
+ index,
381
+ counted: new Set(),
382
+ runs: []
383
+ };
384
+ recounts.push(recount);
385
+ const { start } = measurement;
386
+ const freezeStart = start.mode === "absolute" ? start.value : clauseFreezeStart(measurements, index, paddingOf);
387
+ let freezeEnd;
388
+ switch (measurement.end.mode) {
389
+ case "dwell":
390
+ freezeEnd = freezeStart + measurement.end.distancePx;
391
+ break;
392
+ case "absolute":
393
+ freezeEnd = Math.max(freezeStart, measurement.end.value);
394
+ break;
395
+ case "auto":
396
+ case "max": throw new Error(`StickyScrollTrigger: internal error: a Scene layer reached '${measurement.end.mode}' end mode, which only a cover layer can have.`);
397
+ case "clause": {
398
+ const anchorOffsetEnd = resolveAnchorTop(measurement.end.clause, measurement.endTriggerHeight, viewportHeight);
399
+ if (measurement.endTriggerIsSelf) {
400
+ const nests = nestedIn(measurements, index);
401
+ const weight = resolveElementFraction(measurement.end.clause) - (start.mode === "clause" ? start.elementFraction : 0);
402
+ const dwellInside = measurements.reduce((total, other, k) => {
403
+ if (weight === 0 || other.kind !== "scene" || !nests.includes(k) || order && (order.isBefore(index, k) || isHeldIn(measurements, k, measurement.triggerEnclosedBy, index, order))) return total;
404
+ recount.counted.add(k);
405
+ return total + weight * paddingOf(k);
406
+ }, 0);
407
+ if (start.mode === "clause") {
408
+ freezeEnd = freezeStart + Math.max(0, start.anchorOffset - anchorOffsetEnd + dwellInside);
409
+ break;
410
+ }
411
+ const dwellAbove = measurements.reduce((total, other, k) => {
412
+ if (k === index || other.kind !== "scene" || nests.includes(k) || other.triggerTop + other.triggerHeight > measurement.triggerTop + .05 || order && (order.isBefore(index, k) || isHeldIn(measurements, k, measurement.triggerEnclosedBy, index, order))) return total;
413
+ recount.counted.add(k);
414
+ return total + paddingOf(k);
415
+ }, 0);
416
+ freezeEnd = Math.max(freezeStart, measurement.triggerTop - anchorOffsetEnd + dwellAbove + dwellInside);
417
+ break;
418
+ }
419
+ let endTop;
420
+ if (measurement.end.measureLive) endTop = measureLiveEndTriggerTop(index);
421
+ else {
422
+ const rawTop = measurement.endTriggerIndex === null ? measurement.end.rawTop : measurements[measurement.endTriggerIndex].triggerTop;
423
+ if (rawTop === null) endTop = 0;
424
+ else {
425
+ const box = {
426
+ top: rawTop,
427
+ fraction: resolveElementFraction(measurement.end.clause),
428
+ nests: measurement.endTriggerNests
429
+ };
430
+ const gaps = (w, counted) => gapsBeforeEndAnchor(measurements, w, box, rawTop - anchorOffsetEnd, measurement.endTriggerEnclosedBy, index, measurement.endTriggerIndex, order, counted);
431
+ endTop = rawTop + gaps(knownWindows());
432
+ recount.runs.push((w) => gaps(w, recount.counted));
433
+ }
434
+ }
435
+ let layoutStart;
436
+ if (start.mode === "absolute") layoutStart = start.value;
437
+ else {
438
+ const gaps = (w, counted) => gapsBeforeEndAnchor(measurements, w, {
439
+ top: measurement.triggerTop,
440
+ fraction: start.elementFraction,
441
+ nests: nestedIn(measurements, index)
442
+ }, measurement.triggerTop - start.anchorOffset, measurement.triggerEnclosedBy, index, index, order, counted);
443
+ layoutStart = measurement.triggerTop - start.anchorOffset + gaps(knownWindows());
444
+ recount.runs.push((w) => gaps(w, recount.counted));
445
+ }
446
+ freezeEnd = freezeStart + Math.max(0, endTop - anchorOffsetEnd - layoutStart);
447
+ break;
448
+ }
449
+ }
450
+ const paddingHeight = Math.max(0, freezeEnd - freezeStart);
451
+ const plan = {
452
+ freezeStart,
453
+ freezeEnd,
454
+ stickyTop: 0,
455
+ paddingHeight
456
+ };
457
+ fresh[index] = plan;
458
+ return plan;
459
+ });
460
+ if (record) {
461
+ const windows = knownWindows();
462
+ recounts.forEach(({ index, counted, runs }) => {
463
+ runs.forEach((run) => run(windows));
464
+ record(index, counted);
465
+ });
466
+ }
467
+ return plans;
468
+ };
469
+ const planCover = (measurements, index, windows, { viewportHeight, documentMaxScroll, measureLiveEndTriggerTop }) => {
470
+ const measurement = measurements[index];
471
+ if (measurement.start.mode !== "clause") throw new Error("StickyScrollTrigger: internal error: a cover layer measurement carries an absolute start, which resolveStartSpec should have already rejected.");
472
+ const reached = (reachedAt) => reachedAt + dwellBeforeReach(reachedAt, windows);
473
+ const startReachedAt = measurement.triggerTop - measurement.start.anchorOffset;
474
+ const freezeStart = startReachedAt + dwellBeforeReach(startReachedAt, windows, { countTies: true });
475
+ let freezeEnd;
476
+ switch (measurement.end.mode) {
477
+ case "auto":
478
+ freezeEnd = reached(measurement.coverTop);
479
+ break;
480
+ case "dwell":
481
+ freezeEnd = freezeStart + measurement.end.distancePx;
482
+ break;
483
+ case "absolute":
484
+ freezeEnd = measurement.end.value;
485
+ break;
486
+ case "max":
487
+ freezeEnd = documentMaxScroll + measurement.end.offsetPx;
488
+ break;
489
+ case "clause": {
490
+ const anchorOffsetEnd = resolveAnchorTop(measurement.end.clause, measurement.endTriggerHeight, viewportHeight);
491
+ if (measurement.end.measureLive) freezeEnd = measureLiveEndTriggerTop(index) - anchorOffsetEnd;
492
+ else freezeEnd = reached((measurement.endTriggerIsSelf ? measurement.triggerTop : measurement.endTriggerIndex === null ? measurement.end.rawTop ?? 0 : measurements[measurement.endTriggerIndex].triggerTop) - anchorOffsetEnd);
493
+ break;
494
+ }
495
+ }
496
+ return {
497
+ freezeStart,
498
+ freezeEnd: Math.max(freezeStart, freezeEnd),
499
+ stickyTop: measurement.start.anchorOffset - (measurement.triggerTop - measurement.wrapperTop),
500
+ paddingHeight: null
501
+ };
502
+ };
503
+ const TIE_TOLERANCE_PX = .05;
504
+ const dwellBeforeReach = (reachedAt, windows, { countTies = false } = {}) => {
505
+ const tolerance = countTies ? -.05 : TIE_TOLERANCE_PX;
506
+ let earlierDwell = 0;
507
+ let counted = 0;
508
+ [...windows].sort((a, b) => a.freezeStart - b.freezeStart).forEach(({ freezeStart, freezeEnd }) => {
509
+ if (freezeStart < reachedAt + earlierDwell - tolerance) counted += freezeEnd - freezeStart;
510
+ earlierDwell += freezeEnd - freezeStart;
511
+ });
512
+ return counted;
513
+ };
514
+ const dwellConsumedAt = (scroll, windows) => windows.reduce((consumed, { freezeStart, freezeEnd }) => consumed + Math.min(Math.max(scroll - freezeStart, 0), freezeEnd - freezeStart), 0);
515
+ const componentsOf = (edges) => {
516
+ const visitOrder = edges.map(() => -1);
517
+ const lowLink = edges.map(() => 0);
518
+ const component = edges.map(() => -1);
519
+ const stack = [];
520
+ let visited = 0;
521
+ let components = 0;
522
+ const visit = (v) => {
523
+ visitOrder[v] = visited;
524
+ lowLink[v] = visited;
525
+ visited += 1;
526
+ stack.push(v);
527
+ for (const w of edges[v]) if (visitOrder[w] === -1) {
528
+ visit(w);
529
+ lowLink[v] = Math.min(lowLink[v], lowLink[w]);
530
+ } else if (component[w] === -1) lowLink[v] = Math.min(lowLink[v], visitOrder[w]);
531
+ if (lowLink[v] === visitOrder[v]) {
532
+ let w;
533
+ do {
534
+ w = stack.pop();
535
+ component[w] = components;
536
+ } while (w !== v);
537
+ components += 1;
538
+ }
539
+ };
540
+ edges.forEach((_, v) => {
541
+ if (visitOrder[v] === -1) visit(v);
542
+ });
543
+ return component;
544
+ };
545
+ const fallbackOrder = (measurements, counted) => {
546
+ const component = componentsOf(measurements.map(({ triggerEnclosedBy }, i) => [...counted[i], ...triggerEnclosedBy.filter((m) => m !== i && measurements[m].kind === "scene")]));
547
+ const rank = [];
548
+ measurements.map((_, i) => i).sort((a, b) => component[a] - component[b] || a - b).forEach((layer, position) => {
549
+ rank[layer] = position;
550
+ });
551
+ return { isBefore: (a, b) => rank[a] < rank[b] };
552
+ };
553
+ const planLayers = (measurements, deps) => {
554
+ const needsConvergence = measurements.filter(({ kind }) => kind === "scene").length > 1;
555
+ const liveTopCache = new Map();
556
+ const passDeps = {
557
+ ...deps,
558
+ measureLiveEndTriggerTop: (index) => {
559
+ const cached = liveTopCache.get(index);
560
+ if (cached !== void 0) return cached;
561
+ const value = deps.measureLiveEndTriggerTop(index);
562
+ liveTopCache.set(index, value);
563
+ return value;
564
+ }
565
+ };
566
+ const stateOf = (passPlans) => ({
567
+ paddings: passPlans.map((plan) => plan?.paddingHeight ?? null),
568
+ freezeStarts: passPlans.map((plan) => plan?.freezeStart ?? null)
569
+ });
570
+ const sameValues = (a, b) => a.every((value, i) => value === b[i] || value !== null && b[i] !== null && Math.abs(value - b[i]) <= .05);
571
+ const sameState = (a, b) => sameValues(a.paddings, b.paddings) && sameValues(a.freezeStarts, b.freezeStarts);
572
+ const average = (a, b) => a.map((value, i) => value === null ? null : (value + b[i]) / 2);
573
+ const settle = (order, record) => {
574
+ let plans = runPass(measurements, passDeps, null, order, record);
575
+ if (!needsConvergence) return plans;
576
+ const budget = order === null ? Math.max(64, 2 * measurements.length + 2) : 2 * measurements.length + 2;
577
+ let fed = stateOf(plans);
578
+ let fedBefore = null;
579
+ for (let pass = 0; pass < budget; pass += 1) {
580
+ plans = runPass(measurements, passDeps, fed, order, record);
581
+ const out = stateOf(plans);
582
+ if (sameState(out, fed)) return plans;
583
+ const flipped = fedBefore !== null && sameState(out, fedBefore);
584
+ fedBefore = fed;
585
+ fed = flipped ? {
586
+ paddings: average(out.paddings, fed.paddings),
587
+ freezeStarts: average(out.freezeStarts, fed.freezeStarts)
588
+ } : out;
589
+ }
590
+ return null;
591
+ };
592
+ const counted = measurements.map(() => new Set());
593
+ let settled = settle(null, (index, layers) => layers.forEach((k) => counted[index].add(k)));
594
+ if (settled === null) settled = settle(fallbackOrder(measurements, counted), null);
595
+ if (settled === null) throw new Error("StickyScrollTrigger: could not resolve endTrigger positions: some endTrigger references form a circular structural dependency that never settles. Point each endTrigger at an element that doesn't depend on it.");
596
+ const plans = settled;
597
+ const withTops = plans.map((plan, index) => {
598
+ if (plan === null) return null;
599
+ const outerDwell = plans.reduce((total, outer, k) => k > index && outer !== null && outer.freezeEnd <= plan.freezeStart + .05 ? total + outer.paddingHeight : total, 0);
600
+ return {
601
+ ...plan,
602
+ stickyTop: deps.structureTop - (plan.freezeStart - outerDwell)
603
+ };
604
+ });
605
+ const windows = withTops.filter((plan) => plan !== null);
606
+ const finalPlans = withTops.map((plan, index) => plan ?? planCover(measurements, index, windows, passDeps));
607
+ finalPlans.forEach((plan, index) => deps.onPlanned(index, plan));
608
+ return finalPlans;
609
+ };
181
610
  const OFFSET_PROPERTY = "--sst-scroll-margin-top-offset";
182
611
  let nextInstanceSuffix = 0;
183
612
  const supportsScrollDrivenAnimations = typeof CSS !== "undefined" && typeof CSS.supports === "function" && CSS.supports("animation-timeline", "scroll()");
@@ -232,8 +661,8 @@ var StickyScrollTrigger = (function() {
232
661
  jsHost = null;
233
662
  };
234
663
  return {
235
- sync(scenes, host) {
236
- const ramps = scenes.filter((scene) => scene.freezeEnd > scene.freezeStart);
664
+ sync(scenes, host, measureNaturalTops) {
665
+ const ramps = scenes.filter((scene) => scene.freezeEnd > scene.freezeStart).sort((a, b) => a.freezeStart - b.freezeStart);
237
666
  if (targetSelector === null || !ramps.length || !host) {
238
667
  written.forEach(restoreTarget);
239
668
  written = new Set();
@@ -257,20 +686,22 @@ var StickyScrollTrigger = (function() {
257
686
  sheet.replaceSync(buildStylesheet(instanceId, ramps));
258
687
  }
259
688
  const targets = Array.from(rootElement.querySelectorAll(targetSelector));
689
+ const naturalTops = measureNaturalTops(targets);
260
690
  targets.forEach((target) => {
261
691
  const existing = snapshots.get(target);
262
692
  if (!existing) snapshots.set(target, { inline: target.style.scrollMarginTop });
263
693
  else if (written.has(target)) target.style.scrollMarginTop = existing.inline;
264
694
  });
265
695
  const consumed = ramps.map((_, index) => `var(--${instanceId}-c${index}, 0px)`).join(" + ");
266
- targets.forEach((target) => {
696
+ targets.forEach((target, targetIndex) => {
267
697
  const authorPx = parseFloat(getComputedStyle(target).scrollMarginTop) || 0;
268
- let lag = 0;
269
- ramps.forEach((scene) => {
270
- if (compareDocumentOrder(scene.trigger, target) >= 0) return;
271
- lag += scene.freezeEnd - scene.freezeStart;
272
- });
273
- target.style.scrollMarginTop = `calc(${authorPx}px + var(${OFFSET_PROPERTY}, 0px) + ${consumed} - ${lag}px)`;
698
+ let earlierDwell = 0;
699
+ const lag = ramps.map(({ freezeStart, freezeEnd }) => {
700
+ const margin = naturalTops[targetIndex] - authorPx + earlierDwell - freezeStart - TIE_TOLERANCE_PX;
701
+ earlierDwell += freezeEnd - freezeStart;
702
+ return `clamp(0px, (${margin}px - var(${OFFSET_PROPERTY}, 0px)) * 1000000, ${freezeEnd - freezeStart}px)`;
703
+ }).join(" + ");
704
+ target.style.scrollMarginTop = `calc(${authorPx}px + var(${OFFSET_PROPERTY}, 0px) + ${consumed} - (${lag}))`;
274
705
  });
275
706
  const next = new Set(targets);
276
707
  written.forEach((target) => {
@@ -326,212 +757,6 @@ var StickyScrollTrigger = (function() {
326
757
  }
327
758
  });
328
759
  };
329
- const resolveMaybeFn = (value) => typeof value === "function" ? value() : value;
330
- const KEYWORD_FRACTIONS = {
331
- top: 0,
332
- center: .5,
333
- bottom: 1
334
- };
335
- const signedPx = (sign, value, unit, refSize) => {
336
- const magnitude = unit === "%" ? parseFloat(value) / 100 * refSize : parseFloat(value);
337
- return sign?.startsWith("-") ? -magnitude : magnitude;
338
- };
339
- const CLAUSE_TOKEN_RE = /^(top|center|bottom|[+-]?(?:\d+(?:\.\d*)?|\.\d+))?(%|px)?(?:([+-]=?)(\d+(?:\.\d*)?|\.\d+)(%|px)?)?$/;
340
- const parseClauseToken = (token, refSize) => {
341
- const match = CLAUSE_TOKEN_RE.exec(token);
342
- if (!match || !match[1] && !match[3]) {
343
- if (MAX_TOKEN_RE.test(token)) throw new Error(`StickyScrollTrigger: unsupported position clause "${token}": 'max' is GSAP's end-only keyword for the scroller's maximum scroll position.`);
344
- throw new Error(`StickyScrollTrigger: unsupported position clause "${token}"`);
345
- }
346
- const [, base, baseUnit, sign, offsetValue, offsetUnit] = match;
347
- if (base !== void 0 && sign && !sign.includes("=")) {
348
- const suggestion = `${base}${baseUnit ?? ""}${sign}=${offsetValue}${offsetUnit ?? ""}`;
349
- throw new Error(`StickyScrollTrigger: unsupported position clause "${token}": a signed offset needs an explicit '=' when it follows a keyword or number (GSAP needs it to tell "${base}" from the offset). Did you mean "${suggestion}"?`);
350
- }
351
- const isKeyword = base !== void 0 && base in KEYWORD_FRACTIONS;
352
- const basePercent = baseUnit === "%";
353
- return {
354
- fraction: isKeyword ? KEYWORD_FRACTIONS[base] : basePercent ? parseFloat(base) / 100 : 0,
355
- offsetPx: (!isKeyword && !basePercent && base !== void 0 ? parseFloat(base) : 0) + (sign ? signedPx(sign, offsetValue, offsetUnit, refSize) : 0)
356
- };
357
- };
358
- const isAbsoluteFormat = (resolved) => {
359
- if (typeof resolved === "number") return true;
360
- return resolved.trim() !== "" && !Number.isNaN(Number(resolved));
361
- };
362
- const resolveAbsolute = (resolved) => typeof resolved === "number" ? resolved : Number(resolved);
363
- const CLAMP_PREFIX = "clamp(";
364
- const assertNotClamped = (trimmed) => {
365
- if (!trimmed.startsWith(CLAMP_PREFIX)) return;
366
- const inner = trimmed.slice(6).replace(/\)$/, "").trim();
367
- throw new Error(`StickyScrollTrigger: unsupported position clause "${trimmed}": GSAP's clamp() wrapper isn't supported here.` + (inner ? ` Did you mean "${inner}"?` : ""));
368
- };
369
- const resolveAnchorTop = (position, elementHeight, viewportHeight) => {
370
- const trimmed = position.trim();
371
- assertNotClamped(trimmed);
372
- const [elementToken, viewportToken = "top"] = trimmed.split(/\s+/);
373
- const elementClause = parseClauseToken(elementToken, elementHeight);
374
- const viewportClause = parseClauseToken(viewportToken, viewportHeight);
375
- return viewportHeight * viewportClause.fraction + viewportClause.offsetPx - (elementHeight * elementClause.fraction + elementClause.offsetPx);
376
- };
377
- const DWELL_RELATIVE_RE = /^\+=(\d+(?:\.\d*)?|\.\d+)(%|px)?$/;
378
- const isDwellFormat = (resolved) => typeof resolved === "string" && DWELL_RELATIVE_RE.test(resolved.trim());
379
- const prefixSpacedRelativeEnd = (start, endResolved) => {
380
- if (typeof endResolved !== "string") return endResolved;
381
- const trimmedEnd = endResolved.trim();
382
- if (!trimmedEnd.startsWith("+=") || !/\s/.test(trimmedEnd)) return endResolved;
383
- const startResolved = resolveMaybeFn(start);
384
- if (typeof startResolved !== "string") return endResolved;
385
- const trimmedStart = startResolved.trim();
386
- assertNotClamped(trimmedStart);
387
- const [elementToken] = trimmedStart.split(/\s+/);
388
- try {
389
- parseClauseToken(elementToken, 0);
390
- } catch (error) {
391
- if (!isAbsoluteFormat(startResolved)) throw error;
392
- return endResolved;
393
- }
394
- parseClauseToken(trimmedEnd.split(/\s+/)[0], 0);
395
- if (elementToken.includes("=")) throw new Error(`StickyScrollTrigger: end "${endResolved}" can't be resolved against start "${startResolved}": GSAP reads an end that starts with '+=' and holds a space by prefixing it with the start clause's element token, and "${elementToken}" carries an offset of its own, which GSAP resolves by discarding the end's. Give end a complete position clause instead, such as 'top+=100 bottom'.`);
396
- return elementToken + trimmedEnd;
397
- };
398
- const resolveDwell = (resolved, viewportHeight) => {
399
- const match = DWELL_RELATIVE_RE.exec(String(resolved).trim());
400
- if (!match) throw new Error(`StickyScrollTrigger: unsupported end format "${resolved}"`);
401
- const [, value, unit] = match;
402
- return signedPx(void 0, value, unit, viewportHeight);
403
- };
404
- const MAX_TOKEN_RE = /^max(?:([+-]=)(\d+(?:\.\d*)?|\.\d+)(%|px)?)?$/;
405
- const isMaxFormat = (resolved) => typeof resolved === "string" && MAX_TOKEN_RE.test(resolved.trim());
406
- const resolveMaxOffset = (resolved, viewportHeight) => {
407
- const match = MAX_TOKEN_RE.exec(resolved.trim());
408
- if (!match) throw new Error(`StickyScrollTrigger: unsupported max-position format "${resolved}"`);
409
- const [, sign, value, unit] = match;
410
- return sign ? signedPx(sign, value, unit, viewportHeight) : 0;
411
- };
412
- const classifyPosition = (resolved) => {
413
- if (typeof resolved === "number") return {
414
- kind: "absolute",
415
- value: resolved
416
- };
417
- if (isDwellFormat(resolved)) return {
418
- kind: "dwell",
419
- value: resolved
420
- };
421
- if (isMaxFormat(resolved)) return {
422
- kind: "max",
423
- value: resolved
424
- };
425
- if (isAbsoluteFormat(resolved)) return {
426
- kind: "absolute",
427
- value: resolveAbsolute(resolved)
428
- };
429
- return {
430
- kind: "clause",
431
- value: resolved
432
- };
433
- };
434
- const gapsBeforeRawPosition = (measurements, paddingHeightsSoFar, previous, rawPosition, ownIndex) => {
435
- let total = 0;
436
- measurements.forEach((measurement, i) => {
437
- if (i === ownIndex || measurement.triggerTop >= rawPosition) return;
438
- const paddingHeight = paddingHeightsSoFar[i] !== void 0 ? paddingHeightsSoFar[i] : previous ? previous.paddings[i] : null;
439
- if (paddingHeight !== null && paddingHeight !== void 0) total += paddingHeight;
440
- });
441
- return total;
442
- };
443
- const runPass = (measurements, { viewportHeight, structureTop, documentMaxScroll, measureLiveEndTriggerTop }, previous) => {
444
- const naturalTops = [];
445
- const paddingHeightsSoFar = [];
446
- let precedingGaps = 0;
447
- return {
448
- plans: measurements.map((measurement, index) => {
449
- const naturalAbsoluteTop = measurement.triggerTop + precedingGaps;
450
- const freezeStart = measurement.start.mode === "absolute" ? measurement.start.value : naturalAbsoluteTop - measurement.start.anchorOffset;
451
- let freezeEnd;
452
- switch (measurement.end.mode) {
453
- case "auto":
454
- if (measurement.start.mode !== "clause") throw new Error("StickyScrollTrigger: internal error: an absolute start reached 'auto' end mode, which resolveStartSpec should have already rejected.");
455
- freezeEnd = freezeStart + Math.max(0, measurement.start.anchorOffset + (measurement.coverTop - measurement.triggerTop));
456
- break;
457
- case "dwell":
458
- freezeEnd = freezeStart + measurement.end.distancePx;
459
- break;
460
- case "absolute":
461
- freezeEnd = Math.max(freezeStart, measurement.end.value);
462
- break;
463
- case "max":
464
- freezeEnd = Math.max(freezeStart, documentMaxScroll + measurement.end.offsetPx);
465
- break;
466
- case "clause": {
467
- let endTop;
468
- if (measurement.endTriggerIsSelf) endTop = naturalAbsoluteTop;
469
- else {
470
- const known = measurement.endTriggerIndex === null ? void 0 : naturalTops[measurement.endTriggerIndex] !== void 0 ? naturalTops[measurement.endTriggerIndex] : previous ? previous.naturalTops[measurement.endTriggerIndex] : void 0;
471
- if (known !== void 0) endTop = known;
472
- else if (measurement.end.measureLive) endTop = measureLiveEndTriggerTop(index);
473
- else endTop = measurement.end.rawTop === null ? 0 : measurement.end.rawTop + gapsBeforeRawPosition(measurements, paddingHeightsSoFar, previous, measurement.end.rawTop, index);
474
- }
475
- const anchorOffsetEnd = resolveAnchorTop(measurement.end.clause, measurement.endTriggerHeight, viewportHeight);
476
- freezeEnd = Math.max(freezeStart, endTop - anchorOffsetEnd);
477
- break;
478
- }
479
- }
480
- let plan;
481
- if (measurement.kind === "cover") {
482
- if (measurement.start.mode !== "clause") throw new Error("StickyScrollTrigger: internal error: a cover layer measurement carries an absolute start, which resolveStartSpec should have already rejected.");
483
- plan = {
484
- freezeStart,
485
- freezeEnd,
486
- stickyTop: measurement.start.anchorOffset - (measurement.triggerTop - measurement.wrapperTop),
487
- paddingHeight: null
488
- };
489
- } else plan = {
490
- freezeStart,
491
- freezeEnd,
492
- stickyTop: structureTop - freezeStart,
493
- paddingHeight: Math.max(0, freezeEnd - freezeStart)
494
- };
495
- if (plan.paddingHeight !== null) precedingGaps += plan.paddingHeight;
496
- naturalTops[index] = naturalAbsoluteTop;
497
- paddingHeightsSoFar[index] = plan.paddingHeight;
498
- return plan;
499
- }),
500
- naturalTops
501
- };
502
- };
503
- const planLayers = (measurements, deps) => {
504
- const needsConvergence = measurements.some((measurement, index) => {
505
- if (measurement.end.mode !== "clause" || measurement.endTriggerIsSelf) return false;
506
- return measurement.endTriggerIndex === null ? measurement.end.rawTop !== null : measurement.endTriggerIndex >= index;
507
- });
508
- const liveTopCache = new Map();
509
- const passDeps = {
510
- ...deps,
511
- measureLiveEndTriggerTop: (index) => {
512
- const cached = liveTopCache.get(index);
513
- if (cached !== void 0) return cached;
514
- const value = deps.measureLiveEndTriggerTop(index);
515
- liveTopCache.set(index, value);
516
- return value;
517
- }
518
- };
519
- let { plans, naturalTops } = runPass(measurements, passDeps, null);
520
- if (needsConvergence) for (let pass = 0; pass < measurements.length; pass += 1) {
521
- const previous = {
522
- paddings: plans.map((plan) => plan.paddingHeight),
523
- naturalTops
524
- };
525
- const next = runPass(measurements, passDeps, previous);
526
- const stable = next.plans.every((plan, i) => plan.paddingHeight === plans[i].paddingHeight);
527
- plans = next.plans;
528
- naturalTops = next.naturalTops;
529
- if (stable) break;
530
- if (pass === measurements.length - 1) throw new Error("StickyScrollTrigger: could not resolve endTrigger positions: some endTrigger references form a circular structural dependency, each layer's end depending on a layer whose own end depends back on it. Point each endTrigger at a layer that doesn't depend on it.");
531
- }
532
- plans.forEach((plan, index) => deps.onPlanned(index, plan));
533
- return plans;
534
- };
535
760
  const resolveEndSpec = (rootElement, viewportHeight, layer, endResolved, ownIndex, endTriggerIndex) => {
536
761
  if (endResolved === null) return { mode: "auto" };
537
762
  const classified = classifyPosition(endResolved);
@@ -551,7 +776,7 @@ var StickyScrollTrigger = (function() {
551
776
  offsetPx: resolveMaxOffset(classified.value, viewportHeight)
552
777
  };
553
778
  case "clause": {
554
- if (layer.kind !== "cover" && endTriggerIndex !== null && endTriggerIndex > ownIndex) throw new Error(`StickyScrollTrigger: createStickyTrigger's trigger ${describeElement(layer.trigger)}'s endTrigger (${describeElement(layer.endTrigger)}) refers to a layer positioned later in DOM order, which isn't supported: this layer's own dwell padding pushes that one down, so the freeze window would depend on its own dwell. Point endTrigger at a layer earlier in DOM order, or use a dwell distance such as '+=500'.`);
779
+ if (layer.kind !== "cover" && endTriggerIndex !== null && endTriggerIndex > ownIndex) throw new Error(`StickyScrollTrigger: createStickyTrigger's trigger ${describeElement(layer.trigger)}'s endTrigger (${describeElement(layer.endTrigger)}) refers to a layer positioned later in DOM order, which isn't supported for createStickyTrigger. Point endTrigger at a layer earlier in DOM order, use an unregistered element at the same spot, or use a dwell distance such as '+=500'.`);
555
780
  const unregistered = endTriggerIndex === null;
556
781
  const insideRoot = rootElement.contains(layer.endTrigger);
557
782
  if (unregistered && !insideRoot && layer.kind !== "cover") throw new Error(`StickyScrollTrigger: createStickyTrigger's trigger ${describeElement(layer.trigger)} has an endTrigger (${describeElement(layer.endTrigger)}) outside the shared container: the layer's own dwell keeps pushing it away, so the freeze window never settles. Point endTrigger at an element inside the container, or use a dwell distance such as '+=500'.`);
@@ -577,7 +802,8 @@ var StickyScrollTrigger = (function() {
577
802
  case "dwell":
578
803
  case "clause": return {
579
804
  mode: "clause",
580
- anchorOffset: resolveAnchorTop(classified.value, elementHeight, viewportHeight)
805
+ anchorOffset: resolveAnchorTop(classified.value, elementHeight, viewportHeight),
806
+ elementFraction: resolveElementFraction(classified.value)
581
807
  };
582
808
  }
583
809
  };
@@ -593,12 +819,16 @@ var StickyScrollTrigger = (function() {
593
819
  kind: layer.kind,
594
820
  start,
595
821
  triggerTop: documentTop(layer.trigger),
822
+ triggerHeight: elementHeight,
823
+ triggerEnclosedBy: [...indexByTrigger].filter(([trigger]) => trigger.contains(layer.trigger)).map(([, index]) => index),
596
824
  wrapperTop: layer.wrapper ? documentTop(layer.wrapper) : 0,
597
825
  coverTop: layer.kind === "cover" ? documentTop(layer.cover) : 0,
598
826
  end,
599
827
  endTriggerIsSelf,
600
828
  endTriggerIndex,
601
- endTriggerHeight: end.mode === "clause" ? measureUsedHeight(layer.endTrigger) : 0
829
+ endTriggerHeight: end.mode === "clause" ? measureUsedHeight(layer.endTrigger) : 0,
830
+ endTriggerEnclosedBy: end.mode === "clause" && !end.measureLive && !endTriggerIsSelf ? [...indexByTrigger].filter(([trigger]) => trigger.contains(layer.endTrigger)).map(([, index]) => index) : [],
831
+ endTriggerNests: end.mode === "clause" && !end.measureLive && !endTriggerIsSelf ? [...indexByTrigger].filter(([trigger]) => trigger !== layer.endTrigger && layer.endTrigger.contains(trigger)).map(([, index]) => index) : []
602
832
  };
603
833
  };
604
834
  const EXCLUDED_VAR_KEYS = [
@@ -624,11 +854,11 @@ var StickyScrollTrigger = (function() {
624
854
  };
625
855
  return typeof top === "function" ? () => toClause(top()) : toClause(top);
626
856
  };
627
- const resolvePinReleaseTop = (endTrigger, classifiedEnd, engageTop, viewportHeight) => {
857
+ const resolvePinReleaseScroll = (endTrigger, classifiedEnd, engageScroll, viewportHeight, toScroll) => {
628
858
  switch (classifiedEnd.kind) {
629
- case "dwell": return engageTop + resolveDwell(classifiedEnd.value, viewportHeight);
859
+ case "dwell": return engageScroll + resolveDwell(classifiedEnd.value, viewportHeight);
630
860
  case "absolute": return classifiedEnd.value;
631
- case "clause": return documentTop(endTrigger) - resolveAnchorTop(classifiedEnd.value, measureUsedHeight(endTrigger), viewportHeight);
861
+ case "clause": return toScroll(endTrigger, documentTop(endTrigger) - resolveAnchorTop(classifiedEnd.value, measureUsedHeight(endTrigger), viewportHeight));
632
862
  }
633
863
  };
634
864
  const hasDuplicateTrigger = (list, trigger) => list.some((existing) => existing.trigger === trigger);
@@ -743,6 +973,24 @@ var StickyScrollTrigger = (function() {
743
973
  });
744
974
  };
745
975
  }
976
+ #resetPinStickyState() {
977
+ const snapshots = this.#pinLayers.filter((layer) => layer.inner).map(({ trigger }) => ({
978
+ trigger,
979
+ position: captureInlinePosition(trigger)
980
+ }));
981
+ snapshots.forEach(({ trigger }) => resetStickyPosition(trigger));
982
+ return () => {
983
+ snapshots.forEach(({ trigger, position }) => restoreInlinePosition(trigger, position));
984
+ };
985
+ }
986
+ #resetStickyState() {
987
+ const restoreSceneCoverStickyState = this.#resetSceneCoverStickyState();
988
+ const restorePinStickyState = this.#resetPinStickyState();
989
+ return () => {
990
+ restorePinStickyState();
991
+ restoreSceneCoverStickyState();
992
+ };
993
+ }
746
994
  #resetPinState() {
747
995
  const snapshots = this.#pinLayers.map((layer) => ({
748
996
  layer,
@@ -765,7 +1013,7 @@ var StickyScrollTrigger = (function() {
765
1013
  const restoreSceneCoverStickyState = this.#resetSceneCoverStickyState();
766
1014
  const restorePinState = this.#resetPinState();
767
1015
  try {
768
- this.#refreshPinLayers(viewportHeight);
1016
+ this.#refreshPinLayers(viewportHeight, measureDocumentHeightWithoutPinRanges());
769
1017
  } catch (error) {
770
1018
  restorePinState();
771
1019
  throw error;
@@ -773,7 +1021,7 @@ var StickyScrollTrigger = (function() {
773
1021
  restoreSceneCoverStickyState();
774
1022
  }
775
1023
  }
776
- #refreshPinLayers(viewportHeight) {
1024
+ #refreshPinLayers(viewportHeight, documentHeight) {
777
1025
  this.#pinLayers.forEach((layer) => {
778
1026
  if (!layer.inner) return;
779
1027
  const resolvedStart = resolveMaybeFn(layer.start);
@@ -782,12 +1030,16 @@ var StickyScrollTrigger = (function() {
782
1030
  if (classifiedEnd.kind === "max") throw new Error(`StickyScrollTrigger: createStickyPin's end "${resolvedEnd}" uses GSAP's 'max' keyword, which isn't supported here: the pin's own spacer height adds to the document's max scroll position, so it would depend on itself. Use a position clause against endTrigger, such as 'top top'.`);
783
1031
  const triggerTop = documentTop(layer.trigger);
784
1032
  const triggerHeight = measureUsedHeight(layer.trigger);
1033
+ const triggerMarginBottom = parseFloat(getComputedStyle(layer.trigger).marginBottom) || 0;
785
1034
  const classifiedStart = classifyPosition(resolvedStart);
786
1035
  if (classifiedStart.kind === "absolute") throw new Error(`StickyScrollTrigger: createStickyPin's start "${resolvedStart}" is an absolute scroll position (GSAP reads any bare number this way). A pin can't act on one: it engages when position:sticky engages, so start says where trigger sits in the viewport while pinned. Use the top option (top: ${resolvedStart}) for a px distance from the viewport's top edge, or a position clause such as 'top top'.`);
787
1036
  const topPx = resolveAnchorTop(classifiedStart.value, triggerHeight, viewportHeight);
788
- const height = resolvePinReleaseTop(layer.endTrigger, classifiedEnd, triggerTop - topPx, viewportHeight) - triggerTop + topPx + triggerHeight;
1037
+ const toScroll = (element, reachedAt) => this.#addDwellBeforeReach(element, reachedAt);
1038
+ const releaseScroll = resolvePinReleaseScroll(layer.endTrigger, classifiedEnd, toScroll(layer.trigger, triggerTop - topPx), viewportHeight, toScroll);
1039
+ const height = releaseScroll - (this.#rootElement.contains(layer.trigger) ? dwellConsumedAt(releaseScroll, this.#sceneLayers()) : 0) - triggerTop + topPx + triggerHeight + triggerMarginBottom;
1040
+ const room = documentHeight > 0 ? documentHeight - triggerTop : Infinity;
789
1041
  applyStickyPosition(layer.trigger, topPx);
790
- layer.inner.style.height = `${Math.max(0, height)}px`;
1042
+ layer.inner.style.height = `${Math.max(0, Math.min(height, room))}px`;
791
1043
  });
792
1044
  }
793
1045
  #refreshScenesAndCovers(viewportHeight) {
@@ -795,11 +1047,14 @@ var StickyScrollTrigger = (function() {
795
1047
  const active = this.#layers.filter((layer) => layer.wrapper !== null);
796
1048
  if (!active.length) return;
797
1049
  const restoreStickyState = this.#resetSceneCoverStickyState();
1050
+ const restorePinStickyState = this.#resetPinStickyState();
798
1051
  try {
799
1052
  this.#planLayerPositions(viewportHeight, active);
800
1053
  } catch (error) {
801
1054
  restoreStickyState();
802
1055
  throw error;
1056
+ } finally {
1057
+ restorePinStickyState();
803
1058
  }
804
1059
  }
805
1060
  #planLayerPositions(viewportHeight, active) {
@@ -861,11 +1116,16 @@ var StickyScrollTrigger = (function() {
861
1116
  });
862
1117
  }
863
1118
  #syncScrollMargins() {
864
- this.#scrollMarginSync.sync(this.#layers.filter((layer) => layer.kind === "scene").map(({ trigger, freezeStart, freezeEnd }) => ({
865
- trigger,
1119
+ this.#scrollMarginSync.sync(this.#sceneLayers().map(({ freezeStart, freezeEnd }) => ({
866
1120
  freezeStart,
867
1121
  freezeEnd
868
- })), this.#outermostContainer);
1122
+ })), this.#outermostContainer, (targets) => {
1123
+ if (!targets.length) return [];
1124
+ const restoreStickyState = this.#resetStickyState();
1125
+ const tops = targets.map((target) => documentTop(target));
1126
+ restoreStickyState();
1127
+ return tops;
1128
+ });
869
1129
  }
870
1130
  #assertNoExcludedVars(rest, context) {
871
1131
  const found = EXCLUDED_VAR_KEYS.filter((key) => key in rest);
@@ -996,23 +1256,27 @@ var StickyScrollTrigger = (function() {
996
1256
  }
997
1257
  }
998
1258
  #resolveClauseScrollPosition(element, clause, viewportHeight) {
999
- let gap = 0;
1000
- this.#layers.forEach((layer) => {
1001
- if (layer.kind !== "scene") return;
1002
- if (compareDocumentOrder(layer.trigger, element) >= 0) return;
1003
- gap += layer.freezeEnd - layer.freezeStart;
1004
- });
1005
1259
  const anchorOffset = resolveAnchorTop(clause, measureUsedHeight(element), viewportHeight);
1006
- const restoreSceneCoverStickyState = this.#resetSceneCoverStickyState();
1007
- const result = documentTop(element) + gap - anchorOffset;
1008
- restoreSceneCoverStickyState();
1009
- return result;
1260
+ const restoreStickyState = this.#resetStickyState();
1261
+ const reachedAt = documentTop(element) - anchorOffset;
1262
+ restoreStickyState();
1263
+ return this.#addDwellBeforeReach(element, reachedAt);
1264
+ }
1265
+ #addDwellBeforeReach(element, reachedAt) {
1266
+ if (!this.#rootElement.contains(element)) return reachedAt;
1267
+ return reachedAt + dwellBeforeReach(reachedAt, this.#sceneLayers());
1268
+ }
1269
+ #sceneLayers() {
1270
+ return this.#layers.filter((layer) => layer.kind === "scene");
1010
1271
  }
1011
1272
  static getScrollTop(elementInput, instances) {
1012
1273
  const element = resolveElement(elementInput, "StickyScrollTrigger.getScrollTop");
1013
1274
  const owner = instances.find((instance) => instance.#rootElement.contains(element));
1014
1275
  if (owner) return owner.resolveScrollPosition(element, "top top");
1015
- return documentTop(element);
1276
+ const restores = instances.map((instance) => instance.#resetPinStickyState());
1277
+ const top = documentTop(element);
1278
+ restores.forEach((restore) => restore());
1279
+ return top;
1016
1280
  }
1017
1281
  createResolvedTrigger({ trigger: triggerInput, start = "top bottom", end = "bottom top", endTrigger: endTriggerInput, ...rest }) {
1018
1282
  this.#assertNoExcludedVars(rest, "createResolvedTrigger");