Skip to content
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

Fix contentInsetAdjustmentBehavior set to automatic on ScrollView in the new architecture #34217

Closed
wants to merge 9 commits into from
Closed

Fix contentInsetAdjustmentBehavior set to automatic on ScrollView in the new architecture #34217

Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6200804
Recreated UIScrollView when component recycled
grahammendick Jul 17, 2022
36ab76d
Reset props back to default when recycled
grahammendick Jul 17, 2022
0877c74
Reset event throttle for consistency
grahammendick Jul 17, 2022
2b1be32
Removed old scroll view before adding new
grahammendick Jul 17, 2022
06e6c8f
Fixed typo
grahammendick Jul 17, 2022
f28c6f6
Changed frame to 0 when recycled for large titles
grahammendick Jul 18, 2022
a81587f
Started as null - only need update after a recycle
grahammendick Jul 18, 2022
bba6de8
Changed frame to 0 then back again on recycle
grahammendick Jul 19, 2022
0274549
Merge branch 'facebook:main' into issue-34165
grahammendick Jul 20, 2022
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
8 changes: 8 additions & 0 deletions React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ @implementation RCTScrollViewComponentView {
BOOL _shouldUpdateContentInsetAdjustmentBehavior;

CGPoint _contentOffsetWhenClipped;
CGRect _oldFrame;
}

+ (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(UIView *)view
Expand Down Expand Up @@ -130,6 +131,7 @@ - (instancetype)initWithFrame:(CGRect)frame
[self.scrollViewDelegateSplitter addDelegate:self];

_scrollEventThrottle = INFINITY;
_oldFrame = CGRectNull;
}

return self;
Expand Down Expand Up @@ -178,6 +180,10 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics

- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
{
if (!CGRectEqualToRect(_oldFrame, CGRectNull)) {
[self setFrame:_oldFrame];
_oldFrame = CGRectNull;
}
const auto &oldScrollViewProps = *std::static_pointer_cast<const ScrollViewProps>(_props);
const auto &newScrollViewProps = *std::static_pointer_cast<const ScrollViewProps>(props);

Expand Down Expand Up @@ -401,6 +407,8 @@ - (void)prepareForRecycle
_shouldUpdateContentInsetAdjustmentBehavior = YES;
_state.reset();
_isUserTriggeredScrolling = NO;
_oldFrame = self.frame;
[self setFrame:CGRectZero];
[super prepareForRecycle];
}

Expand Down