diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue index e65a36bb3b5..2050f96235c 100644 --- a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue +++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue @@ -90,6 +90,8 @@ @@ -97,6 +157,10 @@ export default { border-radius: var(--border-radius-element, 32px); line-height: 20px; + &, & * { + cursor: pointer; + } + &:hover, &:focus-within, &:has(:active), @@ -129,6 +193,7 @@ export default { top: 0; left: 0; z-index: -1; + opacity: 0; } &__content { @@ -149,6 +214,7 @@ export default { display: none; margin-left: auto; width: var(--default-clickable-area); + flex-shrink: 0; } } diff --git a/src/components/NewConversationDialog/NewConversationContactsPage.vue b/src/components/NewConversationDialog/NewConversationContactsPage.vue index f86e3bd93a6..339c8ab1cfb 100644 --- a/src/components/NewConversationDialog/NewConversationContactsPage.vue +++ b/src/components/NewConversationDialog/NewConversationContactsPage.vue @@ -46,7 +46,7 @@ :value="searchText" :participant-phone-item.sync="participantPhoneItem" @select="addParticipantPhone" /> - { expect(avatarEl.props('offline')).toBe(true) }) - - test('renders avatar from search result', () => { - participant.label = 'Name from label' - participant.source = 'source-from-search' - participant.id = 'id-from-search' - const wrapper = mountParticipant(participant, true) - const avatarEl = wrapper.findComponent(AvatarWrapper) - expect(avatarEl.exists()).toBe(true) - - expect(avatarEl.props('id')).toBe('id-from-search') - expect(avatarEl.props('name')).toBe('Name from label') - expect(avatarEl.props('source')).toBe('source-from-search') - }) }) describe('user name', () => { @@ -318,14 +305,6 @@ describe('Participant.vue', () => { participant.inCall = PARTICIPANT.CALL_FLAG.WITH_VIDEO | PARTICIPANT.CALL_FLAG.WITH_PHONE checkStateIconsRendered(participant, VideoIcon) }) - test('does not render hand raised icon when searched', () => { - participant.inCall = PARTICIPANT.CALL_FLAG.WITH_VIDEO - participant.label = 'searched result' - getParticipantRaisedHandMock = jest.fn().mockReturnValue({ state: true }) - - checkStateIconsRendered(participant, null) - expect(getParticipantRaisedHandMock).not.toHaveBeenCalled() - }) }) describe('actions', () => { @@ -786,41 +765,4 @@ describe('Participant.vue', () => { }) }) }) - - describe('as search result', () => { - beforeEach(() => { - participant.label = 'Alice Search' - participant.source = 'users' - }) - - test('does not show actions for search results', () => { - const wrapper = mountParticipant(participant) - - // no actions - expect(wrapper.findAllComponents(NcActionButton).exists()).toBe(false) - }) - - test('triggers event when clicking', async () => { - const eventHandler = jest.fn() - const wrapper = mountParticipant(participant) - wrapper.vm.$on('click-participant', eventHandler) - - wrapper.find('a').trigger('click') - - expect(eventHandler).toHaveBeenCalledWith(participant) - }) - - test('does not trigger click event when not a search result', async () => { - const eventHandler = jest.fn() - delete participant.label - delete participant.source - const wrapper = mountParticipant(participant) - wrapper.vm.$on('click-participant', eventHandler) - - wrapper.find('a').trigger('click') - - expect(eventHandler).not.toHaveBeenCalledWith(participant) - }) - }) - }) diff --git a/src/components/RightSidebar/Participants/Participant.vue b/src/components/RightSidebar/Participants/Participant.vue index 86803fd541a..dc3e0cc30c5 100644 --- a/src/components/RightSidebar/Participants/Participant.vue +++ b/src/components/RightSidebar/Participants/Participant.vue @@ -7,23 +7,17 @@ + force-menu> -