From 941f3f57a147344874ddd990eb9d87c305d36873 Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Sat, 18 Nov 2023 23:43:06 +0900
Subject: [PATCH 1/7] =?UTF-8?q?Add:=20=E8=A4=87=E6=95=B0=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AudioCell.vue | 47 ++++++++++++++++++++++++++----------
 src/store/audio.ts           | 12 +++++----
 src/store/type.ts            |  6 ++---
 3 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/components/AudioCell.vue b/src/components/AudioCell.vue
index 3c5a0e9d9f..e1be70b80f 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/AudioCell.vue
@@ -77,7 +77,7 @@
         文章が長いと正常に動作しない可能性があります。
         句読点の位置で文章を分割してください。
       </template>
-      <template v-if="deleteButtonEnable" #after>
+      <template v-if="enableDeleteButton" #after>
         <q-btn
           round
           flat
@@ -436,33 +436,54 @@ const moveDownCell = moveCell(1);
 // 消去
 const willRemove = ref(false);
 const removeCell = async () => {
+  let audioKeysToDelete: AudioKey[];
+  if (
+    isMultiSelectEnabled.value &&
+    store.getters.SELECTED_AUDIO_KEYS.includes(props.audioKey)
+  ) {
+    audioKeysToDelete = store.getters.SELECTED_AUDIO_KEYS;
+  } else {
+    audioKeysToDelete = [props.audioKey];
+  }
+  const firstAudioKey = audioKeysToDelete[0];
+  const selectedAudioKeysLength = audioKeysToDelete.length;
   // 1つだけの時は削除せず
-  if (audioKeys.value.length > 1) {
+  if (audioKeys.value.length > selectedAudioKeysLength) {
     // フォーカスを外したりREMOVEしたりすると、
     // テキストフィールドのchangeイベントが非同期に飛んでundefinedエラーになる
     // エラー防止のためにまずwillRemoveフラグを建てる
     willRemove.value = true;
 
-    const index = audioKeys.value.indexOf(props.audioKey);
-    if (index > 0) {
-      emit("focusCell", {
-        audioKey: audioKeys.value[index - 1],
-      });
-    } else {
+    const firstIndex = audioKeys.value.indexOf(
+      isMultiSelectEnabled.value ? firstAudioKey : props.audioKey
+    );
+    let willNextFocusIndex = firstIndex - 1;
+    if (willNextFocusIndex < 0) {
+      willNextFocusIndex = audioKeys.value.findIndex(
+        (audioKey) => !audioKeysToDelete.includes(audioKey)
+      );
+    }
+    if (audioKeysToDelete.includes(props.audioKey)) {
       emit("focusCell", {
-        audioKey: audioKeys.value[index + 1],
+        audioKey: audioKeys.value[willNextFocusIndex],
       });
     }
 
-    store.dispatch("COMMAND_REMOVE_AUDIO_ITEM", {
-      audioKey: props.audioKey,
+    store.dispatch("COMMAND_MULTI_REMOVE_AUDIO_ITEM", {
+      audioKeys: audioKeysToDelete,
     });
   }
 };
 
 // 削除ボタンの有効／無効判定
-const deleteButtonEnable = computed(() => {
-  return 1 < audioKeys.value.length;
+const enableDeleteButton = computed(() => {
+  if (isMultiSelectEnabled.value) {
+    return (
+      store.getters.SELECTED_AUDIO_KEYS.length !== store.state.audioKeys.length
+    );
+  } else {
+    return store.state.audioKeys.length > 1;
+  }
 });
 
 // テキスト編集エリアの右クリック
diff --git a/src/store/audio.ts b/src/store/audio.ts
index b40400b261..fcc7bc5ead 100644
--- a/src/store/audio.ts
+++ b/src/store/audio.ts
@@ -1883,12 +1883,14 @@ export const audioCommandStore = transformCommandStore(
       },
     },
 
-    COMMAND_REMOVE_AUDIO_ITEM: {
-      mutation(draft, payload: { audioKey: AudioKey }) {
-        audioStore.mutations.REMOVE_AUDIO_ITEM(draft, payload);
+    COMMAND_MULTI_REMOVE_AUDIO_ITEM: {
+      mutation(draft, { audioKeys }: { audioKeys: AudioKey[] }) {
+        for (const audioKey of audioKeys) {
+          audioStore.mutations.REMOVE_AUDIO_ITEM(draft, { audioKey });
+        }
       },
-      action({ commit }, payload: { audioKey: AudioKey }) {
-        commit("COMMAND_REMOVE_AUDIO_ITEM", payload);
+      action({ commit }, payload: { audioKeys: AudioKey[] }) {
+        commit("COMMAND_MULTI_REMOVE_AUDIO_ITEM", payload);
       },
     },
 
diff --git a/src/store/type.ts b/src/store/type.ts
index 95059f0925..e14b05f6a1 100644
--- a/src/store/type.ts
+++ b/src/store/type.ts
@@ -478,9 +478,9 @@ export type AudioCommandStoreTypes = {
     }): Promise<AudioKey>;
   };
 
-  COMMAND_REMOVE_AUDIO_ITEM: {
-    mutation: { audioKey: AudioKey };
-    action(payload: { audioKey: AudioKey }): void;
+  COMMAND_MULTI_REMOVE_AUDIO_ITEM: {
+    mutation: { audioKeys: AudioKey[] };
+    action(payload: { audioKeys: AudioKey[] }): void;
   };
 
   COMMAND_SET_AUDIO_KEYS: {

From b6a9f8c8c27244984b97f2d022bfa5afae6cfc14 Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Tue, 21 Nov 2023 13:50:29 +0900
Subject: [PATCH 2/7] =?UTF-8?q?Change:=20=E3=82=B3=E3=83=A1=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Hiroshiba <Hiroshiba@users.noreply.github.com>
---
 src/components/AudioCell.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AudioCell.vue b/src/components/AudioCell.vue
index e1be70b80f..4fb09e42c9 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/AudioCell.vue
@@ -447,7 +447,7 @@ const removeCell = async () => {
   }
   const firstAudioKey = audioKeysToDelete[0];
   const selectedAudioKeysLength = audioKeysToDelete.length;
-  // 1つだけの時は削除せず
+  // 全て消える場合はなにもしない
   if (audioKeys.value.length > selectedAudioKeysLength) {
     // フォーカスを外したりREMOVEしたりすると、
     // テキストフィールドのchangeイベントが非同期に飛んでundefinedエラーになる

From 307345d187cf0ae9851d5d5a2afdaa98edcaea3d Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Tue, 21 Nov 2023 13:53:02 +0900
Subject: [PATCH 3/7] =?UTF-8?q?Change:=20=E9=A0=86=E5=BA=8F=E3=82=92?=
 =?UTF-8?q?=E4=BF=9D=E8=A8=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Hiroshiba <Hiroshiba@users.noreply.github.com>
---
 src/components/AudioCell.vue | 7 ++++---
 src/store/audio.ts           | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/AudioCell.vue b/src/components/AudioCell.vue
index 4fb09e42c9..de854fd38b 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/AudioCell.vue
@@ -441,14 +441,15 @@ const removeCell = async () => {
     isMultiSelectEnabled.value &&
     store.getters.SELECTED_AUDIO_KEYS.includes(props.audioKey)
   ) {
-    audioKeysToDelete = store.getters.SELECTED_AUDIO_KEYS;
+    audioKeysToDelete = store.state.audioKeys.filter((audioKey) =>
+      store.getters.SELECTED_AUDIO_KEYS.includes(audioKey)
+    );
   } else {
     audioKeysToDelete = [props.audioKey];
   }
   const firstAudioKey = audioKeysToDelete[0];
-  const selectedAudioKeysLength = audioKeysToDelete.length;
   // 全て消える場合はなにもしない
-  if (audioKeys.value.length > selectedAudioKeysLength) {
+  if (audioKeys.value.length > audioKeysToDelete.length) {
     // フォーカスを外したりREMOVEしたりすると、
     // テキストフィールドのchangeイベントが非同期に飛んでundefinedエラーになる
     // エラー防止のためにまずwillRemoveフラグを建てる
diff --git a/src/store/audio.ts b/src/store/audio.ts
index fcc7bc5ead..be4a7425a7 100644
--- a/src/store/audio.ts
+++ b/src/store/audio.ts
@@ -265,7 +265,7 @@ export const audioStoreState: AudioStoreState = {
 export const audioStore = createPartialStore<AudioStoreTypes>({
   ACTIVE_AUDIO_KEY: {
     getter(state) {
-      return state._activeAudioKey !== undefined &&
+      return state._activeAudioKey != undefined &&
         state.audioKeys.includes(state._activeAudioKey)
         ? state._activeAudioKey
         : undefined;

From 1104de876026e225a654d0850b5a9f3864373663 Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Tue, 21 Nov 2023 14:14:10 +0900
Subject: [PATCH 4/7] =?UTF-8?q?Refactor:=20=E9=81=B8=E6=8A=9E=E3=82=A2?=
 =?UTF-8?q?=E3=83=AB=E3=82=B4=E3=83=AA=E3=82=BA=E3=83=A0=E3=82=92=E6=9B=B8?=
 =?UTF-8?q?=E3=81=8D=E7=9B=B4=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AudioCell.vue | 45 ++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/components/AudioCell.vue b/src/components/AudioCell.vue
index de854fd38b..0111a9ed36 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/AudioCell.vue
@@ -447,7 +447,6 @@ const removeCell = async () => {
   } else {
     audioKeysToDelete = [props.audioKey];
   }
-  const firstAudioKey = audioKeysToDelete[0];
   // 全て消える場合はなにもしない
   if (audioKeys.value.length > audioKeysToDelete.length) {
     // フォーカスを外したりREMOVEしたりすると、
@@ -455,16 +454,31 @@ const removeCell = async () => {
     // エラー防止のためにまずwillRemoveフラグを建てる
     willRemove.value = true;
 
-    const firstIndex = audioKeys.value.indexOf(
-      isMultiSelectEnabled.value ? firstAudioKey : props.audioKey
-    );
-    let willNextFocusIndex = firstIndex - 1;
-    if (willNextFocusIndex < 0) {
-      willNextFocusIndex = audioKeys.value.findIndex(
-        (audioKey) => !audioKeysToDelete.includes(audioKey)
-      );
-    }
     if (audioKeysToDelete.includes(props.audioKey)) {
+      const firstAudioKey = audioKeysToDelete[0];
+      const firstIndex = audioKeys.value.indexOf(
+        isMultiSelectEnabled.value ? firstAudioKey : props.audioKey
+      );
+      let willNextFocusIndex = -1;
+      for (let i = firstIndex; i >= 0; i--) {
+        if (!audioKeysToDelete.includes(audioKeys.value[i])) {
+          willNextFocusIndex = i;
+          break;
+        }
+      }
+      if (willNextFocusIndex === -1) {
+        for (let i = firstIndex; i < audioKeys.value.length; i++) {
+          if (!audioKeysToDelete.includes(audioKeys.value[i])) {
+            willNextFocusIndex = i;
+            break;
+          }
+        }
+      }
+      if (willNextFocusIndex === -1) {
+        throw new Error(
+          "次に選択するaudioKeyが見付かりませんでした（unreachable）"
+        );
+      }
       emit("focusCell", {
         audioKey: audioKeys.value[willNextFocusIndex],
       });
@@ -478,13 +492,10 @@ const removeCell = async () => {
 
 // 削除ボタンの有効／無効判定
 const enableDeleteButton = computed(() => {
-  if (isMultiSelectEnabled.value) {
-    return (
-      store.getters.SELECTED_AUDIO_KEYS.length !== store.state.audioKeys.length
-    );
-  } else {
-    return store.state.audioKeys.length > 1;
-  }
+  return (
+    store.state.audioKeys.length >
+    (isMultiSelectEnabled.value ? store.getters.SELECTED_AUDIO_KEYS.length : 1)
+  );
 });
 
 // テキスト編集エリアの右クリック

From ad7539506770811f1f009509eaaa57d0416352a5 Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Wed, 22 Nov 2023 18:39:18 +0900
Subject: [PATCH 5/7] =?UTF-8?q?Delete:=20=E4=B8=8D=E8=A6=81=E3=81=AA?=
 =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Hiroshiba <Hiroshiba@users.noreply.github.com>
---
 src/components/AudioCell.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/AudioCell.vue b/src/components/AudioCell.vue
index 0111a9ed36..8d66f3f0bf 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/AudioCell.vue
@@ -441,9 +441,7 @@ const removeCell = async () => {
     isMultiSelectEnabled.value &&
     store.getters.SELECTED_AUDIO_KEYS.includes(props.audioKey)
   ) {
-    audioKeysToDelete = store.state.audioKeys.filter((audioKey) =>
-      store.getters.SELECTED_AUDIO_KEYS.includes(audioKey)
-    );
+    audioKeysToDelete = store.getters.SELECTED_AUDIO_KEYS;
   } else {
     audioKeysToDelete = [props.audioKey];
   }

From 4a29576a5900a6e50e264d7e90c51888accf3ac5 Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Wed, 22 Nov 2023 18:42:04 +0900
Subject: [PATCH 6/7] =?UTF-8?q?Add:=20=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AudioCell.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/AudioCell.vue b/src/components/AudioCell.vue
index 8d66f3f0bf..5f43919dba 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/AudioCell.vue
@@ -453,19 +453,21 @@ const removeCell = async () => {
     willRemove.value = true;
 
     if (audioKeysToDelete.includes(props.audioKey)) {
-      const firstAudioKey = audioKeysToDelete[0];
-      const firstIndex = audioKeys.value.indexOf(
-        isMultiSelectEnabled.value ? firstAudioKey : props.audioKey
-      );
+      // 選択するAudioKeyを決定する。
+      // - 削除ボタンが押されたAudioCellから開始
+      // - 残るAudioCellを上方向に探す
+      // - 上方向になかったら下方向に探す
+      // - なかったらエラー（Unreachable）
+      const audioKeyIndex = audioKeys.value.indexOf(props.audioKey);
       let willNextFocusIndex = -1;
-      for (let i = firstIndex; i >= 0; i--) {
+      for (let i = audioKeyIndex; i >= 0; i--) {
         if (!audioKeysToDelete.includes(audioKeys.value[i])) {
           willNextFocusIndex = i;
           break;
         }
       }
       if (willNextFocusIndex === -1) {
-        for (let i = firstIndex; i < audioKeys.value.length; i++) {
+        for (let i = audioKeyIndex; i < audioKeys.value.length; i++) {
           if (!audioKeysToDelete.includes(audioKeys.value[i])) {
             willNextFocusIndex = i;
             break;

From 69dadb9f53890be7ac628502270cf176e40babe4 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Thu, 23 Nov 2023 11:26:27 +0900
Subject: [PATCH 7/7] =?UTF-8?q?=E2=86=92=20startIndex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AudioCell.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AudioCell.vue b/src/components/AudioCell.vue
index 5f43919dba..d958607a95 100644
--- a/src/components/AudioCell.vue
+++ b/src/components/AudioCell.vue
@@ -458,16 +458,16 @@ const removeCell = async () => {
       // - 残るAudioCellを上方向に探す
       // - 上方向になかったら下方向に探す
       // - なかったらエラー（Unreachable）
-      const audioKeyIndex = audioKeys.value.indexOf(props.audioKey);
+      const startIndex = audioKeys.value.indexOf(props.audioKey);
       let willNextFocusIndex = -1;
-      for (let i = audioKeyIndex; i >= 0; i--) {
+      for (let i = startIndex; i >= 0; i--) {
         if (!audioKeysToDelete.includes(audioKeys.value[i])) {
           willNextFocusIndex = i;
           break;
         }
       }
       if (willNextFocusIndex === -1) {
-        for (let i = audioKeyIndex; i < audioKeys.value.length; i++) {
+        for (let i = startIndex; i < audioKeys.value.length; i++) {
           if (!audioKeysToDelete.includes(audioKeys.value[i])) {
             willNextFocusIndex = i;
             break;