github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-21 08:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14829 from overleaf/td-history-scroll-editor-tab

Browse source 
History view: prevent scroll to top of document diff viewer when editing in another tab

GitOrigin-RevId: d94da63fdb8e76203a1a2cc5729188a9d28e0be5
This commit is contained in:
Tim Down 2023-09-20 16:02:41 +01:00 committed by Copybot
parent 2e00894270
commit dbe5c9732b
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
services/web/frontend/js/features/history/components/diff-view/diff-view.tsx
View file

@ -1,4 +1,4 @@
import { useEffect } from 'react'
import { useEffect, useMemo } from 'react'
import Toolbar from './toolbar/toolbar'
import Main from './main'
import { Diff, DocDiffResponse } from '../../services/types/doc'
@ -53,18 +53,22 @@ function DiffView() {
handleError,
])
let diff: Diff | null
const diff = useMemo(() => {
let diff: Diff | null
if (!data?.diff) {
diff = null
} else if ('binary' in data.diff) {
diff = { binary: true }
} else {
diff = {
binary: false,
docDiff: highlightsFromDiffResponse(data.diff, t),
if (!data?.diff) {
diff = null
} else if ('binary' in data.diff) {
diff = { binary: true }
} else {
diff = {
binary: false,
docDiff: highlightsFromDiffResponse(data.diff, t),
}
}
}
return diff
}, [data, t])
return (
<div className="doc-panel">