@onekeyfe/react-native-native-list 3.0.113 → 3.0.115

package/src/web/NativeListWebEngine.ts

@@ -49,7 +49,7 @@ import {
 const SECTION_INDEX_CONTENT_INSET = 16;
 const SECTION_INDEX_RAIL_WIDTH = 32;
 const SECTION_INDEX_EDGE_PADDING = 8;
-const SECTION_INDEX_MIN_LABEL_SPACING = 14;
+const SECTION_INDEX_LABEL_SPACING = 16;
 const SECTION_INDEX_MIN_HEIGHT = 120;
 const DEFAULT_VIEWPORT_WIDTH = 320;
 const DEFAULT_VIEWPORT_HEIGHT = 640;
@@ -772,6 +772,32 @@ export function visibleWebLayoutItems(
   return visible;
 }
 
+export type WebCollapsiblePagerScrollMetrics = Readonly<{
+  offset: number;
+  viewportLength: number;
+}>;
+
+export function resolveWebCollapsiblePagerScrollMetrics(
+  rawOffset: number,
+  rawViewportLength: number,
+  headerInset: number,
+  stickyInset: number
+): WebCollapsiblePagerScrollMetrics {
+  const header = Math.max(0, headerInset);
+  const sticky = Math.max(0, stickyInset);
+  return {
+    offset: Math.max(0, rawOffset - header),
+    viewportLength: Math.max(0, rawViewportLength - sticky),
+  };
+}
+
+export function resolveWebCollapsiblePagerRawOffset(
+  logicalOffset: number,
+  headerInset: number
+): number {
+  return Math.max(0, logicalOffset) + Math.max(0, headerInset);
+}
+
 export function webLayoutItemsForMount(
   layout: WebListLayout,
   offset: number,
@@ -896,6 +922,11 @@ export const WEB_LIST_CSS = `
 .ok-native-list-subtitle-segments{display:flex;align-items:center;min-width:0;max-width:100%;height:20px}.ok-native-list-subtitle-segments>.ok-native-list-secondary{flex:0 1 auto;min-width:0}.ok-native-list-subtitle-dot{flex:0 0 4px;width:4px;height:4px;margin:0 6px;border-radius:50%;background:var(--nl-disabled)}.ok-native-list-wallet-row>.ok-native-list-flex{flex:0 1 auto;width:100%;align-items:center}.ok-native-list-wallet-badges{display:flex;gap:4px;justify-content:center;margin-top:4px;height:20px;max-width:100%}.ok-native-list-wallet-badges>.ok-native-list-badge{background:var(--nl-strong);color:var(--nl-secondary);font-size:12px;line-height:16px;height:20px;box-sizing:border-box;padding:2px 4px}.ok-native-list-visual-overlay{position:absolute;display:flex;align-items:center;justify-content:center;box-sizing:border-box;border-radius:50%;overflow:hidden;line-height:1;font-size:10px}.ok-native-list-visual-overlay img,.ok-native-list-visual-overlay svg{width:100%;height:100%;object-fit:contain}
 .ok-native-list-row.ok-native-list-market-skeleton{padding:12px 20px;gap:0}.ok-native-list-skeleton-left{display:flex;align-items:center;gap:12px;flex:1}.ok-native-list-skeleton-text{display:flex;flex-direction:column;gap:4px}.ok-native-list-skeleton-right{display:flex;align-items:center;gap:8px}.ok-native-list-skeleton-mark{display:block;flex-shrink:0;border-radius:8px;animation:ok-native-list-skeleton 1.5s linear infinite alternate}@keyframes ok-native-list-skeleton{from{background-color:var(--nl-skeleton-base)}to{background-color:var(--nl-skeleton-highlight)}}.ok-native-list-market-spinner{display:block;width:20px;height:20px;flex-shrink:0;color:var(--nl-icon);animation:ok-native-list-spin .75s linear infinite}
 @media (prefers-reduced-motion:reduce){.ok-native-list-index-preview,.ok-native-list-refresh{transition:none}.ok-native-list-spinner,.ok-native-list-market-spinner{animation:none}.ok-native-list-skeleton-mark{animation:none;background:var(--nl-skeleton-base)}}
+.ok-native-list-footer{flex:0 0 auto;min-height:0}.ok-native-list-sticky{position:absolute;z-index:4;left:0;right:0;top:0;pointer-events:auto;box-shadow:0 1px 0 var(--nl-separator)}.ok-native-list-viewport-frame:has(>.ok-native-list-index-rail:not([hidden]))>.ok-native-list-viewport{scrollbar-width:none}.ok-native-list-viewport-frame:has(>.ok-native-list-index-rail:not([hidden]))>.ok-native-list-viewport::-webkit-scrollbar{display:none}.ok-native-list-index-rail{position:absolute;z-index:6;top:0;right:0;bottom:0;width:${SECTION_INDEX_RAIL_WIDTH}px;touch-action:none;cursor:pointer}.ok-native-list-index-rail[hidden]{display:none}.ok-native-list-index-button{appearance:none;position:absolute;left:15px;display:flex;width:14px;height:14px;align-items:center;justify-content:center;padding:0;transform:translateY(-50%);border:0;border-radius:7px;background:transparent;color:var(--nl-disabled);font-family:inherit;font-size:10px;font-weight:400;line-height:1;cursor:pointer}.ok-native-list-index-button[data-active="true"]{background:var(--nl-positive);color:var(--nl-inverse-text);font-weight:500}.ok-native-list-index-button:focus-visible{outline:2px solid var(--nl-positive);outline-offset:1px}
+.ok-native-list-refresh{position:absolute;z-index:7;left:50%;top:8px;display:flex;align-items:center;gap:6px;padding:6px 10px;border-radius:999px;background:var(--nl-inverse);color:var(--nl-inverse-text);font-size:12px;opacity:0;transform:translate(-50%,-16px);transition:opacity .15s ease,transform .15s ease;pointer-events:none}.ok-native-list-refresh[data-visible="true"]{opacity:1;transform:translate(-50%,0)}
+.ok-native-list-warning{height:auto;display:flex;flex-direction:column;align-items:stretch;gap:4px;padding:14px 12px;border-top:1px solid;border-bottom:1px solid;box-sizing:border-box;cursor:default}.ok-native-list-warning-title,.ok-native-list-warning-message{font-size:14px;line-height:20px;white-space:normal;overflow-wrap:anywhere}.ok-native-list-warning-title{font-weight:500;color:var(--nl-primary)}.ok-native-list-warning-message{font-weight:400;color:var(--nl-secondary)}
+.ok-native-list-subtitle-segments{display:flex;align-items:center;min-width:0;max-width:100%;height:20px}.ok-native-list-subtitle-segments>.ok-native-list-secondary{flex:0 1 auto;min-width:0}.ok-native-list-subtitle-dot{flex:0 0 4px;width:4px;height:4px;margin:0 6px;border-radius:50%;background:var(--nl-disabled)}.ok-native-list-wallet-row>.ok-native-list-flex{flex:0 1 auto;width:100%;align-items:center}.ok-native-list-wallet-badges{display:flex;gap:4px;justify-content:center;margin-top:4px;height:20px;max-width:100%}.ok-native-list-wallet-badges>.ok-native-list-badge{background:var(--nl-strong);color:var(--nl-secondary);font-size:12px;line-height:16px;height:20px;box-sizing:border-box;padding:2px 4px}.ok-native-list-visual-overlay{position:absolute;display:flex;align-items:center;justify-content:center;box-sizing:border-box;border-radius:50%;overflow:hidden;line-height:1;font-size:10px}.ok-native-list-visual-overlay img,.ok-native-list-visual-overlay svg{width:100%;height:100%;object-fit:contain}
+@media (prefers-reduced-motion:reduce){.ok-native-list-refresh{transition:none}.ok-native-list-spinner{animation:none}}
 /* OneKey patch: selector controls follow their original semantic colors and geometry. */
 .ok-native-list-checkbox[data-selector="networkSelector"]{padding:0;border-radius:4px;border-color:var(--nl-checkbox-border,var(--nl-separator));background:var(--nl-checkbox-icon,var(--nl-inverse-text))}
 .ok-native-list-checkbox[data-selector="networkSelector"]::after{display:none}
@@ -3100,7 +3131,8 @@ function createMarketRow(context: RenderContext, row: MarketRow): HTMLElement {
     visual.style.height = String(height) + 'px';
     visual.style.flexBasis = String(width) + 'px';
     visual.style.borderRadius = String(layoutStyle.imageCornerRadius) + 'px';
-    const borderColor = 'borderColor' in row.leading ? row.leading.borderColor : undefined;
+    const borderColor =
+      'borderColor' in row.leading ? row.leading.borderColor : undefined;
     if (borderColor) {
       visual.style.border = '1px solid ' + borderColor;
       visual.style.boxSizing = 'border-box';
@@ -3111,7 +3143,8 @@ function createMarketRow(context: RenderContext, row: MarketRow): HTMLElement {
         image.style.height = '100%';
         if (borderColor) {
           image.style.borderRadius = '0';
-          image.style.clipPath = 'inset(-1px round ' + String(layoutStyle.imageCornerRadius) + 'px)';
+          image.style.clipPath =
+            'inset(-1px round ' + String(layoutStyle.imageCornerRadius) + 'px)';
         }
         image.style.objectFit =
           style?.image?.contentFit ?? image.style.objectFit;
@@ -3277,7 +3310,6 @@ export class NativeListWebEngine {
   private readonly footer: HTMLElement;
   private readonly sticky: HTMLElement;
   private readonly indexRail: HTMLElement;
-  private readonly indexPreview: HTMLElement;
   private readonly refreshIndicator: HTMLElement;
   private readonly reorderPreview: HTMLElement;
   private readonly previousHostPosition: string;
@@ -3303,7 +3335,6 @@ export class NativeListWebEngine {
   private avatarDirection = 1;
   private reachedGeneration: number | undefined;
   private stickyKey: string | undefined;
-  private previewTimer: number | undefined;
   private sectionIndexEntries: readonly Readonly<{
     key: string;
     title: string;
@@ -3392,12 +3423,6 @@ export class NativeListWebEngine {
     this.indexRail.setAttribute('role', 'navigation');
     this.indexRail.setAttribute('aria-label', 'Section index');
     this.indexRail.hidden = true;
-    this.indexPreview = createElement(
-      this.document,
-      'div',
-      'ok-native-list-index-preview'
-    );
-    this.indexPreview.setAttribute('aria-live', 'polite');
     this.refreshIndicator = createElement(
       this.document,
       'div',
@@ -3418,7 +3443,6 @@ export class NativeListWebEngine {
       this.viewport,
       this.sticky,
       this.indexRail,
-      this.indexPreview,
       this.refreshIndicator
     );
     this.root.append(style, this.viewportFrame, this.footer);
@@ -3427,6 +3451,10 @@ export class NativeListWebEngine {
     this.viewport.addEventListener('scroll', this.handleScroll, {
       passive: true,
     });
+    this.viewport.addEventListener(
+      'ok-collapsible-pager-insets-changed',
+      this.handleCollapsiblePagerInsetsChanged
+    );
     this.root.addEventListener('click', this.handleClick);
     this.root.addEventListener('pointerdown', this.handleMarketPointerDown);
     this.root.addEventListener('pointermove', this.handleMarketPointerMove);
@@ -3463,6 +3491,11 @@ export class NativeListWebEngine {
     );
     this.indexRail.addEventListener('pointerdown', this.handleIndexPointer);
     this.indexRail.addEventListener('pointermove', this.handleIndexPointer);
+    this.indexRail.addEventListener('pointerup', this.handleIndexPointerEnd);
+    this.indexRail.addEventListener(
+      'pointercancel',
+      this.handleIndexPointerEnd
+    );
     this.indexRail.addEventListener('click', this.handleIndexClick);
     this.viewport.addEventListener('pointerdown', this.handlePullStart, {
       passive: true,
@@ -3664,8 +3697,6 @@ export class NativeListWebEngine {
     this.invalidateActionAnchor('destroy');
     this.destroyed = true;
     if (this.frameHandle !== undefined) this.cancelFrame(this.frameHandle);
-    if (this.previewTimer !== undefined)
-      this.document.defaultView?.clearTimeout(this.previewTimer);
     if (this.reorderMovementTimer !== undefined)
       this.document.defaultView?.clearTimeout(this.reorderMovementTimer);
     this.resizeObserver?.disconnect();
@@ -3674,6 +3705,10 @@ export class NativeListWebEngine {
       this.handleWindowResize
     );
     this.viewport.removeEventListener('scroll', this.handleScroll);
+    this.viewport.removeEventListener(
+      'ok-collapsible-pager-insets-changed',
+      this.handleCollapsiblePagerInsetsChanged
+    );
     this.root.removeEventListener('click', this.handleClick);
     this.cancelMarketPointer();
     this.root.removeEventListener('pointerdown', this.handleMarketPointerDown);
@@ -3708,6 +3743,11 @@ export class NativeListWebEngine {
     );
     this.indexRail.removeEventListener('pointerdown', this.handleIndexPointer);
     this.indexRail.removeEventListener('pointermove', this.handleIndexPointer);
+    this.indexRail.removeEventListener('pointerup', this.handleIndexPointerEnd);
+    this.indexRail.removeEventListener(
+      'pointercancel',
+      this.handleIndexPointerEnd
+    );
     this.indexRail.removeEventListener('click', this.handleIndexClick);
     this.viewport.removeEventListener('pointerdown', this.handlePullStart);
     this.viewport.removeEventListener('pointermove', this.handlePullMove);
@@ -3782,7 +3822,20 @@ export class NativeListWebEngine {
   private recomputeLayout = () => {
     if (this.destroyed) return;
     const viewportWidth = this.viewport.clientWidth;
-    const viewportHeight = this.viewport.clientHeight;
+    const viewportHeight =
+      this.snapshot.layout.orientation === 'horizontal'
+        ? this.viewport.clientHeight
+        : this.verticalScrollMetrics().viewportLength;
+    if (this.snapshot.layout.orientation !== 'horizontal') {
+      const stickyInset = this.collapsiblePagerInsets().sticky;
+      this.sticky.style.top = String(stickyInset) + 'px';
+      this.indexRail.style.top = String(stickyInset) + 'px';
+      this.refreshIndicator.style.top = String(stickyInset + 8) + 'px';
+    } else {
+      this.sticky.style.top = '0px';
+      this.indexRail.style.top = '0px';
+      this.refreshIndicator.style.top = '8px';
+    }
     if (
       this.lastViewportWidth >= 0 &&
       (viewportWidth !== this.lastViewportWidth ||
@@ -3813,7 +3866,11 @@ export class NativeListWebEngine {
     );
     this.content.style.width = String(this.layout.contentWidth) + 'px';
     this.content.style.height = String(this.layout.contentHeight) + 'px';
-    this.renderSectionIndex(viewportHeight || DEFAULT_VIEWPORT_HEIGHT);
+    this.renderSectionIndex(
+      this.viewport.clientHeight <= 0
+        ? DEFAULT_VIEWPORT_HEIGHT
+        : Math.max(1, viewportHeight)
+    );
     if (previousHorizontal !== this.layout.horizontal) {
       this.viewport.scrollLeft = 0;
       this.viewport.scrollTop = 0;
@@ -4121,17 +4178,15 @@ export class NativeListWebEngine {
   ): readonly number[] {
     const entryCount = this.sectionIndexEntries.length;
     if (entryCount <= 1) return entryCount ? [0] : [];
-    const availableHeight = Math.max(
-      0,
-      viewportHeight - SECTION_INDEX_EDGE_PADDING * 2
-    );
+    const { trackHeight } = this.sectionIndexMetrics(viewportHeight);
     const maxVisible = Math.max(
-      2,
-      Math.floor(availableHeight / SECTION_INDEX_MIN_LABEL_SPACING) + 1
+      1,
+      Math.floor(trackHeight / SECTION_INDEX_LABEL_SPACING)
     );
     if (entryCount <= maxVisible) {
       return Array.from({ length: entryCount }, (_, index) => index);
     }
+    if (maxVisible === 1) return [0];
     const result = new Set<number>();
     for (let slot = 0; slot < maxVisible; slot += 1) {
       result.add(Math.round((slot * (entryCount - 1)) / (maxVisible - 1)));
@@ -4139,6 +4194,21 @@ export class NativeListWebEngine {
     return [...result].sort((left, right) => left - right);
   }
 
+  private sectionIndexMetrics(viewportHeight: number) {
+    const availableHeight = Math.max(
+      0,
+      viewportHeight - SECTION_INDEX_EDGE_PADDING * 2
+    );
+    const trackHeight = Math.min(
+      availableHeight,
+      SECTION_INDEX_LABEL_SPACING * this.sectionIndexEntries.length
+    );
+    return {
+      originY: (viewportHeight - trackHeight) / 2,
+      trackHeight,
+    };
+  }
+
   private renderSectionIndex(viewportHeight: number) {
     this.indexRail.replaceChildren();
     if (!sectionIndexEnabled(this.snapshot)) {
@@ -4165,8 +4235,15 @@ export class NativeListWebEngine {
       'compact',
       visibleEntryIndices.length < this.sectionIndexEntries.length
     );
+    const metrics = this.sectionIndexMetrics(viewportHeight);
+    const visibleTrackHeight = Math.min(
+      metrics.trackHeight,
+      SECTION_INDEX_LABEL_SPACING * visibleEntryIndices.length
+    );
+    const visibleOriginY =
+      metrics.originY + (metrics.trackHeight - visibleTrackHeight) / 2;
     const fragment = this.document.createDocumentFragment();
-    visibleEntryIndices.forEach((entryIndex) => {
+    visibleEntryIndices.forEach((entryIndex, visibleIndex) => {
       const entry = this.sectionIndexEntries[entryIndex];
       if (!entry) return;
       const button = createElement(
@@ -4180,14 +4257,11 @@ export class NativeListWebEngine {
       setData(button, 'sectionEntryIndex', entryIndex);
       setData(button, 'sectionPosition', entry.position);
       setData(button, 'sectionKey', entry.key);
-      const progress =
-        this.sectionIndexEntries.length === 1
-          ? 0.5
-          : entryIndex / (this.sectionIndexEntries.length - 1);
       button.style.top =
         String(
-          SECTION_INDEX_EDGE_PADDING +
-            progress * (viewportHeight - SECTION_INDEX_EDGE_PADDING * 2)
+          visibleOriginY +
+            (visibleTrackHeight * (visibleIndex + 0.5)) /
+              visibleEntryIndices.length
         ) + 'px';
       fragment.appendChild(button);
     });
@@ -4323,7 +4397,7 @@ export class NativeListWebEngine {
     }
     const next = this.layout.items[nextIndex];
     const translate = next
-      ? Math.min(0, next.y - this.viewport.scrollTop - item.height)
+      ? Math.min(0, next.y - this.currentOffset() - item.height)
       : 0;
     this.sticky.style.transform =
       'translate3d(0,' + String(translate) + 'px,0)';
@@ -4399,9 +4473,11 @@ export class NativeListWebEngine {
   }
 
   private viewportLength(): number {
-    return this.layout.horizontal
-      ? this.viewport.clientWidth || DEFAULT_VIEWPORT_WIDTH
-      : this.viewport.clientHeight || DEFAULT_VIEWPORT_HEIGHT;
+    if (this.layout.horizontal) {
+      return this.viewport.clientWidth || DEFAULT_VIEWPORT_WIDTH;
+    }
+    if (this.viewport.clientHeight <= 0) return DEFAULT_VIEWPORT_HEIGHT;
+    return Math.max(1, this.verticalScrollMetrics().viewportLength);
   }
 
   private contentLength(): number {
@@ -4413,18 +4489,54 @@ export class NativeListWebEngine {
   private currentOffset(): number {
     return this.layout.horizontal
       ? this.viewport.scrollLeft
-      : this.viewport.scrollTop;
+      : this.verticalScrollMetrics().offset;
+  }
+
+  private collapsiblePagerInsets(): Readonly<{
+    header: number;
+    sticky: number;
+  }> {
+    const readInset = (name: string) => {
+      const parsed = Number.parseFloat(
+        this.viewport.style.getPropertyValue(name)
+      );
+      return Number.isFinite(parsed) ? Math.max(0, parsed) : 0;
+    };
+    return {
+      header: readInset('--ok-collapsible-pager-header-inset'),
+      sticky: readInset('--ok-collapsible-pager-sticky-inset'),
+    };
   }
 
+  private verticalScrollMetrics(): WebCollapsiblePagerScrollMetrics {
+    const insets = this.collapsiblePagerInsets();
+    return resolveWebCollapsiblePagerScrollMetrics(
+      this.viewport.scrollTop,
+      this.viewport.clientHeight,
+      insets.header,
+      insets.sticky
+    );
+  }
+
+  private handleCollapsiblePagerInsetsChanged = () => {
+    this.recomputeLayout();
+  };
+
   private scrollToAbsoluteOffset(offset: number, animated: boolean) {
     const resolved = Math.min(
       Math.max(0, offset),
       Math.max(0, this.contentLength() - this.viewportLength())
     );
+    const rawOffset = this.layout.horizontal
+      ? resolved
+      : resolveWebCollapsiblePagerRawOffset(
+          resolved,
+          this.collapsiblePagerInsets().header
+        );
     this.viewport.scrollTo(
       this.layout.horizontal
-        ? { left: resolved, top: 0, behavior: animated ? 'smooth' : 'auto' }
-        : { left: 0, top: resolved, behavior: animated ? 'smooth' : 'auto' }
+        ? { left: rawOffset, top: 0, behavior: animated ? 'smooth' : 'auto' }
+        : { left: 0, top: rawOffset, behavior: animated ? 'smooth' : 'auto' }
     );
     this.scheduleFrame();
   }
@@ -4949,78 +5061,62 @@ export class NativeListWebEngine {
     else view?.clearTimeout(handle);
   }
 
-  private selectIndexPosition(
-    position: number,
-    title: string,
-    previewClientY?: number
-  ) {
+  private selectIndexPosition(position: number) {
+    const activeKey = this.sectionIndexEntries.find(
+      (entry) => entry.position === position
+    )?.key;
+    this.indexRail
+      .querySelectorAll<HTMLElement>('[data-section-key]')
+      .forEach((button) =>
+        setData(button, 'active', button.dataset.sectionKey === activeKey)
+      );
     this.scrollToIndex(position, {
       animated: false,
       alignment: 'start',
       viewPosition: 0,
       viewOffset: 0,
     });
-    const frame = this.viewportFrame.getBoundingClientRect();
-    if (previewClientY !== undefined && frame.height > 0) {
-      const previewY = Math.min(
-        frame.height - 24,
-        Math.max(24, previewClientY - frame.top)
-      );
-      this.indexPreview.style.top = String(previewY) + 'px';
-    } else {
-      this.indexPreview.style.top = '50%';
-    }
-    this.indexPreview.textContent = title;
-    setData(this.indexPreview, 'visible', true);
-    if (this.previewTimer !== undefined)
-      this.document.defaultView?.clearTimeout(this.previewTimer);
-    this.previewTimer = this.document.defaultView?.setTimeout(() => {
-      setData(this.indexPreview, 'visible', false);
-    }, 180);
   }
 
-  private sectionIndexEntryAtEvent(event: PointerEvent):
-    | Readonly<{
-        entry: NativeListWebEngine['sectionIndexEntries'][number];
-        previewClientY: number;
-      }>
-    | undefined {
+  private sectionIndexEntryAtEvent(
+    event: PointerEvent
+  ): NativeListWebEngine['sectionIndexEntries'][number] | undefined {
     const rail = this.indexRail.getBoundingClientRect();
     if (this.sectionIndexEntries.length === 0 || rail.height <= 0) {
       return undefined;
     }
-    const availableHeight = Math.max(
-      1,
-      rail.height - SECTION_INDEX_EDGE_PADDING * 2
-    );
+    const metrics = this.sectionIndexMetrics(rail.height);
+    if (metrics.trackHeight <= 0) return undefined;
     const progress = Math.min(
       1,
       Math.max(
         0,
-        (event.clientY - rail.top - SECTION_INDEX_EDGE_PADDING) /
-          availableHeight
+        (event.clientY - rail.top - metrics.originY) / metrics.trackHeight
       )
     );
-    const entryIndex = Math.round(
-      progress * (this.sectionIndexEntries.length - 1)
+    const entryIndex = Math.min(
+      this.sectionIndexEntries.length - 1,
+      Math.floor(progress * this.sectionIndexEntries.length)
     );
-    const entry = this.sectionIndexEntries[entryIndex];
-    return entry ? { entry, previewClientY: event.clientY } : undefined;
+    return this.sectionIndexEntries[entryIndex];
   }
 
   private handleIndexPointer = (event: PointerEvent) => {
     if (event.type === 'pointermove' && event.buttons === 0) return;
-    const selection = this.sectionIndexEntryAtEvent(event);
-    if (!selection) return;
+    const entry = this.sectionIndexEntryAtEvent(event);
+    if (!entry) return;
     event.preventDefault();
     if (event.type === 'pointerdown') {
       this.indexRail.setPointerCapture?.(event.pointerId);
     }
-    this.selectIndexPosition(
-      selection.entry.position,
-      selection.entry.title,
-      selection.previewClientY
-    );
+    this.selectIndexPosition(entry.position);
+  };
+
+  private handleIndexPointerEnd = (event: PointerEvent) => {
+    if (event.type === 'pointerup') {
+      const entry = this.sectionIndexEntryAtEvent(event);
+      if (entry) this.selectIndexPosition(entry.position);
+    }
   };
 
   private handleIndexClick = (event: Event) => {
@@ -5037,12 +5133,7 @@ export class NativeListWebEngine {
     const entry =
       this.sectionIndexEntries[Number(button.dataset.sectionEntryIndex)];
     if (!entry) return;
-    const rect = button.getBoundingClientRect();
-    this.selectIndexPosition(
-      entry.position,
-      entry.title,
-      rect.top + rect.height / 2
-    );
+    this.selectIndexPosition(entry.position);
   };
 
   private handlePullStart = (event: PointerEvent) => {
@@ -5245,7 +5336,12 @@ export class NativeListWebEngine {
     const maximum = Math.max(0, this.contentLength() - this.viewportLength());
     const next = Math.max(0, Math.min(maximum, offset));
     if (this.layout.horizontal) this.viewport.scrollLeft = next;
-    else this.viewport.scrollTop = next;
+    else {
+      this.viewport.scrollTop = resolveWebCollapsiblePagerRawOffset(
+        next,
+        this.collapsiblePagerInsets().header
+      );
+    }
     this.scheduleFrame();
   }
 
@@ -5327,10 +5423,15 @@ export class NativeListWebEngine {
     }
     this.reorderSettlingKey = state.sourceKey;
     const viewportRect = this.viewport.getBoundingClientRect();
+    const insets = this.collapsiblePagerInsets();
     const left =
       viewportRect.left + destinationLayout.x - this.viewport.scrollLeft;
     const top =
-      viewportRect.top + destinationLayout.y - this.viewport.scrollTop;
+      viewportRect.top +
+      destinationLayout.y +
+      insets.header +
+      insets.sticky -
+      this.viewport.scrollTop;
     this.reorderPreview.getBoundingClientRect();
     this.reorderPreview.style.transition =
       'transform ' +