sticky-scroll-trigger 0.16.0 → 0.17.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.16.0
3
+ * StickyScrollTrigger v0.17.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
@@ -87,8 +87,9 @@ const compareDocumentOrder = (a, b) => {
87
87
  return 0;
88
88
  };
89
89
  const resetStickyPosition = (el) => {
90
- el.style.position = "";
91
- el.style.top = "";
90
+ el.style.setProperty("position", "relative", "important");
91
+ el.style.setProperty("top", "auto", "important");
92
+ el.style.setProperty("bottom", "auto", "important");
92
93
  };
93
94
  const captureInline = (el, property) => ({
94
95
  value: el.style.getPropertyValue(property),
@@ -99,19 +100,21 @@ const restoreInline = (el, property, saved) => {
99
100
  };
100
101
  const captureInlinePosition = (el) => ({
101
102
  position: captureInline(el, "position"),
102
- top: captureInline(el, "top")
103
+ top: captureInline(el, "top"),
104
+ bottom: captureInline(el, "bottom")
103
105
  });
104
106
  const restoreInlinePosition = (el, saved) => {
105
107
  restoreInline(el, "position", saved.position);
106
108
  restoreInline(el, "top", saved.top);
109
+ restoreIfWritten(el, "bottom", saved.bottom, "auto", "important");
107
110
  };
108
- const writeInline = (el, property, value) => {
109
- el.style.setProperty(property, value);
111
+ const writeInline = (el, property, value, priority = "") => {
112
+ el.style.setProperty(property, value, priority);
110
113
  return el.style.getPropertyValue(property);
111
114
  };
112
- const restoreIfWritten = (el, property, saved, written) => {
115
+ const restoreIfWritten = (el, property, saved, written, priority = "") => {
113
116
  const { style } = el;
114
- if (style.getPropertyValue(property) !== written || style.getPropertyPriority(property)) return false;
117
+ if (style.getPropertyValue(property) !== written || style.getPropertyPriority(property) !== priority) return false;
115
118
  restoreInline(el, property, saved);
116
119
  return true;
117
120
  };
@@ -141,20 +144,72 @@ const createStructureElement = () => {
141
144
  el.style.setProperty("transition", "none", "important");
142
145
  return el;
143
146
  };
147
+ let movesUnderWay = 0;
148
+ const isMovingDom = () => movesUnderWay > 0;
149
+ const moveInto = (parent, node, before = null) => {
150
+ const target = parent;
151
+ movesUnderWay += 1;
152
+ try {
153
+ if (target.moveBefore && parent.isConnected && node.isConnected) try {
154
+ target.moveBefore(node, before);
155
+ return;
156
+ } catch {}
157
+ parent.insertBefore(node, before);
158
+ } finally {
159
+ movesUnderWay -= 1;
160
+ }
161
+ };
162
+ const transparentNodes = new WeakSet();
163
+ const isTransparent = (el, own) => transparentNodes.has(el) || own.has(el);
164
+ const logicalParent = (el, own) => {
165
+ let parent = el.parentElement;
166
+ while (parent && isTransparent(parent, own)) parent = parent.parentElement;
167
+ return parent;
168
+ };
169
+ const firstLogicalAt = (el, own) => {
170
+ if (!isTransparent(el, own)) return el;
171
+ for (const child of Array.from(el.children)) {
172
+ const found = firstLogicalAt(child, own);
173
+ if (found) return found;
174
+ }
175
+ return null;
176
+ };
177
+ const logicalNextSibling = (el, own) => {
178
+ for (let node = el;;) {
179
+ for (let sibling = node.nextElementSibling; sibling; sibling = sibling.nextElementSibling) {
180
+ const found = firstLogicalAt(sibling, own);
181
+ if (found) return found;
182
+ }
183
+ const parent = node.parentElement;
184
+ if (!parent || !isTransparent(parent, own)) return null;
185
+ node = parent;
186
+ }
187
+ };
188
+ const physicalHolder = (el) => {
189
+ let node = el;
190
+ while (node.parentElement && transparentNodes.has(node.parentElement)) node = node.parentElement;
191
+ return node;
192
+ };
144
193
  const wrapScene = (inner, holdTrailingMargin) => {
145
194
  if (!inner.parentNode) throw new Error(`StickyScrollTrigger: ${describeElement(inner)} is not attached to the document`);
146
195
  const container = createStructureElement();
147
196
  const wrapper = createStructureElement();
148
197
  const padding = createStructureElement();
198
+ [
199
+ container,
200
+ wrapper,
201
+ padding
202
+ ].forEach((node) => transparentNodes.add(node));
149
203
  padding.setAttribute("aria-hidden", "true");
150
204
  padding.style.pointerEvents = "none";
151
205
  inner.parentNode.insertBefore(container, inner);
152
206
  container.appendChild(wrapper);
153
- wrapper.appendChild(inner);
207
+ moveInto(wrapper, inner);
154
208
  container.appendChild(padding);
155
209
  if (holdTrailingMargin) {
156
210
  const sentinel = createStructureElement();
157
211
  sentinel.style.display = "flow-root";
212
+ transparentNodes.add(sentinel);
158
213
  wrapper.appendChild(sentinel);
159
214
  }
160
215
  return {
@@ -164,21 +219,22 @@ const wrapScene = (inner, holdTrailingMargin) => {
164
219
  };
165
220
  };
166
221
  const wrapCover = (trigger) => {
167
- const parent = trigger.parentNode;
222
+ const holder = physicalHolder(trigger);
223
+ const parent = holder.parentNode;
168
224
  if (!parent) throw new Error(`createOverlapScroll: trigger ${describeElement(trigger)} is not attached to the document`);
169
225
  const wrapper = createStructureElement();
170
226
  parent.insertBefore(wrapper, parent.firstChild);
171
227
  while (wrapper.nextSibling) {
172
228
  const node = wrapper.nextSibling;
173
- wrapper.appendChild(node);
174
- if (node === trigger) break;
229
+ moveInto(wrapper, node);
230
+ if (node === holder) break;
175
231
  }
176
232
  return wrapper;
177
233
  };
178
234
  const unwrapCover = (wrapper) => {
179
235
  const parent = wrapper.parentNode;
180
236
  if (!parent) return;
181
- while (wrapper.firstChild) parent.insertBefore(wrapper.firstChild, wrapper);
237
+ while (wrapper.firstChild) moveInto(parent, wrapper.firstChild, wrapper);
182
238
  wrapper.remove();
183
239
  };
184
240
  const wrapPin = (trigger) => {
@@ -186,9 +242,11 @@ const wrapPin = (trigger) => {
186
242
  const outer = createStructureElement();
187
243
  const inner = createStructureElement();
188
244
  outer.style.display = "flow-root";
245
+ transparentNodes.add(outer);
246
+ transparentNodes.add(inner);
189
247
  trigger.parentNode.insertBefore(outer, trigger);
190
248
  outer.appendChild(inner);
191
- inner.appendChild(trigger);
249
+ moveInto(inner, trigger);
192
250
  pinRanges.add(inner);
193
251
  return {
194
252
  outer,
@@ -238,6 +296,7 @@ const TRIGGER_BOX = [
238
296
  "max-width",
239
297
  "height",
240
298
  "max-height",
299
+ "min-height",
241
300
  "padding-top",
242
301
  "padding-right",
243
302
  "padding-bottom",
@@ -247,48 +306,65 @@ const TRIGGER_BOX = [
247
306
  "margin-bottom",
248
307
  "margin-left"
249
308
  ];
309
+ const BLOCK_BOX = [
310
+ "height",
311
+ "max-height",
312
+ "min-height"
313
+ ];
314
+ const PROBE_HEIGHT = "123456px";
315
+ const readHeldBox = (style, properties) => properties.map((property) => style.getPropertyValue(property.replace(/^m(ax|in)-/, "")));
316
+ const HELD_PRIORITY = "important";
250
317
  const heldBoxes = new WeakMap();
251
- const holdTriggerBox = (trigger, values) => {
252
- const authored = TRIGGER_BOX.map((property) => captureInline(trigger, property));
318
+ const holdTriggerBox = (trigger, properties, values) => {
319
+ const authored = properties.map((property) => captureInline(trigger, property));
253
320
  heldBoxes.set(trigger, {
321
+ properties,
254
322
  authored,
255
- written: TRIGGER_BOX.map((property, i) => writeInline(trigger, property, values[i]))
323
+ written: properties.map((property, i) => writeInline(trigger, property, values[i], HELD_PRIORITY))
256
324
  });
257
325
  };
258
326
  const releaseTriggerBox = (trigger) => {
259
327
  const held = heldBoxes.get(trigger);
260
328
  if (!held) return void 0;
261
- TRIGGER_BOX.forEach((property, i) => {
262
- restoreIfWritten(trigger, property, held.authored[i], held.written[i]);
329
+ held.properties.forEach((property, i) => {
330
+ restoreIfWritten(trigger, property, held.authored[i], held.written[i], HELD_PRIORITY);
263
331
  });
264
332
  heldBoxes.delete(trigger);
265
- return held.written;
333
+ return held;
266
334
  };
267
335
  const fitPinsToItems = (pins) => {
268
336
  const held = pins.map(({ trigger }) => releaseTriggerBox(trigger));
337
+ const enclosing = pins.map(({ trigger }) => pins.filter((other) => other.trigger !== trigger && other.trigger.contains(trigger)));
338
+ const reserved = pins.map(() => void 0);
269
339
  try {
270
- return fitReleasedPins(pins);
340
+ for (let depth = Math.max(0, ...enclosing.map(({ length }) => length)); depth >= 0; depth--) {
341
+ const indexes = pins.flatMap((_, i) => enclosing[i].length === depth ? [i] : []);
342
+ const around = new Set(indexes.flatMap((i) => enclosing[i]));
343
+ fitReleasedPins(indexes.map((i) => pins[i]), [...around]).forEach((height, j) => {
344
+ reserved[indexes[j]] = height;
345
+ });
346
+ }
347
+ return reserved;
271
348
  } catch (error) {
272
349
  pins.forEach(({ trigger }, i) => {
273
- const values = held[i];
274
- if (values) holdTriggerBox(trigger, values);
350
+ const box = held[i];
351
+ releaseTriggerBox(trigger);
352
+ if (box) holdTriggerBox(trigger, box.properties, box.written);
275
353
  });
276
354
  throw error;
277
355
  }
278
356
  };
279
- const fitReleasedPins = (pins) => {
357
+ const fitReleasedPins = (pins, around) => {
280
358
  const styles = pins.map(({ trigger }) => getComputedStyle(trigger));
281
359
  const layouts = pins.map(({ outer }, i) => itemLayout(outer, styles[i]));
282
- const rendered = pins.map(({ trigger }, i) => !!layouts[i] && trigger.getClientRects().length > 0);
360
+ const rendered = pins.map(({ trigger }) => trigger.getClientRects().length > 0);
283
361
  const copied = styles.map((style, i) => PIN_ITEM_PROPERTIES.map((property) => layouts[i] || property === "clear" && isBlockLevel(style) ? style[property] : ""));
284
- const items = pins.flatMap((pin, index) => {
285
- const layout = layouts[index];
286
- return layout && rendered[index] ? [{
287
- ...pin,
288
- index,
289
- layout
290
- }] : [];
291
- });
362
+ const measured = pins.flatMap((pin, index) => rendered[index] ? [{
363
+ ...pin,
364
+ index,
365
+ layout: layouts[index]
366
+ }] : []);
367
+ const aroundDisplays = around.map(({ outer, inner }) => [outer.style.display, inner.style.display]);
292
368
  pins.forEach(({ outer }, i) => {
293
369
  outer.style.width = "";
294
370
  PIN_ITEM_PROPERTIES.forEach((property, j) => {
@@ -296,41 +372,80 @@ const fitReleasedPins = (pins) => {
296
372
  });
297
373
  outer.style.display = rendered[i] ? "contents" : outerDisplay(layouts[i]);
298
374
  });
299
- items.forEach(({ inner }) => {
375
+ [...measured, ...around].forEach(({ outer, inner }) => {
376
+ outer.style.display = "contents";
300
377
  inner.style.display = "contents";
301
378
  });
302
379
  let boxes;
303
380
  try {
304
- boxes = items.map(({ trigger, index, layout }) => {
381
+ boxes = measured.map(({ trigger, index, layout }) => {
305
382
  const style = styles[index];
383
+ if (!layout) return { box: readHeldBox(style, BLOCK_BOX) };
306
384
  return {
307
- width: layout === "grid" ? void 0 : measureUsedWidth(trigger) + parseFloat(style.marginLeft) + parseFloat(style.marginRight),
308
- height: marginBoxHeight(trigger, style),
309
- triggerBox: TRIGGER_BOX.map((property) => style.getPropertyValue(property.replace(/^max-/, "")))
385
+ item: {
386
+ width: layout === "grid" ? void 0 : measureUsedWidth(trigger) + parseFloat(style.marginLeft) + parseFloat(style.marginRight),
387
+ height: marginBoxHeight(trigger, style)
388
+ },
389
+ box: readHeldBox(style, TRIGGER_BOX)
310
390
  };
311
391
  });
312
392
  } finally {
313
- items.forEach(({ outer, inner, layout }) => {
393
+ measured.forEach(({ outer, inner, layout }) => {
314
394
  outer.style.display = outerDisplay(layout);
315
395
  inner.style.display = "";
316
396
  });
397
+ around.forEach(({ outer, inner }, i) => {
398
+ [outer.style.display, inner.style.display] = aroundDisplays[i];
399
+ });
317
400
  }
401
+ const inPx = boxes.map(({ box }) => box.every((value) => value.endsWith("px")));
402
+ const dependent = heightsFollowingInner(measured, boxes, inPx, styles);
318
403
  const reserved = pins.map(() => void 0);
319
- items.forEach(({ outer, trigger, layout, index }, i) => {
320
- const { width, height, triggerBox } = boxes[i];
404
+ measured.forEach(({ outer, trigger, index, layout }, i) => {
405
+ const { item, box } = boxes[i];
406
+ if (!item) {
407
+ if (inPx[i] && dependent.has(i)) holdTriggerBox(trigger, BLOCK_BOX, box);
408
+ return;
409
+ }
410
+ const { width, height } = item;
321
411
  if (!Number.isFinite(height) || width !== void 0 && !Number.isFinite(width)) return;
322
412
  if (layout === "flex") outer.style.flex = "0 0 auto";
323
413
  if (width !== void 0) outer.style.width = `${width}px`;
324
414
  reserved[index] = height;
325
- if (triggerBox.every((value) => value.endsWith("px"))) holdTriggerBox(trigger, triggerBox);
415
+ if (inPx[i]) holdTriggerBox(trigger, TRIGGER_BOX, box);
326
416
  });
327
417
  return reserved;
328
418
  };
419
+ const heightsFollowingInner = (measured, boxes, inPx, styles) => {
420
+ const blocks = measured.flatMap((pin, i) => !boxes[i].item && inPx[i] ? [{
421
+ ...pin,
422
+ i
423
+ }] : []);
424
+ const dependent = new Set(probeInner(blocks, () => PROBE_HEIGHT, boxes));
425
+ const capped = blocks.filter(({ index, i }) => !dependent.has(i) && styles[index].maxHeight.includes("%"));
426
+ probeInner(capped, ({ i }) => boxes[i].box[0], boxes).forEach((i) => dependent.add(i));
427
+ return dependent;
428
+ };
429
+ const probeInner = (blocks, height, boxes) => {
430
+ const saved = blocks.map(({ outer, inner }) => [outer.style.height, inner.style.height]);
431
+ const outerHeights = blocks.map(({ outer }) => getComputedStyle(outer).height);
432
+ blocks.forEach((block, j) => {
433
+ block.outer.style.height = outerHeights[j];
434
+ block.inner.style.height = height(block);
435
+ });
436
+ try {
437
+ return blocks.flatMap(({ trigger, i }) => getComputedStyle(trigger).height !== boxes[i].box[0] ? [i] : []);
438
+ } finally {
439
+ blocks.forEach(({ outer, inner }, j) => {
440
+ [outer.style.height, inner.style.height] = saved[j];
441
+ });
442
+ }
443
+ };
329
444
  const unwrapPin = (outer, trigger, saved) => {
330
445
  const parent = outer.parentNode;
331
446
  restoreInlinePosition(trigger, saved);
332
447
  releaseTriggerBox(trigger);
333
- if (parent) parent.insertBefore(trigger, outer);
448
+ if (parent) moveInto(parent, trigger, outer);
334
449
  if (outer.firstElementChild instanceof HTMLElement) pinRanges.delete(outer.firstElementChild);
335
450
  outer.remove();
336
451
  };
@@ -1684,6 +1799,7 @@ const planLayers = (measurements, deps) => {
1684
1799
  return finalPlans;
1685
1800
  };
1686
1801
  const OFFSET_PROPERTY = "--sst-scroll-margin-top-offset";
1802
+ const PRIORITY = "important";
1687
1803
  const snapshots = new WeakMap();
1688
1804
  let nextInstanceSuffix = 0;
1689
1805
  const supportsScrollDrivenAnimations = typeof CSS !== "undefined" && typeof CSS.supports === "function" && CSS.supports("animation-timeline", "scroll()");
@@ -1724,7 +1840,7 @@ const createScrollMarginSync = (rootElement, targetSelector) => {
1724
1840
  if (usesJsRamp) window.addEventListener("scroll", onScroll, { passive: true });
1725
1841
  const restoreTarget = (target) => {
1726
1842
  const snapshot = snapshots.get(target);
1727
- if (snapshot?.owner === instanceId) restoreIfWritten(target, "scroll-margin-top", snapshot.authored, snapshot.written);
1843
+ if (snapshot?.owner === instanceId) restoreIfWritten(target, "scroll-margin-top", snapshot.authored, snapshot.written, PRIORITY);
1728
1844
  };
1729
1845
  const stopRamps = () => {
1730
1846
  if (sheet) {
@@ -1771,7 +1887,7 @@ const createScrollMarginSync = (rootElement, targetSelector) => {
1771
1887
  const naturalTops = measureNaturalTops(targets);
1772
1888
  targets.forEach((target) => {
1773
1889
  const existing = snapshots.get(target);
1774
- if (existing && restoreIfWritten(target, "scroll-margin-top", existing.authored, existing.written)) return;
1890
+ if (existing && restoreIfWritten(target, "scroll-margin-top", existing.authored, existing.written, PRIORITY)) return;
1775
1891
  snapshots.set(target, {
1776
1892
  authored: captureInline(target, "scroll-margin-top"),
1777
1893
  written: "",
@@ -1788,7 +1904,7 @@ const createScrollMarginSync = (rootElement, targetSelector) => {
1788
1904
  return `clamp(0px, (${margin}px - var(${OFFSET_PROPERTY}, 0px)) * 1000000, ${freezeEnd - freezeStart}px)`;
1789
1905
  }).join(" + ");
1790
1906
  const snapshot = snapshots.get(target);
1791
- snapshot.written = writeInline(target, "scroll-margin-top", `calc(${authorPx}px + var(${OFFSET_PROPERTY}, 0px) + ${consumed} - (${lag}))`);
1907
+ snapshot.written = writeInline(target, "scroll-margin-top", `calc(${authorPx}px + var(${OFFSET_PROPERTY}, 0px) + ${consumed} - (${lag}))`, PRIORITY);
1792
1908
  snapshot.owner = instanceId;
1793
1909
  });
1794
1910
  const next = new Set(targets);
@@ -1836,7 +1952,8 @@ const unbuildCover = (layer) => {
1836
1952
  };
1837
1953
  const unbuildStructure = (rootElement, layers, outermostContainer) => {
1838
1954
  if (outermostContainer) {
1839
- outermostContainer.parentNode?.insertBefore(rootElement, outermostContainer);
1955
+ const parent = outermostContainer.parentNode;
1956
+ if (parent) moveInto(parent, rootElement, outermostContainer);
1840
1957
  outermostContainer.remove();
1841
1958
  }
1842
1959
  for (let i = layers.length - 1; i >= 0; i -= 1) {
@@ -1979,6 +2096,7 @@ let refreshedInGsapRefresh = null;
1979
2096
  const armedInstances = new Set();
1980
2097
  let lastScrollTriggerClass = null;
1981
2098
  const REST_POLL_MS = 100;
2099
+ const refreshedDuringMove = new Map();
1982
2100
  const runEach = (...steps) => {
1983
2101
  let failure = null;
1984
2102
  steps.forEach((step) => {
@@ -2008,6 +2126,7 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2008
2126
  #refreshInitNestedUsed = false;
2009
2127
  #measureAgain = false;
2010
2128
  #keepContentPending = false;
2129
+ #refreshOwed = false;
2011
2130
  #deferredRun = null;
2012
2131
  #restTimer = null;
2013
2132
  #pendingKeep = null;
@@ -2486,10 +2605,11 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2486
2605
  const releaseScroll = resolvePinReleaseScroll(layer.endTrigger, classifiedEnd, toScroll(layer.trigger, triggerTop - topPx), viewportHeight, toScroll);
2487
2606
  const height = releaseScroll - (this.#rootElement.contains(layer.trigger) ? dwellConsumedAt(releaseScroll, this.#engagedWindows()) : 0) - triggerTop + topPx + triggerHeight + triggerMarginBottom;
2488
2607
  const room = documentHeight > 0 ? documentHeight - triggerTop : Infinity;
2608
+ const still = triggerHeight + triggerMarginBottom;
2489
2609
  return [{
2490
2610
  layer,
2491
2611
  topPx,
2492
- range: Math.max(0, Math.min(height, room))
2612
+ range: Math.max(0, Math.min(Math.max(height, still), room))
2493
2613
  }];
2494
2614
  });
2495
2615
  }
@@ -2601,7 +2721,7 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2601
2721
  return evaluateLive(setUp, scroll, liveEnd);
2602
2722
  }
2603
2723
  refresh() {
2604
- if (this.#depth > 0 || isRefreshing(this.#scrollTriggerClass) || this.#destroyed || !this.#armed || pendingDisarms.has(this) || window.scrollY === 0 || this.#measuresInPlace()) {
2724
+ if (this.#depth > 0 || isRefreshing(this.#scrollTriggerClass) || this.#destroyed || !this.#armed || pendingDisarms.has(this) || isMovingDom() || window.scrollY === 0 || this.#measuresInPlace()) {
2605
2725
  this.#refreshFrom(false);
2606
2726
  return;
2607
2727
  }
@@ -2622,6 +2742,13 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2622
2742
  this.#runRefresh();
2623
2743
  }
2624
2744
  #runRefresh() {
2745
+ if (isMovingDom()) {
2746
+ const cls = isRefreshing(this.#scrollTriggerClass) ? this.#scrollTriggerClass : null;
2747
+ this.#refreshOwed = true;
2748
+ if (refreshedDuringMove.size === 0) queueMicrotask(StickyScrollTrigger.#runRefreshesOwed);
2749
+ refreshedDuringMove.set(this, refreshedDuringMove.get(this) ?? cls);
2750
+ return;
2751
+ }
2625
2752
  if (this.#depth > 0) this.#measureAgain = true;
2626
2753
  if (this.#destroyed || !this.#armed || pendingDisarms.has(this)) return;
2627
2754
  let failure = null;
@@ -2638,6 +2765,7 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2638
2765
  if (this.#depth === 0) {
2639
2766
  this.#refreshInitNestedUsed = false;
2640
2767
  this.#measureAgain = false;
2768
+ this.#refreshOwed = false;
2641
2769
  }
2642
2770
  }
2643
2771
  try {
@@ -2652,6 +2780,13 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2652
2780
  this.#scrollMarginSync?.applyRamps(realScroll() ?? scrollRecord(this.#scrollTriggerClass)?.read());
2653
2781
  if (failure) throw failure.error;
2654
2782
  }
2783
+ static #runRefreshesOwed() {
2784
+ const owed = [...refreshedDuringMove];
2785
+ refreshedDuringMove.clear();
2786
+ const classes = new Set(owed.flatMap(([, cls]) => cls ? [cls] : []));
2787
+ const direct = owed.flatMap(([instance, cls]) => !cls && instance.#refreshOwed ? [instance] : []);
2788
+ runEach(...[...classes].map((cls) => () => refreshAll(cls)), ...direct.map((instance) => () => instance.refresh()));
2789
+ }
2655
2790
  #naturalScrollTop(layers) {
2656
2791
  const measured = this.#measuredStructure;
2657
2792
  const container = this.#outermostContainer;
@@ -2722,8 +2857,7 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2722
2857
  }
2723
2858
  #liftCovers() {
2724
2859
  this.#coverLayers().forEach((layer) => {
2725
- const pin = this.#pinLayers.find(({ trigger }) => trigger === layer.cover);
2726
- this.#coverRestoreByLayer.set(layer, liftAboveStickyWrapper(pin?.outer ?? layer.cover));
2860
+ this.#coverRestoreByLayer.set(layer, liftAboveStickyWrapper(physicalHolder(layer.cover)));
2727
2861
  });
2728
2862
  }
2729
2863
  #syncScrollMargins(tops) {
@@ -2810,9 +2944,10 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2810
2944
  const trigger = resolveElement(triggerInput, "createOverlapScroll");
2811
2945
  this.#assertTriggerInsideRoot(trigger, "createOverlapScroll");
2812
2946
  const endTrigger = resolveEndTrigger(trigger, endTriggerInput, "createOverlapScroll");
2813
- const coverElement = cover === void 0 ? trigger.nextElementSibling : resolveElement(cover, "createOverlapScroll");
2814
- if (!(coverElement instanceof HTMLElement)) throw new Error(`createOverlapScroll: cover element (trigger.nextElementSibling) not found for trigger ${describeElement(trigger)}`);
2815
- if (coverElement.parentNode !== trigger.parentNode) throw new Error(`createOverlapScroll: cover ${describeElement(coverElement)} must be a sibling of trigger ` + describeElement(trigger));
2947
+ const ownWrappers = new Set(this.#coverLayers().flatMap(({ wrapper }) => wrapper ? [wrapper] : []));
2948
+ const coverElement = cover === void 0 ? logicalNextSibling(trigger, ownWrappers) : resolveElement(cover, "createOverlapScroll");
2949
+ if (!(coverElement instanceof HTMLElement)) throw new Error(`createOverlapScroll: cover element (trigger's next sibling) not found for trigger ${describeElement(trigger)}`);
2950
+ if (logicalParent(coverElement, ownWrappers) !== logicalParent(trigger, ownWrappers)) throw new Error(`createOverlapScroll: cover ${describeElement(coverElement)} must be a sibling of trigger ` + describeElement(trigger));
2816
2951
  const layer = {
2817
2952
  kind: "cover",
2818
2953
  trigger,
@@ -2831,7 +2966,7 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2831
2966
  unbuildCover(layer);
2832
2967
  onKill?.(self);
2833
2968
  }, rest);
2834
- this.#coverRestoreByLayer.set(layer, liftAboveStickyWrapper(coverElement));
2969
+ this.#coverRestoreByLayer.set(layer, liftAboveStickyWrapper(physicalHolder(coverElement)));
2835
2970
  return vars;
2836
2971
  }
2837
2972
  createStickyPin({ trigger: triggerInput, start, top, endTrigger: endTriggerInput, end = "bottom top", onKill, ...rest }) {
@@ -2907,7 +3042,7 @@ var StickyScrollTrigger = class StickyScrollTrigger {
2907
3042
  try {
2908
3043
  return readThenRestore(StickyScrollTrigger.#resetStickyAround(null, [element]), () => documentTop(element));
2909
3044
  } finally {
2910
- restores.forEach((restore) => restore());
3045
+ restores.reverse().forEach((restore) => restore());
2911
3046
  }
2912
3047
  }
2913
3048
  createResolvedTrigger({ trigger: triggerInput, start = "top bottom", end = "bottom top", endTrigger: endTriggerInput, ...rest }) {