@react-spectrum/card 3.0.0-alpha.40 → 3.0.0-alpha.42

package/src/GridLayout.tsx

@@ -116,11 +116,11 @@ export class GridLayout<T> extends BaseLayout<T> {
     this.horizontalSpacing = 0;
   }
 
-  get layoutType() {
+  get layoutType(): string {
     return 'grid';
   }
 
-  getIndexAtPoint(x, y, allowInsertingAtEnd = false) {
+  getIndexAtPoint(x: number, y: number, allowInsertingAtEnd = false): number {
     let itemHeight = this.itemSize.height + this.minSpace.height;
     let itemWidth = this.itemSize.width + this.horizontalSpacing;
     return Math.max(0,
@@ -131,7 +131,7 @@ export class GridLayout<T> extends BaseLayout<T> {
     );
   }
 
-  buildCollection() {
+  buildCollection(): void {
     let visibleWidth = this.virtualizer.visibleRect.width;
     let visibleHeight = this.virtualizer.visibleRect.height;
     let horizontalItemPadding = this.cardOrientation === 'horizontal' ? this.itemPadding : 0;
@@ -210,7 +210,7 @@ export class GridLayout<T> extends BaseLayout<T> {
   // Since the collection doesn't represent the visual layout, need to calculate what row and column the current key is in,
   // then return the key that occupies the row + column below. This can be done by figuring out how many cards exist per column then dividing the
   // collection contents by that number (which will give us the row distribution)
-  getKeyBelow(key: Key) {
+  getKeyBelow(key: Key): Node<T> | undefined | null {
     // Expected key is the currently focused cell so we need the parent row key
     let parentRowKey = this.collection.getItem(key).parentKey;
     let indexRowBelow;
@@ -225,7 +225,7 @@ export class GridLayout<T> extends BaseLayout<T> {
     return row ? getFirstItem(getChildNodes(row, this.collection))?.key : null;
   }
 
-  getKeyAbove(key: Key) {
+  getKeyAbove(key: Key): Node<T> | undefined | null {
     // Expected key is the currently focused cell so we need the parent row key
     let parentRowKey = this.collection.getItem(key).parentKey;
     let indexRowAbove;

package/src/WaterfallLayout.tsx

@@ -66,11 +66,11 @@ export class WaterfallLayout<T> extends BaseLayout<T> implements KeyboardDelegat
     this.collator = options.collator;
   }
 
-  get layoutType() {
+  get layoutType(): string {
     return 'waterfall';
   }
 
-  buildCollection(invalidationContext: InvalidationContext) {
+  buildCollection(invalidationContext: InvalidationContext): void {
     // Compute the number of columns needed to display the content
     let visibleWidth = this.virtualizer.visibleRect.width;
     let availableWidth = visibleWidth - this.margin * 2;
@@ -163,7 +163,7 @@ export class WaterfallLayout<T> extends BaseLayout<T> implements KeyboardDelegat
     this.contentSize = new Size(this.virtualizer.visibleRect.width, y);
   }
 
-  updateItemSize(key: Key, size: Size) {
+  updateItemSize(key: Key, size: Size): number {
     let layoutInfo = this.layoutInfos.get(key);
     if (!size || !layoutInfo) {
       return false;
@@ -182,7 +182,7 @@ export class WaterfallLayout<T> extends BaseLayout<T> implements KeyboardDelegat
     return false;
   }
 
-  getNextColumnIndex(columnHeights) {
+  getNextColumnIndex(columnHeights: number[]): number {
     let minIndex = 0;
     for (let i = 0; i < columnHeights.length; i++) {
       if (columnHeights[i] < columnHeights[minIndex]) {
@@ -193,7 +193,7 @@ export class WaterfallLayout<T> extends BaseLayout<T> implements KeyboardDelegat
     return minIndex;
   }
 
-  getClosestRight(key: Key) {
+  getClosestRight(key: Key): Node<T> | undefined {
     let layoutInfo = this.getLayoutInfo(key);
     // Refactored from v2. Current strategy is to find the closest card in the adjacent column.
     // This prevent the issue where it was possible that the closest layoutInfo would be two columns over due to the middle card being exceptionally tall
@@ -212,7 +212,7 @@ export class WaterfallLayout<T> extends BaseLayout<T> implements KeyboardDelegat
     return getFirstItem(getChildNodes(item, this.collection))?.key;
   }
 
-  getClosestLeft(key: Key) {
+  getClosestLeft(key: Key): Node<T> | undefined {
     let layoutInfo = this.getLayoutInfo(key);
      // First look for a card to the immediate left of the current card. If we can't find any, look for the nearest card in the entire column to the left of the card
     let rect = new Rect(layoutInfo.rect.x - layoutInfo.rect.width - this.horizontalSpacing - 1, layoutInfo.rect.y, layoutInfo.rect.width + this.horizontalSpacing, layoutInfo.rect.height);
@@ -227,13 +227,13 @@ export class WaterfallLayout<T> extends BaseLayout<T> implements KeyboardDelegat
     return getFirstItem(getChildNodes(item, this.collection))?.key;
   }
 
-  getKeyRightOf(key: Key) {
+  getKeyRightOf(key: Key): Node<T> | undefined {
     // Expected key is the currently focused cell so we need the parent row key
     let parentRowKey = this.collection.getItem(key).parentKey;
     return this.direction === 'rtl' ?  this.getClosestLeft(parentRowKey) : this.getClosestRight(parentRowKey);
   }
 
-  getKeyLeftOf(key: Key) {
+  getKeyLeftOf(key: Key): Node<T> | undefined {
     // Expected key is the currently focused cell so we need the parent row key
     let parentRowKey = this.collection.getItem(key).parentKey;
     return this.direction === 'rtl' ?  this.getClosestRight(parentRowKey) : this.getClosestLeft(parentRowKey);