From b80d6bd930c9d35efad5eb2cd0f9a7635c813f29 Mon Sep 17 00:00:00 2001 From: Xylight Date: Mon, 4 Mar 2024 18:30:57 -0800 Subject: [PATCH] feat: add image pasting, close #234 --- bun.lockb | Bin 294620 -> 294620 bytes package.json | 2 +- .../components/markdown/MarkdownEditor.svelte | 46 ++++++++++++++++-- src/lib/ui/colors.ts | 17 ++----- src/routes/+layout.svelte | 3 +- src/routes/theme/+page.svelte | 44 ++++++++++++++++- 6 files changed, 90 insertions(+), 22 deletions(-) diff --git a/bun.lockb b/bun.lockb index 35b3e761a01f2b4d6a31c6ae9acc786571ae7d6c..ab3293e021fa9beada59e0d4ad582d1264ff147e 100755 GIT binary patch delta 743 zcmaiyTSyd97{|{!wqBsirnJ4RW+sFpp)I+tkYwa4X@o+g z5N@VJoi6*(1#B}~iZ#YEp%Q~G8)`|EV)f#K5I!VWUZQW*o;%FPkN^MspKs=HW^!3S zxvak=nXQ)O2WJBt#F*K^P~D*A$Rq1aaNGUDj2$swcz_5xMyRCD15eB98@o8@nb=CGNMHON(2>9S6W4VOtyjm8Bz zjeJYWW%FUweo#bC*^x`ySlO8EAfH*e91zdR*X<5c$H`yp4)z($-wR13e~08ECzoeA z!dJ6*hXe$x5DGpR9Z&@9|NBtx3baGq4fGEVLgT&P4ok)dduNV}$polS<82qn=WV7x+L%;*eWRz==gFw9JJwL2;XCC%N!@-XMagVuN}`qE bMJ657X>F89kGi5_lyiQD!OBP{vu^e;hV|KG delta 745 zcmccfSMbhX!3lZ_OS+oMt@b}V@LXnj)#*-)`-^WMx9#n`S?~RL-Zhou5BVngy|PVX zVqg$rU}zBKWMB{g(g{Es#193E3j*moqheqbC8-YCA$+0VJ zIDiZ;obZ=Ne6DNlfk2bF@28h?slD&u%)YIizia*a%6`-Byn>7Y?9=y3GI~#6 zA;HKyT~vzEn^AIlq7-BJ^ax3yz)_HZ^z=Xppa6#yP++SBP(XG%qa;vZ2S^|lsJUH0 znsK{;G*iG%M*r!FSC|g7Dg*tZvR(5k(_$t@@9k%=GaY6F8Z+@8lQE|(P)ZtzrKX>~ z$24133docIae-J8ie-Q_C}iZex87&ck>FyCGt@KDGi6|Kng0GelQCoH^xfZ?Bqd-m zoyY2&A^H3EIVO-gQ$6GD3O|^RFhf-_iE>W&`@h3MLqB!8QHaZze4TA7JbOoz(zN89hVe-Jy(m zx`3FeUP*dYaan3kNvdvIesXECZb?yM!Sp+A%*xXfdzlrt8@4kCv28!w$IQ$)y|Ro& XdU}Ev3;XuwUS diff --git a/package.json b/package.json index fc081049..ffe52ea2 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@dicebear/core": "^6.0.4", "@dicebear/initials": "^6.0.4", "markdown-it": "^13.0.1", - "mono-svelte": "^1.4.5" + "mono-svelte": "latest" }, "overrides": { "@rollup/plugin-node-resolve": "^15.2.3", diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index bea100a5..373f01e8 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -8,6 +8,7 @@ import { createEventDispatcher } from 'svelte' import { CodeBracket, + DocumentPlus, ExclamationTriangle, Icon, Link, @@ -60,16 +61,17 @@ let uploadingImage = false let loading = false - let image: FileList | null = null + let image: any + $: previewURL = image instanceof FileList ? URL.createObjectURL(image[0]) : image ? URL.createObjectURL(image) : '' async function upload() { - if (!$profile?.jwt || image == null) return + if (!$profile?.jwt || !image) return loading = true try { const uploaded = await uploadImage( - image[0], + image instanceof FileList ? image[0] : image, $profile.instance, $profile.jwt ) @@ -105,7 +107,35 @@ Upload image
- +
+ +
@@ -251,6 +281,14 @@ overflow-hidden focus-within:border-black focus-within:dark:border-white transit } } }} + on:paste={(e) => { + if (!e.clipboardData?.files) return + const files = Array.from(e.clipboardData.files) + if (files[0]?.type.startsWith('image/')) { + image = e.clipboardData.files[0] + uploadingImage = true + } + }} {rows} {...$$restProps} /> diff --git a/src/lib/ui/colors.ts b/src/lib/ui/colors.ts index 4bd62e22..7028b2f7 100644 --- a/src/lib/ui/colors.ts +++ b/src/lib/ui/colors.ts @@ -116,7 +116,6 @@ export function colorsToVars(colors: Colors): string { let vars: string[] = [] for (let category in colors) { for (let shade in colors[category as keyof Colors]) { - console.log(shade) if (category) // @ts-ignore vars.push(`--c-${category.slice(0, 1)}-${shade}:${colors[category][shade]}`) @@ -128,14 +127,14 @@ export function colorsToVars(colors: Colors): string { export const colorToVar = (category: keyof Colors, shade: keyof keyof Colors): string => `--c-${category.slice(0,2)}-${shade.toString()}` -colors.subscribe((v) => { - -}) function loadColors() { const loaded = localStorage.getItem('colors') if (!loaded) return colors.set(JSON.parse(loaded)) + colors.subscribe((v) => { + localStorage.setItem('colors', JSON.stringify(v)) + }) } if (browser) { @@ -143,16 +142,6 @@ if (browser) { } - - - - - - - - - - const configuredLegacyTheme = env.PUBLIC_LEGACYTHEME ?? 'system' export const legacyTheme = writable<'system' | 'light' | 'dark'>( configuredLegacyTheme as 'system' | 'light' | 'dark' diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 6321cbb5..50fb7dc4 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -10,7 +10,7 @@ import { pwaInfo } from 'virtual:pwa-info' import { inDarkLegacyTheme, legacyTheme } from '$lib/ui/colors.js' import { userSettings } from '$lib/settings.js' - import { Button, Spinner, ToastContainer } from 'mono-svelte' + import { Button, ModalContainer, Spinner, ToastContainer } from 'mono-svelte' import { onMount } from 'svelte' import { browser } from '$app/environment' import { Forward, Icon } from 'svelte-hero-icons' @@ -95,6 +95,7 @@ + - import { Button, Material, Modal, TextArea, toast } from 'mono-svelte' + import { + Button, + Material, + Modal, + TextArea, + action, + modal, + toast, + } from 'mono-svelte' import { defaultColors, type Colors, colors } from '$lib/ui/colors' - import { ArrowDownTray, ArrowUpTray, Bookmark, Icon } from 'svelte-hero-icons' + import { + ArrowDownTray, + ArrowPath, + ArrowUpTray, + Bookmark, + Icon, + } from 'svelte-hero-icons' const c = defaultColors @@ -57,6 +71,32 @@ Export +
{#each svelteIntellisenseSucks() as category}