github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

[cm6] Emacs: close search form when Enter is pressed in "Find" input (#12841)

Browse source 
GitOrigin-RevId: a4c974f45e0dbb13d96b9b424f056768449791fb
This commit is contained in:
Alf Eaton 2023-05-03 09:26:36 +01:00 committed by Copybot
parent 6c21f0821c
commit 8a12c34fce
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
services/web/frontend/js/features/source-editor/components/codemirror-search-form.tsx
View file

@ -23,7 +23,7 @@ import classnames from 'classnames'
import useScopeValue from '../../../shared/hooks/use-scope-value' import useScopeValue from '../../../shared/hooks/use-scope-value'
import { getStoredSelection, setStoredSelection } from '../extensions/search' import { getStoredSelection, setStoredSelection } from '../extensions/search'
import { debounce } from 'lodash' import { debounce } from 'lodash'
import { EditorState } from '@codemirror/state' import { EditorSelection, EditorState } from '@codemirror/state'
const MATCH_COUNT_DEBOUNCE_WAIT = 100 // the amount of ms to wait before counting matches const MATCH_COUNT_DEBOUNCE_WAIT = 100 // the amount of ms to wait before counting matches
const MAX_MATCH_COUNT = 999 // the maximum number of matches to count const MAX_MATCH_COUNT = 999 // the maximum number of matches to count
@ -169,7 +169,12 @@ const CodeMirrorSearchForm: FC = () => {
switch (event.key) { switch (event.key) {
case 'Enter': case 'Enter':
event.preventDefault() event.preventDefault()
if (event.shiftKey) { if (emacsKeybindingsActive) {
closeSearchPanel(view)
view.dispatch({
selection: EditorSelection.cursor(view.state.selection.main.to),
})
} else if (event.shiftKey) {
findPrevious(view) findPrevious(view)
} else { } else {
findNext(view) findNext(view)
@ -178,7 +183,7 @@ const CodeMirrorSearchForm: FC = () => {
} }
handleEmacsNavigation(event) handleEmacsNavigation(event)
}, },
[view, handleEmacsNavigation] [view, handleEmacsNavigation, emacsKeybindingsActive]
) )
const handleReplaceKeyDown = useCallback( const handleReplaceKeyDown = useCallback(