feat(web): paste photo from clipboard (#8475)

* feat(web): paste photo from clipboard

* listen on svelte:window instead of a div

* refactor: move logic to drag overlay

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
TomixUG 2024-04-08 18:19:58 +02:00 committed by GitHub
parent 0075243ed5
commit e49512896f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 39 additions and 37 deletions

View File

@ -1,28 +1,54 @@
<script lang="ts"> <script lang="ts">
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
import ImmichLogo from './immich-logo.svelte'; import ImmichLogo from './immich-logo.svelte';
export let dropHandler: (event: DragEvent) => void; import { page } from '$app/stores';
import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
import { fileUploadHandler } from '$lib/utils/file-uploader';
$: albumId = ($page.route?.id === '/(user)/albums/[albumId]' || undefined) && $page.params.albumId;
$: isShare = $page.route?.id === '/(user)/share/[key]' || undefined;
let dragStartTarget: EventTarget | null = null; let dragStartTarget: EventTarget | null = null;
const handleDragEnter = (e: DragEvent) => { const onDragEnter = (e: DragEvent) => {
if (e.dataTransfer && e.dataTransfer.types.includes('Files')) { if (e.dataTransfer && e.dataTransfer.types.includes('Files')) {
dragStartTarget = e.target; dragStartTarget = e.target;
} }
}; };
</script>
<svelte:body const onDragLeave = (e: DragEvent) => {
on:dragenter|stopPropagation|preventDefault={handleDragEnter}
on:dragleave|stopPropagation|preventDefault={(e) => {
if (dragStartTarget === e.target) { if (dragStartTarget === e.target) {
dragStartTarget = null; dragStartTarget = null;
} }
}} };
on:drop|stopPropagation|preventDefault={(e) => {
const onDrop = async (e: DragEvent) => {
dragStartTarget = null; dragStartTarget = null;
dropHandler(e); await handleFiles(e.dataTransfer?.files);
}} };
const onPaste = ({ clipboardData }: ClipboardEvent) => handleFiles(clipboardData?.files);
const handleFiles = async (files?: FileList) => {
if (!files) {
return;
}
const filesArray: File[] = Array.from<File>(files);
if (isShare) {
dragAndDropFilesStore.set({ isDragging: true, files: filesArray });
} else {
await fileUploadHandler(filesArray, albumId);
}
};
</script>
<svelte:window on:paste={onPaste} />
<svelte:body
on:dragenter|stopPropagation|preventDefault={onDragEnter}
on:dragleave|stopPropagation|preventDefault={onDragLeave}
on:drop|stopPropagation|preventDefault={onDrop}
/> />
{#if dragStartTarget} {#if dragStartTarget}

View File

@ -1,29 +1,6 @@
<script lang="ts"> <script lang="ts">
import { page } from '$app/stores';
import UploadCover from '$lib/components/shared-components/drag-and-drop-upload-overlay.svelte'; import UploadCover from '$lib/components/shared-components/drag-and-drop-upload-overlay.svelte';
import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
import { fileUploadHandler } from '$lib/utils/file-uploader';
let albumId: string | undefined;
const dropHandler = async ({ dataTransfer }: DragEvent) => {
const files = dataTransfer?.files;
if (!files) {
return;
}
const filesArray: File[] = Array.from<File>(files);
albumId = ($page.route.id === '/(user)/albums/[albumId]' || undefined) && $page.params.albumId;
const isShare = $page.route.id === '/(user)/share/[key]' || undefined;
if (isShare) {
dragAndDropFilesStore.set({ isDragging: true, files: filesArray });
} else {
await fileUploadHandler(filesArray, albumId);
}
};
</script> </script>
<slot {albumId} /> <slot />
<UploadCover />
<UploadCover {dropHandler} />

View File

@ -19,7 +19,6 @@
import '../app.css'; import '../app.css';
let showNavigationLoadingBar = false; let showNavigationLoadingBar = false;
let albumId: string | undefined;
const isSharedLinkRoute = (route: string | null) => route?.startsWith('/(user)/share/[key]'); const isSharedLinkRoute = (route: string | null) => route?.startsWith('/(user)/share/[key]');
@ -111,7 +110,7 @@
</FullscreenContainer> </FullscreenContainer>
</noscript> </noscript>
<slot {albumId} /> <slot />
{#if showNavigationLoadingBar} {#if showNavigationLoadingBar}
<NavigationLoadingBar /> <NavigationLoadingBar />