Skip to content

fix: resolve split pane PR #585 conflicts against master#620

Open
RajPabnani03 wants to merge 3 commits intoathasdev:masterfrom
RajPabnani03:fix/pr-585-split-pane-resolved
Open

fix: resolve split pane PR #585 conflicts against master#620
RajPabnani03 wants to merge 3 commits intoathasdev:masterfrom
RajPabnani03:fix/pr-585-split-pane-resolved

Conversation

@RajPabnani03
Copy link
Copy Markdown

This PR resolves the merge conflicts from #585 (Split Pane improvements) against the latest master.

What changed upstream since #585 was opened:

  • Pane-tree helpers (normalizePanePairSizes, getCollapsedSplitRepairs) merged to master
  • Resize handle, pane store tests, and keyboard hooks merged
  • Icon library switched from lucide-react to @phosphor-icons/react
  • Active-pane focus ring and menu event handling merged

What this PR includes:

  • Re-applied split pane UI/structure polish on top of current master
  • Flattened nested same-direction splits in SplitViewRoot
  • Collapsed split ratio repairs on mount
  • Calmer active-pane focus ring styling
  • Tab bar responsive hiding and visual polish
  • Split Pane naming in window menu

Closes #585 (supersedes with resolved conflicts).

…olish

Rebased split pane work onto current master (excluding window.rs which
is already fixed upstream).

Changes:
- Raise minimum pane threshold to 20%
- Normalize collapsed splits to 40/60 on drag release
- Repair bad split ratios on restore/startup
- Generic splits open empty panes (no tab duplication)
- Calmer active-pane focus with ring styling
- Slimmer resize handles with expanded hit areas
- Always-visible tab bar for empty panes
- Hide nonessential chrome in narrow panes
- Split Pane naming (was Split Editor)
- Test coverage for split and normalize behavior
…olish

Reapplied split pane work onto latest upstream master.
Upstream already merged: pane-tree helpers, resize handle, pane store tests,
pane keyboard hooks, menu events.

Remaining changes:
- Flatten nested same-direction splits in SplitViewRoot
- Repair collapsed split ratios on mount
- Calmer active-pane focus ring styling
- Tab bar responsive hiding and visual polish
- Split Pane naming (was Split Editor)
@RajPabnani03
Copy link
Copy Markdown
Author

Hi @athasdev maintainers — this PR is now up to date with the latest master (merged upstream changes just now). All conflicts are resolved and it's ready for review/merge. Thanks!

@RajPabnani03
Copy link
Copy Markdown
Author

Hi maintainers,

This PR is now up to date with master and all merge conflicts from #585 have been resolved. The branch was just synced with the latest upstream changes.

Summary of what this PR delivers:

  • Resolves all merge conflicts from the original split pane PR (Improve split pane behavior and UI polish #585)
  • Flattened nested same-direction splits in SplitViewRoot
  • Collapsed split ratio repairs on mount
  • Calmer active-pane focus ring styling
  • Tab bar responsive hiding and visual polish
  • Updated icon imports to match upstream (@phosphor-icons/react)
  • Split Pane naming in window menu

The PR is merge-ready — no conflicts, no failing checks. Would appreciate a review and merge when you have a moment. Thanks!

cc: @athasdev

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant