add row undefine-checks in GridLayout (#5737)

sookmax · LFDanLu · web-flow · commit 87dbb748cbfd · 2024-01-26T17:31:33.000-08:00
Co-authored-by: Daniel Lu &lt;dl1644@gmail.com&gt;
diff --git a/packages/@react-spectrum/card/src/GridLayout.tsx b/packages/@react-spectrum/card/src/GridLayout.tsx
@@ -256,7 +256,7 @@ export class GridLayout<T> extends BaseLayout<T> {
     }
 
     let row = this.collection.rows[indexRowBelow];
-    return getFirstItem(getChildNodes(row, this.collection))?.key;
+    return row ? getFirstItem(getChildNodes(row, this.collection))?.key : null;
   }
 
   getKeyAbove(key: Key) {
@@ -271,6 +271,6 @@ export class GridLayout<T> extends BaseLayout<T> {
     }
 
     let row = this.collection.rows[indexRowAbove];
-    return getFirstItem(getChildNodes(row, this.collection))?.key;
+    return row ? getFirstItem(getChildNodes(row, this.collection))?.key : null;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ export class GridLayout<T> extends BaseLayout<T> {`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`let row = this.collection.rows[indexRowBelow];`
`259`		`- return getFirstItem(getChildNodes(row, this.collection))?.key;`
	`259`	`+ return row ? getFirstItem(getChildNodes(row, this.collection))?.key : null;`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`getKeyAbove(key: Key) {`
`@@ -271,6 +271,6 @@ export class GridLayout<T> extends BaseLayout<T> {`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`let row = this.collection.rows[indexRowAbove];`
`274`		`- return getFirstItem(getChildNodes(row, this.collection))?.key;`
	`274`	`+ return row ? getFirstItem(getChildNodes(row, this.collection))?.key : null;`
`275`	`275`	`}`
`276`	`276`	`}`