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

feat: remove not necessary workaround for ScrollView from RN 76 #2350

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: remove not necessary workaround for ScrollView from RN 76 #2350

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
1b742f0
feat: remove not necessary workaround for ScrollView from RN 76
WoLewicki Sep 24, 2024
28489f4
feat: add minor version checking
WoLewicki Nov 7, 2024
5d9979d
Merge branch 'main' into @wolewicki/remove-workaround-for-scrollview
WoLewicki Nov 7, 2024
e414521
fix: bump Podfile.lock
WoLewicki Nov 7, 2024
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
6 changes: 3 additions & 3 deletions Example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,7 +1621,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (4.0.0-beta.14):
- RNScreens (4.0.0):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1933,10 +1933,10 @@ SPEC CHECKSUMS:
ReactCommon: 429ca28cd813c31359c73ffac6dc24f93347d522
RNGestureHandler: 6dfe7692a191ee224748964127114edf057a1475
RNReanimated: 8a3f169d2eb2d9eb8387fee5eec644cdd600f395
RNScreens: 6b988457305ab134e9da6f444dd20728f6f447e8
RNScreens: de948b09c9a30f3ea52f9840dd6f8ce92b4e33d3
RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: 1d66db49f38fd9e576a1d7c3b081e46ab4c28b9e
Yoga: f8ec45ce98bba1bc93dd28f2ee37215180e6d2b6

PODFILE CHECKSUM: e789d9c7679b8290c738efa8b22ba8746b7498df

Expand Down
6 changes: 5 additions & 1 deletion ios/RNSScreen.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#else
#import <React/RCTScrollView.h>
#import <React/RCTTouchHandler.h>
#import <React/RCTVersion.h>
#endif // RCT_NEW_ARCH_ENABLED

#import <React/RCTShadowView.h>
Expand Down Expand Up @@ -1438,7 +1439,10 @@ - (void)viewDidDisappear:(BOOL)animated
_shouldNotify = YES;
#ifdef RCT_NEW_ARCH_ENABLED
#else
[self traverseForScrollView:self.screenView];
double rnMinorVersion = [RCTGetReactNativeVersion()[RCTVersionMinor] doubleValue];
if (rnMinorVersion < 76.f) {
[self traverseForScrollView:self.screenView];
}
#endif
}

Expand Down
Loading