dart side update

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m

@@ -50,7 +50,7 @@ - (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)binaryMessen
         [[FWFNavigationDelegateFlutterApiImpl alloc] initWithBinaryMessenger:binaryMessenger
                                                              instanceManager:instanceManager];
 
-    FWFNavigationDelegate __weak __block *weakSelf = self;
+    FWFNavigationDelegate __weak *weakSelf = self;
     _didFinishNavigation = ^(WKWebView *webView, NSString *URL) {
       [weakSelf.navigationDelegateApi didFinishNavigationFunction:weakSelf.didFinishNavigation
                                                           webView:webView

packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/instance_manager.dart

@@ -5,7 +5,7 @@
 /// Maintains instances stored to communicate with Objective-C objects.
 class InstanceManager {
   final Map<int, Object> _instanceIdsToInstances = <int, Object>{};
-  final Map<Object, int> _instancesToInstanceIds = <Object, int>{};
+  final Expando<Object> _instancesToInstanceIds = Expando<Object>();
 
   int _nextInstanceId = 0;
 
@@ -17,7 +17,7 @@ class InstanceManager {
   /// Returns new if [instance] has already been added. Otherwise, it is added
   /// with a new instance id.
   int? tryAddInstance(Object instance) {
-    if (_instancesToInstanceIds.containsKey(instance)) {
+    if (getInstanceId(instance) != null) {
       return null;
     }
 
@@ -27,14 +27,21 @@ class InstanceManager {
     return instanceId;
   }
 
+  /// Store a copy of an instance with the same instance id.
+  void addCopy(Object original, Object copy) {
+    assert(original.runtimeType == copy.runtimeType);
+    _instancesToInstanceIds[copy] = _instancesToInstanceIds[original];
+    assert(original == copy);
+  }
+
   /// Remove the instance from the manager.
   ///
   /// Returns null if the instance is removed. Otherwise, return the instanceId
   /// of the removed instance.
   int? removeInstance<T extends Object>(T instance) {
-    final int? instanceId = _instancesToInstanceIds[instance];
+    final int? instanceId = _instancesToInstanceIds[instance] as int?;
     if (instanceId != null) {
-      _instancesToInstanceIds.remove(instance);
+      _instancesToInstanceIds[instance] = null;
       _instanceIdsToInstances.remove(instanceId);
     }
     return instanceId;
@@ -47,6 +54,6 @@ class InstanceManager {
 
   /// Retrieve the instanceId paired with instance.
   int? getInstanceId(Object instance) {
-    return _instancesToInstanceIds[instance];
+    return _instancesToInstanceIds[instance] as int?;
   }
 }

packages/webview_flutter/webview_flutter_wkwebview/lib/src/common/web_kit.pigeon.dart

@@ -1051,14 +1051,12 @@ class WKNavigationDelegateHostApi {
   static const MessageCodec<Object?> codec =
       _WKNavigationDelegateHostApiCodec();
 
-  Future<void> create(
-      int arg_instanceId, int? arg_didFinishNavigationInstanceId) async {
+  Future<void> create(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
         'dev.flutter.pigeon.WKNavigationDelegateHostApi.create', codec,
         binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-            .send(<Object?>[arg_instanceId, arg_didFinishNavigationInstanceId])
-        as Map<Object?, Object?>?;
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
@@ -1086,8 +1084,7 @@ abstract class WKNavigationDelegateFlutterApi {
   static const MessageCodec<Object?> codec =
       _WKNavigationDelegateFlutterApiCodec();
 
-  void didFinishNavigation(
-      int functionInstanceId, int webViewInstanceId, String? url);
+  void didFinishNavigation(int instanceId, int webViewInstanceId, String? url);
   static void setup(WKNavigationDelegateFlutterApi? api,
       {BinaryMessenger? binaryMessenger}) {
     {
@@ -1102,15 +1099,15 @@ abstract class WKNavigationDelegateFlutterApi {
           assert(message != null,
               'Argument for dev.flutter.pigeon.WKNavigationDelegateFlutterApi.didFinishNavigation was null.');
           final List<Object?> args = (message as List<Object?>?)!;
-          final int? arg_functionInstanceId = (args[0] as int?);
-          assert(arg_functionInstanceId != null,
+          final int? arg_instanceId = (args[0] as int?);
+          assert(arg_instanceId != null,
               'Argument for dev.flutter.pigeon.WKNavigationDelegateFlutterApi.didFinishNavigation was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
           assert(arg_webViewInstanceId != null,
               'Argument for dev.flutter.pigeon.WKNavigationDelegateFlutterApi.didFinishNavigation was null, expected non-null int.');
           final String? arg_url = (args[2] as String?);
           api.didFinishNavigation(
-              arg_functionInstanceId!, arg_webViewInstanceId!, arg_url);
+              arg_instanceId!, arg_webViewInstanceId!, arg_url);
           return;
         });
       }
@@ -1247,38 +1244,6 @@ abstract class NSObjectFlutterApi {
       {BinaryMessenger? binaryMessenger}) {}
 }
 
-class _FunctionFlutterApiCodec extends StandardMessageCodec {
-  const _FunctionFlutterApiCodec();
-}
-
-abstract class FunctionFlutterApi {
-  static const MessageCodec<Object?> codec = _FunctionFlutterApiCodec();
-
-  void dispose(int instanceId);
-  static void setup(FunctionFlutterApi? api,
-      {BinaryMessenger? binaryMessenger}) {
-    {
-      final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FunctionFlutterApi.dispose', codec,
-          binaryMessenger: binaryMessenger);
-      if (api == null) {
-        channel.setMessageHandler(null);
-      } else {
-        channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.FunctionFlutterApi.dispose was null.');
-          final List<Object?> args = (message as List<Object?>?)!;
-          final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.FunctionFlutterApi.dispose was null, expected non-null int.');
-          api.dispose(arg_instanceId!);
-          return;
-        });
-      }
-    }
-  }
-}
-
 class _WKWebViewHostApiCodec extends StandardMessageCodec {
   const _WKWebViewHostApiCodec();
   @override

packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation.dart

@@ -232,8 +232,16 @@ class NSHttpCookie {
   final Map<NSHttpCookiePropertyKey, Object> properties;
 }
 
+/// An object that can provide functional copies of themselves.
+@immutable
+mixin Copyable {
+  /// Instantiates and returns a functionally identical object to oneself.
+  Copyable copy();
+}
+
 /// The root class of most Objective-C class hierarchies.
-class NSObject {
+@immutable
+class NSObject with Copyable {
   /// Constructs an [NSObject].
   NSObject({BinaryMessenger? binaryMessenger, InstanceManager? instanceManager})
       : _api = NSObjectHostApiImpl(
@@ -283,4 +291,27 @@ class NSObject {
   ) {
     throw UnimplementedError();
   }
+
+  @override
+  Copyable copy() {
+    final NSObject copy = NSObject(
+      binaryMessenger: _api.binaryMessenger,
+      instanceManager: _api.instanceManager,
+    );
+    _api.instanceManager.addCopy(this, copy);
+    return copy;
+  }
+
+  @override
+  int get hashCode {
+    return Object.hash(_api, _api.instanceManager.getInstanceId(this));
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is NSObject &&
+        _api == other._api &&
+        _api.instanceManager.getInstanceId(this) ==
+            other._api.instanceManager.getInstanceId(other);
+  }
 }

packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation_api_impls.dart

@@ -5,7 +5,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
-import '../common/function_flutter_api_impls.dart';
 import '../common/instance_manager.dart';
 import '../common/web_kit.pigeon.dart';
 import 'foundation.dart';
@@ -43,11 +42,9 @@ class FoundationFlutterApis {
   @visibleForTesting
   FoundationFlutterApis({
     BinaryMessenger? binaryMessenger,
+    // ignore: avoid_unused_constructor_parameters
     InstanceManager? instanceManager,
-  }) : _binaryMessenger = binaryMessenger {
-    functionFlutterApi =
-        FunctionFlutterApiImpl(instanceManager: instanceManager);
-  }
+  }) : _binaryMessenger = binaryMessenger;
 
   static FoundationFlutterApis _instance = FoundationFlutterApis();
 
@@ -62,38 +59,34 @@ class FoundationFlutterApis {
     return _instance;
   }
 
+  // ignore: unused_field
   final BinaryMessenger? _binaryMessenger;
   bool _hasBeenSetUp = false;
 
-  /// Flutter Api for disposing functions.
-  ///
-  /// This FlutterApi is placed here because [FoundationFlutterApis.ensureSetUp]
-  /// is called inside [NSObject] and [NSObject] is the parent class of all
-  /// objects.
-  @visibleForTesting
-  late final FunctionFlutterApiImpl functionFlutterApi;
-
   /// Ensures all the Flutter APIs have been set up to receive calls from native code.
   void ensureSetUp() {
     if (!_hasBeenSetUp) {
-      FunctionFlutterApi.setup(
-        functionFlutterApi,
-        binaryMessenger: _binaryMessenger,
-      );
       _hasBeenSetUp = true;
     }
   }
 }
 
 /// Host api implementation for [NSObject].
+@immutable
 class NSObjectHostApiImpl extends NSObjectHostApi {
   /// Constructs an [NSObjectHostApiImpl].
   NSObjectHostApiImpl({
-    BinaryMessenger? binaryMessenger,
+    this.binaryMessenger,
     InstanceManager? instanceManager,
   })  : instanceManager = instanceManager ?? InstanceManager.instance,
         super(binaryMessenger: binaryMessenger);
 
+  /// Sends binary data across the Flutter platform barrier.
+  ///
+  /// If it is null, the default BinaryMessenger will be used which routes to
+  /// the host platform.
+  final BinaryMessenger? binaryMessenger;
+
   /// Maintains instances stored to communicate with Objective-C objects.
   final InstanceManager instanceManager;
 
@@ -132,4 +125,16 @@ class NSObjectHostApiImpl extends NSObjectHostApi {
       await dispose(instanceId);
     }
   }
+
+  @override
+  int get hashCode {
+    return Object.hash(binaryMessenger, instanceManager);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is NSObjectHostApiImpl &&
+        binaryMessenger == other.binaryMessenger &&
+        instanceManager == other.instanceManager;
+  }
 }

packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit.dart

@@ -597,6 +597,7 @@ class WKUIDelegate {
 /// coordinate changes in your web view’s main frame.
 ///
 /// Wraps [WKNavigationDelegate](https://developer.apple.com/documentation/webkit/wknavigationdelegate?language=objc).
+@immutable
 class WKNavigationDelegate extends NSObject {
   /// Constructs a [WKNavigationDelegate].
   WKNavigationDelegate({
@@ -662,6 +663,32 @@ class WKNavigationDelegate extends NSObject {
   ) {
     throw UnimplementedError();
   }
+
+  @override
+  Copyable copy() {
+    final WKNavigationDelegate copy = WKNavigationDelegate(
+      didFinishNavigation: didFinishNavigation,
+      binaryMessenger: _navigationDelegateApi.binaryMessenger,
+      instanceManager: _navigationDelegateApi.instanceManager,
+    );
+    _navigationDelegateApi.instanceManager.addCopy(this, copy);
+    return copy;
+  }
+
+  @override
+  int get hashCode {
+    return Object.hash(didFinishNavigation, _navigationDelegateApi,
+        _navigationDelegateApi.instanceManager.getInstanceId(this));
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is WKNavigationDelegate &&
+        didFinishNavigation == other.didFinishNavigation &&
+        _navigationDelegateApi == other._navigationDelegateApi &&
+        _navigationDelegateApi.instanceManager.getInstanceId(this) ==
+            other._navigationDelegateApi.instanceManager.getInstanceId(other);
+  }
 }
 
 /// Object that displays interactive web content, such as for an in-app browser.