wip

packages/frontend/src/components/MkDrive.folder.vue

@@ -43,6 +43,7 @@ import { claimAchievement } from '@/utility/achievements.js';
 import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
 import { prefer } from '@/preferences.js';
 import { DATA_TRANSFER_DRIVE_FILE, DATA_TRANSFER_DRIVE_FILES, DATA_TRANSFER_DRIVE_FOLDER, DATA_TRANSFER_DRIVE_FOLDERS } from '@/consts.js';
+import { globalEvents } from '@/events.js';
 
 const props = withDefaults(defineProps<{
 	folder: Misskey.entities.DriveFolder;
@@ -143,6 +144,7 @@ function onDrop(ev: DragEvent) {
 	}
 
 	//#region ドライブのファイル
+	{
 		const driveFile = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FILE);
 		if (driveFile != null && driveFile !== '') {
 			const file = JSON.parse(driveFile);
@@ -151,9 +153,26 @@ function onDrop(ev: DragEvent) {
 				folderId: props.folder.id,
 			});
 		}
+	}
+	//#endregion
+
+	//#region ドライブのファイル(複数)
+	{
+		const driveFiles = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FILES);
+		if (driveFiles != null && driveFiles !== '') {
+			const files = JSON.parse(driveFiles);
+			misskeyApi('drive/files/move-bulk', {
+				fileIds: files.map(f => f.id),
+				folderId: props.folder.id,
+			}).then(() => {
+				globalEvents.emit('driveFilesMoved', files, props.folder);
+			});
+		}
+	}
 	//#endregion
 
 	//#region ドライブのフォルダ
+	{
 		const driveFolder = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FOLDER);
 		if (driveFolder != null && driveFolder !== '') {
 			const folder = JSON.parse(driveFolder);
@@ -184,6 +203,7 @@ function onDrop(ev: DragEvent) {
 				}
 			});
 		}
+	}
 	//#endregion
 }
 
@@ -204,10 +224,6 @@ function onDragend() {
 	emit('dragend');
 }
 
-function go() {
-	emit('move', props.folder);
-}
-
 function rename() {
 	os.inputText({
 		title: i18n.ts.renameFolder,

packages/frontend/src/components/MkDrive.navFolder.vue

@@ -21,7 +21,8 @@ import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
-import { DATA_TRANSFER_DRIVE_FILE, DATA_TRANSFER_DRIVE_FOLDER } from '@/consts.js';
+import { DATA_TRANSFER_DRIVE_FILE, DATA_TRANSFER_DRIVE_FILES, DATA_TRANSFER_DRIVE_FOLDER, DATA_TRANSFER_DRIVE_FOLDERS } from '@/consts.js';
+import { globalEvents } from '@/events.js';
 
 const props = defineProps<{
 	folder?: Misskey.entities.DriveFolder;
@@ -44,9 +45,11 @@ function onDragover(ev: DragEvent) {
 
 	const isFile = ev.dataTransfer.items[0].kind === 'file';
 	const isDriveFile = ev.dataTransfer.types[0] === DATA_TRANSFER_DRIVE_FILE;
+	const isDriveFiles = ev.dataTransfer.types[0] === DATA_TRANSFER_DRIVE_FILES;
 	const isDriveFolder = ev.dataTransfer.types[0] === DATA_TRANSFER_DRIVE_FOLDER;
+	const isDriveFolders = ev.dataTransfer.types[0] === DATA_TRANSFER_DRIVE_FOLDERS;
 
-	if (isFile || isDriveFile || isDriveFolder) {
+	if (isFile || isDriveFile || isDriveFolder || isDriveFiles || isDriveFolders) {
 		switch (ev.dataTransfer.effectAllowed) {
 			case 'all':
 			case 'uninitialized':
@@ -92,6 +95,7 @@ function onDrop(ev: DragEvent) {
 	}
 
 	//#region ドライブのファイル
+	{
 		const driveFile = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FILE);
 		if (driveFile != null && driveFile !== '') {
 			const file = JSON.parse(driveFile);
@@ -100,9 +104,26 @@ function onDrop(ev: DragEvent) {
 				folderId: props.folder ? props.folder.id : null,
 			});
 		}
+	}
+	//#endregion
+
+	//#region ドライブのファイル(複数)
+	{
+		const driveFiles = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FILES);
+		if (driveFiles != null && driveFiles !== '') {
+			const files = JSON.parse(driveFiles);
+			misskeyApi('drive/files/move-bulk', {
+				fileIds: files.map(f => f.id),
+				folderId: props.folder ? props.folder.id : null,
+			}).then(() => {
+				globalEvents.emit('driveFilesMoved', files, props.folder ?? null);
+			});
+		}
+	}
 	//#endregion
 
 	//#region ドライブのフォルダ
+	{
 		const driveFolder = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FOLDER);
 		if (driveFolder != null && driveFolder !== '') {
 			const folder = JSON.parse(driveFolder);
@@ -113,6 +134,7 @@ function onDrop(ev: DragEvent) {
 				parentId: props.folder ? props.folder.id : null,
 			});
 		}
+	}
 	//#endregion
 }
 </script>

packages/frontend/src/components/MkDrive.vue

@@ -319,6 +319,7 @@ function onDrop(ev: DragEvent) {
 	}
 
 	//#region ドライブのファイル
+	{
 		const driveFile = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FILE);
 		if (driveFile != null && driveFile !== '') {
 			const file = JSON.parse(driveFile);
@@ -328,9 +329,26 @@ function onDrop(ev: DragEvent) {
 				folderId: folder.value ? folder.value.id : null,
 			});
 		}
+	}
+	//#endregion
+
+	//#region ドライブのファイル(複数)
+	{
+		const driveFiles = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FILES);
+		if (driveFiles != null && driveFiles !== '') {
+			const files = JSON.parse(driveFiles);
+			misskeyApi('drive/files/move-bulk', {
+				fileIds: files.map(f => f.id),
+				folderId: folder.value ? folder.value.id : null,
+			}).then(() => {
+				globalEvents.emit('driveFilesMoved', files, folder.value);
+			});
+		}
+	}
 	//#endregion
 
 	//#region ドライブのフォルダ
+	{
 		const driveFolder = ev.dataTransfer.getData(DATA_TRANSFER_DRIVE_FOLDER);
 		if (driveFolder != null && driveFolder !== '') {
 			const droppedFolder = JSON.parse(driveFolder);
@@ -361,6 +379,7 @@ function onDrop(ev: DragEvent) {
 				}
 			});
 		}
+	}
 	//#endregion
 }
 
@@ -649,6 +668,9 @@ function closeTip() {
 }
 
 useGlobalEvent('driveFilesMoved', (files, to) => {
+	for (const f of files) {
+		filesPaginator.removeItem(f.id);
+	}
 	if ((to?.id ?? null) === (folder.value?.id ?? null)) {
 		filesPaginator.unshiftItems(files);
 	}