[macOS] IME preedit lost on focus change (AvaloniaUI#21601)

hyunq21 · MrJul · web-flow · commit dbb8af90c96c · 2026-07-28T15:52:40.000Z
* fix(macOS): commit IME preedit when switching focus between textboxes Fixes AvaloniaUI#19964 * remove comment --------- Co-authored-by: Julien Lebosquain <julien@lebosquain.net>
diff --git a/native/Avalonia.Native/src/OSX/AvnTextInputMethod.mm b/native/Avalonia.Native/src/OSX/AvnTextInputMethod.mm
@@ -29,6 +29,7 @@
 }
 
 void AvnTextInputMethod::Reset() {
+    [_inputMethodDelegate resetInputMethod];
 }
 
 void AvnTextInputMethod::SetSurroundingText(char* text, int start, int end) {
diff --git a/native/Avalonia.Native/src/OSX/AvnTextInputMethodDelegate.h b/native/Avalonia.Native/src/OSX/AvnTextInputMethodDelegate.h
@@ -14,6 +14,7 @@
 -(void) setText:(NSString* _Nonnull) text;
 -(void) setCursorRect:(AvnRect) cursorRect;
 -(void) setSelection: (int) start : (int) end;
+-(void) resetInputMethod;
 
 @end
 
diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -375,7 +375,15 @@ - (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
             [self becomeFirstResponder];
         }
     }
-       
+
+    if([self hasMarkedText] &&
+       (type == LeftButtonDown || type == RightButtonDown || type == MiddleButtonDown ||
+        type == XButton1Down || type == XButton2Down) &&
+       [self inputContext] != nil)
+    {
+        [[self inputContext] handleEvent:event];
+    }
+
     auto parent = _parent.tryGet();
     if(parent != nullptr)
     {
@@ -1035,6 +1043,20 @@ - (void) setSelection:(int)start :(int)end{
     _selectedRange = NSMakeRange(start, end - start);
 }
 
+- (void) resetInputMethod{
+    auto parent = _parent.tryGet();
+
+    if(parent != nullptr && parent->InputMethod->IsActive()){
+        parent->InputMethod->Client->SetPreeditText(nullptr);
+    }
+
+    _markedRange = NSMakeRange(_selectedRange.location, 0);
+
+    if([self inputContext]) {
+        [[self inputContext] discardMarkedText];
+    }
+}
+
 - (void) setCursorRect:(AvnRect)rect{
     NSRect cursorRect = ToNSRect(rect);
     NSRect windowRectOnScreen = [[self window] convertRectToScreen:self.frame];

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`void AvnTextInputMethod::Reset() {`
	`32`	`+ [_inputMethodDelegate resetInputMethod];`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`void AvnTextInputMethod::SetSurroundingText(char* text, int start, int end) {`