Trouble interacting with the Action Flow Editor while resolving merge conflicts

[jelanijohn]

Can we access your project?

• Update: At this point in time, I've already completed the merge, but I see confirm that the issue existed in general - not just with merge conflicts - so it should not be necessary.

Current Behavior

When merging two branches:

• I open the Action Flow Editor to view the action conflict
• attempts to interact with the editor with my mouse (click / wheel / scroll) instead affect the code view behind it.

Expected Behavior

The mouse actions' focus should be in the Action Flow Editor when it is open.

Steps to Reproduce

Merge two branches.
Be alerted of a merge conflict.
Open the Action Flow Editor.
Attempt to interact with different parts of the editor.

Reproducible from Blank

• The steps to reproduce above start from a blank project.

Bug Report Code (Required)

IT43iP7lz6Z6vtdn4KXudcZUpBIgKVM4XYAS0sF7aCosfZT2BLMcec/RVERpXu2gdFFmIFqakWoW097mud7tVPE7BxKdRt0/zKtccz3ybHOnMZC7FJWgSHFBHtNXG0vF5LS3vR54GMlvSXgD3U2MGOuXExPqJuf3IWo4Dq/LZO4=

Visual documentation

Areti.-.FlutterFlow.-.Google.Chrome.2025-05-12.01-11-49.mp4

Environment

- FlutterFlow version: FlutterFlow v5.4.9 released May 6, 2025
- Platform: Web
- Browser name and version: Chrome Version 136.0.7103.93 (Official Build) (64-bit)
- Operating system and version affected: Windows 11

Additional Information

It is possible to get around the issue on the web platform with some css-fiddling, but it isn't ideal.

[Alezanello]

Thank you so much for bringing this issue to our attention!

I'll forward it to the engineering team for further review.