development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-18 07:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17387 from desktop/force-focus-to-selected-tab

Browse source 
Force focus to selected tab
This commit is contained in:
tidy-dev 2023-09-14 07:02:48 -04:00 committed by GitHub
parent a6b3d89ab9 bbfa90c37b
commit 03a90823cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/lib/stores/app-store.ts
View file

@ -2731,7 +2731,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
/** This shouldn't be called directly. See `Dispatcher`. */
public async _changeRepositorySection(
repository: Repository,
selectedSection: RepositorySectionTab
selectedSection: RepositorySectionTab,
forceButtonFocus: boolean = false
): Promise<void> {
this.repositoryStateCache.update(repository, state => {
if (state.selectedSection !== selectedSection) {
@ -2742,13 +2743,21 @@ export class AppStore extends TypedBaseStore<IAppState> {
this.emitUpdate()
if (selectedSection === RepositorySectionTab.History) {
return this.refreshHistorySection(repository)
await this.refreshHistorySection(repository)
} else if (selectedSection === RepositorySectionTab.Changes) {
return this.refreshChangesSection(repository, {
await this.refreshChangesSection(repository, {
includingStatus: true,
clearPartialState: false,
})
}
if (forceButtonFocus) {
const repoSideBar = document.getElementById('repository-sidebar')
const button = repoSideBar?.querySelector(
'.tab-bar-item.selected'
) as HTMLButtonElement
button?.focus()
}
}
/**
@ -4829,7 +4838,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
// Make sure we show the changes after undoing the commit
await this._changeRepositorySection(
repository,
RepositorySectionTab.Changes
RepositorySectionTab.Changes,
true
)
await gitStore.undoCommit(commit)