update

Author: chunhtai

shell/platform/darwin/macos/framework/Source/AccessibilityBridgeMacDelegate.mm

@@ -6,7 +6,6 @@
 
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h"
-#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObject.h"
 #include "flutter/shell/platform/embedder/embedder.h"
 
 namespace flutter {
@@ -117,15 +116,6 @@
       }
       break;
     case ui::AXEventGenerator::Event::DOCUMENT_SELECTION_CHANGED: {
-      id focused = mac_platform_node_delegate->GetFocus();
-      if ([focused isKindOfClass:[FlutterTextField class]]) {
-        // For text field, we update the native NSTextField selection
-        FlutterTextField* native_text_field = (FlutterTextField*)focused;
-        if (native_text_field == mac_platform_node_delegate->GetFocus()) {
-          [native_text_field becomeFirstResponder];
-        }
-        break;
-      }
       // This event always fires at root
       events.push_back({
           .name = NSAccessibilitySelectedTextChangedNotification,
@@ -158,15 +148,6 @@
       });
       break;
     case ui::AXEventGenerator::Event::VALUE_CHANGED:
-      if (ax_node.data().role == ax::mojom::Role::kTextField) {
-        // For text field, we update the native NSTextField string value
-        FlutterTextField* native_text_field =
-            (FlutterTextField*)mac_platform_node_delegate->GetNativeViewAccessible();
-        if (native_text_field == mac_platform_node_delegate->GetFocus()) {
-          [native_text_field becomeFirstResponder];
-        }
-        break;
-      }
       events.push_back({
           .name = NSAccessibilityValueChangedNotification,
           .target = native_node,

shell/platform/darwin/macos/framework/Source/FlutterTextInputPlugin.mm

@@ -288,6 +288,9 @@ - (void)setEditingState:(NSDictionary*)state {
       state[kComposingBaseKey], state[kComposingExtentKey], _activeModel->composing_range());
   size_t cursor_offset = selected_range.base() - composing_range.start();
   _activeModel->SetComposingRange(composing_range, cursor_offset);
+  if (_client) {
+    [_client becomeFirstResponder];
+  }
   [self updateTextAndSelection];
 }
 
@@ -347,13 +350,115 @@ - (BOOL)handleKeyEvent:(NSEvent*)event {
 #pragma mark NSResponder
 
 - (void)keyDown:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
   [self.flutterViewController keyDown:event];
-  return;
 }
 
 - (void)keyUp:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
   [self.flutterViewController keyUp:event];
-  return;
+}
+
+- (void)flagsChanged:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController flagsChanged:event];
+}
+
+- (void)mouseEntered:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController mouseEntered:event];
+}
+
+- (void)mouseExited:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController mouseExited:event];
+}
+
+- (void)mouseDown:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController mouseDown:event];
+}
+
+- (void)mouseUp:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController mouseUp:event];
+}
+
+- (void)mouseDragged:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController mouseDragged:event];
+}
+
+- (void)rightMouseDown:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController rightMouseDown:event];
+}
+
+- (void)rightMouseUp:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController rightMouseUp:event];
+}
+
+- (void)rightMouseDragged:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController rightMouseDragged:event];
+}
+
+- (void)otherMouseDown:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController otherMouseDown:event];
+}
+
+- (void)otherMouseUp:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController otherMouseUp:event];
+}
+
+- (void)otherMouseDragged:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController otherMouseDragged:event];
+}
+
+- (void)mouseMoved:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController mouseMoved:event];
+}
+
+- (void)scrollWheel:(NSEvent*)event {
+  if (!self.flutterViewController) {
+    return;
+  }
+  [self.flutterViewController scrollWheel:event];
 }
 
 #pragma mark -