enhance(frontend): 노트 메뉴를 보기 쉽도록 자주 사용하지 않는 메뉴 이동

kokonect-link · Nov 16, 2023 · 861b748 · 861b748
1 parent 37b538d
commit 861b748
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 46 deletions.
diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
@@ -56,6 +56,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
 - Enhance: 노트 편집 시 관련 안내 추가
 - Enhance: 계정을 고양이로 설정하면 자동으로 노트 작성 버튼을 '노트'에서 '냥!'으로 변경함
   - 임의로 해당 옵션을 조작한 경우에는 설정을 변경하지 않음
+- Enhance: 노트 메뉴를 보기 쉽도록 자주 사용하지 않는 메뉴 이동
 - chore: 이모티콘 이름 필드에서 autocapitalize를 끄기 (misskey-dev/misskey#12139)
 - Fix: 외부 리소스 설치 페이지에서 페이지 캐시가 작동하는 문제 수정 (misskey-dev/misskey#12105)
 - Fix: 채널 생성/업데이트 시 실패하면 아무 것도 표시되지 않는 문제 수정 misskey-dev/misskey#11983 (misskey-dev/misskey#12142)

diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
@@ -340,65 +340,24 @@ export function getNoteMenu(props: {
 					action: unclip,
 				}, null] : []
 			), {
-				icon: 'ti ti-repeat',
-				text: i18n.ts.renotesList,
-				action: showRenotes,
-			}, {
-				icon: 'ti ti-icons',
-				text: i18n.ts.reactionsList,
-				action: showReactions,
-			}, {
 				icon: 'ti ti-info-circle',
 				text: i18n.ts.details,
 				action: openDetail,
-			}, {
-				icon: 'ti ti-copy',
-				text: i18n.ts.copyContent,
-				action: copyContent,
 			}, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink)
-			, (appearNote.url ?? appearNote.uri) ? {
-				icon: 'ti ti-external-link',
-				text: i18n.ts.showOnRemote,
-				action: () => {
-					window.open(appearNote.url ?? appearNote.uri, '_blank');
-				},
-			} : undefined,
-			{
+			, {
 				icon: 'ti ti-share',
 				text: i18n.ts.share,
 				action: share,
+			}, {
+				icon: 'ti ti-copy',
+				text: i18n.ts.copyContent,
+				action: copyContent,
 			},
 			$i && $i.policies.canUseTranslator && instance.translatorAvailable ? {
 				icon: 'ti ti-language-hiragana',
 				text: i18n.ts.translate,
 				action: translate,
 			} : undefined,
-			(appearNote.userId === $i.id) ? null : undefined,
-			(appearNote.userId === $i.id) ? {
-				icon: 'ti ti-edit',
-				text: i18n.ts.copyAndEdit,
-				action: copyEdit,
-			} : undefined,
-			appearNote.userId === $i.id ? {
-				icon: 'ti ti-edit',
-				text: i18n.ts.deleteAndEdit,
-				action: delEdit,
-			} : undefined,
-			null,
-			{
-				icon: 'ti ti-code',
-				text: i18n.ts.viewTextSource,
-				action: showViewTextSource,
-			},
-			props.noNyaize.value ? {
-				icon: 'ti ti-paw-filled',
-				text: i18n.ts.revertNoNyaization,
-				action: revertNoNyaizeText,
-			} : {
-				icon: 'ti ti-paw-off',
-				text: i18n.ts.noNyaization,
-				action: noNyaizeText,
-			},
 			null,
 			statePromise.then(state => state.isFavorited ? {
 				icon: 'ti ti-star-off',
@@ -433,6 +392,52 @@ export function getNoteMenu(props: {
 				text: i18n.ts.pin,
 				action: () => togglePin(true),
 			} : undefined,
+			{
+				type: 'parent' as const,
+				icon: 'ti ti-note',
+				text: i18n.ts.note,
+				children: [{
+					icon: 'ti ti-repeat',
+					text: i18n.ts.renotesList,
+					action: showRenotes,
+				}, {
+					icon: 'ti ti-icons',
+					text: i18n.ts.reactionsList,
+					action: showReactions,
+				}, (appearNote.url ?? appearNote.uri) ? {
+					icon: 'ti ti-external-link',
+					text: i18n.ts.showOnRemote,
+					action: () => {
+						window.open(appearNote.url ?? appearNote.uri, '_blank');
+					},
+				} : undefined
+				, (appearNote.userId === $i.id) ? null : undefined
+				, (appearNote.userId === $i.id) ? {
+					icon: 'ti ti-edit',
+					text: i18n.ts.copyAndEdit,
+					action: copyEdit,
+				} : undefined
+				, appearNote.userId === $i.id ? {
+					icon: 'ti ti-edit',
+					text: i18n.ts.deleteAndEdit,
+					action: delEdit,
+				} : undefined
+				, null
+				, {
+					icon: 'ti ti-code',
+					text: i18n.ts.viewTextSource,
+					action: showViewTextSource,
+				}
+				, props.noNyaize.value ? {
+					icon: 'ti ti-paw-filled',
+					text: i18n.ts.revertNoNyaization,
+					action: revertNoNyaizeText,
+				} : {
+					icon: 'ti ti-paw-off',
+					text: i18n.ts.noNyaization,
+					action: noNyaizeText,
+				}],
+			},
 			{
 				type: 'parent' as const,
 				icon: 'ti ti-user',