Guard against null refs in findSiblingElement (#7228)

t3chguy · web-flow · commit 766d1ee3e86a · 2021-11-30T09:26:38.000Z
diff --git a/src/accessibility/RovingTabIndex.tsx b/src/accessibility/RovingTabIndex.tsx
@@ -165,13 +165,13 @@ export const findSiblingElement = (
 ): RefObject<HTMLElement> => {
     if (backwards) {
         for (let i = startIndex; i < refs.length && i >= 0; i--) {
-            if (refs[i].current.offsetParent !== null) {
+            if (refs[i].current?.offsetParent !== null) {
                 return refs[i];
             }
         }
     } else {
         for (let i = startIndex; i < refs.length && i >= 0; i++) {
-            if (refs[i].current.offsetParent !== null) {
+            if (refs[i].current?.offsetParent !== null) {
                 return refs[i];
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -165,13 +165,13 @@ export const findSiblingElement = (`
`165`	`165`	`): RefObject<HTMLElement> => {`
`166`	`166`	`if (backwards) {`
`167`	`167`	`for (let i = startIndex; i < refs.length && i >= 0; i--) {`
`168`		`- if (refs[i].current.offsetParent !== null) {`
	`168`	`+ if (refs[i].current?.offsetParent !== null) {`
`169`	`169`	`return refs[i];`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`	`} else {`
`173`	`173`	`for (let i = startIndex; i < refs.length && i >= 0; i++) {`
`174`		`- if (refs[i].current.offsetParent !== null) {`
	`174`	`+ if (refs[i].current?.offsetParent !== null) {`
`175`	`175`	`return refs[i];`
`176`	`176`	`}`
`177`	`177`	`}`