Skip to content
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.

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

feat: add autoSave toggle button #283

Merged
merged 6 commits into from
Sep 8, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
17 changes: 12 additions & 5 deletions src/Repl.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import SplitPane from './SplitPane.vue'
import Output from './output/Output.vue'
import { type Store, useStore } from './store'
import { computed, provide, toRefs, useTemplateRef } from 'vue'
import { computed, provide, toRefs, useTemplateRef, ref } from 'vue'
import {
type EditorComponentType,
injectKeyPreviewRef,
Expand All @@ -17,7 +17,6 @@ export interface Props {
editor: EditorComponentType
store?: Store
autoResize?: boolean
autoSave?: boolean // auto save and compile, default to true, if false, user need to press ctrl + s to save and compile
showCompileOutput?: boolean
showImportMap?: boolean
showTsConfig?: boolean
Expand All @@ -42,12 +41,16 @@ export interface Props {
}
}

const autoSave = defineModel<boolean>()
const switchAutoSave = () => {
autoSave.value = !autoSave.value
}

const props = withDefaults(defineProps<Props>(), {
theme: 'light',
previewTheme: false,
store: () => useStore(),
autoResize: true,
autoSave: true,
showCompileOutput: true,
showImportMap: true,
showTsConfig: true,
Expand All @@ -63,14 +66,18 @@ if (!props.editor) {
throw new Error('The "editor" prop is now required.')
}

const outputRef = useTemplateRef('output')
const outputRef = useTemplateRef<typeof Output>('output')
btea marked this conversation as resolved.
Show resolved Hide resolved

props.store.init()

const editorSlotName = computed(() => (props.layoutReverse ? 'right' : 'left'))
const outputSlotName = computed(() => (props.layoutReverse ? 'left' : 'right'))

provide(injectKeyProps, toRefs(props))
provide(injectKeyProps, {
...toRefs(props),
autoSave,
switchAutoSave: ref(switchAutoSave),
})
provide(
injectKeyPreviewRef,
computed(() => outputRef.value?.previewRef?.container ?? null),
Expand Down
2 changes: 1 addition & 1 deletion src/codemirror/CodeMirror.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const props = withDefaults(defineProps<Props>(), {

const emit = defineEmits<(e: 'change', value: string) => void>()

const el = useTemplateRef('container')
const el = useTemplateRef<HTMLElement>('container')
const { autoResize, autoSave } = inject(injectKeyProps)!
let editor: CodeMirror.Editor

Expand Down
10 changes: 7 additions & 3 deletions src/editor/EditorContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import FileSelector from './FileSelector.vue'
import Message from '../Message.vue'
import { debounce } from '../utils'
import { inject, ref, watch } from 'vue'
import MessageToggle from './MessageToggle.vue'
import ToggleButton from './ToggleButton.vue'
import { type EditorComponentType, injectKeyProps } from '../types'

const SHOW_ERROR_KEY = 'repl_show_error'
Expand All @@ -12,8 +12,9 @@ const props = defineProps<{
editorComponent: EditorComponentType
}>()

const { store } = inject(injectKeyProps)!
const { store, autoSave, switchAutoSave } = inject(injectKeyProps)!
const showMessage = ref(getItem())
const auto_save = ref(autoSave.value)

const onChange = debounce((code: string) => {
store.value.activeFile.code = code
Expand All @@ -31,6 +32,8 @@ function getItem() {
watch(showMessage, () => {
setItem()
})

watch(auto_save, switchAutoSave.value)
</script>

<template>
Expand All @@ -42,7 +45,8 @@ watch(showMessage, () => {
@change="onChange"
/>
<Message v-show="showMessage" :err="store.errors[0]" />
<MessageToggle v-model="showMessage" />
<ToggleButton v-model="showMessage" />
<ToggleButton v-model="auto_save" text="Auto Save" bottom="48px" />
</div>
</template>

Expand Down
19 changes: 15 additions & 4 deletions src/editor/MessageToggle.vue → src/editor/ToggleButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,24 @@
import { inject } from 'vue'
import { injectKeyProps } from '../../src/types'

withDefaults(
defineProps<{
text?: string
bottom?: string
}>(),
{
text: 'Show Error',
bottom: '18px',
},
)

const { editorOptions } = inject(injectKeyProps)!
const visible = defineModel<boolean>()
const active = defineModel<boolean>()
</script>

<template>
<div class="wrapper" @click="visible = !visible">
<span>{{ editorOptions?.showErrorText || 'Show Error' }}</span>
<div class="wrapper" @click="active = !active">
<span>{{ editorOptions?.showErrorText || text }}</span>
<div class="toggle" :class="[{ active: modelValue }]">
<div class="indicator" />
</div>
Expand All @@ -18,7 +29,7 @@ const visible = defineModel<boolean>()
<style scoped>
.wrapper {
position: absolute;
bottom: 8px;
bottom: v-bind(bottom);
right: 15px;
z-index: 11;
display: flex;
Expand Down
12 changes: 10 additions & 2 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,16 @@ export type EditorComponentType = Component<EditorProps>

export type OutputModes = 'preview' | EditorMode

export const injectKeyProps: InjectionKey<ToRefs<Required<Props>>> =
Symbol('props')
export const injectKeyProps: InjectionKey<
ToRefs<
Required<
Props & {
autoSave: boolean | undefined
switchAutoSave: () => void
}
>
>
> = Symbol('props')
export const injectKeyPreviewRef: InjectionKey<
ComputedRef<HTMLDivElement | null>
> = Symbol('preview-ref')