diff --git a/index.html b/index.html index b9eb29e..fbdf310 100644 --- a/index.html +++ b/index.html @@ -4,13 +4,9 @@ - Tauri + React + Typescript - - - - - - + Nextcloud Notes + + diff --git a/package.json b/package.json index 1e941c8..9a8272c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nextcloud-notes-tauri", "private": true, - "version": "0.1.3", + "version": "0.1.4", "type": "module", "scripts": { "dev": "vite", diff --git a/public/fonts/Average-Regular.ttf b/public/fonts/Average-Regular.ttf new file mode 100644 index 0000000..c059702 Binary files /dev/null and b/public/fonts/Average-Regular.ttf differ diff --git a/public/fonts/CrimsonPro-Italic-VariableFont_wght.ttf b/public/fonts/CrimsonPro-Italic-VariableFont_wght.ttf new file mode 100644 index 0000000..0bae456 Binary files /dev/null and b/public/fonts/CrimsonPro-Italic-VariableFont_wght.ttf differ diff --git a/public/fonts/CrimsonPro-VariableFont_wght.ttf b/public/fonts/CrimsonPro-VariableFont_wght.ttf new file mode 100644 index 0000000..c383cca Binary files /dev/null and b/public/fonts/CrimsonPro-VariableFont_wght.ttf differ diff --git a/public/fonts/Inconsolata-VariableFont_wdth,wght.ttf b/public/fonts/Inconsolata-VariableFont_wdth,wght.ttf new file mode 100644 index 0000000..2739432 Binary files /dev/null and b/public/fonts/Inconsolata-VariableFont_wdth,wght.ttf differ diff --git a/public/fonts/Merriweather-Italic-VariableFont_opsz,wdth,wght.ttf b/public/fonts/Merriweather-Italic-VariableFont_opsz,wdth,wght.ttf new file mode 100644 index 0000000..24e59dc Binary files /dev/null and b/public/fonts/Merriweather-Italic-VariableFont_opsz,wdth,wght.ttf differ diff --git a/public/fonts/Merriweather-VariableFont_opsz,wdth,wght.ttf b/public/fonts/Merriweather-VariableFont_opsz,wdth,wght.ttf new file mode 100644 index 0000000..558f666 Binary files /dev/null and b/public/fonts/Merriweather-VariableFont_opsz,wdth,wght.ttf differ diff --git a/public/fonts/RobotoMono-VariableFont_wght.ttf b/public/fonts/RobotoMono-VariableFont_wght.ttf new file mode 100644 index 0000000..3a2d704 Binary files /dev/null and b/public/fonts/RobotoMono-VariableFont_wght.ttf differ diff --git a/public/fonts/RobotoSerif-Italic-VariableFont_GRAD,opsz,wdth,wght.ttf b/public/fonts/RobotoSerif-Italic-VariableFont_GRAD,opsz,wdth,wght.ttf new file mode 100644 index 0000000..86d11b7 Binary files /dev/null and b/public/fonts/RobotoSerif-Italic-VariableFont_GRAD,opsz,wdth,wght.ttf differ diff --git a/public/fonts/RobotoSerif-VariableFont_GRAD,opsz,wdth,wght.ttf b/public/fonts/RobotoSerif-VariableFont_GRAD,opsz,wdth,wght.ttf new file mode 100644 index 0000000..2ae12da Binary files /dev/null and b/public/fonts/RobotoSerif-VariableFont_GRAD,opsz,wdth,wght.ttf differ diff --git a/public/fonts/SourceCodePro-VariableFont_wght.ttf b/public/fonts/SourceCodePro-VariableFont_wght.ttf new file mode 100644 index 0000000..cf59205 Binary files /dev/null and b/public/fonts/SourceCodePro-VariableFont_wght.ttf differ diff --git a/public/fonts/fonts.css b/public/fonts/fonts.css new file mode 100644 index 0000000..df79abb --- /dev/null +++ b/public/fonts/fonts.css @@ -0,0 +1,90 @@ +/* Editor Fonts (Monospace) */ + +/* Source Code Pro */ +@font-face { + font-family: 'Source Code Pro'; + font-style: normal; + font-weight: 200 900; + font-display: swap; + src: url('./SourceCodePro-VariableFont_wght.ttf') format('truetype'); +} + +/* Roboto Mono */ +@font-face { + font-family: 'Roboto Mono'; + font-style: normal; + font-weight: 100 700; + font-display: swap; + src: url('./RobotoMono-VariableFont_wght.ttf') format('truetype'); +} + +/* Inconsolata */ +@font-face { + font-family: 'Inconsolata'; + font-style: normal; + font-weight: 200 900; + font-display: swap; + src: url('./Inconsolata-VariableFont_wdth,wght.ttf') format('truetype'); +} + +/* Preview Fonts (Serif) */ + +/* Merriweather */ +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 300 900; + font-display: swap; + src: url('./Merriweather-VariableFont_opsz,wdth,wght.ttf') format('truetype'); +} + +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 300 900; + font-display: swap; + src: url('./Merriweather-Italic-VariableFont_opsz,wdth,wght.ttf') format('truetype'); +} + +/* Crimson Pro */ +@font-face { + font-family: 'Crimson Pro'; + font-style: normal; + font-weight: 200 900; + font-display: swap; + src: url('./CrimsonPro-VariableFont_wght.ttf') format('truetype'); +} + +@font-face { + font-family: 'Crimson Pro'; + font-style: italic; + font-weight: 200 900; + font-display: swap; + src: url('./CrimsonPro-Italic-VariableFont_wght.ttf') format('truetype'); +} + +/* Roboto Serif */ +@font-face { + font-family: 'Roboto Serif'; + font-style: normal; + font-weight: 100 900; + font-display: swap; + src: url('./RobotoSerif-VariableFont_GRAD,opsz,wdth,wght.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto Serif'; + font-style: italic; + font-weight: 100 900; + font-display: swap; + src: url('./RobotoSerif-Italic-VariableFont_GRAD,opsz,wdth,wght.ttf') format('truetype'); +} + +/* Average */ +@font-face { + font-family: 'Average'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('./Average-Regular.ttf') format('truetype'); +} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 64cf905..c24d800 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Nextcloud Notes", - "version": "0.1.3", + "version": "0.1.4", "identifier": "com.davidrelich.nextcloud-notes", "build": { "beforeDevCommand": "npm run dev", diff --git a/src/components/NoteEditor.tsx b/src/components/NoteEditor.tsx index 9d2c714..ebabf4b 100644 --- a/src/components/NoteEditor.tsx +++ b/src/components/NoteEditor.tsx @@ -64,8 +64,16 @@ export function NoteEditor({ note, onUpdateNote, onUnsavedChanges, categories, i // Use setTimeout to ensure DOM has updated setTimeout(() => { if (textareaRef.current) { + // Save cursor position and scroll position + const cursorPosition = textareaRef.current.selectionStart; + const scrollTop = textareaRef.current.scrollTop; + textareaRef.current.style.height = 'auto'; textareaRef.current.style.height = textareaRef.current.scrollHeight + 'px'; + + // Restore cursor position and scroll position + textareaRef.current.setSelectionRange(cursorPosition, cursorPosition); + textareaRef.current.scrollTop = scrollTop; } }, 0); } @@ -608,42 +616,6 @@ export function NoteEditor({ note, onUpdateNote, onUnsavedChanges, categories, i - {/* Attachment Upload */} - - - {/* Preview Toggle */}