mirror of
https://github.com/mattermost/mattermost-mobile.git
synced 2026-11-04 01:48:59 +00:00
b6fc85385e
* Expo-Router partial migration * Full migration to ExpoRouter * i18n * add tests * Merge branch 'main' into expo-router * align package-lock.json * i18n * feedback review * feedback review * android 16kb patch * Refactored emoji picker keyboard using a state machine * set android launch_screen in drawables instead of layout * no conditional hooks * remove duplicate call in test * address feedback * fix tests and address more feedback * small corrections * small corrections * small corrections * fix draft test * fix draft test 2 * remove navigateToScreen in draff test * fix nit in draft test * remove doc file * Feedback review * fix snapshots * improve test coverage * fix i18n * Upgrade t o RN 0.83, other dependencies and new architecture (#9737) * library hardware-keyboard android new arch support fix * library rnshare android new arch support fix * library rnutils android new arch support fix * library secure-pdf-viewer add new arch support * Enable new arch on iOS and Android * update emm and network client with new-arch * update intune to use new-arch * performance improvements * fix tests * fixes post input on new-arch * fix android emoji picker * remove doc * run tests in parallel * upgrade to React Native 0.83.9, Expo 55, React 19, and New Architecture Bumps core dependencies to their latest versions: - React Native 0.77.3 → 0.83.9 (New Architecture enabled) - React 18.3.1 → 19.2.5 - Expo SDK 52 → 55 - TypeScript 5.8.3 → 6.0.3 - Node.js 22.16.0 → 24.15.0 - react-native-reanimated 3.17.3 → 4.3.0 - Various other dependency upgrades Migrates iOS AppDelegate from Objective-C to Swift, updates Android build tooling and Gradle wrapper, refreshes all patches and font assets, and adapts app code, tests, and CI workflows throughout for API changes introduced by these upgrades. * remove unecessary dismissKeyboard in notifications * feedback review * update intune to use new-arch * update @mattermost deps * missing i18n string * additional fixes * update fastlane
39 lines
2.5 KiB
Diff
39 lines
2.5 KiB
Diff
diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
|
|
index 15a5ab7..39fa004 100644
|
|
--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
|
|
+++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
|
|
@@ -1087,13 +1087,14 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
|
|
if (horizontal) {
|
|
CGFloat deltaX = _firstVisibleView.frame.origin.x - _prevFirstVisibleFrame.origin.x;
|
|
if (ABS(deltaX) > 0.5) {
|
|
- CGFloat x = _scrollView.contentOffset.x;
|
|
+ CGFloat leftInset = [self isInverted] ? _scrollView.contentInset.right : _scrollView.contentInset.left;
|
|
+ CGFloat x = _scrollView.contentOffset.x + leftInset;
|
|
[self _forceDispatchNextScrollEvent];
|
|
_scrollView.contentOffset = CGPointMake(_scrollView.contentOffset.x + deltaX, _scrollView.contentOffset.y);
|
|
if (autoscrollThreshold) {
|
|
// If the offset WAS within the threshold of the start, animate to the start.
|
|
if (x <= autoscrollThreshold.value()) {
|
|
- [self scrollToOffset:CGPointMake(0, _scrollView.contentOffset.y) animated:YES];
|
|
+ [self scrollToOffset:CGPointMake(-leftInset, _scrollView.contentOffset.y) animated:YES];
|
|
}
|
|
}
|
|
}
|
|
@@ -1101,13 +1102,14 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
|
|
CGRect newFrame = _firstVisibleView.frame;
|
|
CGFloat deltaY = newFrame.origin.y - _prevFirstVisibleFrame.origin.y;
|
|
if (ABS(deltaY) > 0.5) {
|
|
- CGFloat y = _scrollView.contentOffset.y;
|
|
+ CGFloat bottomInset = [self isInverted] ? _scrollView.contentInset.top : _scrollView.contentInset.bottom;
|
|
+ CGFloat y = _scrollView.contentOffset.y + bottomInset;
|
|
[self _forceDispatchNextScrollEvent];
|
|
_scrollView.contentOffset = CGPointMake(_scrollView.contentOffset.x, _scrollView.contentOffset.y + deltaY);
|
|
if (autoscrollThreshold) {
|
|
// If the offset WAS within the threshold of the start, animate to the start.
|
|
if (y <= autoscrollThreshold.value()) {
|
|
- [self scrollToOffset:CGPointMake(_scrollView.contentOffset.x, 0) animated:YES];
|
|
+ [self scrollToOffset:CGPointMake(_scrollView.contentOffset.x, -bottomInset) animated:YES];
|
|
}
|
|
}
|
|
}
|