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

Add scrollbar to multiline TextInput #1366

Merged
merged 27 commits into from
Aug 23, 2022
Merged

Add scrollbar to multiline TextInput #1366

Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4d3f5c6
initial commit
chiuam May 19, 2022
f9d82f6
Update comment
chiuam May 19, 2022
b719817
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam May 20, 2022
acbccad
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam May 24, 2022
53588ed
Merge branch 'main' of github.com:chiuam/react-native-macos
May 24, 2022
e4907c7
Merge branch 'main' of github.com:microsoft/react-native-macos
Jun 8, 2022
1a93e4d
Merge branch 'main' of github.com:microsoft/react-native-macos
Jun 15, 2022
1cdb579
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Jun 21, 2022
59e90bf
Merge branch 'main' of github.com:chiuam/react-native-macos
chiuam Jun 21, 2022
a2c8bd3
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Jul 7, 2022
6f44929
Merge branch 'main' of github.com:microsoft/react-native-macos
Jul 8, 2022
6104811
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Jul 12, 2022
b8ca9a2
Merge branch 'main' of github.com:chiuam/react-native-macos
chiuam Jul 12, 2022
92133ff
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Jul 21, 2022
425c33c
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Jul 22, 2022
0adab59
Merge branch 'main' of github.com:microsoft/react-native-macos
Jul 22, 2022
a3ba85c
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Jul 25, 2022
b19d0d6
Merge branch 'main' of github.com:chiuam/react-native-macos
Jul 26, 2022
3ea7af2
Merge branch 'main' of github.com:microsoft/react-native-macos
Jul 26, 2022
851bdb9
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Jul 27, 2022
118701f
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Jul 28, 2022
c47d12f
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Aug 1, 2022
d249cc2
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Aug 12, 2022
ccd6330
Merge branch 'main' of github.com:chiuam/react-native-macos
chiuam Aug 12, 2022
9363f05
Merge branch 'main' of github.com:microsoft/react-native-macos
chiuam Aug 19, 2022
7c3073a
Add scrollbar to multiline TextInput
chiuam Aug 22, 2022
3ddc341
Add macro
chiuam Aug 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: 3 additions & 1 deletion Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ - (void)setEnableFocusRing:(BOOL)enableFocusRing {
- (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView // TODO(macOS ISS#3536887)
{
RCTDirectEventBlock onScroll = self.onScroll;

#if TARGET_OS_OSX // [TODO(macOS GH#774)
[_scrollView setHasVerticalScroller:YES];
amgleitman marked this conversation as resolved.
Show resolved Hide resolved
amgleitman marked this conversation as resolved.
Show resolved Hide resolved
#endif // ]TODO(macOS GH#774)
if (onScroll) {
CGPoint contentOffset = scrollView.contentOffset;
CGSize contentSize = scrollView.contentSize;
Expand Down