From 6a68709fb59bab6f02b08133fe3968226be8c259 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 19 Aug 2023 11:27:35 +0900
Subject: [PATCH] feat: move MFM Cheatsheet button (close #35)

---
 README.md                                         |  2 ++
 packages/client/src/components/MkPostForm.vue     | 15 ---------------
 .../client/src/components/MkTutorialDialog.vue    |  5 +----
 packages/client/src/scripts/helpMenu.ts           | 11 ++++++++++-
 packages/client/src/widgets/post-form.vue         |  7 +------
 5 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index edbb1339..b2311bb6 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@
 
 ## 細かい変更点
 
+- MFM チートシートのボタンを投稿画面から左下のヘルプメニューに移動
+	- これがあるために投稿画面下部のボタンが 2 段になってしまうことがあるため
 - 「フォローされています」の表示を目立たせられるように
 	- デフォルトの表示は目立たないため
 - 最大 15 件の投稿を固定できるように
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 00c0c64e..79e6e809 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -213,14 +213,6 @@
 				>
 					<i class="ph-plug ph-bold ph-lg"></i>
 				</button>
-				<!--	v-if="showMfmCheatsheet" -->
-				<button
-					v-tooltip="i18n.ts._mfm.cheatSheet"
-					class="_button right"
-					@click="openCheatSheet"
-				>
-					<i class="ph-question ph-bold ph-lg"></i>
-				</button>
 				<div v-if="showBigPostButton">
 					<button
 						class="submit bigPostButton"
@@ -285,7 +277,6 @@ import {
 } from "@/account";
 import { uploadFile } from "@/scripts/upload";
 import { deepClone } from "@/scripts/clone";
-import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
 import { preprocess } from "@/scripts/preprocess";
 
 const modal = inject("modal");
@@ -306,13 +297,11 @@ const props = withDefaults(
 		instant?: boolean;
 		fixed?: boolean;
 		autofocus?: boolean;
-		showMfmCheatSheet?: boolean;
 		editId?: misskey.entities.Note["id"];
 	}>(),
 	{
 		initialVisibleUsers: () => [],
 		autofocus: true,
-		showMfmCheatSheet: true,
 	},
 );
 
@@ -955,10 +944,6 @@ async function insertEmoji(ev: MouseEvent) {
 	os.openEmojiPicker(ev.currentTarget ?? ev.target, {}, textareaEl);
 }
 
-async function openCheatSheet(ev: MouseEvent) {
-	os.popup(XCheatSheet, {}, {}, "closed");
-}
-
 function showActions(ev) {
 	os.popupMenu(
 		postFormActions.map((action) => ({
diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue
index 369ec122..fff6569c 100644
--- a/packages/client/src/components/MkTutorialDialog.vue
+++ b/packages/client/src/components/MkTutorialDialog.vue
@@ -103,10 +103,7 @@
 								</template>
 							</I18n>
 							<br />
-							<XPostForm
-								class="post-form _block"
-								:show-mfm-cheat-sheet="false"
-							/>
+							<XPostForm class="post-form _block" />
 						</section>
 						<section
 							v-else-if="tutorial === 4"
diff --git a/packages/client/src/scripts/helpMenu.ts b/packages/client/src/scripts/helpMenu.ts
index 55848541..572704a7 100644
--- a/packages/client/src/scripts/helpMenu.ts
+++ b/packages/client/src/scripts/helpMenu.ts
@@ -2,7 +2,8 @@ import { defaultStore } from "@/store";
 import { instance } from "@/instance";
 import { host } from "@/config";
 import * as os from "@/os";
-import XTutorial from "../components/MkTutorialDialog.vue";
+import XTutorial from "@/components/MkTutorialDialog.vue";
+import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
 import { i18n } from "@/i18n";
 
 export function openHelpMenu_(ev: MouseEvent) {
@@ -49,6 +50,14 @@ export function openHelpMenu_(ev: MouseEvent) {
 				text: i18n.ts.replayTutorial,
 				icon: "ph-circle-wavy-question ph-bold ph-lg",
 			},
+			{
+				type: "button",
+				text: i18n.ts._mfm.cheatSheet,
+				icon: "ph-question ph-bold ph-lg",
+				action: async () => {
+					os.popup(XCheatSheet, {}, {}, "closed");
+				},
+			},
 			null,
 			{
 				type: "parent",
diff --git a/packages/client/src/widgets/post-form.vue b/packages/client/src/widgets/post-form.vue
index e76d6ba6..ff25c930 100644
--- a/packages/client/src/widgets/post-form.vue
+++ b/packages/client/src/widgets/post-form.vue
@@ -1,10 +1,5 @@
 <template>
-	<XPostForm
-		class="_panel mkw-postForm"
-		:fixed="true"
-		:autofocus="false"
-		:show-mfm-cheat-sheet="true"
-	/>
+	<XPostForm class="_panel mkw-postForm" :fixed="true" :autofocus="false" />
 </template>
 
 <script lang="ts" setup>