Skip to content

feat(ui): add the draft state * on code editor #1131

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
antfu merged 3 commits into from
Apr 21, 2022
Merged

feat(ui): add the draft state * on code editor #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
413f392
feat(ui): add the draft state * on code editor
userquin Apr 9, 2022
8e5475f
chore: use content to update the server code
userquin Apr 9, 2022
3b65724
chore: add mark on code tab
userquin Apr 9, 2022
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
8 changes: 6 additions & 2 deletions packages/ui/client/components/FileDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type { ModuleGraphData } from '#types'

const data = ref<ModuleGraphData>({ externalized: [], graph: {}, inlined: [] })
const graph = ref<ModuleGraph>({ nodes: [], links: [] })
const draft = ref(false)

debouncedWatch(
current,
Expand All @@ -32,6 +33,9 @@ const changeViewMode = (view: Params['view']) => {
const consoleCount = computed(() => {
return currentLogs.value?.reduce((s, { size }) => s + size, 0) ?? 0
})
function onDraft(value: boolean) {
draft.value = value
}
</script>

<template>
Expand Down Expand Up @@ -72,7 +76,7 @@ const consoleCount = computed(() => {
:class="{ 'tab-button-active': viewMode === 'editor' }"
@click="changeViewMode('editor')"
>
Code
{{ draft ? '*&#160;': '' }}Code
</button>
<button
tab-button
Expand All @@ -86,7 +90,7 @@ const consoleCount = computed(() => {

<div flex flex-col flex-1 overflow="hidden">
<ViewModuleGraph v-show="viewMode === 'graph'" :graph="graph" />
<ViewEditor v-if="viewMode === 'editor'" :key="current.filepath" :file="current" />
<ViewEditor v-if="viewMode === 'editor'" :key="current.filepath" :file="current" @draft="onDraft" />
<ViewConsoleOutput v-else-if="viewMode === 'console'" :file="current" />
<ViewReport v-else-if="!viewMode" :file="current" />
</div>
Expand Down
25 changes: 22 additions & 3 deletions packages/ui/client/components/views/ViewEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,22 @@ import type { File } from '#types'
const props = defineProps<{
file?: File
}>()
const emit = defineEmits<{ (event: 'draft', value: boolean): void }>()

const code = ref('')
const serverCode = shallowRef<string | undefined>(undefined)
const draft = ref(false)
watch(() => props.file,
async() => {
if (!props.file || !props.file?.filepath) {
code.value = ''
serverCode.value = code.value
draft.value = false
return
}
code.value = await client.rpc.readFile(props.file.filepath)
serverCode.value = code.value
draft.value = false
},
{ immediate: true },
)
Expand Down Expand Up @@ -44,8 +51,16 @@ useResizeObserver(editor, () => {
cm.value?.refresh()
})

watch([cm, failed], () => {
if (!cm.value) {
function codemirrorChanges() {
draft.value = serverCode.value !== cm.value!.getValue()
}

watch(draft, (d) => {
emit('draft', d)
}, { immediate: true })

watch([cm, failed], ([cmValue]) => {
if (!cmValue) {
clearListeners()
return
}
Expand All @@ -57,6 +72,8 @@ watch([cm, failed], () => {
widgets.length = 0
handles.length = 0

cmValue.on('changes', codemirrorChanges)

failed.value.forEach((i) => {
const e = i.result?.error
const stacks = (e?.stacks || []).filter(i => i.file && i.file === props.file?.filepath)
Expand Down Expand Up @@ -86,13 +103,15 @@ watch([cm, failed], () => {
}
})
if (!hasBeenEdited.value)
cm.value?.clearHistory() // Prevent getting access to initial state
cmValue.clearHistory() // Prevent getting access to initial state
}, 100)
}, { flush: 'post' })

async function onSave(content: string) {
hasBeenEdited.value = true
await client.rpc.writeFile(props.file!.filepath, content)
serverCode.value = content
draft.value = false
}
</script>

Expand Down