From c109bec0131f6a887e4fb4ca709e33859dd0b1ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 13 Dec 2025 18:17:09 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E3=83=89=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=83=96=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E6=97=A5?=
 =?UTF-8?q?=E4=BB=98=E4=BB=A5=E5=A4=96=E3=81=A7=E4=B8=A6=E3=81=B3=E6=9B=BF?=
 =?UTF-8?q?=E3=81=88=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AF=E6=9C=88=E3=81=A7?=
 =?UTF-8?q?=E3=82=B0=E3=83=AB=E3=83=BC=E3=83=97=E5=8C=96=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=20(#16978)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): ドライブファイルを日付以外で並び替える場合は月でグループ化して表示しないように

* Update Changelog
---
 CHANGELOG.md                                 |  1 +
 packages/frontend/src/components/MkDrive.vue | 79 +++++++++++++-------
 2 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0dd9b3fea..9ae71498b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Fix: 初回読み込み時などに、言語設定で不整合が発生することがある問題を修正
 - Fix: 削除されたノートのリノートが正しく動作されない問題を修正
 - Fix: チャンネルオーナーが削除済みの時にチャンネルのヘッダーメニューが表示されない不具合を修正
+- Fix: ドライブで登録日以外でソートする場合は月でグループ化して表示しないように
 
 ### Server
 - Fix: ジョブキューでSentryが有効にならない問題を修正
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index b84532b40b..d8c949d8eb 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -83,34 +83,58 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<MkButton v-if="foldersPaginator.canFetchOlder.value" primary rounded @click="foldersPaginator.fetchOlder()">{{ i18n.ts.loadMore }}</MkButton>
 
-			<MkStickyContainer v-for="(item, i) in filesTimeline" :key="`${item.date.getFullYear()}/${item.date.getMonth() + 1}`">
-				<template #header>
-					<div :class="$style.date">
-						<span><i class="ti ti-chevron-down"></i> {{ item.date.getFullYear() }}/{{ item.date.getMonth() + 1 }}</span>
-					</div>
-				</template>
+			<template v-if="shouldBeGroupedByDate">
+				<MkStickyContainer v-for="(item, i) in filesTimeline" :key="`${item.date.getFullYear()}/${item.date.getMonth() + 1}`">
+					<template #header>
+						<div :class="$style.date">
+							<span><i class="ti ti-chevron-down"></i> {{ item.date.getFullYear() }}/{{ item.date.getMonth() + 1 }}</span>
+						</div>
+					</template>
+
+					<TransitionGroup
+						tag="div"
+						:enterActiveClass="prefer.s.animation ? $style.transition_files_enterActive : ''"
+						:leaveActiveClass="prefer.s.animation ? $style.transition_files_leaveActive : ''"
+						:enterFromClass="prefer.s.animation ? $style.transition_files_enterFrom : ''"
+						:leaveToClass="prefer.s.animation ? $style.transition_files_leaveTo : ''"
+						:moveClass="prefer.s.animation ? $style.transition_files_move : ''"
+						:class="$style.files"
+					>
+						<XFile
+							v-for="file in item.items" :key="file.id"
+							:class="$style.file"
+							:file="file"
+							:folder="folder"
+							:isSelected="selectedFiles.some(x => x.id === file.id)"
+							@click="onFileClick($event, file)"
+							@dragstart="onFileDragstart(file, $event)"
+							@dragend="isDragSource = false"
+						/>
+					</TransitionGroup>
+				</MkStickyContainer>
+			</template>
+			<TransitionGroup
+				v-else
+				tag="div"
+				:enterActiveClass="prefer.s.animation ? $style.transition_files_enterActive : ''"
+				:leaveActiveClass="prefer.s.animation ? $style.transition_files_leaveActive : ''"
+				:enterFromClass="prefer.s.animation ? $style.transition_files_enterFrom : ''"
+				:leaveToClass="prefer.s.animation ? $style.transition_files_leaveTo : ''"
+				:moveClass="prefer.s.animation ? $style.transition_files_move : ''"
+				:class="$style.files"
+			>
+				<XFile
+					v-for="file in filesPaginator.items.value" :key="file.id"
+					:class="$style.file"
+					:file="file"
+					:folder="folder"
+					:isSelected="selectedFiles.some(x => x.id === file.id)"
+					@click="onFileClick($event, file)"
+					@dragstart="onFileDragstart(file, $event)"
+					@dragend="isDragSource = false"
+				/>
+			</TransitionGroup>
 
-				<TransitionGroup
-					tag="div"
-					:enterActiveClass="prefer.s.animation ? $style.transition_files_enterActive : ''"
-					:leaveActiveClass="prefer.s.animation ? $style.transition_files_leaveActive : ''"
-					:enterFromClass="prefer.s.animation ? $style.transition_files_enterFrom : ''"
-					:leaveToClass="prefer.s.animation ? $style.transition_files_leaveTo : ''"
-					:moveClass="prefer.s.animation ? $style.transition_files_move : ''"
-					:class="$style.files"
-				>
-					<XFile
-						v-for="file in item.items" :key="file.id"
-						:class="$style.file"
-						:file="file"
-						:folder="folder"
-						:isSelected="selectedFiles.some(x => x.id === file.id)"
-						@click="onFileClick($event, file)"
-						@dragstart="onFileDragstart(file, $event)"
-						@dragend="isDragSource = false"
-					/>
-				</TransitionGroup>
-			</MkStickyContainer>
 			<MkButton v-show="filesPaginator.canFetchOlder.value" :class="$style.loadMore" primary rounded @click="filesPaginator.fetchOlder()">{{ i18n.ts.loadMore }}</MkButton>
 
 			<div v-if="filesPaginator.items.value.length == 0 && foldersPaginator.items.value.length == 0 && !fetching" :class="$style.empty">
@@ -217,6 +241,7 @@ const foldersPaginator = markRaw(new Paginator('drive/folders', {
 }));
 
 const filesTimeline = makeDateGroupedTimelineComputedRef(filesPaginator.items, 'month');
+const shouldBeGroupedByDate = computed(() => ['+createdAt', '-createdAt'].includes(sortModeSelect.value));
 
 watch(folder, () => emit('cd', folder.value));
 watch(sortModeSelect, () => {