Skip to content

refactor(ui): use upstream component name for NcPopover #12184

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
ChristophWurst merged 1 commit into from
Dec 17, 2025
+18 −18
Merged

refactor(ui): use upstream component name for NcPopover #12184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/components/MailboxThread.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<SectionTitle
class="section-title"
:name="t('mail', 'Favorites')" />
<Popover trigger="hover focus">
<NcPopover trigger="hover focus">
<template #trigger>
<ButtonVue
type="tertiary-no-background"
Expand All @@ -50,7 +50,7 @@
<p class="section-header-info">
{{ favoritesInfo }}
</p>
</Popover>
</NcPopover>
</div>
<Mailbox
v-show="hasFavoriteEnvelopes"
Expand Down Expand Up @@ -81,7 +81,7 @@
<SectionTitle
class="section-title"
:name="t('mail', 'Favorites')" />
<Popover trigger="hover focus">
<NcPopover trigger="hover focus">
<template #trigger>
<ButtonVue
type="tertiary-no-background"
Expand All @@ -95,7 +95,7 @@
<p class="section-header-info">
{{ favoritesInfo }}
</p>
</Popover>
</NcPopover>
</div>
<Mailbox
v-show="hasFavoriteEnvelopes"
Expand All @@ -114,7 +114,7 @@
<SectionTitle
class="section-title"
:name="t('mail', 'Follow up')" />
<Popover trigger="hover focus">
<NcPopover trigger="hover focus">
<template #trigger>
<ButtonVue
type="tertiary-no-background"
Expand All @@ -128,7 +128,7 @@
<p class="section-header-info">
{{ followupInfo }}
</p>
</Popover>
</NcPopover>
</div>
<Mailbox
v-show="hasFollowUpEnvelopes"
Expand All @@ -145,7 +145,7 @@
<SectionTitle
class="section-title important"
:name="t('mail', 'Important')" />
<Popover trigger="hover focus">
<NcPopover trigger="hover focus">
<template #trigger>
<ButtonVue
type="tertiary-no-background"
Expand All @@ -159,7 +159,7 @@
<p class="section-header-info">
{{ importantInfo }}
</p>
</Popover>
</NcPopover>
</div>
<Mailbox
v-show="hasImportantEnvelopes"
Expand Down Expand Up @@ -196,7 +196,7 @@
</template>

<script>
import { NcAppContent as AppContent, NcAppContentList as AppContentList, NcButton as ButtonVue, isMobile, NcPopover as Popover } from '@nextcloud/vue'
import { NcAppContent as AppContent, NcAppContentList as AppContentList, NcButton as ButtonVue, isMobile, NcPopover } from '@nextcloud/vue'
import addressParser from 'address-rfc2822'
import mitt from 'mitt'
import { mapStores } from 'pinia'
Expand Down Expand Up @@ -237,7 +237,7 @@ export default {
IconInfo,
Mailbox,
NoMessageSelected,
Popover,
NcPopover,
SectionTitle,
SearchMessages,
Thread,
Expand Down
8 changes: 4 additions & 4 deletions src/components/RecipientBubble.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->

<template>
<Popover popup-role="dialog" class="contact-popover">
<NcPopover popup-role="dialog" class="contact-popover">
<template #trigger="{ attrs }">
<UserBubble
v-bind="attrs"
Expand Down Expand Up @@ -109,13 +109,13 @@
</div>
</div>
</template>
</Popover>
</NcPopover>
</template>

<script>
import { showError, showSuccess } from '@nextcloud/dialogs'
import { generateUrl } from '@nextcloud/router'
import { NcButton as ButtonVue, NcSelect, NcPopover as Popover, NcUserBubble as UserBubble } from '@nextcloud/vue'
import { NcButton as ButtonVue, NcPopover, NcSelect, NcUserBubble as UserBubble } from '@nextcloud/vue'
import debouncePromise from 'debounce-promise'
import uniqBy from 'lodash/fp/uniqBy.js'
import IconUser from 'vue-material-design-icons/AccountOutline.vue'
Expand All @@ -137,7 +137,7 @@ export default {
components: {
ButtonVue,
UserBubble,
Popover,
NcPopover,
NcSelect,
IconReply,
IconUser,
Expand Down
8 changes: 4 additions & 4 deletions src/components/Thread.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
:email="participant.email"
:label="participant.label" />
<!-- Indicator to show that there are more participants than displayed -->
<Popover
<NcPopover
v-if="threadParticipants.length > participantsToDisplay"
class="avatar-more">
<template #trigger="{ attrs }">
Expand All @@ -40,7 +40,7 @@
:title="participant.email"
:email="participant.email"
:label="participant.label" />
</Popover>
</NcPopover>
<!-- Remaining participants, if any (Needed to have avatarHeader reactive) -->
<RecipientBubble
v-for="participant in threadParticipants.slice(participantsToDisplay)"
Expand Down Expand Up @@ -74,7 +74,7 @@
import { showError } from '@nextcloud/dialogs'
import { loadState } from '@nextcloud/initial-state'
import moment from '@nextcloud/moment'
import { NcAppContentDetails as AppContentDetails, NcPopover as Popover } from '@nextcloud/vue'
import { NcAppContentDetails as AppContentDetails, NcPopover } from '@nextcloud/vue'
import debounce from 'lodash/fp/debounce.js'
import { mapStores } from 'pinia'
import { prop, uniqBy } from 'ramda'
Expand All @@ -97,7 +97,7 @@ export default {
Error,
Loading,
ThreadEnvelope,
Popover,
NcPopover,
},

props: {
Expand Down
Loading