status-im/react-native-webview
1
0
Fork 0
mirror of https://github.com/status-im/react-native-webview.git synced 2026-08-31 03:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(macOS): Don't include iOS pull-to-refresh control (#1636)

Browse Source 
* Update RNCWebView.h

Limit methods relating to pull to refresh to only iOS

* Update RNCWebView.m

Block methods relating to pull to refresh when the target is macOS as macOS does not have the UIRefreshControl

Co-authored-by: Eloy Durán <eloy.de.enige@gmail.com>
This commit is contained in:
Brandon Lax
2020-10-05 17:14:42 +02:00
committed by GitHub
co-authored by Eloy Durán
parent f2041955a2
commit dbf46593fa
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apple/RNCWebView.h
+4
View File
@@ -64,7 +64,9 @@
@property (nonatomic, assign) BOOL ignoreSilentHardwareSwitch;
@property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
@property (nonatomic, assign) BOOL pullToRefreshEnabled;
#if !TARGET_OS_OSX
@property (nonatomic, weak) UIRefreshControl * refreshControl;
#endif
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
@property (nonatomic, assign) WKContentMode contentMode;
@@ -78,7 +80,9 @@
- (void)goBack;
- (void)reload;
- (void)stopLoading;
#if !TARGET_OS_OSX
- (void)addPullToRefreshControl;
- (void)pullToRefresh:(UIRefreshControl *)refreshControl;
#endif
@end
apple/RNCWebView.m
+2 -2
View File
@@ -1136,7 +1136,7 @@ static NSDictionary* customCertificatesForHost;
[_webView reload];
}
}
#if !TARGET_OS_OSX
- (void)addPullToRefreshControl
{
UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
@@ -1151,7 +1151,7 @@ static NSDictionary* customCertificatesForHost;
[refreshControl endRefreshing];
}
#if !TARGET_OS_OSX
- (void)setPullToRefreshEnabled:(BOOL)pullToRefreshEnabled
{
_pullToRefreshEnabled = pullToRefreshEnabled;