Skip to content

Conversation

@mathijs81
Copy link
Contributor

🧢 Changes

I fixed 3 UI/UX issues I encountered:

  • I kept trying to drag changes onto the 'big' folded out commit panel on the right side of the stack but that wasn't a drop area
  • I found it confusing that I can change branch names by clicking them in the header but not commit titles
  • I ran into a small bug where switching between repos gives a wrong github integration popup

@vercel
Copy link

vercel bot commented Dec 5, 2025

@mathijs81 is attempting to deploy a commit to the GitButler Team on Vercel.

A member of the Team first needs to authorize it.

@Byron Byron requested a review from Copilot December 5, 2025 14:50
Copilot finished reviewing on behalf of Byron December 5, 2025 14:53
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR addresses three UI/UX issues by adding drag-and-drop support to the commit details panel, making commit titles clickable to edit them, and fixing a state management bug in the forge factory that caused incorrect GitHub integration prompts when switching repositories.

  • Adds drop zone support to the expanded commit details view for amending/squashing commits
  • Makes commit titles clickable to enter edit mode, improving discoverability
  • Fixes _determinedForgeType state not resetting when switching repos

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
apps/desktop/src/lib/forge/forgeFactory.svelte.ts Resets _determinedForgeType to 'default' when no repo/baseBranch exists, fixing incorrect forge integration prompts
apps/desktop/src/lib/commits/dropHandler.ts Extracts drop handler creation logic into reusable createCommitDropHandlers helper function
apps/desktop/src/components/StackView.svelte Wraps commit details view in Dropzone component to enable drag-and-drop for amending/squashing commits
apps/desktop/src/components/CommitView.svelte Adds onclick handler to CommitTitle to enable clicking for edit mode
apps/desktop/src/components/CommitTitle.svelte Adds clickable styling, onclick handler, role="button", and keyboard navigation support
apps/desktop/src/components/BranchCommitList.svelte Refactors to use new createCommitDropHandlers helper, reducing code duplication
apps/desktop/cypress/e2e/support/mock/backend.ts Adds amendCommit mock method to support E2E testing of amend functionality
apps/desktop/cypress/e2e/commitActions.cy.ts Adds E2E test verifying drag-and-drop from uncommitted changes to commit drawer

@PavelLaptev PavelLaptev self-assigned this Dec 5, 2025
@PavelLaptev PavelLaptev marked this pull request as draft December 5, 2025 14:57
@PavelLaptev
Copy link
Contributor

@mathijs81 thank you for the PR!

I found it confusing that I can change branch names by clicking them in the header but not commit titles

Let’s move this item to a separate PR because it’s not about fixing a bug but adding a new feature.

When switching from a github repo to a non-github repo you still get
the `UnassignedViewForgePrompt` because the _determinedForgeType didn't get updated.
@mathijs81
Copy link
Contributor Author

I moved the commit title change to a different PR.
Here's a video that shows how you can't drop a file onto the commit details pane in the current version
and when switching to my "Gitbutler Dev" it does work:
https://github.com/user-attachments/assets/44aac688-ef2d-4363-9acd-b76025e620ed

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants