[macOS] Fix TextInputPlugin crash when no viewId is provided (#169583)

knopp · web-flow · commit b804448bd709 · 2025-06-03T08:34:22.000Z
Fixes flutter/flutter#169204 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord].  [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <memory>
 
+#include "flutter/common/constants.h"
 #include "flutter/fml/platform/darwin/string_range_sanitization.h"
 #include "flutter/shell/platform/common/text_editing_delta.h"
 #include "flutter/shell/platform/common/text_input_model.h"
@@ -425,8 +426,12 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
       }
 
       _activeModel = std::make_unique<flutter::TextInputModel>();
-      NSNumber* viewId = config[kViewId];
-      _currentViewController = [_delegate viewControllerForIdentifier:viewId.longLongValue];
+      FlutterViewIdentifier viewId = flutter::kFlutterImplicitViewId;
+      NSObject* requestViewId = config[kViewId];
+      if ([requestViewId isKindOfClass:[NSNumber class]]) {
+        viewId = [(NSNumber*)requestViewId longLongValue];
+      }
+      _currentViewController = [_delegate viewControllerForIdentifier:viewId];
       FML_DCHECK(_currentViewController != nil);
     }
   } else if ([method isEqualToString:kShowMethod]) {
diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm b/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm
@@ -60,6 +60,7 @@ - (bool)testClearClientDuringComposing;
 @interface FlutterTextInputPluginTestDelegate : NSObject <FlutterTextInputPluginDelegate> {
   id<FlutterBinaryMessenger> _binaryMessenger;
   FlutterViewController* _viewController;
+  FlutterViewController* _implicitViewController;
 }
 
 @end
@@ -80,10 +81,22 @@ - (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)messenger
   return self;
 }
 
+- (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)messenger
+                 implicitViewController:(FlutterViewController*)viewController {
+  self = [super init];
+  if (self) {
+    _binaryMessenger = messenger;
+    _implicitViewController = viewController;
+  }
+  return self;
+}
+
 - (nullable FlutterViewController*)viewControllerForIdentifier:
     (FlutterViewIdentifier)viewIdentifier {
   if (viewIdentifier == kViewId) {
     return _viewController;
+  } else if (viewIdentifier == flutter::kFlutterImplicitViewId) {
+    return _implicitViewController;
   } else {
     return nil;
   }
@@ -2394,4 +2407,32 @@ - (bool)testSelectorsNotForwardedToFrameworkIfNoClient {
   ASSERT_TRUE(plugin.clipsToBounds);
 }
 
+TEST(FlutterTextInputPluginTest, WorksWithoutViewId) {
+  id engineMock = flutter::testing::CreateMockFlutterEngine(@"");
+  id binaryMessengerMock = OCMProtocolMock(@protocol(FlutterBinaryMessenger));
+  OCMStub(  // NOLINT(google-objc-avoid-throwing-exception)
+      [engineMock binaryMessenger])
+      .andReturn(binaryMessengerMock);
+
+  FlutterViewController* viewController = [[FlutterViewController alloc] initWithEngine:engineMock
+                                                                                nibName:@""
+                                                                                 bundle:nil];
+
+  FlutterTextInputPluginTestDelegate* delegate =
+      [[FlutterTextInputPluginTestDelegate alloc] initWithBinaryMessenger:binaryMessengerMock
+                                                   implicitViewController:viewController];
+
+  FlutterTextInputPlugin* plugin = [[FlutterTextInputPlugin alloc] initWithDelegate:delegate];
+
+  NSDictionary* setClientConfig = @{
+      // omit viewId
+  };
+  [plugin handleMethodCall:[FlutterMethodCall methodCallWithMethodName:@"TextInput.setClient"
+                                                             arguments:@[ @(1), setClientConfig ]]
+                    result:^(id){
+                    }];
+
+  ASSERT_TRUE(plugin.currentViewController == viewController);
+}
+
 }  // namespace flutter::testing
