Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions packages/virtual-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ export interface VirtualizerOptions<
rangeExtractor?: (range: Range) => number[]
scrollMargin?: number
scrollingDelay?: number
elementKeyAttribute?: string
indexAttribute?: string
initialMeasurementsCache?: VirtualItem[]
}
Expand Down Expand Up @@ -344,6 +345,7 @@ export class Virtualizer<
scrollMargin: 0,
scrollingDelay: 150,
indexAttribute: 'data-index',
elementKeyAttribute: 'data-element-key',
initialMeasurementsCache: [],
...opts,
}
Expand Down Expand Up @@ -561,17 +563,17 @@ export class Virtualizer<
) => {
const index = this.indexFromElement(node)

const item = this.measurementsCache[index]
if (!item) {
return
}
const item = notUndefined(this.measurementsCache[index])

const elementKey =
node.getAttribute(this.options.elementKeyAttribute) ?? item.key

const prevNode = this.measureElementCache.get(item.key)
const prevNode = this.measureElementCache.get(elementKey)

if (!node.isConnected) {
this.observer.unobserve(node)
if (node === prevNode) {
this.measureElementCache.delete(item.key)
this.measureElementCache.delete(elementKey)
}
return
}
Expand All @@ -581,7 +583,7 @@ export class Virtualizer<
this.observer.unobserve(prevNode)
}
this.observer.observe(node)
this.measureElementCache.set(item.key, node)
this.measureElementCache.set(elementKey, node)
}

const measuredItemSize = this.options.measureElement(node, entry, this)
Expand Down