Skip to content

feat(version-control): modernize graph and merge pickers#2123

Merged
kpal81xd merged 12 commits into
mainfrom
feat/vc-graph-modernization
Jun 24, 2026
Merged

feat(version-control): modernize graph and merge pickers#2123
kpal81xd merged 12 commits into
mainfrom
feat/vc-graph-modernization

Conversation

@kpal81xd

@kpal81xd kpal81xd commented Jun 23, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Overview

  • Move the VC graph into a picker overlay with modernized styling, collapsible branch legend, loading skeleton, and cached graph loads.
  • Restore graph node actions for compare, branch creation, restore, hard reset, and diff picker stack behavior.
  • Rework diff and conflict picker surfaces around the shared diff view and streamlined resolution UI.

Preview

image

Manual smoke test

  1. Open Version Control, click Graph, close it, and click Graph again. Expected: the graph reopens quickly from cache with nodes collapsed and the legend styled/collapsible.
  2. From graph nodes, use compare, view changes, new branch, restore, and hard reset flows as permissions allow. Expected: each opens the correct picker or dialog and returning to Graph still shows the graph.
  3. Open a merge conflict in Version Control and switch between conflict items and resolution choices. Expected: diff/merge views render, resolution state persists, and closing returns cleanly to the picker.

@kpal81xd kpal81xd self-assigned this Jun 23, 2026
@vercel

vercel Bot commented Jun 23, 2026 •
edited
Loading

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
editor Ready Ready Preview, Comment Jun 24, 2026 11:27am

Request Review

kpal81xd added 10 commits June 24, 2026 11:42
@kpal81xd
feat(version-control): modernize graph styling
9ea0717
@kpal81xd
feat(version-control): migrate graph window into a picker
8a0baf4 
- host the graph in an Overlay that joins the picker registry
  (picker:open/close 'vc-graph') and closes on Escape, like the
  diff/conflict pickers; register picker:versioncontrol:graph
- add a header bar matching the diff/conflict pickers (title + close),
  reusing their .vc-diff-* styles; drop the floating close button and
  its close-button plumbing through the graph engine
- replace the loading menu box with a centred skeleton chain of node
  cards mirroring the real .vc-graph-node layout
@kpal81xd
fix(version-control): polish graph legend and loading state
0807fe4
@kpal81xd
fix(version-control): restore graph menu picker flows
47d44bf
@kpal81xd
perf(version-control): cache vc graph loads
40640ae
@kpal81xd
fix(version-control): highlight graph node menu target
69c2fcd
@kpal81xd
fix(version-control): keep graph node border color
fd647d5
@kpal81xd
fix(version-control): avoid doubled graph node highlight
e7ce021
@kpal81xd
fix(version-control): avoid compare mode for view changes
075efdc
@kpal81xd
chore(docs): keep mockups out of graph pr
eeb181e
@kpal81xd kpal81xd force-pushed the feat/vc-graph-modernization branch from 8b0581d to eeb181e Compare June 24, 2026 10:44
@kpal81xd kpal81xd merged commit 4b522b6 into main Jun 24, 2026
7 checks passed
@kpal81xd kpal81xd deleted the feat/vc-graph-modernization branch June 24, 2026 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@kpal81xd kpal81xd

Labels

area: editor interface

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@kpal81xd