Re-add IME support

masonry/src/passes/update.rs

@@ -11,9 +11,12 @@ use crate::passes::{enter_span, enter_span_if, merge_state_up, recurse_on_childr
 use crate::render_root::{RenderRoot, RenderRootSignal, RenderRootState};
 use crate::tree_arena::ArenaMut;
 use crate::{
-    PointerEvent, QueryCtx, RegisterCtx, Update, UpdateCtx, Widget, WidgetId, WidgetState,
+    PointerEvent, QueryCtx, RegisterCtx, TextEvent, Update, UpdateCtx, Widget, WidgetId,
+    WidgetState,
 };
 
+use super::event::run_on_text_event_pass;
+
 // --- MARK: HELPERS ---
 fn get_id_path(root: &RenderRoot, widget_id: Option<WidgetId>) -> Vec<WidgetId> {
     let Some(widget_id) = widget_id else {
@@ -471,6 +474,12 @@ pub(crate) fn run_update_focus_pass(root: &mut RenderRoot) {
         // We also request accessibility, because build_access_node() depends on the focus state.
         if let Some(prev_focused) = prev_focused {
             if root.widget_arena.has(prev_focused) {
+                if was_ime_active {
+                    // IME was active, but the next focused widget is going to receive the
+                    // Ime::Disabled event. Synthesize an Ime::Disabled event here and send it to
+                    // the widget about to be unfocused.
+                    run_on_text_event_pass(root, &TextEvent::Ime(winit::event::Ime::Disabled));
+                }
                 run_single_update_pass(root, prev_focused, |widget, ctx| {
                     widget.update(ctx, &Update::FocusChanged(false));
                     ctx.widget_state.request_accessibility = true;

masonry/src/widget/text_area.rs

@@ -788,17 +788,8 @@ impl<const EDITABLE: bool> Widget for TextArea<EDITABLE> {
 
     fn update(&mut self, ctx: &mut UpdateCtx, event: &Update) {
         match event {
-            Update::FocusChanged(focused) => {
-                // HACK: currently, when moving focus away from a text area, the Ime::Disabled
-                // event is routed to the newly focused widget. Do IME clean up here.
-                if !focused && self.editor.is_composing() {
-                    let (fctx, lctx) = ctx.text_contexts();
-                    self.editor.transact(fctx, lctx, |txn| txn.clear_compose());
-                    self.rendered_generation = self.editor.generation();
-                    ctx.request_layout();
-                } else {
-                    ctx.request_render();
-                }
+            Update::FocusChanged(_) => {
+                ctx.request_render();
             }
             Update::DisabledChanged(_) => {
                 // We might need to use the disabled brush, and stop displaying the selection.