From f337459c6e3a1f8a08f69c7b7959dbf21242823e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 5 Sep 2022 18:24:46 +0900
Subject: [PATCH] refactor(client): use setup syntax
---
.../client/src/components/MkUserPreview.vue | 102 +++++++-----------
1 file changed, 41 insertions(+), 61 deletions(-)
diff --git a/packages/client/src/components/MkUserPreview.vue b/packages/client/src/components/MkUserPreview.vue
index 427e46ef16..4de2e8baa2 100644
--- a/packages/client/src/components/MkUserPreview.vue
+++ b/packages/client/src/components/MkUserPreview.vue
@@ -1,7 +1,7 @@
<template>
-<transition :name="$store.state.animation ? 'popup' : ''" appear @after-leave="$emit('closed')">
- <div v-if="showing" class="fxxzrfni _popup _shadow" :style="{ zIndex, top: top + 'px', left: left + 'px' }" @mouseover="() => { $emit('mouseover'); }" @mouseleave="() => { $emit('mouseleave'); }">
- <div v-if="fetched" class="info">
+<transition :name="$store.state.animation ? 'popup' : ''" appear @after-leave="emit('closed')">
+ <div v-if="showing" class="fxxzrfni _popup _shadow" :style="{ zIndex, top: top + 'px', left: left + 'px' }" @mouseover="() => { emit('mouseover'); }" @mouseleave="() => { emit('mouseleave'); }">
+ <div v-if="user != null" class="info">
<div class="banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl})` : ''">
<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ $ts.followsYou }}</span>
</div>
@@ -33,71 +33,51 @@
</transition>
</template>
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { onMounted } from 'vue';
import * as Acct from 'misskey-js/built/acct';
+import * as misskey from 'misskey-js';
import MkFollowButton from '@/components/MkFollowButton.vue';
import { userPage } from '@/filters/user';
import * as os from '@/os';
-export default defineComponent({
- components: {
- MkFollowButton,
- },
-
- props: {
- showing: {
- type: Boolean,
- required: true,
- },
- q: {
- type: String,
- required: true,
- },
- source: {
- required: true,
- },
- },
-
- emits: ['closed', 'mouseover', 'mouseleave'],
-
- data() {
- return {
- user: null,
- fetched: false,
- top: 0,
- left: 0,
- zIndex: os.claimZIndex('middle'),
- };
- },
-
- mounted() {
- if (typeof this.q === 'object') {
- this.user = this.q;
- this.fetched = true;
- } else {
- const query = this.q.startsWith('@') ?
- Acct.parse(this.q.substr(1)) :
- { userId: this.q };
-
- os.api('users/show', query).then(user => {
- if (!this.showing) return;
- this.user = user;
- this.fetched = true;
- });
- }
-
- const rect = this.source.getBoundingClientRect();
- const x = ((rect.left + (this.source.offsetWidth / 2)) - (300 / 2)) + window.pageXOffset;
- const y = rect.top + this.source.offsetHeight + window.pageYOffset;
+const props = defineProps<{
+ showing: boolean;
+ q: string;
+ source: HTMLElement;
+}>();
+
+const emit = defineEmits<{
+ (ev: 'closed'): void;
+ (ev: 'mouseover'): void;
+ (ev: 'mouseleave'): void;
+}>();
+
+const zIndex = os.claimZIndex('middle');
+let user = $ref<misskey.entities.UserDetailed | null>(null);
+let top = $ref(0);
+let left = $ref(0);
+
+onMounted(() => {
+ if (typeof props.q === 'object') {
+ user = props.q;
+ } else {
+ const query = props.q.startsWith('@') ?
+ Acct.parse(props.q.substr(1)) :
+ { userId: props.q };
+
+ os.api('users/show', query).then(res => {
+ if (!props.showing) return;
+ user = res;
+ });
+ }
- this.top = y;
- this.left = x;
- },
+ const rect = props.source.getBoundingClientRect();
+ const x = ((rect.left + (props.source.offsetWidth / 2)) - (300 / 2)) + window.pageXOffset;
+ const y = rect.top + props.source.offsetHeight + window.pageYOffset;
- methods: {
- userPage,
- },
+ top = y;
+ left = x;
});
</script>
--
GitLab