SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MM-31231] Fix gap between post list and draft input (#5024) (#5029)

Browse Source 
* Update keyboard tracking view patch

* Always subtract bottomSafeArea if shown or will show

* Subtract bottomSafeArea if height is not 0 and is shown or will show

(cherry picked from commit b3796e162c)

Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>
This commit is contained in:
Mattermost Build
2020-12-10 23:51:13 +01:00
committed by GitHub
parent 29a12c152a
commit dc70abaf89
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/react-native-keyboard-tracking-view+5.7.0.patch
View File

@@ -1,5 +1,5 @@
diff --git a/node_modules/react-native-keyboard-tracking-view/lib/KeyboardTrackingViewManager.m b/node_modules/react-native-keyboard-tracking-view/lib/KeyboardTrackingViewManager.m
index 1333a10..8f59f3c 100644
index 1333a10..53b73a6 100644
--- a/node_modules/react-native-keyboard-tracking-view/lib/KeyboardTrackingViewManager.m
+++ b/node_modules/react-native-keyboard-tracking-view/lib/KeyboardTrackingViewManager.m
@@ -23,7 +23,7 @@
@@ -197,7 +197,7 @@ index 1333a10..8f59f3c 100644
}
}
else if(self.scrollBehavior == KeyboardTrackingScrollBehaviorFixedOffset && !self.isDraggingScrollView)
@@ -422,16 +459,24 @@ - (void)_updateScrollViewInsets
@@ -422,16 +459,20 @@ - (void)_updateScrollViewInsets
self.scrollViewToManage.contentOffset = CGPointMake(originalOffset.x, originalOffset.y + insetsDiff);
}
@@ -206,12 +206,8 @@ index 1333a10..8f59f3c 100644
- {
- insets.top = bottomInset;
+ CGFloat kHeight = _observingInputAccessoryView.keyboardHeight;
+ if ((_observingInputAccessoryView.keyboardState == KeyboardStateShown || _observingInputAccessoryView.keyboardState == KeyboardStateWillShow) && kHeight == 0) {
+ if (@available(iOS 14.2, *)) {
+ // Do nothing
+ } else {
+ kHeight= bottomSafeArea;
+ }
+ if (kHeight != 0 && (_observingInputAccessoryView.keyboardState == KeyboardStateShown || _observingInputAccessoryView.keyboardState == KeyboardStateWillShow)) {
+ kHeight -= bottomSafeArea;
}
- else
- {
@@ -230,7 +226,7 @@ index 1333a10..8f59f3c 100644
}
}
@@ -448,7 +493,6 @@ -(void)addBottomViewIfNecessary
@@ -448,7 +489,6 @@ -(void)addBottomViewIfNecessary
if (self.addBottomView && _bottomView == nil)
{
_bottomView = [UIView new];
@@ -238,7 +234,7 @@ index 1333a10..8f59f3c 100644
[self addSubview:_bottomView];
[self updateBottomViewFrame];
}
@@ -467,6 +511,12 @@ -(void)updateBottomViewFrame
@@ -467,6 +507,12 @@ -(void)updateBottomViewFrame
}
}
@@ -251,7 +247,7 @@ index 1333a10..8f59f3c 100644
#pragma mark - safe area
-(void)safeAreaInsetsDidChange
@@ -510,7 +560,7 @@ -(void)updateTransformAndInsets
@@ -510,7 +556,7 @@ -(void)updateTransformAndInsets
CGFloat accessoryTranslation = MIN(-bottomSafeArea, -_observingInputAccessoryView.keyboardHeight);
if (_observingInputAccessoryView.keyboardHeight <= bottomSafeArea) {
@@ -260,7 +256,7 @@ index 1333a10..8f59f3c 100644
} else if (_observingInputAccessoryView.keyboardState != KeyboardStateWillHide) {
_bottomViewHeight = 0;
}
@@ -582,6 +632,8 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
@@ -582,6 +628,8 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
{
self.isDraggingScrollView = YES;
@@ -269,7 +265,7 @@ index 1333a10..8f59f3c 100644
}
- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
@@ -592,6 +644,15 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
@@ -592,6 +640,15 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
{
self.isDraggingScrollView = NO;
@@ -285,7 +281,7 @@ index 1333a10..8f59f3c 100644
}
- (CGFloat)getKeyboardHeight
@@ -634,6 +695,12 @@ @implementation KeyboardTrackingViewManager
@@ -634,6 +691,12 @@ @implementation KeyboardTrackingViewManager
RCT_REMAP_VIEW_PROPERTY(addBottomView, addBottomView, BOOL)
RCT_REMAP_VIEW_PROPERTY(scrollToFocusedInput, scrollToFocusedInput, BOOL)
RCT_REMAP_VIEW_PROPERTY(allowHitsOutsideBounds, allowHitsOutsideBounds, BOOL)
@@ -298,7 +294,7 @@ index 1333a10..8f59f3c 100644
+ (BOOL)requiresMainQueueSetup
{
@@ -654,6 +721,20 @@ - (UIView *)view
@@ -654,6 +717,20 @@ - (UIView *)view
return [[KeyboardTrackingView alloc] init];
}