@react-stately/layout 3.13.10-nightly.4695 → 3.13.10-nightly.4700

package/src/GridLayout.ts

@@ -61,7 +61,7 @@ export class GridLayout<T, O = any> extends Layout<Node<T>, O> implements DropTa
     this.dropIndicatorThickness = options.dropIndicatorThickness || 2;
   }
 
-  validate(): void {
+  update(): void {
     let visibleWidth = this.virtualizer.visibleRect.width;
 
     // The max item width is always the entire viewport.
@@ -83,7 +83,7 @@ export class GridLayout<T, O = any> extends Layout<Node<T>, O> implements DropTa
     itemWidth = Math.max(this.minItemSize.width, Math.min(maxItemWidth, itemWidth));
 
     // Compute the item height, which is proportional to the item width
-    let t = ((itemWidth - this.minItemSize.width) / (maxItemWidth - this.minItemSize.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 Size(itemWidth, itemHeight);

package/src/ListLayout.ts

@@ -128,12 +128,12 @@ export class ListLayout<T, O = any> extends Layout<Node<T>, O> implements DropTa
     if (!this.requestedRect.containsRect(rect)) {
       this.requestedRect = this.requestedRect.union(rect);
       this.rootNodes = this.buildCollection();
-    } else {
-      // Ensure all of the persisted keys are available.
-      for (let key of this.virtualizer.persistedKeys) {
-        if (this.ensureLayoutInfo(key)) {
-          break;
-        }
+    }
+    
+    // Ensure all of the persisted keys are available.
+    for (let key of this.virtualizer.persistedKeys) {
+      if (this.ensureLayoutInfo(key)) {
+        return;
       }
     }
   }
@@ -162,7 +162,7 @@ export class ListLayout<T, O = any> extends Layout<Node<T>, O> implements DropTa
     return invalidationContext.sizeChanged;
   }
 
-  validate(invalidationContext: InvalidationContext<O>) {
+  update(invalidationContext: InvalidationContext<O>) {
     this.collection = this.virtualizer.collection;
 
     // Reset valid rect if we will have to invalidate everything.
@@ -170,6 +170,7 @@ export class ListLayout<T, O = any> extends Layout<Node<T>, O> implements DropTa
     this.invalidateEverything = this.shouldInvalidateEverything(invalidationContext);
     if (this.invalidateEverything) {
       this.requestedRect = this.virtualizer.visibleRect.copy();
+      this.layoutNodes.clear();
     }
 
     this.rootNodes = this.buildCollection();

package/src/TableLayout.ts

@@ -46,7 +46,7 @@ export class TableLayout<T, O extends TableLayoutProps = TableLayoutProps> exten
       );
   }
 
-  validate(invalidationContext: InvalidationContext<O>): void {
+  update(invalidationContext: InvalidationContext<O>): void {
     let newCollection = this.virtualizer.collection as TableCollection<T>;
 
     // If columnWidths were provided via layoutOptions, update those.
@@ -62,7 +62,7 @@ export class TableLayout<T, O extends TableLayoutProps = TableLayoutProps> exten
       invalidationContext.sizeChanged = true;
     }
 
-    super.validate(invalidationContext);
+    super.update(invalidationContext);
   }
 
   protected buildCollection(): LayoutNode[] {
@@ -227,7 +227,7 @@ export class TableLayout<T, O extends TableLayoutProps = TableLayoutProps> exten
     let width = 0;
     let children: LayoutNode[] = [];
     let rowHeight = this.getEstimatedRowHeight();
-    for (let [i, node] of [...getChildNodes(this.collection.body, this.collection)].entries()) {
+    for (let node of getChildNodes(this.collection.body, this.collection)) {
       // Skip rows before the valid rectangle unless they are already cached.
       if (y + rowHeight < this.requestedRect.y && !this.isValid(node, y)) {
         y += rowHeight;
@@ -237,7 +237,7 @@ export class TableLayout<T, O extends TableLayoutProps = TableLayoutProps> exten
 
       let layoutNode = this.buildChild(node, 0, y, layoutInfo.key);
       layoutNode.layoutInfo.parentKey = layoutInfo.key;
-      layoutNode.index = i;
+      layoutNode.index = children.length;
       y = layoutNode.layoutInfo.rect.maxY;
       width = Math.max(width, layoutNode.layoutInfo.rect.width);
       children.push(layoutNode);
@@ -285,7 +285,7 @@ export class TableLayout<T, O extends TableLayoutProps = TableLayoutProps> exten
 
     let children: LayoutNode[] = [];
     let height = 0;
-    for (let [i, child] of [...getChildNodes(node, this.collection)].entries()) {
+    for (let child of getChildNodes(node, this.collection)) {
       if (child.type === 'cell') {
         if (x > this.requestedRect.maxX) {
           // Adjust existing cached layoutInfo to ensure that it is out of view.
@@ -299,7 +299,7 @@ export class TableLayout<T, O extends TableLayoutProps = TableLayoutProps> exten
           let layoutNode = this.buildChild(child, x, y, layoutInfo.key);
           x = layoutNode.layoutInfo.rect.maxX;
           height = Math.max(height, layoutNode.layoutInfo.rect.height);
-          layoutNode.index = i;
+          layoutNode.index = children.length;
           children.push(layoutNode);
         }
       }