[RilakKuma2]

Fixes two focus/input handoff issues affecting IME typing when opening dialogs or panes:

1. swallow_shortcut_text (dialogs/find.rs) cleared its swallow guard on plain Event::Key presses, but not on Event::Ime(ImeEvent::Preedit | ImeEvent::Commit), allowing the first IME event after a shortcut to remain guarded.
2. On the opening frame of a focus-taking modeless dialog (Dialog::Find { focus: true, .. }) or when an earlier pane widget already took focus, prepare_layout and update_canvas_focus (canvas.rs) could still consume keyboard/IME events or re-claim focus for the document canvas before the dialog drew.

Paired with macOS Korean IME fixes in storytold/winit (storytold/winit#38).

Summary by CodeRabbit

• Bug Fixes
  • Improved keyboard focus handling when dialogs are open, including the Find and Go To tabs.
  • Prevented canvas keyboard shortcuts from firing when a dialog has focus.
  • Improved handling of text input method events in the Find dialog.

[coderabbitai]

No actionable comments were generated in the recent review.

Walkthrough

Dialog focus state now affects canvas focus and keyboard-event handling. Find-dialog handling clears pending focus on the Go To tab. Shortcut-text swallowing now handles IME preedit and commit events.

Changes: Dialog Keyboard Focus

Layer / File(s)	Summary
Dialog focus arbitration and canvas routing crates/ui-egui/src/dialogs.rs, crates/ui-egui/src/app.rs, crates/ui-egui/src/canvas.rs, crates/ui-egui/src/dialogs/dispatch.rs	Dialog focus classification determines canvas focus requests, focus-lock, and keyboard-event dispatch. The Go To tab clears the pending focus flag.
IME shortcut-text handling crates/ui-egui/src/dialogs/find.rs	IME preedit and commit events clear the shortcut-text swallowing state and return false.

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Suggested reviewers: ratkor, dylanmtaylor, aiongg

Merge Risk: Minimal · up to bd1f9

This change routes IME and keyboard input correctly between the document canvas and focus-taking dialogs. No actionable merge-blocking risk was found; the only remaining edge case is a brief, narrow focus glitch.

Pre-merge checks: 4

Check name	Status	Explanation
Description Check		Check skipped - CodeRabbit’s high-level summary is enabled.
Title check		The title names two changes: canvas focus is yielded on the initial dialog frame, and IME input is preserved after shortcuts. The changeset matches both. Canvas focus is suppressed for dialogs that ta…
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

Full details: Title check

Explanation

The title names two changes: canvas focus is yielded on the initial dialog frame, and IME input is preserved after shortcuts. The changeset matches both. Canvas focus is suppressed for dialogs that take initial focus (dialogs.rs, app.rs, canvas.rs). swallow_shortcut_text in find.rs now returns false for IME preedit and commit events. The title covers the main changes, though it omits the dispatch.rs focus clearing for the Go To tab.

Finishing Touches

Generate unit tests (beta)

• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

• X
• Mastodon
• Reddit
• LinkedIn

Recent review info

Run configuration

• Source mode: Auto
• Repository: storytold/wordcraft
• Branch: main
• File: .coderabbit.yaml
• Commit: 60415e0
• Layers: Repository YAML
• Review profile: CHILL
• Plan: Advanced
• Run ID: 914431d8-1658-404b-a456-dae2b9284340

Commits

Reviewing files that changed from the base of the PR and between 60415e0 and bd1f946.

Files selected for processing: 5

• crates/ui-egui/src/app.rs
• crates/ui-egui/src/canvas.rs
• crates/ui-egui/src/dialogs.rs
• crates/ui-egui/src/dialogs/dispatch.rs
• crates/ui-egui/src/dialogs/find.rs

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.