Fix buttons inside disabled grid list items not being disabled (#6324)

Fix buttons inside disabled grid list items not being disabled (#6324)

Author: joshuajaco

packages/react-aria-components/src/GridList.tsx

@@ -275,6 +275,8 @@ function GridListRow({item}) {
     state
   );
 
+  let buttonProps = state.selectionManager.disabledBehavior === 'all' && states.isDisabled ? {isDisabled: true} : {};
+
   let draggableItem: DraggableItemResult | null = null;
   if (dragState && dragAndDropHooks) {
     draggableItem = dragAndDropHooks.useDraggableItem!({key: item.key, hasDragButton: true}, dragState);
@@ -359,7 +361,7 @@ function GridListRow({item}) {
               }],
               [ButtonContext, {
                 slots: {
-                  [DEFAULT_SLOT]: {},
+                  [DEFAULT_SLOT]: buttonProps,
                   drag: {
                     ...draggableItem?.dragButtonProps,
                     ref: dragButtonRef,

packages/react-aria-components/test/GridList.test.js

@@ -231,12 +231,13 @@ describe('GridList', () => {
     let {getAllByRole} = render(
       <GridList aria-label="Test">
         <GridListItem id="cat">Cat</GridListItem>
-        <GridListItem id="dog" isDisabled>Dog</GridListItem>
+        <GridListItem id="dog" textValue="Dog" isDisabled>Dog <Button aria-label="Info">ⓘ</Button></GridListItem>
         <GridListItem id="kangaroo">Kangaroo</GridListItem>
       </GridList>
     );
     let items = getAllByRole('row');
     expect(items[1]).toHaveAttribute('aria-disabled', 'true');
+    expect(within(items[1]).getByRole('button')).toBeDisabled();
 
     await user.tab();
     expect(document.activeElement).toBe(items[0]);