Skip to content

Fix RTL ScrollView position when content smaller than container #47280

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
NickGerleman wants to merge 1 commit into from
Closed

Fix RTL ScrollView position when content smaller than container #47280

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
7 changes: 5 additions & 2 deletions ...mon/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ void AndroidHorizontalScrollContentViewShadowNode::layout(
ConcreteViewShadowNode::layout(layoutContext);

// When the layout direction is RTL, we expect Yoga to give us a layout
// that extends off the screen to the left so we re-center it with left=0
if (layoutMetrics_.layoutDirection == LayoutDirection::RightToLeft) {
// that extends off the screen to the left so we re-center it to be at most
// zero (where the scrolling offset will be adjusted to match if larger than
// parent width on the Android component side).
if (layoutMetrics_.layoutDirection == LayoutDirection::RightToLeft &&
layoutMetrics_.frame.origin.x < 0) {
layoutMetrics_.frame.origin.x = 0;
}
}
Expand Down
23 changes: 21 additions & 2 deletions packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,19 @@ const examples: Array<RNTesterModuleExample> = [
);
},
},
{
name: 'stubbyHorizontalScrollView',
title: '<ScrollView> (horizontal = true) in RTL not filling content\n',
description:
'A horizontal RTL ScrollView whose content is smaller thatn its containner',
render(): React.Node {
return (
<View testID="stubby-horizontal-rtl-scrollview">
<HorizontalScrollView direction="rtl" itemCount={1} />
</View>
);
},
},
{
title: '<ScrollView> enable & disable\n',
description: 'ScrollView scrolling behaviour can be disabled and enabled',
Expand Down Expand Up @@ -541,10 +554,16 @@ const AndroidScrollBarOptions = () => {
);
};

const HorizontalScrollView = (props: {direction: 'ltr' | 'rtl'}) => {
const HorizontalScrollView = (props: {
direction: 'ltr' | 'rtl',
itemCount?: number,
}) => {
const {direction} = props;
const scrollRef = React.useRef<?React.ElementRef<typeof ScrollView>>();
const title = direction === 'ltr' ? 'LTR Layout' : 'RTL Layout';
const items =
props.itemCount == null ? ITEMS : ITEMS.slice(0, props.itemCount);

return (
<View style={{direction}}>
<RNTesterText style={styles.text}>{title}</RNTesterText>
Expand All @@ -555,7 +574,7 @@ const HorizontalScrollView = (props: {direction: 'ltr' | 'rtl'}) => {
horizontal={true}
style={[styles.scrollView, styles.horizontalScrollView]}
testID={'scroll_horizontal'}>
{ITEMS.map(createItemRow)}
{items.map(createItemRow)}
</ScrollView>
<Button
label="Scroll to start"
Expand Down