Skip to content

[ScrollView] Don't always adjust content view padding for both scrollers #1132

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

Merged
merged 4 commits into from
Apr 22, 2022
Merged

[ScrollView] Don't always adjust content view padding for both scrollers #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb45ef6
Only pass height or width if needed
Saadnajmi Apr 22, 2022
c9c87d0
Merge branch 'main' into scrollview-fix
Saadnajmi Apr 22, 2022
e8ae897
fix typo
Saadnajmi Apr 22, 2022
1e8bf2d
Update RCTScrollContentLocalData.h
Saadnajmi Apr 22, 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
4 changes: 2 additions & 2 deletions React/Views/ScrollView/MacOS/RCTScrollContentLocalData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) CGFloat horizontalScrollerHeight;
@property (nonatomic, assign) CGFloat verticalScrollerWidth;

- (instancetype)initWithVerticalScroller:(nullable NSScroller *)verticalScroller
horizontalScroller:(nullable NSScroller *)horizontalScroller;
- (instancetype)initWithVerticalScrollerWidth:(CGFloat)verticalScrollerWidth
horizontalScrollerHeight:(CGFloat)horizontalScrollerHeight;

@end

Expand Down
8 changes: 4 additions & 4 deletions React/Views/ScrollView/MacOS/RCTScrollContentLocalData.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

@implementation RCTScrollContentLocalData

- (instancetype)initWithVerticalScroller:(NSScroller *)verticalScroller
horizontalScroller:(NSScroller *)horizontalScroller
- (instancetype)initWithVerticalScrollerWidth:(CGFloat)verticalScrollerWidth
horizontalScrollerHeight:(CGFloat)horizontalScrollerHeight;
{
if (self = [super init]) {
_verticalScrollerWidth = NSWidth([verticalScroller frame]);
_horizontalScrollerHeight = NSHeight([horizontalScroller frame]);
_verticalScrollerWidth = verticalScrollerWidth;
_horizontalScrollerHeight = horizontalScrollerHeight;
}
return self;
}
Expand Down
7 changes: 5 additions & 2 deletions React/Views/ScrollView/RCTScrollContentView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,13 @@ - (void)reactSetFrame:(CGRect)frame
_hasHorizontalScroller = nextHasHorizontalScroller;
_hasVerticalScroller = nextHasVerticalScroller;

CGFloat horizontalScrollerHeight = _hasHorizontalScroller ? NSHeight([[platformScrollView horizontalScroller] frame]) : 0;
CGFloat verticalScrollerWidth = _hasVerticalScroller ? NSWidth([[platformScrollView verticalScroller] frame]) : 0;

RCTScrollContentLocalData *localData =
[[RCTScrollContentLocalData alloc]
initWithVerticalScroller:[platformScrollView verticalScroller]
horizontalScroller:[platformScrollView horizontalScroller]];
initWithVerticalScrollerWidth:horizontalScrollerHeight
horizontalScrollerHeight:verticalScrollerWidth];
[[[scrollView bridge] uiManager] setLocalData:localData forView:self];
}
}
Expand Down