github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-22 02:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the scrollToMatch strategy when typing a search query (#14944)

Browse source 
GitOrigin-RevId: e381225b49f36cbf8554fe7deaecef73a8137d66
This commit is contained in:
Alf Eaton 2023-09-27 11:49:31 +01:00 committed by Copybot
parent cb1b5b7d54
commit d1cfc5a783
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
services/web/frontend/js/features/source-editor/extensions/search.ts
View file

@ -105,6 +105,23 @@ const highlightSelectionMatchesExtension = highlightSelectionMatches({
// TODO: move this into EditorContext?
let searchQuery: SearchQuery | null
const scrollToMatch = (range: SelectionRange, view: EditorView) => {
const coords = {
from: view.coordsAtPos(range.from),
to: view.coordsAtPos(range.to),
}
const scrollRect = view.scrollDOM.getBoundingClientRect()
const strategy =
(coords.from && coords.from.top < scrollRect.top) ||
(coords.to && coords.to.bottom > scrollRect.bottom)
? 'center'
: 'nearest'
return EditorView.scrollIntoView(range, {
y: strategy,
})
}
/**
* A collection of extensions related to the search feature.
*/
@ -128,22 +145,7 @@ export const search = () => {
_search({
literal: true,
// centre the search match if it was outside the visible area
scrollToMatch: (range: SelectionRange, view: EditorView) => {
const coords = {
from: view.coordsAtPos(range.from),
to: view.coordsAtPos(range.to),
}
const scrollRect = view.scrollDOM.getBoundingClientRect()
const strategy =
(coords.from && coords.from.top < scrollRect.top) ||
(coords.to && coords.to.bottom > scrollRect.bottom)
? 'center'
: 'nearest'
return EditorView.scrollIntoView(range, {
y: strategy,
})
},
scrollToMatch,
createPanel: () => {
const dom = document.createElement('div')
dom.className = 'ol-cm-search'
@ -226,9 +228,10 @@ export const search = () => {
// scroll into view if not opening the panel
if (searchPanelOpen(tr.startState)) {
spec.effects = EditorView.scrollIntoView(next.from, {
y: 'center',
})
spec.effects = scrollToMatch(
EditorSelection.range(next.from, next.to),
update.view
)
}
update.view.dispatch(spec)