Fix the merge-conflict controls (Exit merge / Undo / Save resolution)…#451
Merged
Conversation
…composer (#2399) * fix(open-knowledge): keep conflict controls visible below the Ask AI composer (PRD-7268) The merge-conflict footer (Exit merge / Undo / Save resolution) rendered at the bottom of the editor content region, and the Ask AI bottom composer is an absolute bottom-0 z-20 overlay over that same region, so the composer covered the controls and conflicts could not be confirmed. DiffView now publishes its conflict footer height as --conflict-footer-height on the document root (counterpart of the composer's --ask-composer-height), and the composer anchors its bottom to that var (0px fallback keeps non-conflict geometry identical), stacking Ask AI above the controls. The conflict diff scroller also reserves composer-height scroll room so the last hunks' inline Accept/Reject buttons can scroll clear. * test: pin ownership-token handoff; make jsdom 0px pins explicit Review follow-ups on #2399: add a direct dom test for the ownership token (a stale instance unmounting after a newer publisher must not clear --conflict-footer-height), replace the /^\d+px$/ assertions with an explicit '0px' so the jsdom no-layout assumption is visible in the assertion, and tighten the hook's comments to name the one interleaving the token defends (mount-before-unmount ordering on fast doc switches) plus the enabled-only dep invariant both call sites rely on. GitOrigin-RevId: 89dc25725dc56c0b796f5dc97a3d1f1d82fc9ecb
![inkeep-internal-ci[bot]](https://avatars.githubusercontent.com/u/123133689?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Automated approval from agents-private public-mirror-sync (run: https://github.com/inkeep/agents-private/actions/runs/28624643176). Source of truth is the monorepo; direct edits on inkeep/open-knowledge are overwritten on next sync.
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
1 participant
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.
Fix the merge-conflict controls (Exit merge / Undo / Save resolution) being
covered by the floating Ask AI composer, which made conflicts impossible to
confirm without first collapsing the composer. The conflict footer now
publishes its height and the composer anchors above it, so the controls stay
visible and clickable with Ask AI stacked on top of them. The conflict diff
also reserves scroll room under the composer, so the last hunks' Accept and
Reject buttons can always scroll clear.