Skip to content

fix(VirtualizedList): sync virtualization logic with local direction style #55481

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

Closed
Hector-Zhuang wants to merge 1 commit into from
Closed

fix(VirtualizedList): sync virtualization logic with local direction style #55481

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
31 changes: 22 additions & 9 deletions packages/virtualized-lists/Lists/VirtualizedList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,11 +924,13 @@ class VirtualizedList extends StateSafePureComponent<
const {ListEmptyComponent, ListFooterComponent, ListHeaderComponent} =
this.props;
const {data, horizontal} = this.props;
const isRTL = this._orientation().rtl
const inversionStyle = this.props.inverted
? horizontalOrDefault(this.props.horizontal)
? styles.horizontallyInverted
? [styles.horizontallyInverted]
: styles.verticallyInverted
: null;
const orientationStyle = {direction: isRTL ? 'rtl' : 'ltr'}
const cells: Array<any | React.Node> = [];
const stickyIndicesFromProps = new Set(this.props.stickyHeaderIndices);
const stickyHeaderIndices = [];
Expand Down Expand Up @@ -1106,8 +1108,8 @@ class VirtualizedList extends StateSafePureComponent<
: this.props.inverted,
stickyHeaderIndices,
style: inversionStyle
? [inversionStyle, this.props.style]
: this.props.style,
? [inversionStyle, this.props.style, orientationStyle]
: [this.props.style, orientationStyle],
isInvertedVirtualizedList: this.props.inverted,
maintainVisibleContentPosition:
this.props.maintainVisibleContentPosition != null
Expand Down Expand Up @@ -1502,7 +1504,7 @@ class VirtualizedList extends StateSafePureComponent<
}

_selectLength(
metrics: Readonly<{
metrics: $ReadOnly<{
height: number,
width: number,
...
Expand All @@ -1517,13 +1519,24 @@ class VirtualizedList extends StateSafePureComponent<
return this._orientation().horizontal ? x : y;
}

_orientation(): ListOrientation {
return {
horizontal: horizontalOrDefault(this.props.horizontal),
rtl: I18nManager.isRTL,
};
_orientation(): ListOrientation {
const horizontal = horizontalOrDefault(this.props.horizontal);
const flatStyle = StyleSheet.flatten(this.props.style);
const localDirection = flatStyle?.direction;

let isRTL = I18nManager.isRTL;
if (localDirection === 'rtl') {
isRTL = true;
} else if (localDirection === 'ltr') {
isRTL = false;
}

return {
horizontal,
rtl: isRTL,
};
}

_maybeCallOnEdgeReached() {
const {
data,
Expand Down