[webview_flutter_wkwebview] Fixes internal enum type and adds unknown…

… enum values (#3812)

Followup from flutter/packages#3543 (comment)

webview_flutter_wkwebview/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.4.1
+
+* Fixes internal type conversion error.
+* Adds internal unknown enum values to handle api updates.
+
 ## 3.4.0
 
 * Adds support for `PlatformWebViewController.setOnPlatformPermissionRequest`.

webview_flutter_wkwebview/example/ios/RunnerTests/FWFDataConvertersTests.m

@@ -155,4 +155,14 @@ - (void)testFWFWKMediaCaptureTypeDataFromWKMediaCaptureType API_AVAILABLE(ios(15
           .value,
       FWFWKMediaCaptureTypeCameraAndMicrophone);
 }
+
+- (void)testNSKeyValueChangeKeyConversionReturnsUnknownIfUnrecognized {
+  XCTAssertEqual(
+      FWFNSKeyValueChangeKeyEnumDataFromNativeNSKeyValueChangeKey(@"SomeUnknownValue").value,
+      FWFNSKeyValueChangeKeyEnumUnknown);
+}
+
+- (void)testWKNavigationTypeConversionReturnsUnknownIfUnrecognized {
+  XCTAssertEqual(FWFWKNavigationTypeFromNativeWKNavigationType(-15), FWFWKNavigationTypeUnknown);
+}
 @end

webview_flutter_wkwebview/ios/Classes/FWFDataConverters.h

@@ -137,7 +137,7 @@ extern FWFNSErrorData *FWFNSErrorDataFromNativeNSError(NSError *error);
  *
  * @param key The data object containing information to create a FWFNSKeyValueChangeKeyEnumData.
  *
- * @return A FWFNSKeyValueChangeKeyEnumData or nil if data could not be converted.
+ * @return A FWFNSKeyValueChangeKeyEnumData.
  */
 extern FWFNSKeyValueChangeKeyEnumData *FWFNSKeyValueChangeKeyEnumDataFromNativeNSKeyValueChangeKey(
     NSKeyValueChangeKey key);

webview_flutter_wkwebview/ios/Classes/FWFDataConverters.m

@@ -210,6 +210,8 @@ WKNavigationActionPolicy FWFNativeWKNavigationActionPolicyFromEnumData(
         makeWithValue:FWFNSKeyValueChangeKeyEnumNotificationIsPrior];
   } else if ([key isEqualToString:NSKeyValueChangeOldKey]) {
     return [FWFNSKeyValueChangeKeyEnumData makeWithValue:FWFNSKeyValueChangeKeyEnumOldValue];
+  } else {
+    return [FWFNSKeyValueChangeKeyEnumData makeWithValue:FWFNSKeyValueChangeKeyEnumUnknown];
   }
 
   return nil;
@@ -234,6 +236,8 @@ FWFWKNavigationType FWFWKNavigationTypeFromNativeWKNavigationType(WKNavigationTy
     case WKNavigationTypeOther:
       return FWFWKNavigationTypeOther;
   }
+
+  return FWFWKNavigationTypeUnknown;
 }
 
 FWFWKSecurityOriginData *FWFWKSecurityOriginDataFromNativeWKSecurityOrigin(

webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.h

@@ -43,6 +43,7 @@ typedef NS_ENUM(NSUInteger, FWFNSKeyValueChangeKeyEnum) {
   FWFNSKeyValueChangeKeyEnumNewValue = 2,
   FWFNSKeyValueChangeKeyEnumNotificationIsPrior = 3,
   FWFNSKeyValueChangeKeyEnumOldValue = 4,
+  FWFNSKeyValueChangeKeyEnumUnknown = 5,
 };
 
 /// Mirror of WKUserScriptInjectionTime.
@@ -143,6 +144,11 @@ typedef NS_ENUM(NSUInteger, FWFWKNavigationType) {
   /// See
   /// https://developer.apple.com/documentation/webkit/wknavigationtype/wknavigationtypeother?language=objc.
   FWFWKNavigationTypeOther = 5,
+  /// An unknown navigation type.
+  ///
+  /// This does not represent an actual value provided by the platform and only
+  /// indicates a value was provided that isn't currently supported.
+  FWFWKNavigationTypeUnknown = 6,
 };
 
 /// Possible permission decisions for device resource access.
@@ -186,6 +192,9 @@ typedef NS_ENUM(NSUInteger, FWFWKMediaCaptureType) {
   /// https://developer.apple.com/documentation/webkit/wkmediacapturetype/wkmediacapturetypemicrophone?language=objc.
   FWFWKMediaCaptureTypeMicrophone = 2,
   /// An unknown media device.
+  ///
+  /// This does not represent an actual value provided by the platform and only
+  /// indicates a value was provided that isn't currently supported.
   FWFWKMediaCaptureTypeUnknown = 3,
 };
 

webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m

@@ -61,7 +61,7 @@ - (void)requestMediaCapturePermissionForDelegateWithIdentifier:(FWFUIDelegate *)
                                                        webView:(WKWebView *)webView
                                                         origin:(WKSecurityOrigin *)origin
                                                          frame:(WKFrameInfo *)frame
-                                                          type:(FWFWKMediaCaptureType)type
+                                                          type:(WKMediaCaptureType)type
                                                     completion:
                                                         (void (^)(WKPermissionDecision))completion
     API_AVAILABLE(ios(15.0)) {

webview_flutter_wkwebview/lib/src/common/web_kit.g.dart

@@ -40,6 +40,7 @@ enum NSKeyValueChangeKeyEnum {
   newValue,
   notificationIsPrior,
   oldValue,
+  unknown,
 }
 
 /// Mirror of WKUserScriptInjectionTime.
@@ -136,6 +137,12 @@ enum WKNavigationType {
   ///
   /// See https://developer.apple.com/documentation/webkit/wknavigationtype/wknavigationtypeother?language=objc.
   other,
+
+  /// An unknown navigation type.
+  ///
+  /// This does not represent an actual value provided by the platform and only
+  /// indicates a value was provided that isn't currently supported.
+  unknown,
 }
 
 /// Possible permission decisions for device resource access.
@@ -178,6 +185,9 @@ enum WKMediaCaptureType {
   microphone,
 
   /// An unknown media device.
+  ///
+  /// This does not represent an actual value provided by the platform and only
+  /// indicates a value was provided that isn't currently supported.
   unknown,
 }
 

webview_flutter_wkwebview/lib/src/foundation/foundation.dart

@@ -91,6 +91,12 @@ enum NSKeyValueChangeKey {
   ///
   /// See https://developer.apple.com/documentation/foundation/nskeyvaluechangeoldkey?language=objc.
   oldValue,
+
+  /// An unknown change key.
+  ///
+  /// This does not represent an actual value provided by the platform and only
+  /// indicates a value was provided that isn't currently supported.
+  unknown,
 }
 
 /// The supported keys in a cookie attributes dictionary.

webview_flutter_wkwebview/pigeons/web_kit.dart

@@ -59,6 +59,7 @@ enum NSKeyValueChangeKeyEnum {
   newValue,
   notificationIsPrior,
   oldValue,
+  unknown,
 }
 
 // TODO(bparrishMines): Enums need be wrapped in a data class because thay can't
@@ -191,6 +192,12 @@ enum WKNavigationType {
   ///
   /// See https://developer.apple.com/documentation/webkit/wknavigationtype/wknavigationtypeother?language=objc.
   other,
+
+  /// An unknown navigation type.
+  ///
+  /// This does not represent an actual value provided by the platform and only
+  /// indicates a value was provided that isn't currently supported.
+  unknown,
 }
 
 /// Possible permission decisions for device resource access.
@@ -241,7 +248,7 @@ enum WKMediaCaptureType {
   /// An unknown media device.
   ///
   /// This does not represent an actual value provided by the platform and only
-  /// indicates a value was provided that we don't currently support.
+  /// indicates a value was provided that isn't currently supported.
   unknown,
 }
 

webview_flutter_wkwebview/pubspec.yaml

@@ -2,7 +2,7 @@ name: webview_flutter_wkwebview
 description: A Flutter plugin that provides a WebView widget based on Apple's WKWebView control.
 repository: https://github.com/flutter/packages/tree/main/packages/webview_flutter/webview_flutter_wkwebview
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
-version: 3.4.0
+version: 3.4.1
 
 environment:
   sdk: ">=2.18.0 <4.0.0"