@react-stately/layout 4.1.1 → 4.2.1

package/dist/GridLayout.module.js

@@ -11,80 +11,153 @@ import {Size as $ipgKF$Size, Rect as $ipgKF$Rect, LayoutInfo as $ipgKF$LayoutInf
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
+const $a58592d295a170a4$var$DEFAULT_OPTIONS = {
+    minItemSize: new (0, $ipgKF$Size)(200, 200),
+    maxItemSize: new (0, $ipgKF$Size)(Infinity, Infinity),
+    preserveAspectRatio: false,
+    minSpace: new (0, $ipgKF$Size)(18, 18),
+    maxColumns: Infinity,
+    dropIndicatorThickness: 2
+};
 class $a58592d295a170a4$export$7d2b12578154a735 extends (0, $ipgKF$Layout) {
-    update() {
+    shouldInvalidateLayoutOptions(newOptions, oldOptions) {
+        return newOptions.maxColumns !== oldOptions.maxColumns || newOptions.dropIndicatorThickness !== oldOptions.dropIndicatorThickness || newOptions.preserveAspectRatio !== oldOptions.preserveAspectRatio || !(newOptions.minItemSize || $a58592d295a170a4$var$DEFAULT_OPTIONS.minItemSize).equals(oldOptions.minItemSize || $a58592d295a170a4$var$DEFAULT_OPTIONS.minItemSize) || !(newOptions.maxItemSize || $a58592d295a170a4$var$DEFAULT_OPTIONS.maxItemSize).equals(oldOptions.maxItemSize || $a58592d295a170a4$var$DEFAULT_OPTIONS.maxItemSize) || !(newOptions.minSpace || $a58592d295a170a4$var$DEFAULT_OPTIONS.minSpace).equals(oldOptions.minSpace || $a58592d295a170a4$var$DEFAULT_OPTIONS.minSpace);
+    }
+    update(invalidationContext) {
+        let { minItemSize: minItemSize = $a58592d295a170a4$var$DEFAULT_OPTIONS.minItemSize, maxItemSize: maxItemSize = $a58592d295a170a4$var$DEFAULT_OPTIONS.maxItemSize, preserveAspectRatio: preserveAspectRatio = $a58592d295a170a4$var$DEFAULT_OPTIONS.preserveAspectRatio, minSpace: minSpace = $a58592d295a170a4$var$DEFAULT_OPTIONS.minSpace, maxColumns: maxColumns = $a58592d295a170a4$var$DEFAULT_OPTIONS.maxColumns, dropIndicatorThickness: dropIndicatorThickness = $a58592d295a170a4$var$DEFAULT_OPTIONS.dropIndicatorThickness } = invalidationContext.layoutOptions || {};
+        this.dropIndicatorThickness = dropIndicatorThickness;
         let visibleWidth = this.virtualizer.visibleRect.width;
         // The max item width is always the entire viewport.
         // If the max item height is infinity, scale in proportion to the max width.
-        let maxItemWidth = Math.min(this.maxItemSize.width, visibleWidth);
-        let maxItemHeight = Number.isFinite(this.maxItemSize.height) ? this.maxItemSize.height : Math.floor(this.minItemSize.height / this.minItemSize.width * maxItemWidth);
+        let maxItemWidth = Math.min(maxItemSize.width, visibleWidth);
+        let maxItemHeight = Number.isFinite(maxItemSize.height) ? maxItemSize.height : Math.floor(minItemSize.height / minItemSize.width * maxItemWidth);
         // Compute the number of rows and columns needed to display the content
-        let columns = Math.floor(visibleWidth / (this.minItemSize.width + this.minSpace.width));
-        this.numColumns = Math.max(1, Math.min(this.maxColumns, columns));
+        let columns = Math.floor(visibleWidth / (minItemSize.width + minSpace.width));
+        let numColumns = Math.max(1, Math.min(maxColumns, columns));
+        this.numColumns = numColumns;
         // Compute the available width (minus the space between items)
-        let width = visibleWidth - this.minSpace.width * Math.max(0, this.numColumns);
+        let width = visibleWidth - minSpace.width * Math.max(0, numColumns);
         // Compute the item width based on the space available
-        let itemWidth = Math.floor(width / this.numColumns);
-        itemWidth = Math.max(this.minItemSize.width, Math.min(maxItemWidth, itemWidth));
+        let itemWidth = Math.floor(width / numColumns);
+        itemWidth = Math.max(minItemSize.width, Math.min(maxItemWidth, itemWidth));
         // Compute the item height, which is proportional to the item width
-        let t = (itemWidth - this.minItemSize.width) / Math.max(1, maxItemWidth - this.minItemSize.width);
-        let itemHeight = this.minItemSize.height + Math.floor((maxItemHeight - this.minItemSize.height) * t);
-        itemHeight = Math.max(this.minItemSize.height, Math.min(maxItemHeight, itemHeight));
-        this.itemSize = new (0, $ipgKF$Size)(itemWidth, itemHeight);
+        let t = (itemWidth - minItemSize.width) / Math.max(1, maxItemWidth - minItemSize.width);
+        let itemHeight = minItemSize.height + Math.floor((maxItemHeight - minItemSize.height) * t);
+        itemHeight = Math.max(minItemSize.height, Math.min(maxItemHeight, itemHeight));
         // Compute the horizontal spacing and content height
-        this.horizontalSpacing = Math.floor((visibleWidth - this.numColumns * this.itemSize.width) / (this.numColumns + 1));
-        this.layoutInfos = [];
-        for (let node of this.virtualizer.collection)this.layoutInfos.push(this.getLayoutInfoForNode(node));
-    }
-    getVisibleLayoutInfos(rect) {
-        let firstVisibleItem = this.getIndexAtPoint(rect.x, rect.y);
-        let lastVisibleItem = this.getIndexAtPoint(rect.maxX, rect.maxY);
-        let result = this.layoutInfos.slice(firstVisibleItem, lastVisibleItem + 1);
-        let persistedIndices = [];
-        for (let key of this.virtualizer.persistedKeys){
-            let item = this.virtualizer.collection.getItem(key);
-            if ((item === null || item === void 0 ? void 0 : item.index) != null) persistedIndices.push(item.index);
-        }
-        persistedIndices.sort((a, b)=>a - b);
-        let persistedBefore = [];
-        for (let index of persistedIndices){
-            if (index < firstVisibleItem) persistedBefore.push(this.layoutInfos[index]);
-            else if (index > lastVisibleItem) result.push(this.layoutInfos[index]);
+        let horizontalSpacing = Math.floor((visibleWidth - numColumns * itemWidth) / (numColumns + 1));
+        this.gap = new (0, $ipgKF$Size)(horizontalSpacing, minSpace.height);
+        let rows = Math.ceil(this.virtualizer.collection.size / numColumns);
+        let iterator = this.virtualizer.collection[Symbol.iterator]();
+        let y = rows > 0 ? minSpace.height : 0;
+        let newLayoutInfos = new Map();
+        let skeleton = null;
+        let skeletonCount = 0;
+        for(let row = 0; row < rows; row++){
+            let maxHeight = 0;
+            let rowLayoutInfos = [];
+            for(let col = 0; col < numColumns; col++){
+                // Repeat skeleton until the end of the current row.
+                let node = skeleton || iterator.next().value;
+                if (!node) break;
+                if (node.type === 'skeleton') skeleton = node;
+                let key = skeleton ? `${skeleton.key}-${skeletonCount++}` : node.key;
+                let oldLayoutInfo = this.layoutInfos.get(key);
+                let content = node;
+                if (skeleton) content = oldLayoutInfo && oldLayoutInfo.content.key === key ? oldLayoutInfo.content : {
+                    ...skeleton,
+                    key: key
+                };
+                let x = horizontalSpacing + col * (itemWidth + horizontalSpacing);
+                let height = itemHeight;
+                let estimatedSize = !preserveAspectRatio;
+                if (oldLayoutInfo && estimatedSize) {
+                    height = oldLayoutInfo.rect.height;
+                    estimatedSize = invalidationContext.layoutOptionsChanged || invalidationContext.sizeChanged || oldLayoutInfo.estimatedSize || oldLayoutInfo.content !== content;
+                }
+                let rect = new (0, $ipgKF$Rect)(x, y, itemWidth, height);
+                let layoutInfo = new (0, $ipgKF$LayoutInfo)(node.type, key, rect);
+                layoutInfo.estimatedSize = estimatedSize;
+                layoutInfo.allowOverflow = true;
+                layoutInfo.content = content;
+                newLayoutInfos.set(key, layoutInfo);
+                rowLayoutInfos.push(layoutInfo);
+                maxHeight = Math.max(maxHeight, layoutInfo.rect.height);
+            }
+            for (let layoutInfo of rowLayoutInfos)layoutInfo.rect.height = maxHeight;
+            y += maxHeight + minSpace.height;
+            // Keep adding skeleton rows until we fill the viewport
+            if (skeleton && row === rows - 1 && y < this.virtualizer.visibleRect.height) rows++;
         }
-        result.unshift(...persistedBefore);
-        return result;
-    }
-    getIndexAtPoint(x, y) {
-        let itemHeight = this.itemSize.height + this.minSpace.height;
-        let itemWidth = this.itemSize.width + this.horizontalSpacing;
-        return Math.max(0, Math.min(this.virtualizer.collection.size - 1, Math.floor(y / itemHeight) * this.numColumns + Math.floor((x - this.horizontalSpacing) / itemWidth)));
+        this.layoutInfos = newLayoutInfos;
+        this.contentSize = new (0, $ipgKF$Size)(this.virtualizer.visibleRect.width, y);
     }
     getLayoutInfo(key) {
-        let node = this.virtualizer.collection.getItem(key);
-        return node ? this.layoutInfos[node.index] : null;
-    }
-    getLayoutInfoForNode(node) {
-        let idx = node.index;
-        let row = Math.floor(idx / this.numColumns);
-        let column = idx % this.numColumns;
-        let x = this.horizontalSpacing + column * (this.itemSize.width + this.horizontalSpacing);
-        let y = this.minSpace.height + row * (this.itemSize.height + this.minSpace.height);
-        let rect = new (0, $ipgKF$Rect)(x, y, this.itemSize.width, this.itemSize.height);
-        return new (0, $ipgKF$LayoutInfo)(node.type, node.key, rect);
+        return this.layoutInfos.get(key);
     }
     getContentSize() {
-        let numRows = Math.ceil(this.virtualizer.collection.size / this.numColumns);
-        let contentHeight = this.minSpace.height + numRows * (this.itemSize.height + this.minSpace.height);
-        return new (0, $ipgKF$Size)(this.virtualizer.visibleRect.width, contentHeight);
+        return this.contentSize;
+    }
+    getVisibleLayoutInfos(rect) {
+        let layoutInfos = [];
+        for (let layoutInfo of this.layoutInfos.values())if (layoutInfo.rect.intersects(rect) || this.virtualizer.isPersistedKey(layoutInfo.key)) layoutInfos.push(layoutInfo);
+        return layoutInfos;
+    }
+    updateItemSize(key, size) {
+        let layoutInfo = this.layoutInfos.get(key);
+        if (!size || !layoutInfo) return false;
+        if (size.height !== layoutInfo.rect.height) {
+            let newLayoutInfo = layoutInfo.copy();
+            newLayoutInfo.rect.height = size.height;
+            newLayoutInfo.estimatedSize = false;
+            this.layoutInfos.set(key, newLayoutInfo);
+            return true;
+        }
+        return false;
     }
     getDropTargetFromPoint(x, y, isValidDropTarget) {
-        if (this.layoutInfos.length === 0) return {
+        if (this.layoutInfos.size === 0) return {
             type: 'root'
         };
         x += this.virtualizer.visibleRect.x;
         y += this.virtualizer.visibleRect.y;
-        let index = this.getIndexAtPoint(x, y);
-        let layoutInfo = this.layoutInfos[index];
+        // Find the closest item within on either side of the point using the gap width.
+        let key = null;
+        if (this.numColumns === 1) {
+            let searchRect = new (0, $ipgKF$Rect)(x, Math.max(0, y - this.gap.height), 1, this.gap.height * 2);
+            let candidates = this.getVisibleLayoutInfos(searchRect);
+            let minDistance = Infinity;
+            for (let candidate of candidates){
+                // Ignore items outside the search rect, e.g. persisted keys.
+                if (!candidate.rect.intersects(searchRect)) continue;
+                let yDist = Math.abs(candidate.rect.y - y);
+                let maxYDist = Math.abs(candidate.rect.maxY - y);
+                let dist = Math.min(yDist, maxYDist);
+                if (dist < minDistance) {
+                    minDistance = dist;
+                    key = candidate.key;
+                }
+            }
+        } else {
+            let searchRect = new (0, $ipgKF$Rect)(Math.max(0, x - this.gap.width), y, this.gap.width * 2, 1);
+            let candidates = this.getVisibleLayoutInfos(searchRect);
+            let minDistance = Infinity;
+            for (let candidate of candidates){
+                // Ignore items outside the search rect, e.g. persisted keys.
+                if (!candidate.rect.intersects(searchRect)) continue;
+                let xDist = Math.abs(candidate.rect.x - x);
+                let maxXDist = Math.abs(candidate.rect.maxX - x);
+                let dist = Math.min(xDist, maxXDist);
+                if (dist < minDistance) {
+                    minDistance = dist;
+                    key = candidate.key;
+                }
+            }
+        }
+        let layoutInfo = key != null ? this.getLayoutInfo(key) : null;
+        if (!layoutInfo) return {
+            type: 'root'
+        };
         let target = {
             type: 'item',
             key: layoutInfo.key,
@@ -116,17 +189,12 @@ class $a58592d295a170a4$export$7d2b12578154a735 extends (0, $ipgKF$Layout) {
         let layoutInfo = this.getLayoutInfo(target.key);
         let rect;
         if (this.numColumns === 1) // Flip from vertical to horizontal if only one column is visible.
-        rect = new (0, $ipgKF$Rect)(layoutInfo.rect.x, target.dropPosition === 'before' ? layoutInfo.rect.y - this.minSpace.height / 2 - this.dropIndicatorThickness / 2 : layoutInfo.rect.maxY + this.minSpace.height / 2 - this.dropIndicatorThickness / 2, layoutInfo.rect.width, this.dropIndicatorThickness);
-        else rect = new (0, $ipgKF$Rect)(target.dropPosition === 'before' ? layoutInfo.rect.x - this.horizontalSpacing / 2 - this.dropIndicatorThickness / 2 : layoutInfo.rect.maxX + this.horizontalSpacing / 2 - this.dropIndicatorThickness / 2, layoutInfo.rect.y, this.dropIndicatorThickness, layoutInfo.rect.height);
+        rect = new (0, $ipgKF$Rect)(layoutInfo.rect.x, target.dropPosition === 'before' ? layoutInfo.rect.y - this.gap.height / 2 - this.dropIndicatorThickness / 2 : layoutInfo.rect.maxY + this.gap.height / 2 - this.dropIndicatorThickness / 2, layoutInfo.rect.width, this.dropIndicatorThickness);
+        else rect = new (0, $ipgKF$Rect)(target.dropPosition === 'before' ? layoutInfo.rect.x - this.gap.width / 2 - this.dropIndicatorThickness / 2 : layoutInfo.rect.maxX + this.gap.width / 2 - this.dropIndicatorThickness / 2, layoutInfo.rect.y, this.dropIndicatorThickness, layoutInfo.rect.height);
         return new (0, $ipgKF$LayoutInfo)('dropIndicator', target.key + ':' + target.dropPosition, rect);
     }
-    constructor(options){
-        super(), this.itemSize = new (0, $ipgKF$Size)(), this.numColumns = 0, this.horizontalSpacing = 0, this.layoutInfos = [];
-        this.minItemSize = options.minItemSize || new (0, $ipgKF$Size)(200, 200);
-        this.maxItemSize = options.maxItemSize || new (0, $ipgKF$Size)(Infinity, Infinity);
-        this.minSpace = options.minSpace || new (0, $ipgKF$Size)(18, 18);
-        this.maxColumns = options.maxColumns || Infinity;
-        this.dropIndicatorThickness = options.dropIndicatorThickness || 2;
+    constructor(...args){
+        super(...args), this.gap = $a58592d295a170a4$var$DEFAULT_OPTIONS.minSpace, this.dropIndicatorThickness = 2, this.numColumns = 0, this.contentSize = new (0, $ipgKF$Size)(), this.layoutInfos = new Map();
     }
 }
 

package/dist/GridLayout.module.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/@react-stately/layout/src/GridLayout.ts"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {DropTarget, DropTargetDelegate, ItemDropTarget, Key, Node} from '@react-types/shared';\nimport {Layout, LayoutInfo, Rect, Size} from '@react-stately/virtualizer';\n\nexport interface GridLayoutOptions {\n  /**\n   * The minimum item size.\n   * @default 200 x 200\n   */\n  minItemSize?: Size,\n  /**\n   * The maximum item size.\n   * @default Infinity\n   */\n  maxItemSize?: Size,\n  /**\n   * The minimum space required between items.\n   * @default 18 x 18\n   */\n  minSpace?: Size,\n  /**\n   * The maximum number of columns.\n   * @default Infinity\n   */\n  maxColumns?: number,\n  /**\n   * The thickness of the drop indicator.\n   * @default 2\n   */\n  dropIndicatorThickness?: number\n}\n\nexport class GridLayout<T, O = any> extends Layout<Node<T>, O> implements DropTargetDelegate {\n  protected minItemSize: Size;\n  protected maxItemSize: Size;\n  protected minSpace: Size;\n  protected maxColumns: number;\n  protected dropIndicatorThickness: number;\n  protected itemSize: Size = new Size();\n  protected numColumns: number = 0;\n  protected horizontalSpacing: number = 0;\n  protected layoutInfos: LayoutInfo[] = [];\n\n  constructor(options: GridLayoutOptions) {\n    super();\n    this.minItemSize = options.minItemSize || new Size(200, 200);\n    this.maxItemSize = options.maxItemSize || new Size(Infinity, Infinity);\n    this.minSpace = options.minSpace || new Size(18, 18);\n    this.maxColumns = options.maxColumns || Infinity;\n    this.dropIndicatorThickness = options.dropIndicatorThickness || 2;\n  }\n\n  update(): void {\n    let visibleWidth = this.virtualizer!.visibleRect.width;\n\n    // The max item width is always the entire viewport.\n    // If the max item height is infinity, scale in proportion to the max width.\n    let maxItemWidth = Math.min(this.maxItemSize.width, visibleWidth);\n    let maxItemHeight = Number.isFinite(this.maxItemSize.height) \n      ? this.maxItemSize.height\n      : Math.floor((this.minItemSize.height / this.minItemSize.width) * maxItemWidth);\n\n    // Compute the number of rows and columns needed to display the content\n    let columns = Math.floor(visibleWidth / (this.minItemSize.width + this.minSpace.width));\n    this.numColumns = Math.max(1, Math.min(this.maxColumns, columns));\n\n    // Compute the available width (minus the space between items)\n    let width = visibleWidth - (this.minSpace.width * Math.max(0, this.numColumns));\n\n    // Compute the item width based on the space available\n    let itemWidth = Math.floor(width / this.numColumns);\n    itemWidth = Math.max(this.minItemSize.width, Math.min(maxItemWidth, itemWidth));\n\n    // Compute the item height, which is proportional to the item width\n    let t = ((itemWidth - this.minItemSize.width) / Math.max(1, maxItemWidth - this.minItemSize.width));\n    let itemHeight = this.minItemSize.height +  Math.floor((maxItemHeight - this.minItemSize.height) * t);\n    itemHeight = Math.max(this.minItemSize.height, Math.min(maxItemHeight, itemHeight));\n    this.itemSize = new Size(itemWidth, itemHeight);\n\n    // Compute the horizontal spacing and content height\n    this.horizontalSpacing = Math.floor((visibleWidth - this.numColumns * this.itemSize.width) / (this.numColumns + 1));\n\n    this.layoutInfos = [];\n    for (let node of this.virtualizer!.collection) {\n      this.layoutInfos.push(this.getLayoutInfoForNode(node));\n    }\n  }\n\n  getVisibleLayoutInfos(rect: Rect): LayoutInfo[] {\n    let firstVisibleItem = this.getIndexAtPoint(rect.x, rect.y);\n    let lastVisibleItem = this.getIndexAtPoint(rect.maxX, rect.maxY);\n    let result = this.layoutInfos.slice(firstVisibleItem, lastVisibleItem + 1);\n    let persistedIndices: number[] = [];\n    for (let key of this.virtualizer!.persistedKeys) {\n      let item = this.virtualizer!.collection.getItem(key);\n      if (item?.index != null) {\n        persistedIndices.push(item.index);\n      }\n    }\n    persistedIndices.sort((a, b) => a - b);\n    \n    let persistedBefore: LayoutInfo[] = [];\n    for (let index of persistedIndices) {\n      if (index < firstVisibleItem) {\n        persistedBefore.push(this.layoutInfos[index]);\n      } else if (index > lastVisibleItem) {\n        result.push(this.layoutInfos[index]);\n      }\n    }\n    result.unshift(...persistedBefore);\n    return result;\n  }\n\n  protected getIndexAtPoint(x: number, y: number) {\n    let itemHeight = this.itemSize.height + this.minSpace.height;\n    let itemWidth = this.itemSize.width + this.horizontalSpacing;\n    return Math.max(0,\n      Math.min(\n        this.virtualizer!.collection.size - 1,\n        Math.floor(y / itemHeight) * this.numColumns + Math.floor((x - this.horizontalSpacing) / itemWidth)\n      )\n    );\n  }\n\n  getLayoutInfo(key: Key): LayoutInfo | null {\n    let node = this.virtualizer!.collection.getItem(key);\n    return node ? this.layoutInfos[node.index] : null;\n  }\n\n  protected getLayoutInfoForNode(node: Node<T>): LayoutInfo {\n    let idx = node.index;\n    let row = Math.floor(idx / this.numColumns);\n    let column = idx % this.numColumns;\n    let x = this.horizontalSpacing + column * (this.itemSize.width + this.horizontalSpacing);\n    let y = this.minSpace.height + row * (this.itemSize.height + this.minSpace.height);\n    let rect = new Rect(x, y, this.itemSize.width, this.itemSize.height);\n    return new LayoutInfo(node.type, node.key, rect);\n  }\n\n  getContentSize(): Size {\n    let numRows = Math.ceil(this.virtualizer!.collection.size / this.numColumns);\n    let contentHeight = this.minSpace.height + numRows * (this.itemSize.height + this.minSpace.height);  \n    return new Size(this.virtualizer!.visibleRect.width, contentHeight);\n  }\n\n  getDropTargetFromPoint(x: number, y: number, isValidDropTarget: (target: DropTarget) => boolean): DropTarget {\n    if (this.layoutInfos.length === 0) {\n      return {type: 'root'};\n    }\n\n    x += this.virtualizer!.visibleRect.x;\n    y += this.virtualizer!.visibleRect.y;\n    let index = this.getIndexAtPoint(x, y);\n\n    let layoutInfo = this.layoutInfos[index];\n    let target: DropTarget =  {\n      type: 'item',\n      key: layoutInfo.key,\n      dropPosition: 'on'\n    };\n\n    let pos = this.numColumns === 1 ? y : x;\n    let layoutInfoPos = this.numColumns === 1 ? layoutInfo.rect.y : layoutInfo.rect.x;\n    let size = this.numColumns === 1 ? layoutInfo.rect.height : layoutInfo.rect.width;\n    if (isValidDropTarget(target)) {\n      // If dropping on the item is accepted, try the before/after positions\n      // if within 5px of the start or end of the item.\n      if (pos < layoutInfoPos + 5) {\n        target.dropPosition = 'before';\n      } else if (pos > layoutInfoPos + size - 5) {\n        target.dropPosition = 'after';\n      }\n    } else {\n      // If dropping on the item isn't accepted, try the target before or after depending on the position.\n      let mid = layoutInfoPos + size / 2;\n      if (pos <= mid && isValidDropTarget({...target, dropPosition: 'before'})) {\n        target.dropPosition = 'before';\n      } else if (pos >= mid && isValidDropTarget({...target, dropPosition: 'after'})) {\n        target.dropPosition = 'after';\n      }\n    }\n\n    return target;\n  }\n\n  getDropTargetLayoutInfo(target: ItemDropTarget): LayoutInfo {\n    let layoutInfo = this.getLayoutInfo(target.key)!;\n    let rect: Rect;\n    if (this.numColumns === 1) {\n      // Flip from vertical to horizontal if only one column is visible.\n      rect = new Rect(\n        layoutInfo.rect.x,\n        target.dropPosition === 'before' \n          ? layoutInfo.rect.y - this.minSpace.height / 2 - this.dropIndicatorThickness / 2\n          : layoutInfo.rect.maxY + this.minSpace.height / 2 - this.dropIndicatorThickness / 2,\n        layoutInfo.rect.width,\n        this.dropIndicatorThickness\n      );\n    } else {\n      rect = new Rect(\n        target.dropPosition === 'before' \n          ? layoutInfo.rect.x - this.horizontalSpacing / 2 - this.dropIndicatorThickness / 2 \n          : layoutInfo.rect.maxX + this.horizontalSpacing / 2 - this.dropIndicatorThickness / 2,\n        layoutInfo.rect.y,\n        this.dropIndicatorThickness,\n        layoutInfo.rect.height\n      );\n    }\n\n    return new LayoutInfo('dropIndicator', target.key + ':' + target.dropPosition, rect);\n  }\n}\n"],"names":[],"version":3,"file":"GridLayout.module.js.map"}
+{"mappings":"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","sources":["packages/@react-stately/layout/src/GridLayout.ts"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {DropTarget, DropTargetDelegate, ItemDropTarget, Key, Node} from '@react-types/shared';\nimport {InvalidationContext, Layout, LayoutInfo, Rect, Size} from '@react-stately/virtualizer';\n\nexport interface GridLayoutOptions {\n  /**\n   * The minimum item size.\n   * @default 200 x 200\n   */\n  minItemSize?: Size,\n  /**\n   * The maximum item size.\n   * @default Infinity\n   */\n  maxItemSize?: Size,\n  /**\n   * Whether to preserve the aspect ratio of the `minItemSize`.\n   * By default, grid rows may have variable heights. When `preserveAspectRatio`\n   * is true, all rows will have equal heights.\n   * @default false\n   */\n  preserveAspectRatio?: boolean,\n  /**\n   * The minimum space required between items.\n   * @default 18 x 18\n   */\n  minSpace?: Size,\n  /**\n   * The maximum number of columns.\n   * @default Infinity\n   */\n  maxColumns?: number,\n  /**\n   * The thickness of the drop indicator.\n   * @default 2\n   */\n  dropIndicatorThickness?: number\n}\n\nconst DEFAULT_OPTIONS = {\n  minItemSize: new Size(200, 200),\n  maxItemSize: new Size(Infinity, Infinity),\n  preserveAspectRatio: false,\n  minSpace: new Size(18, 18),\n  maxColumns: Infinity,\n  dropIndicatorThickness: 2\n};\n\n/**\n * GridLayout is a virtualizer Layout implementation\n * that arranges its items in a grid. \n * The items are sized between a minimum and maximum size\n * depending on the width of the container.\n */\nexport class GridLayout<T, O extends GridLayoutOptions = GridLayoutOptions> extends Layout<Node<T>, O> implements DropTargetDelegate {\n  protected gap: Size = DEFAULT_OPTIONS.minSpace;\n  protected dropIndicatorThickness = 2;\n  protected numColumns: number = 0;\n  private contentSize: Size = new Size();\n  private layoutInfos: Map<Key, LayoutInfo> = new Map();\n\n  shouldInvalidateLayoutOptions(newOptions: O, oldOptions: O): boolean {\n    return newOptions.maxColumns !== oldOptions.maxColumns\n      || newOptions.dropIndicatorThickness !== oldOptions.dropIndicatorThickness\n      || newOptions.preserveAspectRatio !== oldOptions.preserveAspectRatio\n      || (!(newOptions.minItemSize || DEFAULT_OPTIONS.minItemSize).equals(oldOptions.minItemSize || DEFAULT_OPTIONS.minItemSize))\n      || (!(newOptions.maxItemSize || DEFAULT_OPTIONS.maxItemSize).equals(oldOptions.maxItemSize || DEFAULT_OPTIONS.maxItemSize))\n      || (!(newOptions.minSpace || DEFAULT_OPTIONS.minSpace).equals(oldOptions.minSpace || DEFAULT_OPTIONS.minSpace));\n  }\n\n  update(invalidationContext: InvalidationContext<O>): void {\n    let {\n      minItemSize = DEFAULT_OPTIONS.minItemSize,\n      maxItemSize = DEFAULT_OPTIONS.maxItemSize,\n      preserveAspectRatio = DEFAULT_OPTIONS.preserveAspectRatio,\n      minSpace = DEFAULT_OPTIONS.minSpace,\n      maxColumns = DEFAULT_OPTIONS.maxColumns,\n      dropIndicatorThickness = DEFAULT_OPTIONS.dropIndicatorThickness\n    } = invalidationContext.layoutOptions || {};\n    this.dropIndicatorThickness = dropIndicatorThickness;\n\n    let visibleWidth = this.virtualizer!.visibleRect.width;\n\n    // The max item width is always the entire viewport.\n    // If the max item height is infinity, scale in proportion to the max width.\n    let maxItemWidth = Math.min(maxItemSize.width, visibleWidth);\n    let maxItemHeight = Number.isFinite(maxItemSize.height)\n      ? maxItemSize.height\n      : Math.floor((minItemSize.height / minItemSize.width) * maxItemWidth);\n\n    // Compute the number of rows and columns needed to display the content\n    let columns = Math.floor(visibleWidth / (minItemSize.width + minSpace.width));\n    let numColumns = Math.max(1, Math.min(maxColumns, columns));\n    this.numColumns = numColumns;\n\n    // Compute the available width (minus the space between items)\n    let width = visibleWidth - (minSpace.width * Math.max(0, numColumns));\n\n    // Compute the item width based on the space available\n    let itemWidth = Math.floor(width / numColumns);\n    itemWidth = Math.max(minItemSize.width, Math.min(maxItemWidth, itemWidth));\n\n    // Compute the item height, which is proportional to the item width\n    let t = ((itemWidth - minItemSize.width) / Math.max(1, maxItemWidth - minItemSize.width));\n    let itemHeight = minItemSize.height + Math.floor((maxItemHeight - minItemSize.height) * t);\n    itemHeight = Math.max(minItemSize.height, Math.min(maxItemHeight, itemHeight));\n\n    // Compute the horizontal spacing and content height\n    let horizontalSpacing = Math.floor((visibleWidth - numColumns * itemWidth) / (numColumns + 1));\n    this.gap = new Size(horizontalSpacing, minSpace.height);\n\n    let rows = Math.ceil(this.virtualizer!.collection.size / numColumns);\n    let iterator = this.virtualizer!.collection[Symbol.iterator]();\n    let y = rows > 0 ? minSpace.height : 0;\n    let newLayoutInfos = new Map();\n    let skeleton: Node<T> | null = null;\n    let skeletonCount = 0;\n    for (let row = 0; row < rows; row++) {\n      let maxHeight = 0;\n      let rowLayoutInfos: LayoutInfo[] = [];\n      for (let col = 0; col < numColumns; col++) {\n        // Repeat skeleton until the end of the current row.\n        let node = skeleton || iterator.next().value;\n        if (!node) {\n          break;\n        }\n\n        if (node.type === 'skeleton') {\n          skeleton = node;\n        }\n\n        let key = skeleton ? `${skeleton.key}-${skeletonCount++}` : node.key;\n        let oldLayoutInfo = this.layoutInfos.get(key);\n        let content = node;\n        if (skeleton) {\n          content = oldLayoutInfo && oldLayoutInfo.content.key === key ? oldLayoutInfo.content : {...skeleton, key};\n        }\n        let x = horizontalSpacing + col * (itemWidth + horizontalSpacing);\n        let height = itemHeight;\n        let estimatedSize = !preserveAspectRatio;\n        if (oldLayoutInfo && estimatedSize) {\n          height = oldLayoutInfo.rect.height;\n          estimatedSize = invalidationContext.layoutOptionsChanged || invalidationContext.sizeChanged || oldLayoutInfo.estimatedSize || (oldLayoutInfo.content !== content);\n        }\n\n        let rect = new Rect(x, y, itemWidth, height);\n        let layoutInfo = new LayoutInfo(node.type, key, rect);\n        layoutInfo.estimatedSize = estimatedSize;\n        layoutInfo.allowOverflow = true;\n        layoutInfo.content = content;\n        newLayoutInfos.set(key, layoutInfo);\n        rowLayoutInfos.push(layoutInfo);\n\n        maxHeight = Math.max(maxHeight, layoutInfo.rect.height);\n      }\n\n      for (let layoutInfo of rowLayoutInfos) {\n        layoutInfo.rect.height = maxHeight;\n      }\n\n      y += maxHeight + minSpace.height;\n\n      // Keep adding skeleton rows until we fill the viewport\n      if (skeleton && row === rows - 1 && y < this.virtualizer!.visibleRect.height) {\n        rows++;\n      }\n    }\n\n    this.layoutInfos = newLayoutInfos;\n    this.contentSize = new Size(this.virtualizer!.visibleRect.width, y);\n  }\n\n  getLayoutInfo(key: Key): LayoutInfo {\n    return this.layoutInfos.get(key)!;\n  }\n\n  getContentSize(): Size {\n    return this.contentSize;\n  }\n\n  getVisibleLayoutInfos(rect: Rect): LayoutInfo[] {\n    let layoutInfos: LayoutInfo[] = [];\n    for (let layoutInfo of this.layoutInfos.values()) {\n      if (layoutInfo.rect.intersects(rect) || this.virtualizer!.isPersistedKey(layoutInfo.key)) {\n        layoutInfos.push(layoutInfo);\n      }\n    }\n    return layoutInfos;\n  }\n\n  updateItemSize(key: Key, size: Size) {\n    let layoutInfo = this.layoutInfos.get(key);\n    if (!size || !layoutInfo) {\n      return false;\n    }\n\n    if (size.height !== layoutInfo.rect.height) {\n      let newLayoutInfo = layoutInfo.copy();\n      newLayoutInfo.rect.height = size.height;\n      newLayoutInfo.estimatedSize = false;\n      this.layoutInfos.set(key, newLayoutInfo);\n      return true;\n    }\n\n    return false;\n  }\n\n  getDropTargetFromPoint(x: number, y: number, isValidDropTarget: (target: DropTarget) => boolean): DropTarget {\n    if (this.layoutInfos.size === 0) {\n      return {type: 'root'};\n    }\n\n    x += this.virtualizer!.visibleRect.x;\n    y += this.virtualizer!.visibleRect.y;\n\n    // Find the closest item within on either side of the point using the gap width.\n    let key: Key | null = null;\n    if (this.numColumns === 1) {\n      let searchRect = new Rect(x, Math.max(0, y - this.gap.height), 1, this.gap.height * 2);\n      let candidates = this.getVisibleLayoutInfos(searchRect);\n      let minDistance = Infinity;\n      for (let candidate of candidates) {\n        // Ignore items outside the search rect, e.g. persisted keys.\n        if (!candidate.rect.intersects(searchRect)) {\n          continue;\n        }\n\n        let yDist = Math.abs(candidate.rect.y - y);\n        let maxYDist = Math.abs(candidate.rect.maxY - y);\n        let dist = Math.min(yDist, maxYDist);\n        if (dist < minDistance) {\n          minDistance = dist;\n          key = candidate.key;\n        }\n      }\n    } else {\n      let searchRect = new Rect(Math.max(0, x - this.gap.width), y, this.gap.width * 2, 1);\n      let candidates = this.getVisibleLayoutInfos(searchRect);\n      let minDistance = Infinity;\n      for (let candidate of candidates) {\n        // Ignore items outside the search rect, e.g. persisted keys.\n        if (!candidate.rect.intersects(searchRect)) {\n          continue;\n        }\n\n        let xDist = Math.abs(candidate.rect.x - x);\n        let maxXDist = Math.abs(candidate.rect.maxX - x);\n        let dist = Math.min(xDist, maxXDist);\n        if (dist < minDistance) {\n          minDistance = dist;\n          key = candidate.key;\n        }\n      }\n    }\n\n    let layoutInfo = key != null ? this.getLayoutInfo(key) : null;\n    if (!layoutInfo) {\n      return {type: 'root'};\n    }\n\n    let target: DropTarget =  {\n      type: 'item',\n      key: layoutInfo.key,\n      dropPosition: 'on'\n    };\n\n    let pos = this.numColumns === 1 ? y : x;\n    let layoutInfoPos = this.numColumns === 1 ? layoutInfo.rect.y : layoutInfo.rect.x;\n    let size = this.numColumns === 1 ? layoutInfo.rect.height : layoutInfo.rect.width;\n    if (isValidDropTarget(target)) {\n      // If dropping on the item is accepted, try the before/after positions\n      // if within 5px of the start or end of the item.\n      if (pos < layoutInfoPos + 5) {\n        target.dropPosition = 'before';\n      } else if (pos > layoutInfoPos + size - 5) {\n        target.dropPosition = 'after';\n      }\n    } else {\n      // If dropping on the item isn't accepted, try the target before or after depending on the position.\n      let mid = layoutInfoPos + size / 2;\n      if (pos <= mid && isValidDropTarget({...target, dropPosition: 'before'})) {\n        target.dropPosition = 'before';\n      } else if (pos >= mid && isValidDropTarget({...target, dropPosition: 'after'})) {\n        target.dropPosition = 'after';\n      }\n    }\n\n    return target;\n  }\n\n  getDropTargetLayoutInfo(target: ItemDropTarget): LayoutInfo {\n    let layoutInfo = this.getLayoutInfo(target.key)!;\n    let rect: Rect;\n    if (this.numColumns === 1) {\n      // Flip from vertical to horizontal if only one column is visible.\n      rect = new Rect(\n        layoutInfo.rect.x,\n        target.dropPosition === 'before' \n          ? layoutInfo.rect.y - this.gap.height / 2 - this.dropIndicatorThickness / 2\n          : layoutInfo.rect.maxY + this.gap.height / 2 - this.dropIndicatorThickness / 2,\n        layoutInfo.rect.width,\n        this.dropIndicatorThickness\n      );\n    } else {\n      rect = new Rect(\n        target.dropPosition === 'before' \n          ? layoutInfo.rect.x - this.gap.width / 2 - this.dropIndicatorThickness / 2 \n          : layoutInfo.rect.maxX + this.gap.width / 2 - this.dropIndicatorThickness / 2,\n        layoutInfo.rect.y,\n        this.dropIndicatorThickness,\n        layoutInfo.rect.height\n      );\n    }\n\n    return new LayoutInfo('dropIndicator', target.key + ':' + target.dropPosition, rect);\n  }\n}\n"],"names":[],"version":3,"file":"GridLayout.module.js.map"}

package/dist/ListLayout.main.js

@@ -35,7 +35,7 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
         // (only if height > 1 for getDropTargetFromPoint)
         if (rect.height > 1) {
             var _this_rowHeight, _ref;
-            let rowHeight = (_ref = (_this_rowHeight = this.rowHeight) !== null && _this_rowHeight !== void 0 ? _this_rowHeight : this.estimatedRowHeight) !== null && _ref !== void 0 ? _ref : $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT;
+            let rowHeight = ((_ref = (_this_rowHeight = this.rowHeight) !== null && _this_rowHeight !== void 0 ? _this_rowHeight : this.estimatedRowHeight) !== null && _ref !== void 0 ? _ref : $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT) + this.gap;
             rect.y = Math.floor(rect.y / rowHeight) * rowHeight;
             rect.height = Math.ceil(rect.height / rowHeight) * rowHeight;
         }
@@ -81,7 +81,13 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
     shouldInvalidateEverything(invalidationContext) {
         // Invalidate cache if the size of the collection changed.
         // In this case, we need to recalculate the entire layout.
-        return invalidationContext.sizeChanged || false;
+        // Also invalidate if fixed sizes/gaps change.
+        let options = invalidationContext.layoutOptions;
+        var _options_rowHeight, _options_headingHeight, _options_loaderHeight, _options_gap, _options_padding;
+        return invalidationContext.sizeChanged || this.rowHeight !== ((_options_rowHeight = options === null || options === void 0 ? void 0 : options.rowHeight) !== null && _options_rowHeight !== void 0 ? _options_rowHeight : this.rowHeight) || this.headingHeight !== ((_options_headingHeight = options === null || options === void 0 ? void 0 : options.headingHeight) !== null && _options_headingHeight !== void 0 ? _options_headingHeight : this.headingHeight) || this.loaderHeight !== ((_options_loaderHeight = options === null || options === void 0 ? void 0 : options.loaderHeight) !== null && _options_loaderHeight !== void 0 ? _options_loaderHeight : this.loaderHeight) || this.gap !== ((_options_gap = options === null || options === void 0 ? void 0 : options.gap) !== null && _options_gap !== void 0 ? _options_gap : this.gap) || this.padding !== ((_options_padding = options === null || options === void 0 ? void 0 : options.padding) !== null && _options_padding !== void 0 ? _options_padding : this.padding);
+    }
+    shouldInvalidateLayoutOptions(newOptions, oldOptions) {
+        return newOptions.rowHeight !== oldOptions.rowHeight || newOptions.estimatedRowHeight !== oldOptions.estimatedRowHeight || newOptions.headingHeight !== oldOptions.headingHeight || newOptions.estimatedHeadingHeight !== oldOptions.estimatedHeadingHeight || newOptions.loaderHeight !== oldOptions.loaderHeight || newOptions.dropIndicatorThickness !== oldOptions.dropIndicatorThickness || newOptions.gap !== oldOptions.gap || newOptions.padding !== oldOptions.padding;
     }
     update(invalidationContext) {
         let collection = this.virtualizer.collection;
@@ -92,6 +98,23 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
             this.requestedRect = this.virtualizer.visibleRect.copy();
             this.layoutNodes.clear();
         }
+        let options = invalidationContext.layoutOptions;
+        var _options_rowHeight;
+        this.rowHeight = (_options_rowHeight = options === null || options === void 0 ? void 0 : options.rowHeight) !== null && _options_rowHeight !== void 0 ? _options_rowHeight : this.rowHeight;
+        var _options_estimatedRowHeight;
+        this.estimatedRowHeight = (_options_estimatedRowHeight = options === null || options === void 0 ? void 0 : options.estimatedRowHeight) !== null && _options_estimatedRowHeight !== void 0 ? _options_estimatedRowHeight : this.estimatedRowHeight;
+        var _options_headingHeight;
+        this.headingHeight = (_options_headingHeight = options === null || options === void 0 ? void 0 : options.headingHeight) !== null && _options_headingHeight !== void 0 ? _options_headingHeight : this.headingHeight;
+        var _options_estimatedHeadingHeight;
+        this.estimatedHeadingHeight = (_options_estimatedHeadingHeight = options === null || options === void 0 ? void 0 : options.estimatedHeadingHeight) !== null && _options_estimatedHeadingHeight !== void 0 ? _options_estimatedHeadingHeight : this.estimatedHeadingHeight;
+        var _options_loaderHeight;
+        this.loaderHeight = (_options_loaderHeight = options === null || options === void 0 ? void 0 : options.loaderHeight) !== null && _options_loaderHeight !== void 0 ? _options_loaderHeight : this.loaderHeight;
+        var _options_dropIndicatorThickness;
+        this.dropIndicatorThickness = (_options_dropIndicatorThickness = options === null || options === void 0 ? void 0 : options.dropIndicatorThickness) !== null && _options_dropIndicatorThickness !== void 0 ? _options_dropIndicatorThickness : this.dropIndicatorThickness;
+        var _options_gap;
+        this.gap = (_options_gap = options === null || options === void 0 ? void 0 : options.gap) !== null && _options_gap !== void 0 ? _options_gap : this.gap;
+        var _options_padding;
+        this.padding = (_options_padding = options === null || options === void 0 ? void 0 : options.padding) !== null && _options_padding !== void 0 ? _options_padding : this.padding;
         this.rootNodes = this.buildCollection();
         // Remove deleted layout nodes
         if (this.lastCollection && collection !== this.lastCollection) {
@@ -100,32 +123,33 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
                 if (layoutNode) this.layoutNodes.delete(key);
             }
         }
-        this.lastWidth = this.virtualizer.visibleRect.width;
         this.lastCollection = collection;
         this.invalidateEverything = false;
         this.validRect = this.requestedRect.copy();
     }
-    buildCollection(y = 0) {
+    buildCollection(y = this.padding) {
         let collection = this.virtualizer.collection;
         let skipped = 0;
         let nodes = [];
         for (let node of collection){
             var _this_rowHeight, _ref;
-            let rowHeight = (_ref = (_this_rowHeight = this.rowHeight) !== null && _this_rowHeight !== void 0 ? _this_rowHeight : this.estimatedRowHeight) !== null && _ref !== void 0 ? _ref : $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT;
+            let rowHeight = ((_ref = (_this_rowHeight = this.rowHeight) !== null && _this_rowHeight !== void 0 ? _this_rowHeight : this.estimatedRowHeight) !== null && _ref !== void 0 ? _ref : $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT) + this.gap;
             // Skip rows before the valid rectangle unless they are already cached.
             if (node.type === 'item' && y + rowHeight < this.requestedRect.y && !this.isValid(node, y)) {
                 y += rowHeight;
                 skipped++;
                 continue;
             }
-            let layoutNode = this.buildChild(node, 0, y, null);
-            y = layoutNode.layoutInfo.rect.maxY;
+            let layoutNode = this.buildChild(node, this.padding, y, null);
+            y = layoutNode.layoutInfo.rect.maxY + this.gap;
             nodes.push(layoutNode);
             if (node.type === 'item' && y > this.requestedRect.maxY) {
                 y += (collection.size - (nodes.length + skipped)) * rowHeight;
                 break;
             }
         }
+        y -= this.gap;
+        y += this.padding;
         this.contentSize = new (0, $iId4j$reactstatelyvirtualizer.Size)(this.virtualizer.visibleRect.width, y);
         return nodes;
     }
@@ -155,9 +179,9 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
         }
     }
     buildLoader(node, x, y) {
-        let rect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(x, y, 0, 0);
+        let rect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(x, y, this.padding, 0);
         let layoutInfo = new (0, $iId4j$reactstatelyvirtualizer.LayoutInfo)('loader', node.key, rect);
-        rect.width = this.virtualizer.contentSize.width;
+        rect.width = this.virtualizer.contentSize.width - this.padding - x;
         rect.height = this.loaderHeight || this.rowHeight || this.estimatedRowHeight || $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT;
         return {
             layoutInfo: layoutInfo,
@@ -166,15 +190,15 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
     }
     buildSection(node, x, y) {
         let collection = this.virtualizer.collection;
-        let width = this.virtualizer.visibleRect.width;
-        let rect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(0, y, width, 0);
+        let width = this.virtualizer.visibleRect.width - this.padding;
+        let rect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(x, y, width - x, 0);
         let layoutInfo = new (0, $iId4j$reactstatelyvirtualizer.LayoutInfo)(node.type, node.key, rect);
         let startY = y;
         let skipped = 0;
         let children = [];
         for (let child of (0, $iId4j$reactstatelycollections.getChildNodes)(node, collection)){
             var _this_rowHeight, _ref;
-            let rowHeight = (_ref = (_this_rowHeight = this.rowHeight) !== null && _this_rowHeight !== void 0 ? _this_rowHeight : this.estimatedRowHeight) !== null && _ref !== void 0 ? _ref : $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT;
+            let rowHeight = ((_ref = (_this_rowHeight = this.rowHeight) !== null && _this_rowHeight !== void 0 ? _this_rowHeight : this.estimatedRowHeight) !== null && _ref !== void 0 ? _ref : $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT) + this.gap;
             // Skip rows before the valid rectangle unless they are already cached.
             if (y + rowHeight < this.requestedRect.y && !this.isValid(node, y)) {
                 y += rowHeight;
@@ -182,7 +206,7 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
                 continue;
             }
             let layoutNode = this.buildChild(child, x, y, layoutInfo.key);
-            y = layoutNode.layoutInfo.rect.maxY;
+            y = layoutNode.layoutInfo.rect.maxY + this.gap;
             children.push(layoutNode);
             if (y > this.requestedRect.maxY) {
                 // Estimate the remaining height for rows that we don't need to layout right now.
@@ -192,6 +216,7 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
                 break;
             }
         }
+        y -= this.gap;
         rect.height = y - startY;
         return {
             layoutInfo: layoutInfo,
@@ -201,7 +226,7 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
         };
     }
     buildSectionHeader(node, x, y) {
-        let width = this.virtualizer.visibleRect.width;
+        let width = this.virtualizer.visibleRect.width - this.padding;
         let rectHeight = this.headingHeight;
         let isEstimated = false;
         // If no explicit height is available, use an estimated height.
@@ -215,14 +240,14 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
                 let curNode = this.virtualizer.collection.getItem(node.key);
                 let lastNode = this.lastCollection ? this.lastCollection.getItem(node.key) : null;
                 rectHeight = previousLayoutInfo.rect.height;
-                isEstimated = width !== this.lastWidth || curNode !== lastNode || previousLayoutInfo.estimatedSize;
+                isEstimated = width !== previousLayoutInfo.rect.width || curNode !== lastNode || previousLayoutInfo.estimatedSize;
             } else {
                 rectHeight = node.rendered ? this.estimatedHeadingHeight : 0;
                 isEstimated = true;
             }
         }
         if (rectHeight == null) rectHeight = $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT;
-        let headerRect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(0, y, width, rectHeight);
+        let headerRect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(x, y, width - x, rectHeight);
         let header = new (0, $iId4j$reactstatelyvirtualizer.LayoutInfo)('header', node.key, headerRect);
         header.estimatedSize = isEstimated;
         return {
@@ -233,7 +258,7 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
         };
     }
     buildItem(node, x, y) {
-        let width = this.virtualizer.visibleRect.width;
+        let width = this.virtualizer.visibleRect.width - this.padding - x;
         let rectHeight = this.rowHeight;
         let isEstimated = false;
         // If no explicit height is available, use an estimated height.
@@ -244,14 +269,14 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
             let previousLayoutNode = this.layoutNodes.get(node.key);
             if (previousLayoutNode) {
                 rectHeight = previousLayoutNode.layoutInfo.rect.height;
-                isEstimated = width !== this.lastWidth || node !== previousLayoutNode.node || previousLayoutNode.layoutInfo.estimatedSize;
+                isEstimated = width !== previousLayoutNode.layoutInfo.rect.width || node !== previousLayoutNode.node || previousLayoutNode.layoutInfo.estimatedSize;
             } else {
                 rectHeight = this.estimatedRowHeight;
                 isEstimated = true;
             }
         }
         if (rectHeight == null) rectHeight = $fe69e47e38ed0ac4$var$DEFAULT_HEIGHT;
-        let rect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(x, y, width - x, rectHeight);
+        let rect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(x, y, width, rectHeight);
         let layoutInfo = new (0, $iId4j$reactstatelyvirtualizer.LayoutInfo)(node.type, node.key, rect);
         layoutInfo.estimatedSize = isEstimated;
         return {
@@ -304,7 +329,22 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
     getDropTargetFromPoint(x, y, isValidDropTarget) {
         x += this.virtualizer.visibleRect.x;
         y += this.virtualizer.visibleRect.y;
-        let key = this.virtualizer.keyAtPoint(new (0, $iId4j$reactstatelyvirtualizer.Point)(x, y));
+        // Find the closest item within on either side of the point using the gap width.
+        let searchRect = new (0, $iId4j$reactstatelyvirtualizer.Rect)(x, Math.max(0, y - this.gap), 1, this.gap * 2);
+        let candidates = this.getVisibleLayoutInfos(searchRect);
+        let key = null;
+        let minDistance = Infinity;
+        for (let candidate of candidates){
+            // Ignore items outside the search rect, e.g. persisted keys.
+            if (!candidate.rect.intersects(searchRect)) continue;
+            let yDist = Math.abs(candidate.rect.y - y);
+            let maxYDist = Math.abs(candidate.rect.maxY - y);
+            let dist = Math.min(yDist, maxYDist);
+            if (dist < minDistance) {
+                minDistance = dist;
+                key = candidate.key;
+            }
+        }
         if (key == null || this.virtualizer.collection.size === 0) return {
             type: 'root'
         };
@@ -362,9 +402,10 @@ class $fe69e47e38ed0ac4$export$cacbb3924155d68e extends (0, $iId4j$reactstatelyv
         var _options_loaderHeight;
         this.loaderHeight = (_options_loaderHeight = options.loaderHeight) !== null && _options_loaderHeight !== void 0 ? _options_loaderHeight : null;
         this.dropIndicatorThickness = options.dropIndicatorThickness || 2;
+        this.gap = options.gap || 0;
+        this.padding = options.padding || 0;
         this.layoutNodes = new Map();
         this.rootNodes = [];
-        this.lastWidth = 0;
         this.lastCollection = null;
         this.invalidateEverything = false;
         this.validRect = new (0, $iId4j$reactstatelyvirtualizer.Rect)();