Repository navigation
Conversation
added 3 commits
November 8, 2026 19:01
Generated with pi (Claude)
…fallbacks Generated with pi (Claude)
Generated with pi (Claude)
shsteimer
marked this pull request as ready for review
November 19, 2026 15:24
Co-authored-by: pi coding agent
This branch was successfully deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Quick-edit support for showing merge conflicts in EW layout: a live read-only toggle and a generic diff highlight. Paired with adobe/da-live#1681.
Refs adobe/da-live#1144
SET_READ_ONLY { readOnly }(host → iframe) — lets the host lock/unlock the preview without reloading. Locks inline editors, image/block drops andDROP_TARGET. Can only lock: effective state is!config.canWrite || readOnly.data-diff="<kind>"marker — visual highlight in layout.local/upstreamstyled to match content view;added/removed/changedreserved for version comparison ([EW] Support version comparison in layout mode da-live#1651), other kinds get a neutral outline.data-block-index/data-prose-index; markers without an index (li,picture, paired-conflict blocks) are kept as delivered.docs/quick-edit-events.md.Reviewer notes
SET_READ_ONLY, so layout would stay editable. No capability flag.node-update/image-replaceitself; the iframe still sendshistoryand selection messages while locked.Testing against this da-nx branch
tools/quick-edit/quick-edit.jsreadsquick-edit=<branch>(e.g. Frescopa) load the branch via the URL below.da-universalbootstrap (most customer projects) hardcodehttps://da.live/nx/public/plugins/quick-edit/quick-edit.jsand ignore the param, so the iframe runs production quick-edit (no highlight, preview not read-only). Use a DevTools local override (Sources > Overrides) on that URL with:Test URLs (page with merge conflicts;
quick-edit=<branch>loads this da-nx branch in the iframe on frescopa):