mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
175a4d024d
Fix focus highlight decoration for new review panel GitOrigin-RevId: c69ba8dd8527b6c3797b1e986cfd87c1ca87da6d
455 lines
12 KiB
TypeScript
455 lines
12 KiB
TypeScript
import { StateEffect, StateField, TransactionSpec } from '@codemirror/state'
|
|
import {
|
|
Decoration,
|
|
type DecorationSet,
|
|
EditorView,
|
|
type PluginValue,
|
|
ViewPlugin,
|
|
WidgetType,
|
|
} from '@codemirror/view'
|
|
import {
|
|
AnyOperation,
|
|
Change,
|
|
DeleteOperation,
|
|
} from '../../../../../types/change'
|
|
import { debugConsole } from '@/utils/debugging'
|
|
import {
|
|
isCommentOperation,
|
|
isDeleteOperation,
|
|
isInsertOperation,
|
|
} from '@/utils/operations'
|
|
import { Ranges } from '@/features/review-panel-new/context/ranges-context'
|
|
import { Threads } from '@/features/review-panel-new/context/threads-context'
|
|
import { isSelectionWithinOp } from '@/features/review-panel-new/utils/is-selection-within-op'
|
|
|
|
type RangesData = {
|
|
ranges: Ranges
|
|
threads: Threads
|
|
}
|
|
|
|
const updateRangesEffect = StateEffect.define<RangesData>()
|
|
const highlightRangesEffect = StateEffect.define<AnyOperation>()
|
|
const clearHighlightRangesEffect = StateEffect.define<AnyOperation>()
|
|
|
|
export const updateRanges = (data: RangesData): TransactionSpec => {
|
|
return {
|
|
effects: updateRangesEffect.of(data),
|
|
}
|
|
}
|
|
export const highlightRanges = (op: AnyOperation): TransactionSpec => {
|
|
return {
|
|
effects: highlightRangesEffect.of(op),
|
|
}
|
|
}
|
|
export const clearHighlightRanges = (op: AnyOperation): TransactionSpec => {
|
|
return {
|
|
effects: clearHighlightRangesEffect.of(op),
|
|
}
|
|
}
|
|
|
|
export const rangesDataField = StateField.define<RangesData | null>({
|
|
create() {
|
|
return null
|
|
},
|
|
update(rangesData, tr) {
|
|
for (const effect of tr.effects) {
|
|
if (effect.is(updateRangesEffect)) {
|
|
return effect.value
|
|
}
|
|
}
|
|
return rangesData
|
|
},
|
|
})
|
|
|
|
/**
|
|
* A custom extension that initialises the change manager, passes any updates to it,
|
|
* and produces decorations for tracked changes and comments.
|
|
*/
|
|
export const ranges = () => [
|
|
rangesDataField,
|
|
// handle viewportChanged updates
|
|
ViewPlugin.define(view => {
|
|
let timer: number
|
|
|
|
return {
|
|
update(update) {
|
|
if (update.viewportChanged) {
|
|
if (timer) {
|
|
window.clearTimeout(timer)
|
|
}
|
|
|
|
timer = window.setTimeout(() => {
|
|
dispatchEvent(new Event('editor:viewport-changed'))
|
|
}, 25)
|
|
}
|
|
},
|
|
}
|
|
}),
|
|
|
|
// draw change decorations
|
|
ViewPlugin.define<
|
|
PluginValue & {
|
|
decorations: DecorationSet
|
|
}
|
|
>(
|
|
() => {
|
|
return {
|
|
decorations: Decoration.none,
|
|
update(update) {
|
|
for (const transaction of update.transactions) {
|
|
this.decorations = this.decorations.map(transaction.changes)
|
|
|
|
for (const effect of transaction.effects) {
|
|
if (effect.is(updateRangesEffect)) {
|
|
this.decorations = buildChangeDecorations(effect.value)
|
|
} else if (
|
|
effect.is(highlightRangesEffect) &&
|
|
isDeleteOperation(effect.value)
|
|
) {
|
|
this.decorations = updateDeleteWidgetHighlight(
|
|
this.decorations,
|
|
widget =>
|
|
widget.change.op.p === effect.value.p &&
|
|
widget.highlightType !== 'focus',
|
|
'highlight'
|
|
)
|
|
} else if (
|
|
effect.is(clearHighlightRangesEffect) &&
|
|
isDeleteOperation(effect.value)
|
|
) {
|
|
this.decorations = updateDeleteWidgetHighlight(
|
|
this.decorations,
|
|
widget =>
|
|
widget.change.op.p === effect.value.p &&
|
|
widget.highlightType !== 'focus',
|
|
null
|
|
)
|
|
}
|
|
}
|
|
|
|
if (transaction.selection) {
|
|
this.decorations = updateDeleteWidgetHighlight(
|
|
this.decorations,
|
|
({ change }) =>
|
|
isSelectionWithinOp(change.op, update.state.selection.main),
|
|
'focus'
|
|
)
|
|
this.decorations = updateDeleteWidgetHighlight(
|
|
this.decorations,
|
|
({ change }) =>
|
|
!isSelectionWithinOp(change.op, update.state.selection.main),
|
|
null
|
|
)
|
|
}
|
|
}
|
|
},
|
|
}
|
|
},
|
|
{
|
|
decorations: value => value.decorations,
|
|
}
|
|
),
|
|
|
|
// draw highlight decorations
|
|
ViewPlugin.define<
|
|
PluginValue & {
|
|
decorations: DecorationSet
|
|
}
|
|
>(
|
|
() => {
|
|
return {
|
|
decorations: Decoration.none,
|
|
update(update) {
|
|
for (const transaction of update.transactions) {
|
|
this.decorations = this.decorations.map(transaction.changes)
|
|
|
|
for (const effect of transaction.effects) {
|
|
if (effect.is(highlightRangesEffect)) {
|
|
this.decorations = buildHighlightDecorations(
|
|
'ol-cm-change-highlight',
|
|
effect.value
|
|
)
|
|
} else if (effect.is(clearHighlightRangesEffect)) {
|
|
this.decorations = Decoration.none
|
|
}
|
|
}
|
|
}
|
|
},
|
|
}
|
|
},
|
|
{
|
|
decorations: value => value.decorations,
|
|
}
|
|
),
|
|
|
|
// draw focus decorations
|
|
ViewPlugin.define<
|
|
PluginValue & {
|
|
decorations: DecorationSet
|
|
}
|
|
>(
|
|
view => {
|
|
return {
|
|
decorations: Decoration.none,
|
|
update(update) {
|
|
if (
|
|
!update.transactions.some(
|
|
tr =>
|
|
tr.selection ||
|
|
tr.effects.some(effect => effect.is(updateRangesEffect))
|
|
)
|
|
) {
|
|
return
|
|
}
|
|
|
|
this.decorations = Decoration.none
|
|
const rangesData = view.state.field(rangesDataField)
|
|
|
|
if (!rangesData?.ranges) {
|
|
return
|
|
}
|
|
const { changes, comments } = rangesData.ranges
|
|
const unresolvedComments = rangesData.threads
|
|
? comments.filter(
|
|
comment =>
|
|
comment.op.t &&
|
|
rangesData.threads[comment.op.t] &&
|
|
!rangesData.threads[comment.op.t].resolved
|
|
)
|
|
: []
|
|
|
|
for (const range of [...changes, ...unresolvedComments]) {
|
|
if (isSelectionWithinOp(range.op, update.state.selection.main)) {
|
|
this.decorations = buildHighlightDecorations(
|
|
'ol-cm-change-focus',
|
|
range.op
|
|
)
|
|
break
|
|
}
|
|
}
|
|
},
|
|
}
|
|
},
|
|
{
|
|
decorations: value => value.decorations,
|
|
}
|
|
),
|
|
|
|
// styles for change decorations
|
|
trackChangesTheme,
|
|
]
|
|
|
|
const buildChangeDecorations = (data: RangesData) => {
|
|
if (!data.ranges) {
|
|
return Decoration.none
|
|
}
|
|
|
|
const changes = [...data.ranges.changes, ...data.ranges.comments]
|
|
|
|
const decorations = []
|
|
|
|
for (const change of changes) {
|
|
try {
|
|
decorations.push(...createChangeRange(change, data))
|
|
} catch (error) {
|
|
// ignore invalid changes
|
|
debugConsole.debug('invalid change position', error)
|
|
}
|
|
}
|
|
|
|
return Decoration.set(decorations, true)
|
|
}
|
|
|
|
const updateDeleteWidgetHighlight = (
|
|
decorations: DecorationSet,
|
|
predicate: (widget: ChangeDeletedWidget) => boolean,
|
|
highlightType?: 'focus' | 'highlight' | null
|
|
) => {
|
|
const widgetsToReplace: ChangeDeletedWidget[] = []
|
|
const cursor = decorations.iter()
|
|
while (cursor.value) {
|
|
const widget = cursor.value.spec?.widget
|
|
if (widget instanceof ChangeDeletedWidget && predicate(widget)) {
|
|
widgetsToReplace.push(cursor.value.spec.widget)
|
|
}
|
|
cursor.next()
|
|
}
|
|
|
|
return decorations.update({
|
|
filter: (from, to, decoration) => {
|
|
return !widgetsToReplace.includes(decoration.spec?.widget)
|
|
},
|
|
add: widgetsToReplace.map(({ change }) =>
|
|
Decoration.widget({
|
|
widget: new ChangeDeletedWidget(change, highlightType),
|
|
side: 1,
|
|
opType: 'd',
|
|
id: change.id,
|
|
metadata: change.metadata,
|
|
}).range(change.op.p, change.op.p)
|
|
),
|
|
})
|
|
}
|
|
|
|
const buildHighlightDecorations = (className: string, op: AnyOperation) => {
|
|
if (isDeleteOperation(op)) {
|
|
// delete indicators are handled in change decorations
|
|
return Decoration.none
|
|
}
|
|
|
|
const opFrom = op.p
|
|
const opLength = isInsertOperation(op) ? op.i.length : op.c.length
|
|
const opType = isInsertOperation(op) ? 'i' : 'c'
|
|
|
|
if (opLength === 0) {
|
|
return Decoration.none
|
|
}
|
|
|
|
return Decoration.set(
|
|
Decoration.mark({
|
|
class: `${className} ${className}-${opType}`,
|
|
}).range(opFrom, opFrom + opLength),
|
|
true
|
|
)
|
|
}
|
|
|
|
class ChangeDeletedWidget extends WidgetType {
|
|
constructor(
|
|
public change: Change<DeleteOperation>,
|
|
public highlightType: 'highlight' | 'focus' | null = null
|
|
) {
|
|
super()
|
|
}
|
|
|
|
toDOM() {
|
|
const widget = document.createElement('span')
|
|
widget.classList.add('ol-cm-change')
|
|
widget.classList.add('ol-cm-change-d')
|
|
widget.textContent = '[ — ]'
|
|
if (this.highlightType) {
|
|
widget.classList.add(`ol-cm-change-d-${this.highlightType}`)
|
|
}
|
|
return widget
|
|
}
|
|
|
|
eq(old: ChangeDeletedWidget) {
|
|
return old.highlightType === this.highlightType
|
|
}
|
|
}
|
|
|
|
const createChangeRange = (change: Change, data: RangesData) => {
|
|
const { id, metadata, op } = change
|
|
|
|
const from = op.p
|
|
|
|
if (isDeleteOperation(op)) {
|
|
const opType = 'd'
|
|
|
|
const changeWidget = Decoration.widget({
|
|
widget: new ChangeDeletedWidget(change as Change<DeleteOperation>),
|
|
side: 1,
|
|
opType,
|
|
id,
|
|
metadata,
|
|
})
|
|
|
|
return [changeWidget.range(from, from)]
|
|
}
|
|
|
|
const _isCommentOperation = isCommentOperation(op)
|
|
|
|
if (_isCommentOperation) {
|
|
const thread = data.threads[op.t]
|
|
if (!thread || thread.resolved) {
|
|
return []
|
|
}
|
|
}
|
|
|
|
const opType = _isCommentOperation ? 'c' : 'i'
|
|
const changedText = _isCommentOperation ? op.c : op.i
|
|
const to = from + changedText.length
|
|
|
|
// Mark decorations must not be empty
|
|
if (from === to) {
|
|
return []
|
|
}
|
|
|
|
const changeMark = Decoration.mark({
|
|
tagName: 'span',
|
|
class: `ol-cm-change ol-cm-change-${opType}`,
|
|
opType,
|
|
id,
|
|
metadata,
|
|
})
|
|
|
|
return [changeMark.range(from, to)]
|
|
}
|
|
|
|
const trackChangesTheme = EditorView.baseTheme({
|
|
'&light .ol-cm-change-i': {
|
|
backgroundColor: '#2c8e304d',
|
|
},
|
|
'&dark .ol-cm-change-i': {
|
|
backgroundColor: 'rgba(37, 107, 41, 0.15)',
|
|
},
|
|
'&light .ol-cm-change-c': {
|
|
backgroundColor: '#f3b1114d',
|
|
},
|
|
'&dark .ol-cm-change-c': {
|
|
backgroundColor: 'rgba(194, 93, 11, 0.15)',
|
|
},
|
|
'.ol-cm-change': {
|
|
padding: 'var(--half-leading, 0) 0',
|
|
},
|
|
'.ol-cm-change-highlight': {
|
|
padding: 'var(--half-leading, 0) 0',
|
|
},
|
|
'.ol-cm-change-focus': {
|
|
padding: 'var(--half-leading, 0) 0',
|
|
},
|
|
// TODO: fix dark mode colors
|
|
'&light .ol-cm-change-d': {
|
|
color: '#c5060b',
|
|
backgroundColor: '#f5beba57',
|
|
},
|
|
'&dark .ol-cm-change-d': {
|
|
color: '#c5060b',
|
|
backgroundColor: '#f5beba57',
|
|
},
|
|
'&light .ol-cm-change-d-highlight': {
|
|
backgroundColor: '#f5bebaa4',
|
|
},
|
|
'&dark .ol-cm-change-d-highlight': {
|
|
backgroundColor: '#f5bebaa4',
|
|
},
|
|
'&light .ol-cm-change-d-focus': {
|
|
backgroundColor: '#F5BEBA',
|
|
},
|
|
'&dark .ol-cm-change-d-focus': {
|
|
backgroundColor: '#F5BEBA',
|
|
},
|
|
'&light .ol-cm-change-highlight-i': {
|
|
backgroundColor: '#b8dbc899',
|
|
},
|
|
'&dark .ol-cm-change-highlight-i': {
|
|
backgroundColor: '#b8dbc899',
|
|
},
|
|
'&light .ol-cm-change-highlight-c': {
|
|
backgroundColor: '#fcc4837d',
|
|
},
|
|
'&dark .ol-cm-change-highlight-c': {
|
|
backgroundColor: '#fcc4837d',
|
|
},
|
|
'&light .ol-cm-change-focus-i': {
|
|
backgroundColor: '#B8DBC8',
|
|
},
|
|
'&dark .ol-cm-change-focus-i': {
|
|
backgroundColor: '#B8DBC8',
|
|
},
|
|
'&light .ol-cm-change-focus-c': {
|
|
backgroundColor: '#FCC483',
|
|
},
|
|
'&dark .ol-cm-change-focus-c': {
|
|
backgroundColor: '#FCC483',
|
|
},
|
|
})
|