History Sidebar

[Avni2000]

Changes the logic for opening the history sidebar to expand and take 20% of the right side.

Summary by CodeRabbit

• Accessibility

  • Improved the conflict history panel with an explicit close control and better open/closed state handling.

• UI Improvements

  • Redesigned the history panel as a slide-in sidebar.
  • Refined header, action controls, list spacing, selection states, hover effects, and keyboard focus styling.
  • Preserved closing via outside click and Escape.

[coderabbitai]

Warning

Review limit reached

@Avni2000, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 51 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: bb2d1853-e766-42e5-8c27-551bc584ec23

📥 Commits

Reviewing files that changed from the base of the PR and between 2f12062 and 8cdf798.

📒 Files selected for processing (2)

• packages/web/client/src/components/ConflictResolver.tsx
• packages/web/client/src/styles.ts

📝 Walkthrough

Walkthrough

The ConflictResolver history panel now uses an aside with explicit close and grouped undo/redo controls. Its CSS implements a fixed right-edge slide-in layout with updated header, action, list, item, hover, and focus styling.

Changes

Conflict history UI

Layer / File(s)	Summary
History panel markup packages/web/client/src/components/ConflictResolver.tsx	The history content is rendered in an aside with aria-hidden, an explicit close button, and grouped Undo/Redo actions.
History sidebar styling packages/web/client/src/styles.ts	The history panel uses fixed slide-in positioning, updated visibility handling, revised controls and list spacing, and new item selection and focus styles.

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

Possibly related PRs

• Avni2000/MergeNB#50: Introduced the undo/redo-enabled history panel that this refactor adjusts.
• Avni2000/MergeNB#157: Updated the history state management used by the ConflictResolver history panel.
• Avni2000/MergeNB#291: Also modified the ConflictResolver history UI and Undo/Redo controls.

Poem

I’m a bunny by the history pane,
Sliding right and back again.
A close button, actions neat,
Focus rings and borders meet.
Undo, redo—hop hooray!

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title is concise and accurately reflects the main change: the history UI was turned into a sidebar.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch history-sidebar

---

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

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@packages/web/client/src/components/ConflictResolver.tsx`:
- Around line 543-551: Update ConflictResolver’s history close flow to keep a
ref to the history-toggle trigger and focus that element when the history close
button’s onClick hides the sidebar. Ensure the focus restoration occurs after
closing so focus does not remain inside the aria-hidden history content.

In `@packages/web/client/src/styles.ts`:
- Around line 287-300: Update the .history-dropdown width from the fixed 320px
value to a viewport-relative 20vw width, retaining max-width: 90vw or adding
only necessary usability bounds.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 79a60917-2ec5-4c6a-b9e1-8e3e175bbea3

📥 Commits

Reviewing files that changed from the base of the PR and between 41fa4f7 and 2f12062.

📒 Files selected for processing (2)

• packages/web/client/src/components/ConflictResolver.tsx
• packages/web/client/src/styles.ts

[sonarqubecloud]

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud