Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
29 changes: 21 additions & 8 deletions src/renderer/components/editor/header/Header.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<script setup lang="ts">
import { useApp, useSnippets, useSnippetUpdate } from '@/composables'
import {
useApp,
useEditableField,
useSnippets,
useSnippetUpdate,
} from '@/composables'
import { i18n } from '@/electron'

import {
Expand Down Expand Up @@ -30,11 +35,13 @@ const { addToUpdateQueue } = useSnippetUpdate()

const isShowDescription = ref(false)

const name = computed({
get() {
return selectedSnippet?.value?.name
},
set(v: string) {
const {
model: name,
onFocus: onNameFocus,
onBlur,
} = useEditableField(
() => selectedSnippet?.value?.name,
(v) => {
addToUpdateQueue(selectedSnippet.value!.id, {
name: v,
description: selectedSnippet.value!.description,
Expand All @@ -43,7 +50,12 @@ const name = computed({
isFavorites: selectedSnippet.value!.isFavorites,
})
},
})
)

function onNameBlur() {
onBlur()
isFocusedSnippetName.value = false
}

const isShowJsonVisualizerAction = computed(
() => selectedSnippetContent.value?.language === 'json',
Expand Down Expand Up @@ -86,7 +98,8 @@ function onJsonVisualizerToggle() {
variant="ghost"
class="w-full truncate px-0"
:select="isFocusedSnippetName"
@blur="isFocusedSnippetName = false"
@focus="onNameFocus"
@blur="onNameBlur"
/>
<div class="ml-2 flex">
<UiActionButton
Expand Down
29 changes: 21 additions & 8 deletions src/renderer/components/notes/NotesEditorPane.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<script setup lang="ts">
import * as Select from '@/components/ui/shadcn/select'
import { useNotes, useNotesApp, useNoteUpdate } from '@/composables'
import {
useEditableField,
useNotes,
useNotesApp,
useNoteUpdate,
} from '@/composables'
import { i18n } from '@/electron'
import { router, RouterName } from '@/router'
import {
Expand Down Expand Up @@ -75,16 +80,23 @@ function onPresentationToggle() {
router.push({ name: RouterName.notesPresentation })
}

const name = computed({
get() {
return selectedNote.value?.name
},
set(v: string) {
const {
model: name,
onFocus: onNameFocus,
onBlur,
} = useEditableField(
() => selectedNote.value?.name,
(v) => {
if (selectedNote.value) {
addToUpdateQueue(selectedNote.value.id, { name: v })
}
},
})
)

function onNameBlur() {
onBlur()
isFocusedNoteName.value = false
}

const editorContent = ref('')

Expand Down Expand Up @@ -128,7 +140,8 @@ const textStats = computed(() => getTextStats(content.value))
variant="ghost"
class="w-full truncate px-0"
:select="isFocusedNoteName"
@blur="isFocusedNoteName = false"
@focus="onNameFocus"
@blur="onNameBlur"
/>
<div class="ml-2 flex h-7 items-center">
<UiActionButton
Expand Down
1 change: 1 addition & 0 deletions src/renderer/composables/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export * from './spaces/notes'
export * from './useApp'
export * from './useCopyToClipboard'
export * from './useDialog'
export * from './useEditableField'
export * from './useEditor'
export * from './useFolders'
export * from './useNotesEditor'
Expand Down
37 changes: 37 additions & 0 deletions src/renderer/composables/useEditableField.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
type SourceFn = () => string | undefined

export function useEditableField(
source: SourceFn,
onUpdate: (value: string) => void,
) {
const localValue = ref('')
const isFocused = ref(false)

watch(
source,
(newValue) => {
if (!isFocused.value) {
localValue.value = newValue ?? ''
}
},
{ immediate: true },
)

const model = computed({
get: () => localValue.value,
set: (v: string) => {
localValue.value = v
onUpdate(v)
},
})

function onFocus() {
isFocused.value = true
}

function onBlur() {
isFocused.value = false
}

return { model, onFocus, onBlur }
}