fix: (WIP) 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

@@ -44,6 +44,7 @@ export function scrollIntoView(scrollView: HTMLElement, element: HTMLElement, op
   let itemStyle = window.getComputedStyle(element);
   let viewStyle = window.getComputedStyle(scrollView);
   let root = document.scrollingElement || document.documentElement;
+  let isRoot = scrollView === root;
 
   let viewTop = scrollView === root ? 0 : view.top;
   let viewBottom = scrollView === root ? scrollView.clientHeight : view.bottom;
@@ -72,13 +73,13 @@ 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 scrollBarWidth = scrollView === root ? 0 : scrollView.offsetWidth - scrollView.clientWidth - scrollBarOffsetX;
+  let scrollBarHeight = scrollView === root ? 0 : scrollView.offsetHeight - scrollView.clientHeight - scrollBarOffsetY;
 
-  let scrollPortTop = viewTop + borderTopWidth + scrollPaddingTop;
-  let scrollPortBottom = viewBottom - borderBottomWidth - scrollPaddingBottom - scrollBarHeight;
-  let scrollPortLeft = viewLeft + borderLeftWidth + scrollPaddingLeft;
-  let scrollPortRight = viewRight - borderRightWidth - scrollPaddingRight;
+  let scrollPortTop = viewTop + (isRoot ? 0 : borderTopWidth) + scrollPaddingTop;
+  let scrollPortBottom = viewBottom - (isRoot ? 0 : borderBottomWidth) - scrollPaddingBottom - scrollBarHeight;
+  let scrollPortLeft = viewLeft + (isRoot ? 0 : borderLeftWidth) + scrollPaddingLeft;
+  let scrollPortRight = viewRight - (isRoot ? 0 : borderRightWidth) - scrollPaddingRight;
 
   // IOS always positions the scrollbar on the right ¯\_(ツ)_/¯
   if (viewStyle.direction === 'rtl' && !isIOS()) {
@@ -159,9 +160,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);
+        }
       }
     }
   }

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2026 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import {getScrollParents} from '../src/getScrollParents';
+
+describe('getScrollParents', () => {
+  let root: Element;
+
+  beforeEach(() => {
+    root = document.documentElement;
+  });
+
+  afterEach(() => {
+    document.body.innerHTML = '';
+    jest.restoreAllMocks();
+  });
+
+  it('includes root as a scroll parent for a node in the document', () => {
+    let div = document.createElement('div');
+    document.body.appendChild(div);
+
+    let parents = getScrollParents(div);
+    expect(parents).toContain(root);
+  });
+
+  it('does not include root when root has overflow: hidden', () => {
+    let div = document.createElement('div');
+    document.body.appendChild(div);
+
+    jest.spyOn(window, 'getComputedStyle').mockImplementation((el) => {
+      if (el === root) {
+        return {overflow: 'hidden'} as CSSStyleDeclaration;
+      }
+      return {overflow: 'visible'} as CSSStyleDeclaration;
+    });
+
+    let parents = getScrollParents(div);
+    expect(parents).not.toContain(root);
+  });
+
+  it('includes a scrollable intermediate parent', () => {
+    let scrollable = document.createElement('div');
+    let child = document.createElement('div');
+    document.body.appendChild(scrollable);
+    scrollable.appendChild(child);
+
+    jest.spyOn(window, 'getComputedStyle').mockImplementation((el) => {
+      if (el === scrollable) {
+        return {overflow: 'auto'} as CSSStyleDeclaration;
+      }
+      return {overflow: 'visible'} as CSSStyleDeclaration;
+    });
+
+    let parents = getScrollParents(child);
+    expect(parents).toContain(scrollable);
+    expect(parents).toContain(root);
+  });
+
+  it('excludes non-scrollable ancestors', () => {
+    let plain = document.createElement('div');
+    let child = document.createElement('div');
+    document.body.appendChild(plain);
+    plain.appendChild(child);
+
+    let parents = getScrollParents(child);
+    expect(parents).not.toContain(plain);
+    expect(parents).not.toContain(document.body);
+  });
+});