@symbiote-native/angular 3.2.0 → 3.4.0

package/src/components/virtualized-list/directives.ts

@@ -30,36 +30,60 @@ import {
   TemplateRef,
   ViewContainerRef,
   inject,
+  reflectComponentType,
+  type ComponentRef,
   type EmbeddedViewRef,
   type OnChanges,
   type OnDestroy,
   type SimpleChanges,
+  type Type,
 } from '@angular/core';
-import { dlog, isDebug } from '@symbiote-native/engine';
+import { dlog, isDebug, type IViewStyle } from '@symbiote-native/engine';
 import { countAngular } from '../../diagnostics';
 import type { ISeparators } from '@symbiote-native/components';
 
 let vListOutletInstanceCounter = 0;
 
+function nextOutletInstanceId(): number {
+  vListOutletInstanceCounter += 1;
+  return vListOutletInstanceCounter;
+}
+
 // The context a `vListItem` template receives, mirroring RN's renderItem info arg
 // ({ item, index, separators }). `$implicit` is the item, so `let-item` (no key) binds it.
-export interface IVListItemContext<ItemT> {
+export type IVListItemContext<ItemT> = {
   $implicit: ItemT;
   index: number;
   separators: ISeparators;
-}
+};
 
 // The context a `vListSeparator` template receives, mirroring RN's ItemSeparatorComponent props
 // (the highlight flag the cell toggles + the items flanking the gap). `$implicit` is the highlight
 // flag, so `let-highlighted` binds it.
-export interface IVListSeparatorContext<ItemT> {
+export type IVListSeparatorContext<ItemT> = {
   $implicit: boolean;
   highlighted: boolean;
   leadingItem?: ItemT;
   trailingItem?: ItemT;
   // RN lets a row drive arbitrary separator props via separators.updateProps; they ride here.
   [key: string]: unknown;
-}
+};
+
+// The context a `vListCell` template receives, RN's `CellRendererComponent` props
+// The template draws the wrapper and stamps the item and its separator through `content`
+// The item is `unknown`, a wrapping list hands it an entry or a row, not its own item type
+export type IVListCellContext = {
+  $implicit: unknown;
+  cellKey: string;
+  index: number;
+  style: IViewStyle | undefined;
+  // Wire both onto the wrapper: `(layout)="cell.layout($event)"`, `(focus)="cell.focus()"`
+  layout: (event: unknown) => void;
+  focus: () => void;
+  // Stamp it with `[vListOutlet]="cell.content" [vListOutletContext]="cell.contentContext"`
+  content: TemplateRef<unknown> | undefined;
+  contentContext: unknown;
+};
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === 'object' && value !== null;
@@ -114,6 +138,20 @@ export class VListSeparatorDirective<ItemT = unknown> {
   }
 }
 
+// `<ng-template vListCell>` replaces the view around each cell (RN CellRendererComponent)
+// It must wire `layout` and `focus` itself, as RN's custom cell must wire `onLayout`
+@Directive({ selector: '[vListCell]', standalone: true })
+export class VListCellDirective {
+  readonly templateRef = inject<TemplateRef<IVListCellContext>>(TemplateRef);
+
+  static ngTemplateContextGuard(
+    _dir: VListCellDirective,
+    _ctx: unknown,
+  ): _ctx is IVListCellContext {
+    return true;
+  }
+}
+
 // Core-only NgTemplateOutlet twin. The adapter cannot import @angular/common's NgTemplateOutlet
 // (not a dependency), so the list stamps templates through this: it creates the embedded view when
 // the template changes and updates the live view's context IN PLACE on a context change, so a
@@ -122,19 +160,32 @@ export class VListSeparatorDirective<ItemT = unknown> {
 export class VListOutletDirective<C = unknown> implements OnChanges, OnDestroy {
   @Input({ alias: 'vListOutlet' }) templateRef?: TemplateRef<C>;
   @Input({ alias: 'vListOutletContext' }) context?: C;
+  // RN's `ListItemComponent`: stamped instead of the template, its inputs are the item context
+  @Input({ alias: 'vListOutletComponent' }) component?: Type<unknown>;
 
   private viewRef: EmbeddedViewRef<C> | null = null;
+  private componentRef: ComponentRef<unknown> | null = null;
   private readonly viewContainer = inject(ViewContainerRef);
-  private readonly instanceId = (vListOutletInstanceCounter += 1);
+  private readonly instanceId = nextOutletInstanceId();
 
   ngOnChanges(changes: SimpleChanges): void {
-    if (changes['templateRef'] !== undefined) {
+    if (
+      changes['templateRef'] !== undefined ||
+      changes['component'] !== undefined
+    ) {
       if (isDebug())
         dlog(
-          `Angular VListOutlet#${this.instanceId} templateRef CHANGED (was=${changes['templateRef'].previousValue !== undefined} now=${this.templateRef !== undefined}) -> clear + recreate`,
+          `Angular VListOutlet#${this.instanceId} templateRef CHANGED (was=${changes['templateRef']?.previousValue !== undefined} now=${this.templateRef !== undefined}) -> clear + recreate`,
         );
       this.viewContainer.clear();
       countAngular('outletCreates');
+      this.componentRef = null;
+      this.viewRef = null;
+      if (this.component !== undefined) {
+        this.componentRef = this.viewContainer.createComponent(this.component);
+        this.writeComponentInputs(this.componentRef);
+        return;
+      }
       this.viewRef =
         this.templateRef === undefined
           ? null
@@ -144,6 +195,11 @@ export class VListOutletDirective<C = unknown> implements OnChanges, OnDestroy {
             );
       return;
     }
+    if (this.componentRef !== null) {
+      countAngular('outletUpdates');
+      this.writeComponentInputs(this.componentRef);
+      return;
+    }
     if (this.viewRef !== null && this.context !== undefined) {
       countAngular('outletUpdates');
       if (isDebug())
@@ -161,6 +217,26 @@ export class VListOutletDirective<C = unknown> implements OnChanges, OnDestroy {
     this.viewContainer.clear();
   }
 
+  // The item context becomes the component's inputs, only those it declares: RN hands a
+  // `ListItemComponent` item, index and separators, and one may not read all three
+  private writeComponentInputs(ref: ComponentRef<unknown>): void {
+    const { context } = this;
+    if (!isRecord(context)) return;
+    const declared = new Set(
+      reflectComponentType(ref.componentType)?.inputs.map(
+        input => input.propName,
+      ),
+    );
+    const inputs = {
+      item: context['$implicit'],
+      index: context['index'],
+      separators: context['separators'],
+    };
+    for (const [name, value] of Object.entries(inputs)) {
+      if (declared.has(name)) ref.setInput(name, value);
+    }
+  }
+
   // Copy the new context's fields onto the live embedded view's context object (whose identity the
   // consumer's `let-` bindings already read), dropping keys that disappeared. The generic `C` can't
   // be index-WRITTEN even once narrowed (TS2862), so the copy runs in a non-generic helper the

package/src/components/virtualized-list/index.ts

@@ -9,25 +9,32 @@ import {
   Component,
   ElementRef,
   ViewChild,
+  forwardRef,
   inject,
   type AfterViewChecked,
   type DoCheck,
   type OnDestroy,
+  type TemplateRef,
 } from '@angular/core';
 import {
   EMPTY_OFFSET,
   FIRST_INDEX,
   LIST_ACTION_KIND,
-  buildListPlan,
+  LIST_SEGMENT_KIND,
   buildScrollViewHandle,
   buildViewabilityPairs,
-  computeWindow,
   createInitialListState,
+  createListNesting,
+  deriveWindow,
   listEffectSignature,
+  listHasMore,
+  planFromMetrics,
   reduceList,
   resolveItemKey,
   type IListAction,
+  type IListNesting,
   type IListReducerInputs,
+  type IListScope,
   type IListState,
   type IScrollViewHandle,
   type IViewableItemsChangedInfo,
@@ -46,11 +53,14 @@ import {
   SymbioteStyleInputDirective,
   ViewHost,
 } from '../../primitives';
-import { CellRegistry, type IWindowCell } from './cell-registry';
+import { CellRegistry } from './cell-registry';
+import { buildCellRendererContext } from './cell-renderer-context';
 import { VListOutletDirective } from './directives';
 import { ListEffectRunner } from './list-effects';
 import { VirtualizedListBagsBase } from './list-bags';
 import type { IVirtualizedListInputs } from './list-props';
+import { injectVirtualizedListScope, ListScopeProvider } from './nested-scope';
+import { stampPlanRows, type IListRow, type IRowsParams } from './list-rows';
 import { resolveListStyles } from './list-styles';
 import { VIRTUALIZED_LIST_TEMPLATE } from './list-template';
 
@@ -66,15 +76,19 @@ export type {
   IVirtualizedListHandle,
 } from '@symbiote-native/components';
 export {
+  VListCellDirective,
   VListEmptyDirective,
   VListFooterDirective,
   VListHeaderDirective,
   VListItemDirective,
+  VListOutletDirective,
   VListSeparatorDirective,
 } from './directives';
-export type { IVListItemContext, IVListSeparatorContext } from './directives';
-
-type IListPlan = ReturnType<typeof buildListPlan>;
+export type {
+  IVListCellContext,
+  IVListItemContext,
+  IVListSeparatorContext,
+} from './directives';
 
 export type {
   IVirtualizedListInputs,
@@ -89,17 +103,32 @@ export type {
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   imports: [SymbioteHostPropsDirective, VListOutletDirective, ViewHost],
+  providers: [
+    {
+      provide: ListScopeProvider,
+      useExisting: forwardRef(() => VirtualizedList),
+    },
+  ],
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: VIRTUALIZED_LIST_TEMPLATE,
 })
 export class VirtualizedList<ItemT = unknown>
   extends VirtualizedListBagsBase<ItemT>
-  implements IVirtualizedListInputs<ItemT>, DoCheck, AfterViewChecked, OnDestroy
+  implements
+    IVirtualizedListInputs<ItemT>,
+    ListScopeProvider,
+    DoCheck,
+    AfterViewChecked,
+    OnDestroy
 {
   // A template ref on a bare intrinsic hands back the host node directly
   @ViewChild('scrollHost', { read: ElementRef })
   private scrollHostRef?: ElementRef<unknown>;
 
+  // The template holding a cell's item and separator, sits at the root so it resolves up front
+  @ViewChild('cellBody', { static: true })
+  private cellBody?: TemplateRef<unknown>;
+
   protected get scrollNode(): ISymbioteNode | null {
     const node = this.scrollHostRef?.nativeElement;
     return isSymbioteNode(node) ? node : null;
@@ -109,15 +138,16 @@ export class VirtualizedList<ItemT = unknown>
     () => this.scrollNode,
   );
 
+  // The template tells a spacer row from a cell row by this, a bare literal would repeat per host
+  protected readonly spacerKind = LIST_SEGMENT_KIND.spacer;
+
   // Template-bound view state, assembled by `recomputeView` in `ngDoCheck`
   itemCount = EMPTY_OFFSET;
-  windowCells: IWindowCell<ItemT>[] = [];
-  // The nearest sticky cell mounted outside the window, `gapSpacerStyle` fills up to the window
-  forcedStickyCell: IWindowCell<ItemT> | null = null;
-  leadingSpacerStyle: IViewStyle | null = null;
-  gapSpacerStyle: IViewStyle | null = null;
-  trailingSpacerStyle: IViewStyle | null = null;
+  // The plan's spacers and cells in document order
+  rows: IListRow<ItemT>[] = [];
   cellStyle: IViewStyle | undefined = undefined;
+  headerStyle: IViewStyle | undefined = undefined;
+  footerStyle: IViewStyle | undefined = undefined;
 
   // `renderVersion` bumps on every transition that changes render state, for the recompute dedup
   private readonly listState: IListState<ItemT> =
@@ -149,11 +179,34 @@ export class VirtualizedList<ItemT = unknown>
   // This component's own host, the anchor that `class="..."` at the use site resolves onto
   private readonly elementRef = inject(ElementRef);
 
-  private keyFor = (index: number): string => {
+  protected readonly keyFor = (index: number): string => {
     const item = this.getItem(this.data, index);
     return resolveItemKey(item, index, this.keyExtractor);
   };
 
+  private readonly parentScope = injectVirtualizedListScope();
+  private nestingMemo: IListNesting<ItemT> | undefined = undefined;
+
+  // Built on first use, the inputs that pick its axis are set only after construction
+  protected get nesting(): IListNesting<ItemT> {
+    this.nestingMemo ??= createListNesting<ItemT>({
+      parent: this.parentScope,
+      horizontal: this.isHorizontal,
+      getState: () => this.listState,
+      dispatch: action => this.dispatch(action),
+      getContainerNode: () => this.scrollNode,
+      getHasMore: () => listHasMore(this.listState),
+      keyFor: this.keyFor,
+      handlers: () => this.listHandlers,
+    });
+    return this.nestingMemo;
+  }
+
+  // The scope the lists in this list's cells inject
+  get listScope(): IListScope {
+    return this.nesting.scope;
+  }
+
   // Edge and viewability listeners map to `.observed`, so the reducer emits only if listened to
   private buildInputs(): IListReducerInputs<ItemT> {
     return {
@@ -164,6 +217,7 @@ export class VirtualizedList<ItemT = unknown>
       getItemLayout: this.getItemLayout,
       horizontal: this.isHorizontal,
       windowSize: this.windowSizeValue,
+      disableVirtualization: this.disableVirtualization,
       initialNumToRender: this.initialNumToRenderValue,
       maxToRenderPerBatch: this.maxToRenderPerBatchValue,
       updateCellsBatchingPeriod: this.updateCellsBatchingPeriodValue,
@@ -181,6 +235,8 @@ export class VirtualizedList<ItemT = unknown>
       ),
       maintainVisibleContentPosition: this.maintainVisibleContentPosition,
       initialScrollIndex: this.initialScrollIndex,
+      findFirstChildWithMore: (first, last) =>
+        this.nesting.findFirstChildWithMore(first, last),
     };
   }
 
@@ -204,15 +260,12 @@ export class VirtualizedList<ItemT = unknown>
     const m = this.listState.metrics;
     // Mid-fill the window climbs one batch step per render, only a render advances it
     if (m.first !== m.target.first || m.last !== m.target.last) return false;
-    const next = computeWindow(
+    const next = deriveWindow(
+      this.listState,
+      this.buildInputs(),
       m.count,
-      m.offsets,
-      m.lengths,
-      this.listState.scrollOffset,
-      this.listState.viewportLength,
-      this.windowSizeValue,
-      this.initialNumToRenderValue,
-    );
+      m,
+    ).target;
     const isSettled =
       next.first === m.target.first && next.last === m.target.last;
     if (!isSettled)
@@ -234,6 +287,7 @@ export class VirtualizedList<ItemT = unknown>
       this.isHorizontal,
       this.isInverted,
       this.windowSizeValue,
+      this.disableVirtualization,
       this.initialNumToRenderValue,
       this.maxToRenderPerBatchValue,
       this.stickyHeaderIndices,
@@ -242,11 +296,14 @@ export class VirtualizedList<ItemT = unknown>
       // Arrives through `addClass` and `removeClass`, never as an input
       anchorHostStyle(this.elementRef),
       this.contentContainerStyle,
+      this.listHeaderComponentStyle,
+      this.listFooterComponentStyle,
       this.renderVersion,
       this.headerDir !== undefined,
       this.footerDir !== undefined,
       this.emptyDir !== undefined,
       this.separatorTemplate !== undefined,
+      this.cellRendererTpl,
     ];
     const previous = this.lastRecompute;
     this.lastRecompute = recomputeInputs;
@@ -281,6 +338,7 @@ export class VirtualizedList<ItemT = unknown>
 
   ngOnDestroy(): void {
     this.effects.dispose();
+    this.nestingMemo?.detach();
   }
 
   private recomputeView(): void {
@@ -297,29 +355,35 @@ export class VirtualizedList<ItemT = unknown>
       this.showEmpty();
       return;
     }
-    const stickySet =
-      this.stickyHeaderIndices !== undefined
-        ? new Set(this.stickyHeaderIndices)
-        : undefined;
-    const plan = buildListPlan({
+    this.rows = stampPlanRows({
+      windowPlan: planFromMetrics(m, this.keyFor, this.stickyHeaderIndices),
+      cells: this.cells,
       count: m.count,
-      first: m.first,
-      last: m.last,
-      offsets: m.offsets,
-      lengths: m.lengths,
-      total: m.total,
-      keyFor: this.keyFor,
-      stickyIndices: stickySet,
-      hasHeader: this.headerDir !== undefined,
+      isHorizontal: this.isHorizontal,
+      hasSeparators: this.separatorTemplate !== undefined,
+      rendererFor: this.rendererFor(),
     });
-    this.applySpacers(plan);
-    this.buildCells(plan, stickySet);
+    this.cells.endPass();
     dlog(
       `Angular VirtualizedList window [${m.first}, ${m.last}] of ${m.count} ` +
-        `(offset=${this.listState.scrollOffset}, viewport=${this.listState.viewportLength}, rendered=${this.windowCells.length})`,
+        `(offset=${this.listState.scrollOffset}, viewport=${this.listState.viewportLength}, rows=${this.rows.length})`,
     );
   }
 
+  // Only a list given a `vListCell` template builds the wrapper contexts
+  private rendererFor(): IRowsParams<ItemT>['rendererFor'] {
+    if (this.cellRendererTpl === undefined) return undefined;
+    return cell =>
+      buildCellRendererContext({
+        cell,
+        style: this.cellStyle,
+        body: this.cellBody,
+        layout: (measure, event, index) =>
+          this.handleCellLayout(measure, event, index),
+        focus: index => this.handleCellFocus(index),
+      });
+  }
+
   private applyStyles(total: number): void {
     const styles = resolveListStyles({
       isHorizontal: this.isHorizontal,
@@ -328,75 +392,44 @@ export class VirtualizedList<ItemT = unknown>
       hasHeader: this.headerDir !== undefined,
       style: this.style,
       contentContainerStyle: this.contentContainerStyle,
+      listHeaderComponentStyle: this.listHeaderComponentStyle,
+      listFooterComponentStyle: this.listFooterComponentStyle,
       anchorStyle: anchorHostStyle(this.elementRef),
       maintainVisibleContentPosition: this.maintainVisibleContentPosition,
     });
     this.resolvedStyle = styles.style;
     this.resolvedContentContainerStyle = styles.contentContainerStyle;
     this.cellStyle = styles.cellStyle;
+    this.headerStyle = styles.headerStyle;
+    this.footerStyle = styles.footerStyle;
     this.resolvedMaintainVisibleContentPosition =
       styles.maintainVisibleContentPosition;
   }
 
   private showEmpty(): void {
     this.cells.clear();
-    this.windowCells = [];
-    this.forcedStickyCell = null;
-    this.leadingSpacerStyle = null;
-    this.gapSpacerStyle = null;
-    this.trailingSpacerStyle = null;
+    this.rows = [];
     dlog(
       `Angular VirtualizedList empty (viewport=${this.listState.viewportLength})`,
     );
   }
 
-  private applySpacers(plan: IListPlan): void {
-    this.leadingSpacerStyle = this.spacerStyle(plan.leadingExtent);
-    this.gapSpacerStyle = this.spacerStyle(plan.gapExtent);
-    this.trailingSpacerStyle = this.spacerStyle(plan.trailingExtent);
-  }
-
-  private spacerStyle(extent: number): IViewStyle | null {
-    if (extent <= EMPTY_OFFSET) return null;
-    return this.isHorizontal ? { width: extent } : { height: extent };
-  }
-
-  private buildCells(
-    plan: IListPlan,
-    stickySet: Set<number> | undefined,
-  ): void {
-    const count = this.listState.metrics.count;
-    const forced = plan.forcedStickyCell;
-    dlog(
-      `STICKY[list] stickySet=${stickySet === undefined ? 'undefined' : JSON.stringify([...stickySet])} ` +
-        `childPositions=${JSON.stringify(plan.stickyChildPositions)} ` +
-        `forcedStickyCell=${forced === undefined ? 'none' : forced.index}`,
-    );
-    // Sticky by construction: a forced cell exists only for an index in `stickySet`
-    this.forcedStickyCell =
-      forced !== undefined
-        ? this.cells.windowCell(forced.index, forced.key, false, true)
-        : null;
-    const hasSeparators = this.separatorTemplate !== undefined;
-    // The separator gates on the last index of the data, not of the window, or a cell's height
-    // would shift as it slides past
-    this.windowCells = plan.cells.map(planned =>
-      this.cells.windowCell(
-        planned.index,
-        planned.key,
-        hasSeparators && planned.index < count - 1,
-        stickySet?.has(planned.index) === true,
-      ),
-    );
-    this.cells.endPass();
-  }
-
   // Angular forbids an `[onLayout]` binding, so the event arrives untyped and is narrowed here
   handleCellLayout(
     measure: (event: ISymbioteEvent) => void,
     event: unknown,
+    index: number,
   ): void {
-    if (this.isSymbioteEvent(event)) measure(event);
+    if (!this.isSymbioteEvent(event)) return;
+    measure(event);
+    const cellKey = this.keyFor(index);
+    this.nesting.scope.registerCellNode(event.currentTarget, cellKey);
+    this.nesting.remeasureCell(cellKey);
+  }
+
+  // Focus inside a cell keeps a viewport of cells around it mounted, like RN's focus capture
+  handleCellFocus(index: number): void {
+    this.dispatch({ kind: LIST_ACTION_KIND.cellFocused, index });
   }
 
   private isSymbioteEvent(value: unknown): value is ISymbioteEvent {

package/src/components/virtualized-list/list-bags.ts

@@ -3,15 +3,14 @@
 
 import { Directive, computed, signal, type OnChanges } from '@angular/core';
 import {
-  LIST_ACTION_KIND,
-  readLayoutLength,
-  readScrollOffset,
+  createListHandlers,
   resolveAccessibilityProps,
   type IAccessibilityProps,
   type IAriaProps,
+  type IListHandlers,
+  type IListNesting,
 } from '@symbiote-native/components';
 import {
-  dlog,
   type IStyleProp,
   type ISymbioteEvent,
   type IViewStyle,
@@ -32,6 +31,23 @@ export abstract class VirtualizedListBagsBase<ItemT>
   // A fresh object per push, so the commit re-applies a repeated offset
   commandedOffset: { x: number; y: number } | undefined = undefined;
 
+  protected abstract get nesting(): IListNesting<ItemT>;
+
+  protected abstract readonly keyFor: (index: number) => string;
+
+  // Reads of `this` are deferred to the event, so the inputs are set by the time they run
+  protected readonly listHandlers: IListHandlers = createListHandlers<ItemT>({
+    isHorizontal: () => this.isHorizontal,
+    user: () => this,
+    nesting: () => this.nesting,
+    dispatch: action => this.dispatch(action),
+    clearCommandedOffset: () => {
+      this.commandedOffset = undefined;
+    },
+    getNode: () => this.scrollNode,
+    keyFor: index => this.keyFor(index),
+  });
+
   // Only inputs may feed this signal, window state changes skip `ngOnChanges`
   private readonly inputsRevision = signal(0);
 
@@ -64,15 +80,18 @@ export abstract class VirtualizedListBagsBase<ItemT>
       contentContainerStyle: this.resolvedContentContainerStyle,
       onScroll: this.onScrollTick,
       onLayout: this.onLayoutTick,
-      onScrollBeginDrag: this.onScrollBeginDrag,
-      onScrollEndDrag: this.onScrollEndDrag,
-      onMomentumScrollBegin: this.onMomentumScrollBegin,
-      onMomentumScrollEnd: this.onMomentumScrollEnd,
+      onScrollBeginDrag: this.listHandlers.onScrollBeginDrag,
+      onScrollEndDrag: this.listHandlers.onScrollEndDrag,
+      onMomentumScrollBegin: this.listHandlers.onMomentumScrollBegin,
+      onMomentumScrollEnd: this.listHandlers.onMomentumScrollEnd,
+      onContentSizeChange: this.listHandlers.onContentSizeChange,
       scrollEventThrottle: this.scrollEventThrottle,
       keyboardShouldPersistTaps: this.keyboardShouldPersistTaps,
       keyboardDismissMode: this.keyboardDismissMode,
       removeClippedSubviews: this.removeClippedSubviews,
       nestedScrollEnabled: this.nestedScrollEnabled,
+      stickyHeaderHiddenOnScroll: this.stickyHeaderHiddenOnScroll,
+      innerViewRef: this.innerViewRef,
       // Android moves the scrollbar back after the `scale: -1` flip
       isInvertedVirtualizedList: this.isInverted ? true : undefined,
       contentOffset: this.commandedOffset,
@@ -101,23 +120,23 @@ export abstract class VirtualizedListBagsBase<ItemT>
     };
   }
 
+  // The list above scrolls, so RN renders a `View` with no content container
+  nestedViewBag(): Record<string, unknown> {
+    return {
+      ...this.foldedAccessibility(),
+      style: this.resolvedStyle,
+      onLayout: this.onLayoutTick,
+    };
+  }
+
   // `onScroll` stays a callback so an `Animated.event` target can flow through it
   onScrollTick = (event: ISymbioteEvent): void => {
     countAngular('scrollTicks');
-    const offset = readScrollOffset(event, this.isHorizontal);
-    if (offset === undefined) return;
-    dlog(`Angular VirtualizedList onScroll offset=${offset}`);
-    // A real native scroll supersedes any pending commanded offset
-    this.commandedOffset = undefined;
-    this.dispatch({ kind: LIST_ACTION_KIND.scroll, offset });
-    this.onScroll?.(event);
+    this.listHandlers.onScroll(event);
   };
 
   onLayoutTick = (event: ISymbioteEvent): void => {
-    const length = readLayoutLength(event, this.isHorizontal);
-    if (length === undefined) return;
-    dlog(`Angular VirtualizedList onLayout viewport=${length}`);
-    this.dispatch({ kind: LIST_ACTION_KIND.layout, length });
+    this.listHandlers.onViewportLayout(event);
   };
 
   handleRefresh = (): void => {