From a811cbe42eb7291ed931e49915381b3e9fdd9084 Mon Sep 17 00:00:00 2001
From: jdkfx <htazoe@jdkfx.com>
Date: Wed, 18 Dec 2024 00:14:50 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9F=E9=A8=93=E7=9A=84=E3=81=ABuseDial?=
 =?UTF-8?q?ogPluginComponent=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=A6=E3=81=BF?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/AllDialog.vue           |  8 --------
 .../Dialog/HelpDialog/HelpDialog.vue          | 18 +++++++----------
 src/components/Menu/MenuBar/MenuBar.vue       | 20 +++++--------------
 3 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/components/Dialog/AllDialog.vue b/src/components/Dialog/AllDialog.vue
index 468371c4a2..4c714f1b7f 100644
--- a/src/components/Dialog/AllDialog.vue
+++ b/src/components/Dialog/AllDialog.vue
@@ -3,7 +3,6 @@
     v-model="isAcceptRetrieveTelemetryDialogOpenComputed"
   />
   <AcceptTermsDialog v-model="isAcceptTermsDialogOpenComputed" />
-  <HelpDialog v-model="isHelpDialogOpenComputed" />
   <SettingDialog v-model="isSettingDialogOpenComputed" />
   <HotkeySettingDialog v-model="isHotkeySettingDialogOpenComputed" />
   <ToolBarCustomDialog v-model="isToolbarSettingDialogOpenComputed" />
@@ -28,7 +27,6 @@
 
 <script setup lang="ts">
 import { computed } from "vue";
-import HelpDialog from "@/components/Dialog/HelpDialog/HelpDialog.vue";
 import SettingDialog from "@/components/Dialog/SettingDialog/SettingDialog.vue";
 import HotkeySettingDialog from "@/components/Dialog/HotkeySettingDialog.vue";
 import ToolBarCustomDialog from "@/components/Dialog/ToolBarCustomDialog.vue";
@@ -49,12 +47,6 @@ const props = defineProps<{
 }>();
 const store = useStore();
 
-// ライセンス表示
-const isHelpDialogOpenComputed = computed({
-  get: () => store.state.isHelpDialogOpen,
-  set: (val) => store.actions.SET_DIALOG_OPEN({ isHelpDialogOpen: val }),
-});
-
 // 設定
 const isSettingDialogOpenComputed = computed({
   get: () => store.state.isSettingDialogOpen,
diff --git a/src/components/Dialog/HelpDialog/HelpDialog.vue b/src/components/Dialog/HelpDialog/HelpDialog.vue
index 34bea3cfd5..02487c9b01 100644
--- a/src/components/Dialog/HelpDialog/HelpDialog.vue
+++ b/src/components/Dialog/HelpDialog/HelpDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <QDialog
-    v-model="modelValueComputed"
+    ref="dialogRef"
     maximized
     transitionShow="jump-up"
     transitionHide="jump-down"
@@ -32,7 +32,7 @@
               icon="close"
               color="display"
               aria-label="ヘルプを閉じる"
-              @click="modelValueComputed = false"
+              @click="onDialogCancel"
             />
           </QToolbar>
         </QHeader>
@@ -74,6 +74,7 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import type { Component } from "vue";
+import { useDialogPluginComponent } from "quasar";
 import MarkdownView from "./HelpMarkdownViewSection.vue";
 import OssLicense from "./HelpOssLicenseSection.vue";
 import UpdateInfo from "./HelpUpdateInfoSection.vue";
@@ -99,16 +100,11 @@ type PageSeparator = {
 };
 type PageData = PageItem | PageSeparator;
 
-const props = defineProps<{
-  modelValue: boolean;
-}>();
-const emit = defineEmits<{
-  (e: "update:modelValue", val: boolean): void;
-}>();
+const { dialogRef, onDialogCancel } = useDialogPluginComponent();
 
-const modelValueComputed = computed({
-  get: () => props.modelValue,
-  set: (val) => emit("update:modelValue", val),
+// これがいるかどうか分からない
+defineEmits({
+  ...useDialogPluginComponent.emitsObject,
 });
 
 // エディタのアップデート確認
diff --git a/src/components/Menu/MenuBar/MenuBar.vue b/src/components/Menu/MenuBar/MenuBar.vue
index 262628cd10..0e9d5a1c7c 100644
--- a/src/components/Menu/MenuBar/MenuBar.vue
+++ b/src/components/Menu/MenuBar/MenuBar.vue
@@ -28,7 +28,7 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
-import { useQuasar } from "quasar";
+import { useQuasar, Dialog } from "quasar";
 import { MenuItemData, MenuItemRoot } from "../type";
 import MenuButton from "../MenuButton.vue";
 import TitleBarButtons from "./TitleBarButtons.vue";
@@ -36,6 +36,7 @@ import TitleBarEditorSwitcher from "./TitleBarEditorSwitcher.vue";
 import { useStore } from "@/store";
 import { HotkeyAction, useHotkeyManager } from "@/plugins/hotkeyPlugin";
 import { useEngineIcons } from "@/composables/useEngineIcons";
+import HelpDialog from "@/components/Dialog/HelpDialog/HelpDialog.vue";
 
 const props = defineProps<{
   /** 「ファイル」メニューのサブメニュー */
@@ -117,9 +118,6 @@ const closeAllDialog = () => {
   void store.actions.SET_DIALOG_OPEN({
     isSettingDialogOpen: false,
   });
-  void store.actions.SET_DIALOG_OPEN({
-    isHelpDialogOpen: false,
-  });
   void store.actions.SET_DIALOG_OPEN({
     isHotkeySettingDialogOpen: false,
   });
@@ -134,12 +132,6 @@ const closeAllDialog = () => {
   });
 };
 
-const openHelpDialog = () => {
-  void store.actions.SET_DIALOG_OPEN({
-    isHelpDialogOpen: true,
-  });
-};
-
 const toggleFullScreen = async () => {
   window.backend.toggleFullScreen();
 };
@@ -538,11 +530,9 @@ const menudata = computed<MenuItemData[]>(() => [
     type: "button",
     label: "ヘルプ",
     onClick: () => {
-      if (store.state.isHelpDialogOpen) closeAllDialog();
-      else {
-        closeAllDialog();
-        openHelpDialog();
-      }
+      Dialog.create({
+        component: HelpDialog,
+      });
     },
     disableWhenUiLocked: false,
   },

From c26204b064b9c41c3441dfe49029c66a2ce341f8 Mon Sep 17 00:00:00 2001
From: jdkfx <htazoe@jdkfx.com>
Date: Wed, 18 Dec 2024 13:18:30 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=98=E3=83=AB=E3=83=97=E3=83=80?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?UTF-8?q?=E3=81=BF=E6=99=82=E3=81=AB=E5=87=BA=E3=82=8B=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E5=AF=BE=E5=87=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/HelpDialog/HelpDialog.vue          | 9 ++-------
 .../Dialog/HelpDialog/HelpMarkdownViewSection.vue        | 9 ++++++++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/Dialog/HelpDialog/HelpDialog.vue b/src/components/Dialog/HelpDialog/HelpDialog.vue
index 02487c9b01..d99f69ba05 100644
--- a/src/components/Dialog/HelpDialog/HelpDialog.vue
+++ b/src/components/Dialog/HelpDialog/HelpDialog.vue
@@ -102,11 +102,6 @@ type PageData = PageItem | PageSeparator;
 
 const { dialogRef, onDialogCancel } = useDialogPluginComponent();
 
-// これがいるかどうか分からない
-defineEmits({
-  ...useDialogPluginComponent.emitsObject,
-});
-
 // エディタのアップデート確認
 const store = useStore();
 const { warn } = createLogger("HelpDialog");
@@ -128,7 +123,7 @@ const newUpdateResult = useFetchNewUpdateInfos(
 const licenses = ref<Record<string, string>[]>();
 void store.actions.GET_OSS_LICENSES().then((obj) => (licenses.value = obj));
 
-const policy = ref<string>();
+const policy = ref<string>("");
 void store.actions.GET_POLICY_TEXT().then((obj) => (policy.value = obj));
 
 const howToUse = ref<string>();
@@ -198,7 +193,7 @@ const pagedata = computed(() => {
             }
           : {
               isUpdateAvailable: false,
-              latestVersion: undefined,
+              latestVersion: "",
             }),
       },
     },
diff --git a/src/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue b/src/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue
index 812a8d7d6e..cd8565d2a8 100644
--- a/src/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue
+++ b/src/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { onMounted, ref, watch } from "vue";
 import BaseDocumentView from "@/components/Base/BaseDocumentView.vue";
 import BaseScrollArea from "@/components/Base/BaseScrollArea.vue";
 import { useMarkdownIt } from "@/plugins/markdownItPlugin";
@@ -28,6 +28,13 @@ const md = useMarkdownIt();
 onMounted(async () => {
   documentHtml.value = md.render(props.markdown);
 });
+
+watch(
+  () => props.markdown,
+  (newMarkdown) => {
+    documentHtml.value = md.render(newMarkdown);
+  },
+);
 </script>
 
 <style scoped lang="scss">