fix: editor issues on mobile. Temp fix #1365 #1366
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| <script lang="ts"> | ||
| import { onDestroy, onMount } from 'svelte'; | ||
| import { Compartment, EditorState, type Extension } from '@codemirror/state'; | ||
| import { EditorView, keymap, type ViewUpdate } from '@codemirror/view'; | ||
| import { defaultKeymap, indentWithTab, historyKeymap } from '@codemirror/commands'; | ||
| import { history } from '@codemirror/history'; | ||
| import { StreamLanguage } from '@codemirror/language'; | ||
| import { linter, lintGutter, type Diagnostic, type LintSource } from '@codemirror/lint'; | ||
| import { yaml } from '@codemirror/lang-yaml'; | ||
| import { properties } from '@codemirror/legacy-modes/mode/properties'; | ||
| import jsyaml from 'js-yaml'; | ||
| import { arcaneCodeMirrorTheme } from './theme'; | ||
|
|
||
| type CodeLanguage = 'yaml' | 'env'; | ||
|
|
||
| let { | ||
| value = $bindable(''), | ||
| language = 'yaml' as CodeLanguage, | ||
| readOnly = false, | ||
| fontSize = '12px', | ||
| autoHeight = false | ||
| }: { | ||
| value: string; | ||
| language: CodeLanguage; | ||
| readOnly?: boolean; | ||
| fontSize?: string; | ||
| autoHeight?: boolean; | ||
| } = $props(); | ||
|
|
||
| let container = $state<HTMLDivElement>(); | ||
| let view = $state.raw<EditorView | null>(null); | ||
|
|
||
| const languageCompartment = new Compartment(); | ||
| const readOnlyCompartment = new Compartment(); | ||
| const themeCompartment = new Compartment(); | ||
|
|
||
| const yamlLinter: LintSource = (view): Diagnostic[] => { | ||
| const diagnostics: Diagnostic[] = []; | ||
| try { | ||
| jsyaml.load(view.state.doc.toString()); | ||
| } catch (e: unknown) { | ||
| const err = e as { mark?: { position: number }; message?: string }; | ||
| const start = err.mark?.position || 0; | ||
| const end = err.mark?.position !== undefined ? Math.max(start + 1, err.mark.position + 1) : start + 1; | ||
| diagnostics.push({ | ||
| from: start, | ||
| to: end, | ||
| severity: 'error', | ||
| message: err.message || 'YAML error' | ||
| }); | ||
| } | ||
| return diagnostics; | ||
| }; | ||
|
|
||
| function getLanguageExtensions(lang: CodeLanguage): Extension[] { | ||
| if (lang === 'yaml') { | ||
| const exts: Extension[] = [yaml()]; | ||
| if (!readOnly) { | ||
| exts.push(lintGutter(), linter(yamlLinter)); | ||
| } | ||
| return exts; | ||
| } | ||
| // Best-effort .env highlighting (key/value) | ||
| return [StreamLanguage.define(properties)]; | ||
| } | ||
|
|
||
| function getThemeExtensions(size: string) { | ||
| return EditorView.theme({ | ||
| '&': { | ||
| fontSize: size | ||
| }, | ||
| '.cm-content': { | ||
| padding: '12px' | ||
|
Contributor
There was a problem hiding this comment. Padding inconsistency between editors: CodeMirror uses 12px padding while Monaco uses Prompt To Fix With AIThis is a comment left during a code review.
Path: frontend/src/lib/components/codemirror-code-editor/editor.svelte
Line: 73:73
Comment:
Padding inconsistency between editors: CodeMirror uses 12px padding while Monaco uses `padding: { top: 10, bottom: 10 }` (monaco-code-editor/editor.svelte line 117). This creates a different visual appearance when switching between desktop and mobile. Consider standardizing the padding values.
How can I resolve this? If you propose a fix, please make it concise. |
||
| }, | ||
| '&.cm-editor[contenteditable=false]': { | ||
| cursor: 'not-allowed' | ||
| }, | ||
| '.cm-content[contenteditable=false]': { | ||
| cursor: 'not-allowed' | ||
| }, | ||
| '.cm-scroller': { | ||
| overflow: 'auto' | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function updateAutoHeight() { | ||
| if (!view || !container || !autoHeight) return; | ||
| const scroller = view.dom.querySelector('.cm-scroller') as HTMLElement | null; | ||
| if (!scroller) return; | ||
| container.style.height = `${scroller.scrollHeight}px`; | ||
| } | ||
|
|
||
| onMount(() => { | ||
| if (!container) return; | ||
|
|
||
| // Match prior behavior: compute theme from CSS variables at runtime. | ||
| const theme = arcaneCodeMirrorTheme(); | ||
|
|
||
| const initialState = EditorState.create({ | ||
| doc: value, | ||
| extensions: [ | ||
| history(), | ||
| keymap.of([indentWithTab, ...defaultKeymap, ...historyKeymap]), | ||
| EditorView.lineWrapping, | ||
| languageCompartment.of(getLanguageExtensions(language)), | ||
| readOnlyCompartment.of([EditorView.editable.of(!readOnly), EditorState.readOnly.of(readOnly)]), | ||
| themeCompartment.of(getThemeExtensions(fontSize)), | ||
| theme, | ||
| EditorView.updateListener.of((update: ViewUpdate) => { | ||
| if (update.docChanged) { | ||
| value = update.state.doc.toString(); | ||
| } | ||
| if (autoHeight) { | ||
| requestAnimationFrame(updateAutoHeight); | ||
| } | ||
| }) | ||
| ] | ||
| }); | ||
|
|
||
| view = new EditorView({ | ||
| state: initialState, | ||
| parent: container | ||
| }); | ||
|
|
||
| if (autoHeight) { | ||
| requestAnimationFrame(updateAutoHeight); | ||
| } | ||
| }); | ||
|
|
||
| onDestroy(() => { | ||
| view?.destroy(); | ||
| view = null; | ||
| }); | ||
|
|
||
| $effect(() => { | ||
| if (!view) return; | ||
| view.dispatch({ | ||
| effects: languageCompartment.reconfigure(getLanguageExtensions(language)) | ||
| }); | ||
| }); | ||
|
|
||
| $effect(() => { | ||
| if (!view) return; | ||
| view.dispatch({ | ||
| effects: readOnlyCompartment.reconfigure([EditorView.editable.of(!readOnly), EditorState.readOnly.of(readOnly)]) | ||
| }); | ||
| }); | ||
|
|
||
| $effect(() => { | ||
| if (!view) return; | ||
| view.dispatch({ | ||
| effects: themeCompartment.reconfigure(getThemeExtensions(fontSize)) | ||
| }); | ||
| }); | ||
|
|
||
| $effect(() => { | ||
| if (!view) return; | ||
| const current = view.state.doc.toString(); | ||
| if (value === current) return; | ||
| view.dispatch({ | ||
| changes: { from: 0, to: current.length, insert: value } | ||
| }); | ||
| }); | ||
|
|
||
| $effect(() => { | ||
| if (!container) return; | ||
| if (!autoHeight) { | ||
| container.style.height = ''; | ||
| return; | ||
| } | ||
| requestAnimationFrame(updateAutoHeight); | ||
| }); | ||
| </script> | ||
|
|
||
| <div bind:this={container} class="relative min-h-0 w-full overflow-hidden {autoHeight ? '' : 'h-full'}"></div> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| import { tags as t } from '@lezer/highlight'; | ||
| import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes'; | ||
|
|
||
| function getAccentColor(): string { | ||
| if (typeof document === 'undefined') return 'oklch(0.606 0.25 292.717)'; | ||
| const primary = getComputedStyle(document.documentElement).getPropertyValue('--primary').trim(); | ||
| return primary || 'oklch(0.606 0.25 292.717)'; | ||
| } | ||
|
|
||
| function getAccentColorWithAlpha(alpha: number): string { | ||
| const accent = getAccentColor(); | ||
|
|
||
| if (accent.startsWith('oklch')) { | ||
| const hasAlpha = accent.includes('/'); | ||
| if (hasAlpha) { | ||
| return accent.replace(/\/\s*[\d.]+\s*\)/, ` / ${alpha})`); | ||
| } | ||
| return accent.replace(')', ` / ${alpha})`); | ||
| } | ||
|
|
||
| if (accent.startsWith('#') && accent.length >= 7) { | ||
| const r = parseInt(accent.slice(1, 3), 16); | ||
| const g = parseInt(accent.slice(3, 5), 16); | ||
| const b = parseInt(accent.slice(5, 7), 16); | ||
| return `rgba(${r}, ${g}, ${b}, ${alpha})`; | ||
| } | ||
|
|
||
| return accent; | ||
| } | ||
|
|
||
| export function arcaneCodeMirrorTheme(options?: Partial<CreateThemeOptions>) { | ||
| const { theme = 'dark', settings = {}, styles = [] } = options || {}; | ||
|
|
||
| const accentColor = getAccentColor(); | ||
| const accentWithAlpha35 = getAccentColorWithAlpha(0.35); | ||
| const accentWithAlpha15 = getAccentColorWithAlpha(0.15); | ||
| const accentWithAlpha05 = getAccentColorWithAlpha(0.05); | ||
|
|
||
| // Keep backgrounds transparent so the editor inherits the card background. | ||
| const dynamicSettings: CreateThemeOptions['settings'] = { | ||
| background: 'transparent', | ||
| foreground: 'hsl(var(--foreground))', | ||
| caret: accentColor, | ||
| selection: accentWithAlpha35, | ||
| selectionMatch: accentWithAlpha15, | ||
| lineHighlight: accentWithAlpha05, | ||
| gutterBackground: 'transparent', | ||
| gutterForeground: 'hsl(var(--muted-foreground))', | ||
| gutterActiveForeground: 'hsl(var(--foreground))', | ||
| gutterBorder: 'transparent', | ||
|
|
||
| fontFamily: | ||
| '"Geist Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace' | ||
|
Comment on lines
+52
to
+53
Contributor
There was a problem hiding this comment. Font family inconsistency: CodeMirror includes "Geist Mono" as the primary font, but Monaco editor (monaco-code-editor/editor.svelte line 115) uses 'ui-monospace' as primary and doesn't include "Geist Mono" at all. Since these editors display the same content on different devices, consider aligning the font stacks for visual consistency. Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time! Prompt To Fix With AIThis is a comment left during a code review.
Path: frontend/src/lib/components/codemirror-code-editor/theme.ts
Line: 52:53
Comment:
Font family inconsistency: CodeMirror includes "Geist Mono" as the primary font, but Monaco editor (monaco-code-editor/editor.svelte line 115) uses 'ui-monospace' as primary and doesn't include "Geist Mono" at all. Since these editors display the same content on different devices, consider aligning the font stacks for visual consistency.
<sub>Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!</sub>
How can I resolve this? If you propose a fix, please make it concise. |
||
| }; | ||
|
|
||
| // These colors mirror the project's previous CodeMirror implementation to ensure | ||
| // highlighting is clearly visible on mobile. | ||
| const dynamicStyles: CreateThemeOptions['styles'] = [ | ||
| { tag: [t.comment, t.meta], color: 'hsl(var(--muted-foreground))' }, | ||
| { tag: [t.keyword, t.modifier, t.operatorKeyword], color: '#ff7b72' }, | ||
|
|
||
| { tag: [t.typeName, t.namespace, t.number, t.atom, t.bool], color: '#ffa657' }, | ||
| { tag: [t.function(t.variableName), t.labelName], color: accentColor }, | ||
| { tag: [t.className, t.definition(t.variableName), t.propertyName, t.attributeName], color: '#d2a8ff' }, | ||
|
|
||
| { tag: [t.variableName, t.name], color: 'hsl(var(--foreground))' }, | ||
| { tag: [t.string, t.inserted, t.regexp, t.special(t.string)], color: '#7ee787' }, | ||
| { tag: [t.operator, t.url, t.link, t.escape], color: '#a5d6ff' }, | ||
|
|
||
| { tag: [t.separator, t.punctuation], color: 'hsl(var(--muted-foreground))' }, | ||
|
|
||
| { tag: t.heading, color: 'hsl(var(--foreground))', fontWeight: 'bold' }, | ||
| { tag: t.strong, fontWeight: 'bold' }, | ||
| { tag: t.emphasis, fontStyle: 'italic' }, | ||
| { tag: t.strikethrough, textDecoration: 'line-through' }, | ||
| { tag: t.invalid, color: 'hsl(var(--destructive))' }, | ||
| { tag: t.link, textDecoration: 'underline' } | ||
| ]; | ||
|
|
||
| return createTheme({ | ||
| theme, | ||
| settings: { ...dynamicSettings, ...settings }, | ||
| styles: [...dynamicStyles, ...styles] | ||
| }); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
Math.maxcall is redundant here since both arguments evaluate to the same value whenerr.mark.positionis defined.When
err.mark?.positionexists,startis already set toerr.mark.position(line 43), so this becomesMath.max(err.mark.position + 1, err.mark.position + 1), which is justerr.mark.position + 1. Consider simplifying:Prompt To Fix With AI