Skip to content

refactor: save editor view state in store #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2023
Merged

refactor: save editor view state in store #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
568f1cf
refactor: save the code editor view state in the store
Sight-wcg Jul 7, 2023
d531da1
chore: update code
Sight-wcg Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/monaco/Monaco.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ onMounted(async () => {
} else {
watch(
() => props.filename,
() => {
(_, oldFilename) => {
if (!editorInstance) return
const file = store.state.files[props.filename]
if (!file) return null
Expand All @@ -114,10 +114,16 @@ onMounted(async () => {
file.language,
file.code
)

const oldFile = oldFilename ? store.state.files[oldFilename] : null
if (oldFile) {
oldFile.editorViewState = editorInstance.saveViewState()
}

editorInstance.setModel(model)

if (file.selection) {
editorInstance.setSelection(file.selection)
if (file.editorViewState) {
editorInstance.restoreViewState(file.editorViewState)
editorInstance.focus()
}
},
Expand All @@ -135,14 +141,6 @@ onMounted(async () => {
emit('change', editorInstance.getValue())
})

editorInstance.onDidChangeCursorSelection((e) => {
const selection = e.selection
const file = store.state.files[props.filename]
if (file) {
file.selection = selection
}
})

// update theme
watch(replTheme, (n) => {
editorInstance.updateOptions({
Expand Down
4 changes: 2 additions & 2 deletions src/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
SFCTemplateCompileOptions,
} from 'vue/compiler-sfc'
import { OutputModes } from './output/types'
import type { Selection } from 'monaco-editor-core'
import type { editor } from 'monaco-editor-core'

const defaultMainFile = 'src/App.vue'

Expand Down Expand Up @@ -52,7 +52,7 @@ export class File {
css: '',
ssr: '',
}
selection: Selection | null = null
editorViewState: editor.ICodeEditorViewState | null = null

constructor(filename: string, code = '', hidden = false) {
this.filename = filename
Expand Down