Move user list from reactions to its own component, make favs and rts use it
This commit is contained in:
parent
950ae6d89a
commit
6079301ec4
6 changed files with 131 additions and 90 deletions
|
@ -1,5 +1,5 @@
|
|||
import UserAvatar from '../user_avatar/user_avatar.vue'
|
||||
import Popover from '../popover/popover.vue'
|
||||
import UserListPopover from '../user_list_popover/user_list_popover.vue'
|
||||
|
||||
const EMOJI_REACTION_COUNT_CUTOFF = 12
|
||||
|
||||
|
@ -7,7 +7,7 @@ const EmojiReactions = {
|
|||
name: 'EmojiReactions',
|
||||
components: {
|
||||
UserAvatar,
|
||||
Popover
|
||||
UserListPopover
|
||||
},
|
||||
props: ['status'],
|
||||
data: () => ({
|
||||
|
|
|
@ -1,44 +1,11 @@
|
|||
<template>
|
||||
<div class="emoji-reactions">
|
||||
<Popover
|
||||
<UserListPopover
|
||||
v-for="(reaction) in emojiReactions"
|
||||
:key="reaction.name"
|
||||
trigger="hover"
|
||||
placement="top"
|
||||
:offset="{ y: 5 }"
|
||||
:users="accountsForEmoji[reaction.name]"
|
||||
>
|
||||
<div
|
||||
slot="content"
|
||||
class="reacted-users"
|
||||
>
|
||||
<div v-if="accountsForEmoji[reaction.name].length">
|
||||
<div
|
||||
v-for="(account) in accountsForEmoji[reaction.name]"
|
||||
:key="account.id"
|
||||
class="reacted-user"
|
||||
>
|
||||
<UserAvatar
|
||||
:user="account"
|
||||
class="avatar-small"
|
||||
:compact="true"
|
||||
/>
|
||||
<div class="reacted-user-names">
|
||||
<!-- eslint-disable vue/no-v-html -->
|
||||
<span
|
||||
class="reacted-user-name"
|
||||
v-html="account.name_html"
|
||||
/>
|
||||
<!-- eslint-enable vue/no-v-html -->
|
||||
<span class="reacted-user-screen-name">{{ account.screen_name }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<i class="icon-spin4 animate-spin" />
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
slot="trigger"
|
||||
class="emoji-reaction btn btn-default"
|
||||
:class="{ 'picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
|
||||
@click="emojiOnClick(reaction.name, $event)"
|
||||
|
@ -47,7 +14,7 @@
|
|||
<span class="reaction-emoji">{{ reaction.name }}</span>
|
||||
<span>{{ reaction.count }}</span>
|
||||
</button>
|
||||
</Popover>
|
||||
</UserListPopover>
|
||||
<a
|
||||
v-if="tooManyReactions"
|
||||
class="emoji-reaction-expand faint"
|
||||
|
@ -69,32 +36,6 @@
|
|||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.reacted-users {
|
||||
padding: 0.5em;
|
||||
}
|
||||
|
||||
.reacted-user {
|
||||
padding: 0.25em;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.reacted-user-names {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-left: 0.5em;
|
||||
min-width: 5em;
|
||||
|
||||
img {
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
}
|
||||
}
|
||||
|
||||
.reacted-user-screen-name {
|
||||
font-size: 9px;
|
||||
}
|
||||
}
|
||||
|
||||
.emoji-reaction {
|
||||
padding: 0 0.5em;
|
||||
margin-right: 0.5em;
|
||||
|
|
|
@ -9,6 +9,7 @@ import AvatarList from '../avatar_list/avatar_list.vue'
|
|||
import Timeago from '../timeago/timeago.vue'
|
||||
import StatusContent from '../status_content/status_content.vue'
|
||||
import StatusPopover from '../status_popover/status_popover.vue'
|
||||
import UserListPopover from '../user_list_popover/user_list_popover.vue'
|
||||
import EmojiReactions from '../emoji_reactions/emoji_reactions.vue'
|
||||
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
||||
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
|
||||
|
@ -18,6 +19,21 @@ import { mapGetters, mapState } from 'vuex'
|
|||
|
||||
const Status = {
|
||||
name: 'Status',
|
||||
components: {
|
||||
FavoriteButton,
|
||||
ReactButton,
|
||||
RetweetButton,
|
||||
ExtraButtons,
|
||||
PostStatusForm,
|
||||
UserCard,
|
||||
UserAvatar,
|
||||
AvatarList,
|
||||
Timeago,
|
||||
StatusPopover,
|
||||
UserListPopover,
|
||||
EmojiReactions,
|
||||
StatusContent
|
||||
},
|
||||
props: [
|
||||
'statusoid',
|
||||
'expandable',
|
||||
|
@ -197,20 +213,6 @@ const Status = {
|
|||
currentUser: state => state.users.currentUser
|
||||
})
|
||||
},
|
||||
components: {
|
||||
FavoriteButton,
|
||||
ReactButton,
|
||||
RetweetButton,
|
||||
ExtraButtons,
|
||||
PostStatusForm,
|
||||
UserCard,
|
||||
UserAvatar,
|
||||
AvatarList,
|
||||
Timeago,
|
||||
StatusPopover,
|
||||
EmojiReactions,
|
||||
StatusContent
|
||||
},
|
||||
methods: {
|
||||
visibilityIcon (visibility) {
|
||||
switch (visibility) {
|
||||
|
|
|
@ -265,17 +265,22 @@
|
|||
class="favs-repeated-users"
|
||||
>
|
||||
<div class="stats">
|
||||
<div
|
||||
<UserListPopover
|
||||
v-if="statusFromGlobalRepository.rebloggedBy && statusFromGlobalRepository.rebloggedBy.length > 0"
|
||||
class="stat-count"
|
||||
:users="statusFromGlobalRepository.rebloggedBy"
|
||||
>
|
||||
<div class="stat-count">
|
||||
<a class="stat-title">{{ $t('status.repeats') }}</a>
|
||||
<div class="stat-number">
|
||||
{{ statusFromGlobalRepository.rebloggedBy.length }}
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
</UserListPopover>
|
||||
<UserListPopover
|
||||
v-if="statusFromGlobalRepository.favoritedBy && statusFromGlobalRepository.favoritedBy.length > 0"
|
||||
:users="statusFromGlobalRepository.favoritedBy"
|
||||
>
|
||||
<div
|
||||
class="stat-count"
|
||||
>
|
||||
<a class="stat-title">{{ $t('status.favorites') }}</a>
|
||||
|
@ -283,6 +288,7 @@
|
|||
{{ statusFromGlobalRepository.favoritedBy.length }}
|
||||
</div>
|
||||
</div>
|
||||
</UserListPopover>
|
||||
<div class="avatar-row">
|
||||
<AvatarList :users="combinedFavsAndRepeatsUsers" />
|
||||
</div>
|
||||
|
@ -722,6 +728,11 @@ $status-margin: 0.75em;
|
|||
|
||||
.stat-count {
|
||||
margin-right: $status-margin;
|
||||
user-select: none;
|
||||
|
||||
&:hover .stat-title {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.stat-title {
|
||||
color: var(--faint, $fallback--faint);
|
||||
|
|
13
src/components/user_list_popover/user_list_popover.js
Normal file
13
src/components/user_list_popover/user_list_popover.js
Normal file
|
@ -0,0 +1,13 @@
|
|||
|
||||
const UserListPopover = {
|
||||
name: 'UserListPopover',
|
||||
props: [
|
||||
'users'
|
||||
],
|
||||
components: {
|
||||
Popover: () => import('../popover/popover.vue'),
|
||||
UserAvatar: () => import('../user_avatar/user_avatar.vue')
|
||||
}
|
||||
}
|
||||
|
||||
export default UserListPopover
|
74
src/components/user_list_popover/user_list_popover.vue
Normal file
74
src/components/user_list_popover/user_list_popover.vue
Normal file
|
@ -0,0 +1,74 @@
|
|||
<template>
|
||||
<Popover
|
||||
trigger="hover"
|
||||
placement="top"
|
||||
:offset="{ y: 5 }"
|
||||
>
|
||||
<template slot="trigger">
|
||||
<slot />
|
||||
</template>
|
||||
<div
|
||||
slot="content"
|
||||
class="reacted-users"
|
||||
>
|
||||
<div v-if="users.length">
|
||||
<div
|
||||
v-for="(user) in users"
|
||||
:key="user.id"
|
||||
class="reacted-user"
|
||||
>
|
||||
<UserAvatar
|
||||
:user="user"
|
||||
class="avatar-small"
|
||||
:compact="true"
|
||||
/>
|
||||
<div class="reacted-user-names">
|
||||
<!-- eslint-disable vue/no-v-html -->
|
||||
<span
|
||||
class="reacted-user-name"
|
||||
v-html="user.name_html"
|
||||
/>
|
||||
<!-- eslint-enable vue/no-v-html -->
|
||||
<span class="reacted-user-screen-name">{{ user.screen_name }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<i class="icon-spin4 animate-spin" />
|
||||
</div>
|
||||
</div>
|
||||
</Popover>
|
||||
</template>
|
||||
|
||||
<script src="./user_list_popover.js" ></script>
|
||||
|
||||
<style lang="scss">
|
||||
@import '../../_variables.scss';
|
||||
|
||||
.reacted-users {
|
||||
padding: 0.5em;
|
||||
}
|
||||
|
||||
.reacted-user {
|
||||
padding: 0.25em;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.reacted-user-names {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-left: 0.5em;
|
||||
min-width: 5em;
|
||||
|
||||
img {
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
}
|
||||
}
|
||||
|
||||
.reacted-user-screen-name {
|
||||
font-size: 9px;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
Loading…
Reference in a new issue