From ae3abc2126409da909edc1134a057fa13d819ed8 Mon Sep 17 00:00:00 2001 From: tamaina Date: Tue, 1 Feb 2022 23:48:19 +0900 Subject: [PATCH] fix: Fix Sideview (#8235) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix #7890 * a- * 3度目の正直 * fix * :v: * update CHANGELOG Co-authored-by: syuilo --- CHANGELOG.md | 1 + packages/client/src/components/global/a.vue | 5 +- packages/client/src/ui/classic.side.vue | 162 ++++++------- packages/client/src/ui/universal.vue | 250 +++++++++----------- 4 files changed, 194 insertions(+), 224 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1725c7703..a0eef5a6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - 投稿フォームのハッシュタグ保持フィールドが動作しない問題を修正 - Add `img-src` and `media-src` directives to `Content-Security-Policy` for files and media proxy +- サイドビューが動かないのを修正 - ensure that specified users does not get duplicates ## 12.102.1 (2022/01/27) diff --git a/packages/client/src/components/global/a.vue b/packages/client/src/components/global/a.vue index b1b6a0cda..52fef50f9 100644 --- a/packages/client/src/components/global/a.vue +++ b/packages/client/src/components/global/a.vue @@ -23,8 +23,9 @@ const props = withDefaults(defineProps<{ behavior: null, }); -const navHook = inject('navHook', null); -const sideViewHook = inject('sideViewHook', null); +type Navigate = (path: string, record?: boolean) => void; +const navHook = inject('navHook', null); +const sideViewHook = inject('sideViewHook', null); const active = $computed(() => { if (props.activeClass == null) return false; diff --git a/packages/client/src/ui/classic.side.vue b/packages/client/src/ui/classic.side.vue index f81683414..6c2329194 100644 --- a/packages/client/src/ui/classic.side.vue +++ b/packages/client/src/ui/classic.side.vue @@ -4,7 +4,7 @@
- {{ pageInfo.title }} +
@@ -13,99 +13,89 @@ - diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index 8fe9dcffa..b0dfc5aad 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -20,7 +20,7 @@ - +
@@ -31,9 +31,9 @@
- + - +
@@ -64,155 +64,133 @@
-