Skip to content

Commit ae28784

Browse files
rilescodeyihuiliao
andauthored
fix: correctly pass through disallowTypeAhead in RAC GridList (#9124)
* pass through disallowTypeAhead to useGridListProps * add story --------- Co-authored-by: Yihui Liao <[email protected]>
1 parent c626125 commit ae28784

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ function GridListInner<T extends object>({props, collection, gridListRef: ref}:
156156
// Only tab navigation is supported in grid layout.
157157
keyboardNavigationBehavior: layout === 'grid' ? 'tab' : keyboardNavigationBehavior,
158158
isVirtualized,
159-
shouldSelectOnPressUp: props.shouldSelectOnPressUp
159+
shouldSelectOnPressUp: props.shouldSelectOnPressUp,
160+
disallowTypeAhead
160161
}, filteredState, ref);
161162

162163
let selectionManager = filteredState.selectionManager;

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ export const GridListExample: GridListStory = (args) => (
6868
gridTemplate: args.layout === 'grid' ? 'repeat(3, 1fr) / repeat(3, 1fr)' : 'auto / 1fr',
6969
gridAutoFlow: 'row'
7070
}}>
71-
<MyGridListItem>1,1 <Button>Actions</Button></MyGridListItem>
72-
<MyGridListItem>1,2 <Button>Actions</Button></MyGridListItem>
73-
<MyGridListItem>1,3 <Button>Actions</Button></MyGridListItem>
74-
<MyGridListItem>2,1 <Button>Actions</Button></MyGridListItem>
75-
<MyGridListItem>2,2 <Button>Actions</Button></MyGridListItem>
76-
<MyGridListItem>2,3 <Button>Actions</Button></MyGridListItem>
77-
<MyGridListItem>3,1 <Button>Actions</Button></MyGridListItem>
78-
<MyGridListItem>3,2 <Button>Actions</Button></MyGridListItem>
79-
<MyGridListItem>3,3 <Button>Actions</Button></MyGridListItem>
71+
<MyGridListItem textValue="1,1">1,1 <Button>Actions</Button></MyGridListItem>
72+
<MyGridListItem textValue="1,2">1,2 <Button>Actions</Button></MyGridListItem>
73+
<MyGridListItem textValue="1,3">1,3 <Button>Actions</Button></MyGridListItem>
74+
<MyGridListItem textValue="2,1">2,1 <Button>Actions</Button></MyGridListItem>
75+
<MyGridListItem textValue="2,2">2,2 <Button>Actions</Button></MyGridListItem>
76+
<MyGridListItem textValue="2,3">2,3 <Button>Actions</Button></MyGridListItem>
77+
<MyGridListItem textValue="3,1">3,1 <Button>Actions</Button></MyGridListItem>
78+
<MyGridListItem textValue="3,2">3,2 <Button>Actions</Button></MyGridListItem>
79+
<MyGridListItem textValue="3,3">3,3 <Button>Actions</Button></MyGridListItem>
8080
</GridList>
8181
);
8282

@@ -103,7 +103,8 @@ GridListExample.story = {
103103
args: {
104104
layout: 'stack',
105105
escapeKeyBehavior: 'clearSelection',
106-
shouldSelectOnPressUp: false
106+
shouldSelectOnPressUp: false,
107+
disallowTypeAhead: false
107108
},
108109
argTypes: {
109110
layout: {
@@ -634,3 +635,4 @@ export let GridListInModalPicker: StoryObj<typeof GridListInModalPickerRender> =
634635
}
635636
}
636637
};
638+

0 commit comments

Comments
 (0)