Skip to content

[0.66] ScrollView - Respect the shows<Horizontal | Vertical>ScrollIndicator props on macOS #1136

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 2 commits into from
Apr 25, 2022
Merged

[0.66] ScrollView - Respect the shows<Horizontal | Vertical>ScrollIndicator props on macOS #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d4a44f
Respect the iOS scrollbar props on macOS
Saadnajmi Apr 25, 2022
08f30dd
Fix iOS build error + reduce upstream diff
Saadnajmi Apr 25, 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
37 changes: 10 additions & 27 deletions React/Views/ScrollView/RCTScrollContentView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,25 @@
#import "RCTScrollView.h"

@implementation RCTScrollContentView
#if TARGET_OS_OSX // [TODO(macOS GH#774)
{
BOOL _hasHorizontalScroller;
BOOL _hasVerticalScroller;
}
#endif // ]TODO(macOS GH#774)

- (void)reactSetFrame:(CGRect)frame
{
[super reactSetFrame:frame];

#if !TARGET_OS_OSX // TODO(macOS GH#774)
RCTScrollView *scrollView = (RCTScrollView *)self.superview.superview;
#else // [TODO(macOS GH#774)
// macOS also has a NSClipView in its hierarchy
RCTScrollView *scrollView = (RCTScrollView *)self.superview.superview.superview;
#endif // ]TODO(macOS GH#774)

[super reactSetFrame:frame];

if (!scrollView) {
return;
}

RCTAssert([scrollView isKindOfClass:[RCTScrollView class]], @"Unexpected view hierarchy of RCTScrollView component.");

[scrollView updateContentSizeIfNeeded];

#if TARGET_OS_OSX // [TODO(macOS GH#774)
// On macOS scroll indicators may float over the content view like they do in iOS
// or depending on system preferences they may be outside of the content view
Expand All @@ -52,24 +45,14 @@ - (void)reactSetFrame:(CGRect)frame
// the contents will overflow causing the scroll indicators to appear unnecessarily.
NSScrollView *platformScrollView = [scrollView scrollView];
if ([platformScrollView scrollerStyle] == NSScrollerStyleLegacy) {
const BOOL nextHasHorizontalScroller = [platformScrollView hasHorizontalScroller];
const BOOL nextHasVerticalScroller = [platformScrollView hasVerticalScroller];

if (_hasHorizontalScroller != nextHasHorizontalScroller ||
_hasVerticalScroller != nextHasVerticalScroller) {

_hasHorizontalScroller = nextHasHorizontalScroller;
_hasVerticalScroller = nextHasVerticalScroller;

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

RCTScrollContentLocalData *localData =
[[RCTScrollContentLocalData alloc]
initWithVerticalScrollerWidth:horizontalScrollerHeight
horizontalScrollerHeight:verticalScrollerWidth];
[[[scrollView bridge] uiManager] setLocalData:localData forView:self];
}
CGFloat horizontalScrollerHeight = [platformScrollView hasHorizontalScroller] ? NSHeight([[platformScrollView horizontalScroller] frame]) : 0;
CGFloat verticalScrollerWidth = [platformScrollView hasVerticalScroller] ? NSWidth([[platformScrollView verticalScroller] frame]) : 0;

RCTScrollContentLocalData *localData =
[[RCTScrollContentLocalData alloc]
initWithVerticalScrollerWidth:horizontalScrollerHeight
horizontalScrollerHeight:verticalScrollerWidth];
[[[scrollView bridge] uiManager] setLocalData:localData forView:self];
}
#endif // ]TODO(macOS GH#774)
}
Expand Down
6 changes: 1 addition & 5 deletions React/Views/ScrollView/RCTScrollView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ - (instancetype)initWithFrame:(CGRect)frame
self.scrollEnabled = YES;
self.hasHorizontalScroller = YES;
self.hasVerticalScroller = YES;
self.autohidesScrollers = YES;
self.panGestureRecognizer = [[NSPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleCustomPan:)];
#else // ]TODO(macOS GH#774)
[self.panGestureRecognizer addTarget:self action:@selector(handleCustomPan:)];
Expand Down Expand Up @@ -642,11 +643,6 @@ - (void)updateClippedSubviews
[self react_updateClippedSubviewsWithClipRect:clipRect relativeToView:clipView];
_lastClippedToRect = bounds;
}

#if TARGET_OS_OSX // [TODO(macOS GH#774)
[[self scrollView] setHasHorizontalScroller:[self isHorizontal:_scrollView]];
[[self scrollView] setHasVerticalScroller:[self isVertical:_scrollView]];
#endif // ]TODO(macOS GH#774)
}

#if TARGET_OS_OSX // [TODO(macOS GH#774)
Expand Down