@tanstack/virtual-core 3.0.0-beta.40 → 3.0.0-beta.42

package/src/index.ts

@@ -1,4 +1,4 @@
-import { memo } from './utils'
+import { approxEqual, memo, notUndefined } from './utils'
 
 export * from './utils'
 
@@ -438,8 +438,6 @@ export class Virtualizer<
           }, this.options.scrollingDelay)
         }),
       )
-    } else if (!this.isScrolling) {
-      this.calculateRange()
     }
   }
 
@@ -490,7 +488,7 @@ export class Virtualizer<
 
   calculateRange = memo(
     () => [this.getMeasurements(), this.getSize(), this.scrollOffset],
-    (measurements, outerSize, scrollOffset) => {
+    (measurements, outerSize, scrollOffset, [flush = true]: [boolean?]) => {
       const range = calculateRange({
         measurements,
         outerSize,
@@ -501,7 +499,9 @@ export class Virtualizer<
         range.endIndex !== this.range.endIndex
       ) {
         this.range = range
-        this.notify()
+        if (flush) {
+          this.notify()
+        }
       }
       return this.range
     },
@@ -514,7 +514,7 @@ export class Virtualizer<
   private getIndexes = memo(
     () => [
       this.options.rangeExtractor,
-      this.range,
+      this.calculateRange(false),
       this.options.overscan,
       this.options.count,
     ],
@@ -693,6 +693,8 @@ export class Virtualizer<
     index: number,
     { align = 'auto', behavior }: ScrollToIndexOptions = {},
   ) => {
+    index = Math.max(0, Math.min(index, this.options.count - 1))
+
     if (this.scrollToIndexTimeoutId !== null) {
       clearTimeout(this.scrollToIndexTimeoutId)
       this.scrollToIndexTimeoutId = null
@@ -707,19 +709,7 @@ export class Virtualizer<
       return
     }
 
-    const getMeasurement = () => {
-      const measurements = this.getMeasurements()
-      const measurement =
-        measurements[Math.max(0, Math.min(index, this.options.count - 1))]
-
-      if (!measurement) {
-        throw new Error(`VirtualItem not found for index = ${index}`)
-      }
-
-      return measurement
-    }
-
-    const measurement = getMeasurement()
+    const measurement = notUndefined(this.getMeasurements()[index])
 
     if (align === 'auto') {
       if (
@@ -754,8 +744,6 @@ export class Virtualizer<
     }
     this._scrollToOffset(toOffset, options)
 
-    const approxEqual = (a: number, b: number) => Math.abs(a - b) < 1
-
     if (isDynamic) {
       this.scrollToIndexTimeoutId = setTimeout(() => {
         this.scrollToIndexTimeoutId = null
@@ -764,7 +752,9 @@ export class Virtualizer<
           !!this.measureElementCache[this.options.getItemKey(index)]
 
         if (elementInDOM) {
-          const toOffset = getOffsetForIndexAndAlignment(getMeasurement())
+          const toOffset = getOffsetForIndexAndAlignment(
+            notUndefined(this.getMeasurements()[index]),
+          )
 
           if (!approxEqual(toOffset, this.scrollOffset)) {
             this.scrollToIndex(index, { align, behavior })

package/src/utils.ts

@@ -2,19 +2,23 @@ export type NoInfer<A extends any> = [A][A extends any ? 0 : never]
 
 export type PartialKeys<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
 
-export function memo<TDeps extends readonly any[], TResult>(
+export function memo<
+  TDeps extends readonly any[],
+  TResult,
+  FArgs extends readonly any[],
+>(
   getDeps: () => [...TDeps],
-  fn: (...args: NoInfer<[...TDeps]>) => TResult,
+  fn: (...args: [...TDeps, FArgs]) => TResult,
   opts: {
     key: any
     debug?: () => any
     onChange?: (result: TResult) => void
   },
-): () => TResult {
+) {
   let deps: any[] = []
   let result: TResult | undefined
 
-  return () => {
+  return (...fArgs: FArgs): TResult => {
     let depTime: number
     if (opts.key && opts.debug?.()) depTime = Date.now()
 
@@ -33,7 +37,7 @@ export function memo<TDeps extends readonly any[], TResult>(
     let resultTime: number
     if (opts.key && opts.debug?.()) resultTime = Date.now()
 
-    result = fn(...newDeps)
+    result = fn(...newDeps, fArgs)
     opts?.onChange?.(result)
 
     if (opts.key && opts.debug?.()) {
@@ -65,3 +69,13 @@ export function memo<TDeps extends readonly any[], TResult>(
     return result!
   }
 }
+
+export function notUndefined<T>(value: T | undefined, msg?: string): T {
+  if (value === undefined) {
+    throw new Error(`Unexpected undefined${msg ? `: ${msg}` : ''}`)
+  } else {
+    return value
+  }
+}
+
+export const approxEqual = (a: number, b: number) => Math.abs(a - b) < 1