Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

[webview_flutter_wkwebview] Update copy method for Dart classes and support the NSObject.observeValue for subclasses #5961

Merged
merged 36 commits into from
Jun 22, 2022
Merged

[webview_flutter_wkwebview] Update copy method for Dart classes and support the NSObject.observeValue for subclasses #5961

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e6618c8
standard creation
bparrishMines Jun 8, 2022
1bd8ca3
fix tests
bparrishMines Jun 8, 2022
6d67ecd
update mocks
bparrishMines Jun 8, 2022
8083132
ensure setup
bparrishMines Jun 8, 2022
abec006
current url
bparrishMines Jun 8, 2022
e5c820b
only set if nonnull
bparrishMines Jun 8, 2022
ed678fd
webview may have gotten it done
bparrishMines Jun 8, 2022
2edf7d7
some more objc polish
bparrishMines Jun 9, 2022
4ffc2de
formatting
bparrishMines Jun 9, 2022
8b7f28a
passing tests
bparrishMines Jun 9, 2022
613d5ac
prevent progress bug
bparrishMines Jun 9, 2022
6c059cf
pass error data back
bparrishMines Jun 9, 2022
1bfa38e
return errors instead
bparrishMines Jun 9, 2022
6aaf2c2
fix returning non bool
bparrishMines Jun 9, 2022
1ab7ceb
return expected string bool and double values
bparrishMines Jun 9, 2022
3c7090a
use objective c string as returning result
bparrishMines Jun 9, 2022
4ff2fc0
dart side of addiing dispose and create webview configuration
bparrishMines Jun 10, 2022
bd635a7
webviewconfiguration objc code
bparrishMines Jun 10, 2022
0cdcde3
formatting
bparrishMines Jun 10, 2022
6f9dbc1
store binary messenger
bparrishMines Jun 10, 2022
8bc168e
fix configuration identifier
bparrishMines Jun 10, 2022
5ebbb62
Merge branch 'main' of github.com:flutter/plugins into copies
bparrishMines Jun 10, 2022
191bd31
Merge branch 'main' of github.com:flutter/plugins into copies
bparrishMines Jun 13, 2022
c8585c0
new fix for nserror
bparrishMines Jun 14, 2022
37d8300
fix crash
bparrishMines Jun 14, 2022
e7b9d11
correct import
bparrishMines Jun 14, 2022
5537463
Merge branch 'main' of github.com:flutter/plugins into copies
bparrishMines Jun 15, 2022
b2892e2
formatting and test passing
bparrishMines Jun 15, 2022
f40115d
nonatomic
bparrishMines Jun 15, 2022
2a18e2c
duplicate code + missing comma
bparrishMines Jun 15, 2022
3011abe
missing commas
bparrishMines Jun 15, 2022
f3f58e3
another missing comma
bparrishMines Jun 21, 2022
353cab1
improve weak comments
bparrishMines Jun 22, 2022
d92b699
formatting
bparrishMines Jun 22, 2022
4710dc9
Merge branch 'main' of github.com:flutter/plugins into copies
bparrishMines Jun 22, 2022
7d7a273
Merge branch 'main' of github.com:flutter/plugins into copies
bparrishMines Jun 22, 2022
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
5 changes: 3 additions & 2 deletions ...r/webview_flutter_wkwebview/example/ios/RunnerTests/FWFScriptMessageHandlerHostApiTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ - (id)mockFlutterApiWithManager:(FWFInstanceManager *)instanceManager {

- (void)testCreateWithIdentifier {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
FWFScriptMessageHandlerHostApiImpl *hostAPI =
[[FWFScriptMessageHandlerHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFScriptMessageHandlerHostApiImpl *hostAPI = [[FWFScriptMessageHandlerHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI createWithIdentifier:@0 error:&error];
Expand Down
5 changes: 3 additions & 2 deletions ...iew_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFUIDelegateHostApiTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ - (id)mockFlutterApiWithManager:(FWFInstanceManager *)instanceManager {

- (void)testCreateWithIdentifier {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
FWFUIDelegateHostApiImpl *hostAPI =
[[FWFUIDelegateHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFUIDelegateHostApiImpl *hostAPI = [[FWFUIDelegateHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI createWithIdentifier:@0 error:&error];
Expand Down
20 changes: 12 additions & 8 deletions ...r/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewConfigurationHostApiTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ @interface FWFWebViewConfigurationHostApiTests : XCTestCase
@implementation FWFWebViewConfigurationHostApiTests
- (void)testCreateWithIdentifier {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
FWFWebViewConfigurationHostApiImpl *hostAPI =
[[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI createWithIdentifier:@0 error:&error];
Expand All @@ -27,8 +28,9 @@ - (void)testCreateWithIdentifier {

- (void)testCreateFromWebViewWithIdentifier {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
FWFWebViewConfigurationHostApiImpl *hostAPI =
[[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

WKWebView *mockWebView = OCMClassMock([WKWebView class]);
OCMStub([mockWebView configuration]).andReturn(OCMClassMock([WKWebViewConfiguration class]));
Expand All @@ -48,8 +50,9 @@ - (void)testSetAllowsInlineMediaPlayback {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebViewConfiguration withIdentifier:0];

FWFWebViewConfigurationHostApiImpl *hostAPI =
[[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI setAllowsInlineMediaPlaybackForConfigurationWithIdentifier:@0
Expand All @@ -65,8 +68,9 @@ - (void)testSetMediaTypesRequiringUserActionForPlayback {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebViewConfiguration withIdentifier:0];

FWFWebViewConfigurationHostApiImpl *hostAPI =
[[FWFWebViewConfigurationHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewConfigurationHostApiImpl *hostAPI = [[FWFWebViewConfigurationHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI
Expand Down
104 changes: 62 additions & 42 deletions ...ebview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFWebViewHostApiTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ @interface FWFWebViewHostApiTests : XCTestCase
@implementation FWFWebViewHostApiTests
- (void)testCreateWithIdentifier {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

[instanceManager addDartCreatedInstance:[[WKWebViewConfiguration alloc] init] withIdentifier:0];

Expand All @@ -32,8 +33,9 @@ - (void)testLoadRequest {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
FWFNSUrlRequestData *requestData = [FWFNSUrlRequestData makeWithUrl:@"https://www.flutter.dev"
Expand All @@ -57,8 +59,9 @@ - (void)testLoadRequestWithInvalidUrl {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
FWFNSUrlRequestData *requestData = [FWFNSUrlRequestData makeWithUrl:@"%invalidUrl%"
Expand All @@ -78,8 +81,9 @@ - (void)testSetCustomUserAgent {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI setUserAgentForWebViewWithIdentifier:@0 userAgent:@"userA" error:&error];
Expand All @@ -94,8 +98,9 @@ - (void)testURL {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
XCTAssertEqualObjects([hostAPI URLForWebViewWithIdentifier:@0 error:&error],
Expand All @@ -110,8 +115,9 @@ - (void)testCanGoBack {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
XCTAssertEqualObjects([hostAPI canGoBackForWebViewWithIdentifier:@0 error:&error], @YES);
Expand All @@ -124,8 +130,9 @@ - (void)testSetUIDelegate {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

id<WKUIDelegate> mockDelegate = OCMProtocolMock(@protocol(WKUIDelegate));
[instanceManager addDartCreatedInstance:mockDelegate withIdentifier:1];
Expand All @@ -142,8 +149,9 @@ - (void)testSetNavigationDelegate {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

id<WKNavigationDelegate> mockDelegate = OCMProtocolMock(@protocol(WKNavigationDelegate));
[instanceManager addDartCreatedInstance:mockDelegate withIdentifier:1];
Expand All @@ -161,8 +169,9 @@ - (void)testEstimatedProgress {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
XCTAssertEqualObjects([hostAPI estimatedProgressForWebViewWithIdentifier:@0 error:&error], @34.0);
Expand All @@ -175,8 +184,9 @@ - (void)testloadHTMLString {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI loadHTMLForWebViewWithIdentifier:@0
Expand All @@ -193,8 +203,9 @@ - (void)testLoadFileURL {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI loadFileForWebViewWithIdentifier:@0
Expand Down Expand Up @@ -222,10 +233,11 @@ - (void)testLoadFlutterAsset {
OCMStub([mockBundle URLForResource:@"myFolder/assets/index" withExtension:@"html"])
.andReturn([NSURL URLWithString:@"webview_flutter/myFolder/assets/index.html"]);

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager
bundle:mockBundle
assetManager:mockAssetManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager
bundle:mockBundle
assetManager:mockAssetManager];

FlutterError *error;
[hostAPI loadAssetForWebViewWithIdentifier:@0 assetKey:@"assets/index.html" error:&error];
Expand All @@ -243,8 +255,9 @@ - (void)testCanGoForward {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
XCTAssertEqualObjects([hostAPI canGoForwardForWebViewWithIdentifier:@0 error:&error], @NO);
Expand All @@ -257,8 +270,9 @@ - (void)testGoBack {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI goBackForWebViewWithIdentifier:@0 error:&error];
Expand All @@ -272,8 +286,9 @@ - (void)testGoForward {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI goForwardForWebViewWithIdentifier:@0 error:&error];
Expand All @@ -287,8 +302,9 @@ - (void)testReload {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI reloadWebViewWithIdentifier:@0 error:&error];
Expand All @@ -303,8 +319,9 @@ - (void)testTitle {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
XCTAssertEqualObjects([hostAPI titleForWebViewWithIdentifier:@0 error:&error], @"myTitle");
Expand All @@ -317,8 +334,9 @@ - (void)testSetAllowsBackForwardNavigationGestures {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

FlutterError *error;
[hostAPI setAllowsBackForwardForWebViewWithIdentifier:@0 isAllowed:@YES error:&error];
Expand All @@ -336,8 +354,9 @@ - (void)testEvaluateJavaScript {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

NSString __block *returnValue;
FlutterError __block *returnError;
Expand Down Expand Up @@ -369,8 +388,9 @@ - (void)testEvaluateJavaScriptReturnsNSErrorData {
FWFInstanceManager *instanceManager = [[FWFInstanceManager alloc] init];
[instanceManager addDartCreatedInstance:mockWebView withIdentifier:0];

FWFWebViewHostApiImpl *hostAPI =
[[FWFWebViewHostApiImpl alloc] initWithInstanceManager:instanceManager];
FWFWebViewHostApiImpl *hostAPI = [[FWFWebViewHostApiImpl alloc]
initWithBinaryMessenger:OCMProtocolMock(@protocol(FlutterBinaryMessenger))
instanceManager:instanceManager];

NSString __block *returnValue;
FlutterError __block *returnError;
Expand Down
4 changes: 3 additions & 1 deletion packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFHTTPCookieStoreHostApi.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
#import "FWFWebsiteDataStoreHostApi.h"

@interface FWFHTTPCookieStoreHostApiImpl ()
@property(nonatomic) FWFInstanceManager *instanceManager;
// BinaryMessenger and InstanceManager must be weak to prevent a circular reference
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're adding a reference to BinaryMessenger in this comment throughout the files, even though many of the classes don't have BinaryMessenger properties.

Also, the comment is confusing now because ther are two subjects, but layer the comment refers to "the objects it stores", which applies only to one of them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clarified the the comments and created separate ones for BinaryMessenger and InstanceManager.

// with the objects it stores.
@property(nonatomic, weak) FWFInstanceManager *instanceManager;
@end

@implementation FWFHTTPCookieStoreHostApiImpl
Expand Down
8 changes: 5 additions & 3 deletions ...ages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
#import "FWFWebViewConfigurationHostApi.h"

@interface FWFNavigationDelegateFlutterApiImpl ()
// This reference must be weak to prevent a circular reference with the objects it stores.
// BinaryMessenger and InstanceManager must be weak to prevent a circular reference
// with the objects it stores.
@property(nonatomic, weak) FWFInstanceManager *instanceManager;
@end

Expand Down Expand Up @@ -183,8 +184,9 @@ - (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView {
@end

@interface FWFNavigationDelegateHostApiImpl ()
@property(weak) id<FlutterBinaryMessenger> binaryMessenger;
// This reference must be weak to prevent a circular reference with the objects it stores.
// BinaryMessenger and InstanceManager must be weak to prevent a circular reference
// with the objects it stores.
@property(nonatomic weak) id<FlutterBinaryMessenger> binaryMessenger;
@property(nonatomic, weak) FWFInstanceManager *instanceManager;
@end

Expand Down
5 changes: 5 additions & 0 deletions packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFObjectHostApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ NS_ASSUME_NONNULL_BEGIN
@interface FWFObjectFlutterApiImpl : FWFNSObjectFlutterApi
- (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)binaryMessenger
instanceManager:(FWFInstanceManager *)instanceManager;
- (void)observeValueForObject:(NSObject *)instance
keyPath:(NSString *)keyPath
object:(NSObject *)object
change:(NSDictionary<NSKeyValueChangeKey, id> *)change
completion:(void (^)(NSError *_Nullable))completion;
@end

/**
Expand Down
6 changes: 4 additions & 2 deletions packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFObjectHostApi.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#import "FWFDataConverters.h"

@interface FWFObjectFlutterApiImpl ()
// This reference must be weak to prevent a circular reference with the objects it stores.
// BinaryMessenger and InstanceManager must be weak to prevent a circular reference
// with the objects it stores.
@property(nonatomic, weak) FWFInstanceManager *instanceManager;
@end

Expand Down Expand Up @@ -74,7 +75,8 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
@end

@interface FWFObjectHostApiImpl ()
// This reference must be weak to prevent a circular reference with the objects it stores.
// BinaryMessenger and InstanceManager must be weak to prevent a circular reference
// with the objects it stores.
@property(nonatomic, weak) FWFInstanceManager *instanceManager;
@end

Expand Down
4 changes: 3 additions & 1 deletion packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFPreferencesHostApi.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
#import "FWFWebViewConfigurationHostApi.h"

@interface FWFPreferencesHostApiImpl ()
@property(nonatomic) FWFInstanceManager *instanceManager;
// BinaryMessenger and InstanceManager must be weak to prevent a circular reference
// with the objects it stores.
@property(nonatomic, weak) FWFInstanceManager *instanceManager;
@end

@implementation FWFPreferencesHostApiImpl
Expand Down
Loading