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

Jump to bottom

Reapplied #134 with additional checks to tackle unintentional scrolls #296

Merged
merged 3 commits into from
Feb 6, 2019
Merged

Reapplied #134 with additional checks to tackle unintentional scrolls #296

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efb7de3
Reapplied #134 with additional checks to tackle unintentional scrolls
stammbach Jan 31, 2019
831f8f4
Updated keyboardDisplacementFix on RNCWKWebView
stammbach Feb 1, 2019
f1cbe91
Merge upstream
stammbach Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 42 additions & 0 deletions ios/RNCWKWebView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#import "objc/runtime.h"

static NSTimer *keyboardTimer;
static NSString *const MessageHandlerName = @"ReactNativeWebView";

// runtime trick to remove WKWebView keyboard default toolbar
Expand Down Expand Up @@ -70,6 +71,20 @@ - (instancetype)initWithFrame:(CGRect)frame
_automaticallyAdjustContentInsets = YES;
_contentInset = UIEdgeInsetsZero;
}

// Workaround for a keyboard dismissal bug present in iOS 12
// https://openradar.appspot.com/radar?id=5018321736957952
if (@available(iOS 12.0, *)) {
[[NSNotificationCenter defaultCenter]
addObserver:self
selector:@selector(keyboardWillHide)
name:UIKeyboardWillHideNotification object:nil];
[[NSNotificationCenter defaultCenter]
addObserver:self
selector:@selector(keyboardWillShow)
name:UIKeyboardWillShowNotification object:nil];
}

return self;
}

Expand Down Expand Up @@ -172,6 +187,33 @@ - (void)removeFromSuperview
[super removeFromSuperview];
}

-(void)keyboardWillHide
{
keyboardTimer = [NSTimer scheduledTimerWithTimeInterval:0 target:self selector:@selector(keyboardDisplacementFix) userInfo:nil repeats:false];
[[NSRunLoop mainRunLoop] addTimer:keyboardTimer forMode:NSRunLoopCommonModes];
}
-(void)keyboardWillShow
{
if (keyboardTimer != nil) {
[keyboardTimer invalidate];
}
}
-(void)keyboardDisplacementFix
{
// Additional viewport checks to prevent unintentional scrolls
UIScrollView *scrollView = self.webView.scrollView;
double maxContentOffset = scrollView.contentSize.height - scrollView.frame.size.height;
if (maxContentOffset < 0) {
maxContentOffset = 0;
}
if (scrollView.contentOffset.y > maxContentOffset) {
// https://stackoverflow.com/a/9637807/824966
[UIView animateWithDuration:.25 animations:^{
scrollView.contentOffset = CGPointMake(0, maxContentOffset);
}];
}
}

- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) {
if(_onLoadingProgress){
Expand Down