From d01230c17b51305721ba9e0ce7c8b9ab3d49a542 Mon Sep 17 00:00:00 2001
From: takusea <takusea826@gmail.com>
Date: Wed, 7 Feb 2024 22:00:41 +0900
Subject: [PATCH] =?UTF-8?q?=E9=9F=B3=E5=A3=B0=E3=83=A9=E3=82=A4=E3=83=96?=
 =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AE=E5=88=A9=E7=94=A8=E8=A6=8F=E7=B4=84?=
 =?UTF-8?q?=E3=82=BB=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E6=96=B0?=
 =?UTF-8?q?=E3=81=97=E3=81=84=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3=E3=81=B8?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/help/HelpDialog.vue            |   2 +-
 .../HelpLibraryPolicySection.vue}             | 131 ++++++++++--------
 2 files changed, 78 insertions(+), 55 deletions(-)
 rename src/components/{help/LibraryPolicy.vue => template/HelpLibraryPolicySection.vue} (51%)

diff --git a/src/components/help/HelpDialog.vue b/src/components/help/HelpDialog.vue
index e9cff56340..a3a581463f 100644
--- a/src/components/help/HelpDialog.vue
+++ b/src/components/help/HelpDialog.vue
@@ -93,7 +93,7 @@ import UpdateInfo from "../template/HelpUpdateInfoSection.vue";
 import OssCommunityInfo from "../template/HelpOssCommunityInfoSection.vue";
 import QAndA from "../template/HelpQAndASection.vue";
 import ContactInfo from "../template/HelpContactInfoSection.vue";
-import LibraryPolicy from "./LibraryPolicy.vue";
+import LibraryPolicy from "../template/HelpLibraryPolicySection.vue";
 import { UpdateInfo as UpdateInfoObject } from "@/type/preload";
 import { useStore } from "@/store";
 import { useFetchNewUpdateInfos } from "@/composables/useFetchNewUpdateInfos";
diff --git a/src/components/help/LibraryPolicy.vue b/src/components/template/HelpLibraryPolicySection.vue
similarity index 51%
rename from src/components/help/LibraryPolicy.vue
rename to src/components/template/HelpLibraryPolicySection.vue
index ca8a4c4b51..583f8958c9 100644
--- a/src/components/help/LibraryPolicy.vue
+++ b/src/components/template/HelpLibraryPolicySection.vue
@@ -1,31 +1,26 @@
 <template>
-  <q-page
-    ref="scroller"
-    class="relative-absolute-wrapper scroller bg-background"
-  >
-    <div class="q-pa-md markdown-body">
-      <q-list v-if="selectedInfo === undefined">
-        <template
-          v-for="(engineId, engineIndex) in sortedEngineInfos.map(
-            (engineInfo) => engineInfo.uuid
-          )"
-          :key="engineIndex"
-        >
-          <!-- エンジンが一つだけの場合は名前を表示しない -->
-          <template v-if="engineInfos.size > 1">
-            <q-separator v-if="engineIndex > 0" spaced />
-            <q-item-label header>{{
-              mapUndefinedPipe(engineInfos.get(engineId), (v) => v.name)
-            }}</q-item-label>
-          </template>
+  <div v-if="selectedInfo === undefined" class="container">
+    <BaseScrollArea>
+      <div class="inner inner-list">
+        <h1 class="title">音声ライブラリの利用規約</h1>
+        <div class="list">
           <template
-            v-for="([, characterInfo], characterIndex) in mapUndefinedPipe(
-              engineInfos.get(engineId),
-              (v) => v.characterInfos
+            v-for="(engineId, engineIndex) in sortedEngineInfos.map(
+              (engineInfo) => engineInfo.uuid
             )"
-            :key="characterIndex"
+            :key="engineIndex"
           >
-            <q-item
+            <!-- エンジンが一つだけの場合は名前を表示しない -->
+            <h2 v-if="engineInfos.size > 1" class="subtitle">
+              {{ mapUndefinedPipe(engineInfos.get(engineId), (v) => v.name) }}
+            </h2>
+            <BaseRowCard
+              v-for="([, characterInfo], characterIndex) in mapUndefinedPipe(
+                engineInfos.get(engineId),
+                (v) => v.characterInfos
+              )"
+              :key="characterIndex"
+              :title="characterInfo.metas.speakerName"
               clickable
               @click="
                 selectCharacterInfo({
@@ -34,24 +29,25 @@
                 })
               "
             >
-              <q-item-section>{{
-                characterInfo.metas.speakerName
-              }}</q-item-section>
-            </q-item>
+              <!-- 暫定でq-iconを使用 -->
+              <q-icon name="keyboard_arrow_right" size="sm" />
+            </BaseRowCard>
           </template>
-        </template>
-      </q-list>
-      <div v-else>
-        <div class="q-mb-md">
-          <q-btn
-            outline
-            color="primary"
-            icon="keyboard_arrow_left"
+        </div>
+      </div>
+    </BaseScrollArea>
+  </div>
+  <div v-else class="container container-detail">
+    <BaseScrollArea>
+      <div class="inner">
+        <div>
+          <BaseButton
             label="戻る"
+            icon="keyboard_arrow_left"
             @click="selectCharacterInfo(undefined)"
           />
         </div>
-        <div class="text-subtitle">
+        <h1 class="title">
           {{
             mapUndefinedPipe(
               engineInfos.get(selectedInfo.engine),
@@ -60,16 +56,22 @@
               (v) => v.metas.speakerName
             )
           }}
-        </div>
+        </h1>
         <!-- eslint-disable-next-line vue/no-v-html -->
-        <div v-if="policy" class="markdown" v-html="policy"></div>
+        <BaseDocumentView>
+          <div v-if="policy" class="markdown" v-html="policy"></div>
+        </BaseDocumentView>
       </div>
-    </div>
-  </q-page>
+    </BaseScrollArea>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { computed, ref } from "vue";
+import BaseRowCard from "../base/BaseRowCard.vue";
+import BaseScrollArea from "../base/BaseScrollArea.vue";
+import BaseButton from "../base/BaseButton.vue";
+import BaseDocumentView from "../base/BaseDocumentView.vue";
 import { useStore } from "@/store";
 import { useMarkdownIt } from "@/plugins/markdownItPlugin";
 import { EngineId, SpeakerId } from "@/type/preload";
@@ -118,24 +120,45 @@ const policy = computed<string | undefined>(() => {
 });
 
 const selectedInfo = ref<DetailKey | undefined>(undefined);
-
-const scroller = ref<HTMLElement>();
 const selectCharacterInfo = (index: DetailKey | undefined) => {
-  if (scroller.value == undefined)
-    throw new Error("scroller.value == undefined");
-  scroller.value.scrollTop = 0;
   selectedInfo.value = index;
 };
 </script>
 
 <style scoped lang="scss">
-.root {
-  .scroller {
-    width: 100%;
-    overflow: auto;
-    > div {
-      overflow-wrap: break-word;
-    }
-  }
+@use '@/styles/variables' as vars;
+@use '@/styles/mixin' as mixin;
+@use '@/styles/new-colors' as colors;
+
+.container {
+  // TODO: 親コンポーネントからheightを取得できないため一時的にcalcを使用、HelpDialogの構造を再設計後100%に変更する
+  // height: 100%;
+  height: calc(100vh - 90px);
+}
+
+.container-detail {
+  border-left: 1px solid colors.$border;
+  background-color: colors.$surface;
+}
+
+.inner {
+  display: flex;
+  flex-direction: column;
+  padding: vars.$padding-2;
+  gap: vars.$gap-1;
+}
+
+.title {
+  @include mixin.headline-1;
+}
+
+.subtitle {
+  @include mixin.headline-2;
+}
+
+.list {
+  display: flex;
+  flex-direction: column;
+  gap: vars.$gap-1;
 }
 </style>