refactor(client): use composition api for tooltip logic

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

@@ -94,7 +94,7 @@
 					<template v-else><i class="fas fa-reply"></i></template>
 					<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 				</button>
-				<XRenoteButton :note="appearNote" :count="appearNote.renoteCount" ref="renoteButton"/>
+				<XRenoteButton class="button" :note="appearNote" :count="appearNote.renoteCount" ref="renoteButton"/>
 				<button v-if="appearNote.myReaction == null" class="button _button" @click="react()" ref="reactButton">
 					<i class="fas fa-plus"></i>
 				</button>
@@ -132,16 +132,16 @@ import XMediaList from './media-list.vue';
 import XCwButton from './cw-button.vue';
 import XPoll from './poll.vue';
 import XRenoteButton from './renote-button.vue';
-import { pleaseLogin } from '@client/scripts/please-login';
+import { pleaseLogin } from '@/scripts/please-login';
-import { focusPrev, focusNext } from '@client/scripts/focus';
+import { focusPrev, focusNext } from '@/scripts/focus';
-import { url } from '@client/config';
+import { url } from '@/config';
-import copyToClipboard from '@client/scripts/copy-to-clipboard';
+import copyToClipboard from '@/scripts/copy-to-clipboard';
-import { checkWordMute } from '@client/scripts/check-word-mute';
+import { checkWordMute } from '@/scripts/check-word-mute';
-import { userPage } from '@client/filters/user';
+import { userPage } from '@/filters/user';
-import * as os from '@client/os';
+import * as os from '@/os';
-import { noteActions, noteViewInterruptors } from '@client/store';
+import { noteActions, noteViewInterruptors } from '@/store';
-import { reactionPicker } from '@client/scripts/reaction-picker';
+import { reactionPicker } from '@/scripts/reaction-picker';
-import { extractUrlFromMfm } from '@/misc/extract-url-from-mfm';
+import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
 
 // TODO: note.vueとほぼ同じなので共通化したい
 export default defineComponent({
@@ -154,8 +154,8 @@ export default defineComponent({
 		XCwButton,
 		XPoll,
 		XRenoteButton,
-		MkUrlPreview: defineAsyncComponent(() => import('@client/components/url-preview.vue')),
+		MkUrlPreview: defineAsyncComponent(() => import('@/components/url-preview.vue')),
-		MkInstanceTicker: defineAsyncComponent(() => import('@client/components/instance-ticker.vue')),
+		MkInstanceTicker: defineAsyncComponent(() => import('@/components/instance-ticker.vue')),
 	},
 
 	inject: {

packages/client/src/components/note.vue

@@ -78,7 +78,7 @@
 					<template v-else><i class="fas fa-reply"></i></template>
 					<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
 				</button>
-				<XRenoteButton :note="appearNote" :count="appearNote.renoteCount" ref="renoteButton"/>
+				<XRenoteButton class="button" :note="appearNote" :count="appearNote.renoteCount" ref="renoteButton"/>
 				<button v-if="appearNote.myReaction == null" class="button _button" @click="react()" ref="reactButton">
 					<i class="fas fa-plus"></i>
 				</button>
@@ -115,16 +115,16 @@ import XMediaList from './media-list.vue';
 import XCwButton from './cw-button.vue';
 import XPoll from './poll.vue';
 import XRenoteButton from './renote-button.vue';
-import { pleaseLogin } from '@client/scripts/please-login';
+import { pleaseLogin } from '@/scripts/please-login';
-import { focusPrev, focusNext } from '@client/scripts/focus';
+import { focusPrev, focusNext } from '@/scripts/focus';
-import { url } from '@client/config';
+import { url } from '@/config';
-import copyToClipboard from '@client/scripts/copy-to-clipboard';
+import copyToClipboard from '@/scripts/copy-to-clipboard';
-import { checkWordMute } from '@client/scripts/check-word-mute';
+import { checkWordMute } from '@/scripts/check-word-mute';
-import { userPage } from '@client/filters/user';
+import { userPage } from '@/filters/user';
-import * as os from '@client/os';
+import * as os from '@/os';
-import { noteActions, noteViewInterruptors } from '@client/store';
+import { noteActions, noteViewInterruptors } from '@/store';
-import { reactionPicker } from '@client/scripts/reaction-picker';
+import { reactionPicker } from '@/scripts/reaction-picker';
-import { extractUrlFromMfm } from '@/misc/extract-url-from-mfm';
+import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
 
 export default defineComponent({
 	components: {
@@ -136,8 +136,8 @@ export default defineComponent({
 		XCwButton,
 		XPoll,
 		XRenoteButton,
-		MkUrlPreview: defineAsyncComponent(() => import('@client/components/url-preview.vue')),
+		MkUrlPreview: defineAsyncComponent(() => import('@/components/url-preview.vue')),
-		MkInstanceTicker: defineAsyncComponent(() => import('@client/components/instance-ticker.vue')),
+		MkInstanceTicker: defineAsyncComponent(() => import('@/components/instance-ticker.vue')),
 	},
 
 	inject: {

packages/client/src/components/notification.vue

@@ -78,6 +78,7 @@ import notePage from '@/filters/note';
 import { userPage } from '@/filters/user';
 import { i18n } from '@/i18n';
 import * as os from '@/os';
+import { useTooltip } from '@/scripts/use-tooltip';
 
 export default defineComponent({
 	components: {
@@ -153,47 +154,14 @@ export default defineComponent({
 			os.api('users/groups/invitations/reject', { invitationId: props.notification.invitation.id });
 		};
 
-		let isReactionHovering = false;
+		const { onMouseover: onReactionMouseover, onMouseleave: onReactionMouseleave } = useTooltip((showing) => {
-		let reactionTooltipTimeoutId;
-
-		const onReactionMouseover = () => {
-			if (isReactionHovering) return;
-			isReactionHovering = true;
-			reactionTooltipTimeoutId = setTimeout(openReactionTooltip, 300);
-		};
-
-		const onReactionMouseleave = () => {
-			if (!isReactionHovering) return;
-			isReactionHovering = false;
-			clearTimeout(reactionTooltipTimeoutId);
-			closeReactionTooltip();
-		};
-
-		let changeReactionTooltipShowingState: (() => void) | null;
-
-		const openReactionTooltip = () => {
-			closeReactionTooltip();
-			if (!isReactionHovering) return;
-
-			const showing = ref(true);
 			os.popup(XReactionTooltip, {
 				showing,
 				reaction: props.notification.reaction ? props.notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : props.notification.reaction,
 				emojis: props.notification.note.emojis,
 				source: reactionRef.value.$el,
 			}, {}, 'closed');
-
+		});
-			changeReactionTooltipShowingState = () => {
-				showing.value = false;
-			};
-		};
-
-		const closeReactionTooltip = () => {
-			if (changeReactionTooltipShowingState != null) {
-				changeReactionTooltipShowingState();
-				changeReactionTooltipShowingState = null;
-			}
-		};
 
 		return {
 			getNoteSummary: (note: misskey.entities.Note) => getNoteSummary(note),

packages/client/src/components/reactions-viewer.reaction.vue

@@ -2,13 +2,13 @@
 <button
 	class="hkzvhatu _button"
 	:class="{ reacted: note.myReaction == reaction, canToggle }"
-	@click="toggleReaction(reaction)"
+	@click="toggleReaction()"
 	v-if="count > 0"
 	@touchstart.passive="onMouseover"
 	@mouseover="onMouseover"
 	@mouseleave="onMouseleave"
 	@touchend="onMouseleave"
-	ref="reaction"
+	ref="buttonRef"
 	v-particle="canToggle"
 >
 	<XReactionIcon :reaction="reaction" :custom-emojis="note.emojis"/>
@@ -17,15 +17,18 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { computed, defineComponent, onMounted, ref, watch } from 'vue';
 import XDetails from '@/components/reactions-viewer.details.vue';
 import XReactionIcon from '@/components/reaction-icon.vue';
 import * as os from '@/os';
+import { useTooltip } from '@/scripts/use-tooltip';
+import { $i } from '@/account';
 
 export default defineComponent({
 	components: {
 		XReactionIcon
 	},
+
 	props: {
 		reaction: {
 			type: String,
@@ -44,101 +47,78 @@ export default defineComponent({
 			required: true,
 		},
 	},
-	data() {
-		return {
-			close: null,
-			detailsTimeoutId: null,
-			isHovering: false
-		};
-	},
-	computed: {
-		canToggle(): boolean {
-			return !this.reaction.match(/@\w/) && this.$i;
-		},
-	},
-	watch: {
-		count(newCount, oldCount) {
-			if (oldCount < newCount) this.anime();
-			if (this.close != null) this.openDetails();
-		},
-	},
-	mounted() {
-		if (!this.isInitial) this.anime();
-	},
-	methods: {
-		toggleReaction() {
-			if (!this.canToggle) return;
 
-			const oldReaction = this.note.myReaction;
+	setup(props) {
+		const buttonRef = ref<HTMLElement>();
+
+		const canToggle = computed(() => !props.reaction.match(/@\w/) && $i);
+
+		const toggleReaction = () => {
+			if (!canToggle.value) return;
+
+			const oldReaction = props.note.myReaction;
 			if (oldReaction) {
 				os.api('notes/reactions/delete', {
-					noteId: this.note.id
+					noteId: props.note.id
 				}).then(() => {
-					if (oldReaction !== this.reaction) {
+					if (oldReaction !== props.reaction) {
 						os.api('notes/reactions/create', {
-							noteId: this.note.id,
+							noteId: props.note.id,
-							reaction: this.reaction
+							reaction: props.reaction
 						});
 					}
 				});
 			} else {
 				os.api('notes/reactions/create', {
-					noteId: this.note.id,
+					noteId: props.note.id,
-					reaction: this.reaction
+					reaction: props.reaction
 				});
 			}
-		},
+		};
-		onMouseover() {
+
-			if (this.isHovering) return;
+		const anime = () => {
-			this.isHovering = true;
+			if (document.hidden) return;
-			this.detailsTimeoutId = setTimeout(this.openDetails, 300);
+
-		},
+			// TODO: 新しくリアクションが付いたことが視覚的に分かりやすいアニメーション
-		onMouseleave() {
+		};
-			if (!this.isHovering) return;
+
-			this.isHovering = false;
+		watch(() => props.count, (newCount, oldCount) => {
-			clearTimeout(this.detailsTimeoutId);
+			if (oldCount < newCount) anime();
-			this.closeDetails();
+		});
-		},
+
-		openDetails() {
+		onMounted(() => {
-			os.api('notes/reactions', {
+			if (!props.isInitial) anime();
-				noteId: this.note.id,
+		});
-				type: this.reaction,
+
+		const { onMouseover, onMouseleave } = useTooltip(async (showing) => {
+			const reactions = await os.api('notes/reactions', {
+				noteId: props.note.id,
+				type: props.reaction,
 				limit: 11
-			}).then((reactions: any[]) => {
+			});
+
 			const users = reactions
 				.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime())
 				.map(x => x.user);
 
-				this.closeDetails();
-				if (!this.isHovering) return;
-
-				const showing = ref(true);
 			os.popup(XDetails, {
 				showing,
-					reaction: this.reaction,
+				reaction: props.reaction,
-					emojis: this.note.emojis,
+				emojis: props.note.emojis,
 				users,
-					count: this.count,
+				count: props.count,
-					source: this.$refs.reaction
+				source: buttonRef.value
 			}, {}, 'closed');
-
-				this.close = () => {
-					showing.value = false;
-				};
 		});
-		},
-		closeDetails() {
-			if (this.close != null) {
-				this.close();
-				this.close = null;
-			}
-		},
-		anime() {
-			if (document.hidden) return;
 
-			// TODO
+		return {
+			buttonRef,
+			canToggle,
+			toggleReaction,
+			onMouseover,
+			onMouseleave,
+		};
 	},
-	}
 });
 </script>
 

packages/client/src/components/renote-button.vue

@@ -1,13 +1,13 @@
 <template>
 <button
-	class="button _button canRenote"
+	class="eddddedb _button canRenote"
 	@click="renote()"
 	v-if="canRenote"
 	@touchstart.passive="onMouseover"
 	@mouseover="onMouseover"
 	@mouseleave="onMouseleave"
 	@touchend="onMouseleave"
-	ref="renoteButton"
+	ref="buttonRef"
 >
 	<i class="fas fa-retweet"></i>
 	<p class="count" v-if="count > 0">{{ count }}</p>
@@ -21,10 +21,13 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { computed, defineComponent, ref } from 'vue';
-import XDetails from '@client/components/renote.details.vue';
+import XDetails from '@/components/renote.details.vue';
-import { pleaseLogin } from '@client/scripts/please-login';
+import { pleaseLogin } from '@/scripts/please-login';
-import * as os from '@client/os';
+import * as os from '@/os';
+import { $i } from '@/account';
+import { useTooltip } from '@/scripts/use-tooltip';
+import { i18n } from '@/i18n';
 
 export default defineComponent({
 	props: {
@@ -37,95 +40,68 @@ export default defineComponent({
 			required: true,
 		},
 	},
-	data() {
+
-		return {
+	setup(props) {
-			close: null,
+		const buttonRef = ref<HTMLElement>();
-			detailsTimeoutId: null,
+
-			isHovering: false
+		const canRenote = computed(() => ['public', 'home'].includes(props.note.visibility) || props.note.userId === $i.id);
-		};
+
-	},
+		const { onMouseover, onMouseleave } = useTooltip(async (showing) => {
-	computed: {
+			const renotes = await os.api('notes/renotes', {
-		canRenote(): boolean {
+				noteId: props.note.id,
-			return ['public', 'home'].includes(this.note.visibility) || this.note.userId === this.$i.id;
-		},
-	},
-	watch: {
-		count(newCount, oldCount) {
-			if (oldCount < newCount) this.anime();
-			if (this.close != null) this.openDetails();
-		},
-	},
-	methods: {
-		renote(viaKeyboard = false) {
-			pleaseLogin();
-			os.popupMenu([{
-				text: this.$ts.renote,
-				icon: 'fas fa-retweet',
-				action: () => {
-					os.api('notes/create', {
-						renoteId: this.note.id
-					});
-				}
-			}, {
-				text: this.$ts.quote,
-				icon: 'fas fa-quote-right',
-				action: () => {
-					os.post({
-						renote: this.note,
-					});
-				}
-			}], this.$refs.renoteButton, {
-				viaKeyboard
-			});
-		},
-		onMouseover() {
-			if (this.isHovering) return;
-			this.isHovering = true;
-			this.detailsTimeoutId = setTimeout(this.openDetails, 300);
-		},
-		onMouseleave() {
-			if (!this.isHovering) return;
-			this.isHovering = false;
-			clearTimeout(this.detailsTimeoutId);
-			this.closeDetails();
-		},
-		openDetails() {
-			os.api('notes/renotes', {
-				noteId: this.note.id,
 				limit: 11
-			}).then((renotes: any[]) => {
+			});
+
 			const users = renotes
 				.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime())
 				.map(x => x.user);
 
-				this.closeDetails();
+			if (users.length < 1) return;
-				if (!this.isHovering || users.length < 1) return;
 
-				const showing = ref(true);
 			os.popup(XDetails, {
 				showing,
 				users,
-					count: this.count,
+				count: props.count,
-					source: this.$refs.renoteButton
+				source: buttonRef.value
 			}, {}, 'closed');
-
-				this.close = () => {
-					showing.value = false;
-				};
 		});
-		},
+
-		closeDetails() {
+		const renote = (viaKeyboard = false) => {
-			if (this.close != null) {
+			pleaseLogin();
-				this.close();
+			os.popupMenu([{
-				this.close = null;
+				text: i18n.locale.renote,
+				icon: 'fas fa-retweet',
+				action: () => {
+					os.api('notes/create', {
+						renoteId: props.note.id
+					});
 				}
-		},
+			}, {
+				text: i18n.locale.quote,
+				icon: 'fas fa-quote-right',
+				action: () => {
+					os.post({
+						renote: props.note,
+					});
 				}
+			}], buttonRef.value, {
+				viaKeyboard
+			});
+		};
+
+		return {
+			buttonRef,
+			canRenote,
+			renote,
+			onMouseover,
+			onMouseleave,
+		};
+	},
 });
 </script>
 
 <style lang="scss" scoped>
-.button {
+.eddddedb {
 	display: inline-block;
 	height: 32px;
 	margin: 2px;

packages/client/src/scripts/use-tooltip.ts

@@ -0,0 +1,44 @@
+import { Ref, ref } from 'vue';
+
+export function useTooltip(onShow: (showing: Ref<boolean>) => void) {
+	let isHovering = false;
+	let timeoutId: number;
+
+	let changeShowingState: (() => void) | null;
+
+	const open = () => {
+		close();
+		if (!isHovering) return;
+
+		const showing = ref(true);
+		onShow(showing);
+		changeShowingState = () => {
+			showing.value = false;
+		};
+	};
+
+	const close = () => {
+		if (changeShowingState != null) {
+			changeShowingState();
+			changeShowingState = null;
+		}
+	};
+
+	const onMouseover = () => {
+		if (isHovering) return;
+		isHovering = true;
+		timeoutId = window.setTimeout(open, 300);
+	};
+
+	const onMouseleave = () => {
+		if (!isHovering) return;
+		isHovering = false;
+		window.clearTimeout(timeoutId);
+		close();
+	};
+
+	return {
+		onMouseover,
+		onMouseleave,
+	};
+}