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

[web] [cm6] Fix alignment of tracked changes/comments with review panel (#6557)

Browse source 
GitOrigin-RevId: 65416f32874da1cc866e4949244c4934aeabe804
This commit is contained in:
Alf Eaton 2022-02-10 13:26:58 +00:00 committed by Copybot
parent 34a296747b
commit 5f9cc7512a
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
services/web/frontend/js/ide/review-panel/directives/reviewPanelSorted.js
View file

@ -25,6 +25,7 @@ export default App.directive('reviewPanelSorted', $timeout => ({
i,
original_top,
overflowTop,
screenPosHeight,
OVERVIEW_TOGGLE_HEIGHT,
PADDING,
TOOLBAR_HEIGHT,
@ -89,17 +90,22 @@ export default App.directive('reviewPanelSorted', $timeout => ({
sl_console.log('focused_entry_index', focused_entry_index)
const positionLayoutEl = function ($callout_el, original_top, top) {
const positionLayoutEl = function (
$callout_el,
original_top,
top,
height
) {
if (original_top <= top) {
$callout_el.removeClass('rp-entry-callout-inverted')
return $callout_el.css({
top: original_top + line_height - 1,
top: original_top + height - 1,
height: top - original_top,
})
} else {
$callout_el.addClass('rp-entry-callout-inverted')
return $callout_el.css({
top: top + line_height,
top: top + height,
height: original_top - top,
})
}
@ -117,15 +123,21 @@ export default App.directive('reviewPanelSorted', $timeout => ({
visibility: 'visible',
})
focused_entry.$indicator_el.css({ top: focused_entry_top })
// use screenPos.height if set
screenPosHeight =
focused_entry.scope.entry.screenPos.height ?? line_height
positionLayoutEl(
focused_entry.$callout_el,
focused_entry.scope.entry.screenPos.y,
focused_entry_top
focused_entry_top,
screenPosHeight
)
let previousBottom = focused_entry_top + focused_entry.$layout_el.height()
for (entry of Array.from(entries_after)) {
original_top = entry.scope.entry.screenPos.y
// use screenPos.height if set
screenPosHeight = entry.scope.entry.screenPos.height ?? line_height
;({ height } = entry)
top = Math.max(original_top, previousBottom + PADDING)
previousBottom = top + height
@ -136,7 +148,7 @@ export default App.directive('reviewPanelSorted', $timeout => ({
visibility: 'visible',
})
entry.$indicator_el.css({ top })
positionLayoutEl(entry.$callout_el, original_top, top)
positionLayoutEl(entry.$callout_el, original_top, top, screenPosHeight)
sl_console.log('ENTRY', { entry: entry.scope.entry, top })
}
@ -147,6 +159,8 @@ export default App.directive('reviewPanelSorted', $timeout => ({
for (i = 0; i < entries_before.length; i++) {
entry = entries_before[i]
original_top = entry.scope.entry.screenPos.y
// use screenPos.height if set
screenPosHeight = entry.scope.entry.screenPos.height ?? line_height
;({ height } = entry)
const original_bottom = original_top + height
const bottom = Math.min(original_bottom, previousTop - PADDING)
@ -159,7 +173,7 @@ export default App.directive('reviewPanelSorted', $timeout => ({
visibility: 'visible',
})
entry.$indicator_el.css({ top })
positionLayoutEl(entry.$callout_el, original_top, top)
positionLayoutEl(entry.$callout_el, original_top, top, screenPosHeight)
sl_console.log('ENTRY', { entry: entry.scope.entry, top })
}