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

Merge pull request #15435 from overleaf/mj-scroll-content-width-fix

Browse source 
[web] Fix broken scrolling with table rendering error

GitOrigin-RevId: 425c9ccf2f7f40e0842455eeb40975171c1f0d16
This commit is contained in:
Mathias Jakobsen 2023-10-25 12:11:41 +01:00 • committed by Copybot
parent 1e810a987f
commit 7da8e3b646
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
services/web/frontend/js/features/source-editor/extensions/visual/visual-theme.ts
View file

@ -1,7 +1,7 @@
import { EditorView } from '@codemirror/view'
import { HighlightStyle, syntaxHighlighting } from '@codemirror/language'
import { tags } from '@lezer/highlight'
import { Annotation, Compartment, Extension } from '@codemirror/state'
import { Annotation, Compartment, Extension, Facet } from '@codemirror/state'
/**
* A syntax highlighter for content types that are only styled in the visual editor.
@ -427,13 +427,24 @@ const mainVisualTheme = EditorView.theme({
const contentWidthThemeConf = new Compartment()
const changeContentWidthAnnotation = Annotation.define<boolean>()
const currentWidth = Facet.define<string, string>({
combine: values => {
if (values.length === 0) {
return ''
}
return values[0]
},
})
function createContentWidthTheme(contentWidth: string) {
return EditorView.theme({
'&.cm-editor': {
'--content-width': contentWidth,
},
})
return [
currentWidth.of(contentWidth),
EditorView.theme({
'&.cm-editor': {
'--content-width': contentWidth,
},
}),
]
}
const contentWidthSetter = EditorView.updateListener.of(update => {
@ -446,9 +457,18 @@ const contentWidthSetter = EditorView.updateListener.of(update => {
) {
return
}
const viewWidth = `${update.view.contentDOM.offsetWidth}px`
const currentConfiguredWidth = update.state.facet(currentWidth)
if (currentConfiguredWidth === viewWidth) {
// We already have the correct width stored
return
}
update.view.dispatch({
effects: contentWidthThemeConf.reconfigure(
createContentWidthTheme(update.view.contentDOM.offsetWidth + 'px')
createContentWidthTheme(viewWidth)
),
// Set the selection explicitly to force the cursor to redraw if CM6
// fails to spot a change in geometry, which sometimes seems to happen