Skip to content

fix(SortableGridList): forward ScrollView props to inner ScrollView #4003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yinminqian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(SortableGridList): forward ScrollView props to inner ScrollView #4003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/react-native-ui-lib/src/components/sortableGridList/__tests__/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,10 @@ describe('SortableGridlist', () => {
expect(onOrderChange).toHaveBeenCalledWith(newOrder.map(index => TEST_DATA[index]),
newOrder.map(index => TEST_DATA[index].id));
});
it('should forward ScrollView props to the inner ScrollView', () => {
const {getByTestId} = render(<TestCase scrollEnabled={false} showsVerticalScrollIndicator={false}/>);
const scrollView = getByTestId(testID);
expect(scrollView.props.scrollEnabled).toBe(false);
expect(scrollView.props.showsVerticalScrollIndicator).toBe(false);
});
});
24 changes: 22 additions & 2 deletions packages/react-native-ui-lib/src/components/sortableGridList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,28 @@ function generateItemsOrder(data: SortableGridListProps['data']) {
return _.map(data, item => item.id);
}

const CONSUMED_PROPS = [
'renderItem',
'onOrderChange',
'flexMigration',
'orderByIndex',
'data',
'extraData',
// Consumed by useGridLayout — re-applied via listStyle / listContentStyle / listColumnWrapperStyle.
'style',
'contentContainerStyle',
'columnWrapperStyle',
'numColumns',
'itemSpacing',
'maxItemWidth',
'listPadding',
'keepItemSize',
'containerWidth'
];

function SortableGridList<T = any>(props: SortableGridListProps<T>) {
const {renderItem, onOrderChange, flexMigration, orderByIndex = false, ...others} = props;
const {renderItem, onOrderChange, flexMigration, orderByIndex = false, data} = props;
const scrollViewProps = _.omit(props, CONSUMED_PROPS);

const {
itemContainerStyle,
Expand All @@ -28,7 +48,6 @@ function SortableGridList<T = any>(props: SortableGridListProps<T>) {
listContentStyle,
listColumnWrapperStyle
} = useGridLayout(props);
const {data} = others;
const itemsOrder = useSharedValue<ItemsOrder>(generateItemsOrder(data));

// TODO: Remove once flexMigration migration is completed
Expand Down Expand Up @@ -79,6 +98,7 @@ function SortableGridList<T = any>(props: SortableGridListProps<T>) {
return (
<GestureHandlerRootView style={flexMigration ? styles.container : undefined}>
<ScrollView
{...scrollViewProps}
style={listStyle}
contentContainerStyle={[styles.listContent, listContentStyle, listColumnWrapperStyle]}
>
Expand Down