Skip to content

[6.x] Better Collaboration Avatars #14511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 2 commits into from
Apr 17, 2026
+24 −3
Merged

[6.x] Better Collaboration Avatars #14511

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfe33dd
Better Collaboration Avatars
jackmcdade Apr 17, 2026
90b1658
use import while we're here
jasonvarga Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions resources/js/components/ui/Publish/Field.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { computed, useTemplateRef, watch, ref, inject } from 'vue';
import { injectContainerContext } from './Container.vue';
import { injectFieldsContext } from './FieldsProvider.vue';
import {
Avatar,
Field,
Icon,
Label,
} from '@ui';
import FieldActions from '@/components/field-actions/FieldActions.vue';
Expand Down Expand Up @@ -242,7 +242,16 @@ const fieldtypeComponentEvents = computed(() => ({
v-bind="$attrs"
>
<template #label v-if="shouldShowLabel">
<Label :for="fieldId" :required="isRequired">
<Label :for="fieldId" :required="isRequired" class="relative">
<Transition name="lock-avatar-pop" mode="out-in">
<Avatar
v-if="isLocked"
:key="`lock-avatar-${handle}-${lockedBy?.id}`"
:user="lockedBy"
class="inline-flex mx-1 -start-8 -top-0.5 absolute rounded-full size-6 text-3xs"
v-tooltip="lockedBy.name"
/>
</Transition>
<template v-if="shouldShowLabelText">
<span v-tooltip="config.handle">
{{ __(config.display) }}
Expand All @@ -251,7 +260,6 @@ const fieldtypeComponentEvents = computed(() => ({
<template v-else-if="config.hide_display">
<span class="sr-only">{{ __(config.display) }}</span>
</template>
<ui-avatar v-if="isLocked" :user="lockedBy" class="rounded-full w-4 h-4 text-2xs" v-tooltip="lockedBy.name" />
<ui-button size="xs" inset icon="synced" variant="ghost" v-tooltip="__('messages.field_synced_with_origin')" v-if="!isReadOnly && isSyncable" v-show="isSynced" @click="desync" />
<ui-button size="xs" inset icon="unsynced" variant="ghost" v-tooltip="__('messages.field_desynced_from_origin')" v-if="!isReadOnly && isSyncable" v-show="!isSynced" @click="sync" />
</Label>
Expand All @@ -273,3 +281,16 @@ const fieldtypeComponentEvents = computed(() => ({
</Field>
</slot>
</template>

<style scoped>
.lock-avatar-pop-enter-active,
.lock-avatar-pop-leave-active {
transition: opacity 120ms ease, transform 120ms ease;
}

.lock-avatar-pop-enter-from,
.lock-avatar-pop-leave-to {
opacity: 0;
transform: translateX(-5px) scale(0.85);
}
</style>
Loading