From 3c0a878b1afa1cfc9377c6eb0c65838baae6351a Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:00:58 +0900 Subject: [PATCH] wip --- locales/index.d.ts | 8 + locales/ja-JP.yml | 2 + .../src/components/MkNoteDetailed.vue | 6 +- .../components/global/MkStickyContainer.vue | 12 +- .../page-editor/els/page-editor.el.image.vue | 2 +- .../page-editor/els/page-editor.el.note.vue | 2 +- .../els/page-editor.el.section.vue | 4 +- .../page-editor/els/page-editor.el.text.vue | 3 +- .../pages/page-editor/page-editor.blocks.vue | 174 ++++++++++++++-- .../page-editor/page-editor.container.vue | 191 +++++++++++------- .../src/pages/page-editor/page-editor.vue | 90 ++++++++- 11 files changed, 391 insertions(+), 103 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 440f24ac84..e80e40bcea 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -9276,6 +9276,14 @@ export interface Locale extends ILocale { * 特殊 */ "specialBlocks": string; + /** + * タイトルを入力 + */ + "inputTitleHere": string; + /** + * ここに移動 + */ + "moveToHere": string; "blocks": { /** * テキスト diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 5d8e1a5e72..3a14d73c0e 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -2446,6 +2446,8 @@ _pages: contentBlocks: "コンテンツ" inputBlocks: "入力" specialBlocks: "特殊" + inputTitleHere: "タイトルを入力" + moveToHere: "ここに移動" blocks: text: "テキスト" textarea: "テキストエリア" diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index e0473dce5e..8da6279d6b 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -246,9 +246,11 @@ import { isEnabledUrlPreview } from '@/instance.js'; import { getAppearNote } from '@/scripts/get-appear-note.js'; import { type Keymap } from '@/scripts/hotkey.js'; +type Tab = 'replies' | 'renotes' | 'reactions'; + const props = withDefaults(defineProps<{ note: Misskey.entities.Note; - initialTab: string; + initialTab?: Tab; }>(), { initialTab: 'replies', }); @@ -332,7 +334,7 @@ provide('react', (reaction: string) => { }); }); -const tab = ref(props.initialTab); +const tab = ref(props.initialTab); const reactionTabType = ref(null); const renotesPagination = computed(() => ({ diff --git a/packages/frontend/src/components/global/MkStickyContainer.vue b/packages/frontend/src/components/global/MkStickyContainer.vue index 1aebf487bb..24f9333f74 100644 --- a/packages/frontend/src/components/global/MkStickyContainer.vue +++ b/packages/frontend/src/components/global/MkStickyContainer.vue @@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only -->