Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-09-21 09:58:09 +03:00
Code Issues Projects Releases Wiki Activity

make ctrl-f select the search query

Browse Source
This commit is contained in:
Eugene Pankov 2022-10-21 20:50:23 +02:00
parent 0e529ea5a1
commit aa439ccbb0
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tabby-core/src/services/hotkeys.service.ts
View File

@ -1,5 +1,5 @@
import { Injectable, Inject, NgZone, EventEmitter } from '@angular/core'
import { Observable, Subject } from 'rxjs'
import { Observable, Subject, filter } from 'rxjs'
import { HotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
import { KeyEventData, getKeyName, Keystroke, KeyName, getKeystrokeName, metaKeyName, altKeyName } from './hotkeys.util'
import { ConfigService } from './config.service'
@ -28,7 +28,16 @@ export class HotkeysService {
/**
* Fired for each recognized hotkey
*/
get hotkey$ (): Observable<string> { return this._hotkey }
get unfilteredHotkey$ (): Observable<string> { return this._hotkey }
/**
* Fired for each recognized hotkey
*/
get hotkey$ (): Observable<string> {
return this._hotkey.pipe(filter(() => {
return document.querySelectorAll('input:focus').length === 0
}))
}
/**
* Fired for once hotkey is released
@ -292,11 +301,9 @@ export class HotkeysService {
this.emitHotkeyOff(this.pressedHotkey)
}
}
if (document.querySelectorAll('input:focus').length === 0) {
console.debug('Matched hotkey', hotkey)
this._hotkey.next(hotkey)
this.pressedHotkey = hotkey
}
console.debug('Matched hotkey', hotkey)
this._hotkey.next(hotkey)
this.pressedHotkey = hotkey
this.recognitionPhase = false
}

22
tabby-terminal/src/api/baseTerminalTab.component.ts
View File

@ -191,6 +191,20 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
this.logger = this.log.create('baseTerminalTab')
this.setTitle(this.translate.instant('Terminal'))
this.subscribeUntilDestroyed(this.hotkeys.unfilteredHotkey$, async hotkey => {
if (!this.hasFocus) {
return
}
if (hotkey === 'search') {
this.showSearchPanel = true
setImmediate(() => {
const input = this.element.nativeElement.querySelector('.search-input')
input?.focus()
input?.select()
})
}
})
this.subscribeUntilDestroyed(this.hotkeys.hotkey$, async hotkey => {
if (!this.hasFocus) {
return
@ -265,14 +279,6 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
}[this.hostApp.platform])
})
break
case 'search':
this.showSearchPanel = true
setImmediate(() => {
const input = this.element.nativeElement.querySelector('.search-input')
input?.focus()
input?.select()
})
break
case 'pane-focus-all':
this.focusAllPanes()
break