refac
This commit is contained in:
1 parent
c205d3a353
commit
4f69c33de0
2 files changed
+23
-9
No files matched your search
@@ -28,5 +28,5 @@
|
|||||||
</button>
|
</button>
|
||||||
</LinkPreview.Trigger>
|
</LinkPreview.Trigger>
|
||||||
|
|
||||||
<UserStatusLinkPreview id={user?.id} {side} {align} {sideOffset} />
|
<UserStatusLinkPreview id={user?.id} {openPreview} {side} {align} {sideOffset} />
|
||||||
</LinkPreview.Root>
|
</LinkPreview.Root>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { getContext, onMount } from 'svelte';
|
import { getContext } from 'svelte';
|
||||||
import { LinkPreview } from 'bits-ui';
|
import { LinkPreview } from 'bits-ui';
|
||||||
|
|
||||||
const i18n = getContext('i18n');
|
const i18n = getContext('i18n');
|
||||||
@@ -7,21 +7,35 @@
|
|||||||
|
|
||||||
import UserStatus from './UserStatus.svelte';
|
import UserStatus from './UserStatus.svelte';
|
||||||
|
|
||||||
export let id = null;
|
export let id: string | null = null;
|
||||||
|
export let openPreview = false;
|
||||||
|
|
||||||
export let side = 'top';
|
export let side = 'top';
|
||||||
export let align = 'start';
|
export let align = 'start';
|
||||||
export let sideOffset = 6;
|
export let sideOffset = 6;
|
||||||
|
|
||||||
let user = null;
|
let user = null;
|
||||||
onMount(async () => {
|
let requestedUserId: string | null = null;
|
||||||
if (id) {
|
|
||||||
user = await getUserInfoById(localStorage.token, id).catch((error) => {
|
const loadUser = async (userId: string) => {
|
||||||
|
requestedUserId = userId;
|
||||||
|
|
||||||
|
const loadedUser = await getUserInfoById(localStorage.token, userId).catch((error) => {
|
||||||
|
if (requestedUserId === userId) {
|
||||||
console.error('Error fetching user by ID:', error);
|
console.error('Error fetching user by ID:', error);
|
||||||
return null;
|
}
|
||||||
});
|
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (requestedUserId === userId) {
|
||||||
|
user = loadedUser;
|
||||||
}
|
}
|
||||||
});
|
};
|
||||||
|
|
||||||
|
$: if (openPreview && id && id !== requestedUserId) {
|
||||||
|
loadUser(id);
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if user}
|
{#if user}
|
||||||
|
|||||||
Reference in new issue
Block a user