Commit bff80ccc authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Fix rendering of user popover

Popovers were flickering because mouseleave is being triggered
immediately after the popover is rendered.
parent 2fc77624
...@@ -73,9 +73,14 @@ const handleUserPopoverMouseOver = event => { ...@@ -73,9 +73,14 @@ const handleUserPopoverMouseOver = event => {
location: userData.location, location: userData.location,
bio: userData.bio, bio: userData.bio,
organization: userData.organization, organization: userData.organization,
status: userData.status,
loaded: true, loaded: true,
}); });
if (userData.status) {
return Promise.resolve();
}
return UsersCache.retrieveStatusById(userId); return UsersCache.retrieveStatusById(userId);
}) })
.then(status => { .then(status => {
......
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
</script> </script>
<template> <template>
<gl-popover :target="target" boundary="viewport" placement="top" show> <gl-popover :target="target" boundary="viewport" placement="top" offset="0, 1" show>
<div class="user-popover d-flex"> <div class="user-popover d-flex">
<div class="p-1 flex-shrink-1"> <div class="p-1 flex-shrink-1">
<user-avatar-image :img-src="user.avatarUrl" :size="60" css-classes="mr-2" /> <user-avatar-image :img-src="user.avatarUrl" :size="60" css-classes="mr-2" />
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
name="location" name="location"
class="category-icon flex-shrink-0" class="category-icon flex-shrink-0"
/> />
<span class="ml-1">{{ user.location }}</span> <span v-if="user.location" class="ml-1">{{ user.location }}</span>
<gl-skeleton-loading <gl-skeleton-loading
v-if="locationIsLoading" v-if="locationIsLoading"
:lines="1" :lines="1"
......
---
title: Fix user popover not being displayed when the user has a status message
merge_request: 19519
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment