fix: properly scroll body if keyboard focusing a item with no other scroll parents

packages/@react-aria/utils/src/getScrollParents.ts

@@ -16,12 +16,15 @@ export function getScrollParents(node: Element, checkForOverflow?: boolean): Ele
   let parentElements: Element[] = [];
   let root = document.scrollingElement || document.documentElement;
 
-  do {
+  while (node) {
     if (isScrollable(node, checkForOverflow)) {
       parentElements.push(node);
     }
+    if (node === root) {
+      break;
+    }
     node = node.parentElement as Element;
-  } while (node && node !== root);
+  }
 
   return parentElements;
 }

packages/@react-aria/utils/src/scrollIntoView.ts

@@ -73,7 +73,7 @@ export function scrollIntoView(scrollView: HTMLElement, element: HTMLElement, op
   let scrollBarOffsetX = scrollView === root ? 0 : borderLeftWidth + borderRightWidth;
   let scrollBarOffsetY = scrollView === root ? 0 : borderTopWidth + borderBottomWidth;
   let scrollBarWidth = scrollView.offsetWidth - scrollView.clientWidth - scrollBarOffsetX;
-  let scrollBarHeight = scrollView.offsetHeight - scrollView.clientHeight - scrollBarOffsetY;
+  let scrollBarHeight = scrollView === root ? 0 : scrollView.offsetHeight - scrollView.clientHeight - scrollBarOffsetY;
 
   let scrollPortTop = viewTop + borderTopWidth + scrollPaddingTop;
   let scrollPortBottom = viewBottom - borderBottomWidth - scrollPaddingBottom - scrollBarHeight;
@@ -159,9 +159,13 @@ export function scrollIntoViewport(targetElement: Element | null, opts: ScrollIn
       // Account for sub pixel differences from rounding
       if ((Math.abs(originalLeft - newLeft) > 1) || (Math.abs(originalTop - newTop) > 1)) {
         scrollParents = containingElement ? getScrollParents(containingElement, true) : [];
+        // scroll containing element into view first, then rescroll target element into view like the non chrome flow above
         for (let scrollParent of scrollParents) {
           scrollIntoView(scrollParent as HTMLElement, containingElement as HTMLElement, {block: 'center', inline: 'center'});
         }
+        for (let scrollParent of getScrollParents(targetElement, true)) {
+          scrollIntoView(scrollParent as HTMLElement, targetElement as HTMLElement);
+        }
       }
     }
   }