diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2026-01-09 12:21:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-09 12:21:08 +0900 |
| commit | 2a14025c29081bd8080b4dec0823a7625a791950 (patch) | |
| tree | e02f7fe6363457996efba020ec964bb6e4f041ed /packages/frontend/src/components/MkDrive.vue | |
| parent | Bump version to 2026.1.0-alpha.3 (diff) | |
| download | misskey-2a14025c29081bd8080b4dec0823a7625a791950.tar.gz misskey-2a14025c29081bd8080b4dec0823a7625a791950.tar.bz2 misskey-2a14025c29081bd8080b4dec0823a7625a791950.zip | |
fix(frontend): popupのemit型が正しく利用できるように修正 (#16826)
* fix(frontend): popupのemit型が正しく利用できるように修正
* fix: revert unnecessary code (for testing purpose)
* fix lint
* fix type errors
* fix types
* add comment
* fix
* fix
* fix: OverloadToUnionの仕組みを変更
* add comments, clean up
* fix lint
* fix types
* clean up [ci skip]
* fix
* add comments [ci skip]
Diffstat (limited to 'packages/frontend/src/components/MkDrive.vue')
| -rw-r--r-- | packages/frontend/src/components/MkDrive.vue | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue index 71ffb252df..6e286f4882 100644 --- a/packages/frontend/src/components/MkDrive.vue +++ b/packages/frontend/src/components/MkDrive.vue @@ -577,17 +577,19 @@ function cd(target?: Misskey.entities.DriveFolder | Misskey.entities.DriveFolder async function moveFilesBulk() { if (selectedFiles.value.length === 0) return; - const toFolder = await selectDriveFolder(folder.value ? folder.value.id : null); + const { canceled, folders } = await selectDriveFolder(folder.value ? folder.value.id : null); + + if (canceled) return; await os.apiWithDialog('drive/files/move-bulk', { fileIds: selectedFiles.value.map(f => f.id), - folderId: toFolder[0] ? toFolder[0].id : null, + folderId: folders[0] ? folders[0].id : null, }); globalEvents.emit('driveFilesUpdated', selectedFiles.value.map(x => ({ ...x, - folderId: toFolder[0] ? toFolder[0].id : null, - folder: toFolder[0] ?? null, + folderId: folders[0] ? folders[0].id : null, + folder: folders[0] ?? null, }))); } |