platform_interface: Updated static fromMap implementation for some classes, ios and macos: Moved WKUserContentController initialization on preWKWebViewConfiguration to fix possible undefined is not an object (evaluating 'window.webkit.messageHandlers') javascript error

Author: pichillilorenzo

dev_packages/generators/lib/src/exchangeable_object_generator.dart

@@ -335,6 +335,7 @@ class ExchangeableObjectGenerator
                 .trim();
             value = "map['$newFieldName']";
           }
+          final mapValue = value;
 
           final customDeserializer = _coreCheckerObjectProperty
               .firstAnnotationOf(fieldElement)
@@ -361,7 +362,14 @@ class ExchangeableObjectGenerator
           if (isRequiredParameter || fieldElement.isFinal || annotation.read("fromMapForceAllInline").boolValue) {
             requiredFields.add('$fieldName: $value,');
           } else {
+            final isFieldNullable = Util.typeIsNullable(fieldElement.type);
+            if (!isFieldNullable) {
+              nonRequiredFields.add("if ($mapValue != null) {");
+            }
             nonRequiredFields.add("instance.$fieldName = $value;");
+            if (!isFieldNullable) {
+              nonRequiredFields.add("}");
+            }
           }
         }
       }

flutter_inappwebview/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 6.2.0
+
+- Updated dependencies to the latest versions for all platform implementations:
+  - `flutter_inappwebview_platform_interface`: `^1.3.0` -> `^1.4.0`
+  - `flutter_inappwebview_android`: `^1.1.3` -> `^1.2.0`
+  - `flutter_inappwebview_ios`: `^1.1.2` -> `^1.2.0`
+  - `flutter_inappwebview_macos`: `^1.1.2` -> `^1.2.0`
+  - `flutter_inappwebview_web`: `^1.1.2` -> `^1.2.0`
+  - `flutter_inappwebview_windows`: `^0.6.0` -> `^0.7.0`
+
+#### Platform Interface
+- Updated static `fromMap` implementation for some classes
+
+#### iOS Platform
+- Moved `WKUserContentController` initialization on `preWKWebViewConfiguration` to fix possible `undefined is not an object (evaluating 'window.webkit.messageHandlers')` javascript error
+
+#### macOS Platform
+- Moved `WKUserContentController` initialization on `preWKWebViewConfiguration` to fix possible `undefined is not an object (evaluating 'window.webkit.messageHandlers')` javascript error
+
 ## 6.1.5
 
 - Updated dependencies to the latest versions for all platform implementations:

flutter_inappwebview/example/test/widget_test.dart

@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:example/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}

flutter_inappwebview/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview
 description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window.
-version: 6.1.5
+version: 6.2.0
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -20,7 +20,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.3.0
+  flutter_inappwebview_platform_interface: ^1.4.0
   flutter_inappwebview_android: ^1.1.3
   flutter_inappwebview_ios: ^1.1.2
   flutter_inappwebview_macos: ^1.1.2

flutter_inappwebview_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.0
+
+- Updated flutter_inappwebview_platform_interface version to ^1.4.0
+
 ## 1.1.3
 
 - Updated flutter_inappwebview_platform_interface version to ^1.3.0

flutter_inappwebview_android/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview_android
 description: Android implementation of the flutter_inappwebview plugin.
-version: 1.1.3
+version: 1.2.0
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_android
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -20,7 +20,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.3.0
+  flutter_inappwebview_platform_interface: ^1.4.0
 
 dev_dependencies:
   flutter_test:

flutter_inappwebview_ios/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.0
+
+- Updated flutter_inappwebview_platform_interface version to ^1.4.0
+- Moved `WKUserContentController` initialization on `preWKWebViewConfiguration` to fix possible `undefined is not an object (evaluating 'window.webkit.messageHandlers')` javascript error
+
 ## 1.1.2
 
 - Updated flutter_inappwebview_platform_interface version to ^1.3.0

flutter_inappwebview_ios/ios/Classes/InAppWebView/InAppWebView.swift

@@ -546,7 +546,6 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
             // This is a limitation of the official WebKit API.
             return
         }
-        configuration.userContentController = WKUserContentController()
         configuration.userContentController.initialize()
 
         if let applePayAPIEnabled = settings?.applePayAPIEnabled, applePayAPIEnabled {
@@ -595,7 +594,8 @@ public class InAppWebView: WKWebView, UIScrollViewDelegate, WKUIDelegate,
 
     public static func preWKWebViewConfiguration(settings: InAppWebViewSettings?) -> WKWebViewConfiguration {
         let configuration = WKWebViewConfiguration()
-        
+        // initialzie WKUserContentController here to fix possible "undefined is not an object (evaluating 'window.webkit.messageHandlers')" javascript error
+        configuration.userContentController = WKUserContentController()
         configuration.processPool = WKProcessPoolManager.sharedProcessPool
 
         if let settings = settings {

flutter_inappwebview_ios/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview_ios
 description: iOS implementation of the flutter_inappwebview plugin.
-version: 1.1.2
+version: 1.2.0
 homepage: https://inappwebview.dev/
 repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_ios
 issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
@@ -20,7 +20,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview_platform_interface: ^1.3.0
+  flutter_inappwebview_platform_interface: ^1.4.0
 
 dev_dependencies:
   flutter_test:

flutter_inappwebview_macos/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.0
+
+- Updated flutter_inappwebview_platform_interface version to ^1.4.0
+- Moved `WKUserContentController` initialization on `preWKWebViewConfiguration` to fix possible `undefined is not an object (evaluating 'window.webkit.messageHandlers')` javascript error
+
 ## 1.1.2
 
 - Updated flutter_inappwebview_platform_interface version to ^1.3.0