Merge branch 'develop'

CHANGELOG.md

@@ -10,6 +10,14 @@
 You should also include the user name that made the change.
 -->
 
+## 12.106.3 (2022/02/11)
+
+### Improvements
+- クライアント: スマートフォンでの余白を調整 @syuilo
+
+### Bugfixes
+- クライアント: ノートの詳細が表示されない問題を修正 @syuilo
+
 ## 12.106.2 (2022/02/11)
 
 ### Bugfixes

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.106.2",
+	"version": "12.106.3",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/client/src/components/global/spacer.vue

@@ -7,6 +7,7 @@
 </template>
 
 <script lang="ts">
+import { deviceKind } from '@/scripts/device-kind';
 import { defineComponent, inject, onMounted, onUnmounted, ref } from 'vue';
 
 export default defineComponent({
@@ -35,7 +36,7 @@ export default defineComponent({
 		const margin = ref(0);
 		const shouldSpacerMin = inject('shouldSpacerMin', false);
 		const adjust = (rect: { width: number; height: number; }) => {
-			if (shouldSpacerMin) {
+			if (shouldSpacerMin || deviceKind === 'smartphone') {
 				margin.value = props.marginMin;
 				return;
 			}

packages/client/src/components/note-detailed.vue

@@ -154,11 +154,13 @@ const props = defineProps<{
 
 const inChannel = inject('inChannel', null);
 
+const note = $ref(JSON.parse(JSON.stringify(props.note)));
+
 const isRenote = (
-	props.note.renote != null &&
+	note.renote != null &&
-	props.note.text == null &&
+	note.text == null &&
-	props.note.fileIds.length === 0 &&
+	note.fileIds.length === 0 &&
-	props.note.poll == null
+	note.poll == null
 );
 
 const el = ref<HTMLElement>();
@@ -166,8 +168,8 @@ const menuButton = ref<HTMLElement>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
 const renoteTime = ref<HTMLElement>();
 const reactButton = ref<HTMLElement>();
-let appearNote = $ref(isRenote ? props.note.renote as misskey.entities.Note : props.note);
+let appearNote = $ref(isRenote ? note.renote as misskey.entities.Note : note);
-const isMyRenote = $i && ($i.id === props.note.userId);
+const isMyRenote = $i && ($i.id === note.userId);
 const showContent = ref(false);
 const isDeleted = ref(false);
 const muted = ref(checkWordMute(appearNote, $i, defaultStore.state.mutedWords));
@@ -188,8 +190,9 @@ const keymap = {
 };
 
 useNoteCapture({
-	appearNote: $$(appearNote),
 	rootEl: el,
+	note: $$(appearNote),
+	isDeletedRef: isDeleted,
 });
 
 function reply(viaKeyboard = false): void {
@@ -237,12 +240,12 @@ function onContextmenu(ev: MouseEvent): void {
 		ev.preventDefault();
 		react();
 	} else {
-		os.contextMenu(getNoteMenu({ note: props.note, translating, translation, menuButton }), ev).then(focus);
+		os.contextMenu(getNoteMenu({ note: note, translating, translation, menuButton }), ev).then(focus);
 	}
 }
 
 function menu(viaKeyboard = false): void {
-	os.popupMenu(getNoteMenu({ note: props.note, translating, translation, menuButton }), menuButton.value, {
+	os.popupMenu(getNoteMenu({ note: note, translating, translation, menuButton }), menuButton.value, {
 		viaKeyboard
 	}).then(focus);
 }
@@ -255,7 +258,7 @@ function showRenoteMenu(viaKeyboard = false): void {
 		danger: true,
 		action: () => {
 			os.api('notes/delete', {
-				noteId: props.note.id
+				noteId: note.id
 			});
 			isDeleted.value = true;
 		}

packages/client/src/components/note.vue

@@ -180,7 +180,7 @@ const keymap = {
 useNoteCapture({
 	rootEl: el,
 	note: $$(appearNote),
-	isDeletedRef: $$(isDeleted),
+	isDeletedRef: isDeleted,
 });
 
 function reply(viaKeyboard = false): void {