Hide inbox tooltips and fic cursor (#6060)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina 2024-07-12 19:15:55 +04:00 committed by GitHub
parent c94076087d
commit 6b50e2c6fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 38 additions and 42 deletions

View File

@ -109,7 +109,6 @@ li {
p {
user-select: text;
cursor: auto;
a {
word-break: break-all;

View File

@ -27,7 +27,7 @@
import { Icon, Label, resizeObserver, TimeSince, tooltip } from '@hcengineering/ui'
import { Asset, getEmbeddedLabel, IntlString } from '@hcengineering/platform'
import activity, { ActivityMessage, ActivityMessagePreviewType } from '@hcengineering/activity'
import { classIcon, DocNavLink, showMenu } from '@hcengineering/view-resources'
import { classIcon, DocNavLink } from '@hcengineering/view-resources'
import { markupToText } from '@hcengineering/text'
export let message: ActivityMessage | undefined = undefined
@ -102,13 +102,13 @@
width = element.clientWidth
}}
on:click
on:contextmenu={(evt) => {
showMenu(evt, { object: message, baseMenuClass: activity.class.ActivityMessage }, () => {
isActionsOpened = false
})
isActionsOpened = true
}}
>
<!-- on:contextmenu={(evt) => {-->
<!-- showMenu(evt, { object: message, baseMenuClass: activity.class.ActivityMessage }, () => {-->
<!-- isActionsOpened = false-->
<!-- })-->
<!-- isActionsOpened = true-->
<!--}}-->
<span class="left overflow-label">
{#if type === 'full'}
<div class="header">
@ -158,11 +158,11 @@
<slot name="content" />
</span>
{#if !readonly}
<div class="actions" class:opened={isActionsOpened}>
<slot name="actions" />
</div>
{/if}
<!--{#if !readonly}-->
<!-- <div class="actions" class:opened={isActionsOpened}>-->
<!-- <slot name="actions" />-->
<!-- </div>-->
<!--{/if}-->
<div class="right">
<slot name="right" />

View File

@ -15,9 +15,8 @@
<script lang="ts">
import { IntlString } from '@hcengineering/platform'
import activity, { ActivityMessage, ActivityMessagePreviewType } from '@hcengineering/activity'
import { ActivityMessage, ActivityMessagePreviewType } from '@hcengineering/activity'
import ActivityMessageActions from '../ActivityMessageActions.svelte'
import ReactionsPreview from '../reactions/ReactionsPreview.svelte'
import BasePreview from '../BasePreview.svelte'
import { Action } from '@hcengineering/ui'
@ -53,15 +52,15 @@
<ReactionsPreview {message} {readonly} />
{/if}
</svelte:fragment>
<svelte:fragment slot="actions">
{#if previewElement}
<ActivityMessageActions
{message}
{actions}
withActionMenu={false}
onOpen={previewElement.onActionsOpened}
onClose={previewElement.onActionsClosed}
/>
{/if}
</svelte:fragment>
<!-- <svelte:fragment slot="actions">-->
<!-- {#if previewElement}-->
<!-- <ActivityMessageActions-->
<!-- {message}-->
<!-- {actions}-->
<!-- withActionMenu={false}-->
<!-- onOpen={previewElement.onActionsOpened}-->
<!-- onClose={previewElement.onActionsClosed}-->
<!-- />-->
<!-- {/if}-->
<!-- </svelte:fragment>-->
</BasePreview>

View File

@ -13,7 +13,7 @@
// limitations under the License.
-->
<script lang="ts">
import { ButtonIcon, CheckBox, Component, IconMoreV, Label, showPopup, Spinner, tooltip } from '@hcengineering/ui'
import { ButtonIcon, CheckBox, Component, IconMoreV, Label, showPopup, Spinner } from '@hcengineering/ui'
import notification, {
ActivityNotificationViewlet,
DisplayInboxNotification,
@ -28,7 +28,6 @@
import { personAccountByIdStore } from '@hcengineering/contact-resources'
import { Person, PersonAccount } from '@hcengineering/contact'
import MessagesPopup from './MessagePopup.svelte'
import InboxNotificationPresenter from './inbox/InboxNotificationPresenter.svelte'
import NotifyContextIcon from './NotifyContextIcon.svelte'
import {
@ -166,11 +165,11 @@
archivingPromise = undefined
}
function canShowTooltip (group: InboxNotification[]): boolean {
const first = group[0]
return canGroup(first)
}
// function canShowTooltip (group: InboxNotification[]): boolean {
// const first = group[0]
//
// return canGroup(first)
// }
function getKey (group: InboxNotification[]): string {
return group.map((it) => it._id).join('-')
@ -229,15 +228,14 @@
<div class="content">
<div class="notifications">
{#each groupedNotifications.slice(0, maxNotifications) as group (getKey(group))}
<div
class="notification"
use:tooltip={canShowTooltip(group)
? {
component: MessagesPopup,
props: { context: value, notifications: group }
}
: undefined}
>
<div class="notification">
<!-- use:tooltip={canShowTooltip(group)-->
<!-- ? {-->
<!-- component: MessagesPopup,-->
<!-- props: { context: value, notifications: group }-->
<!-- }-->
<!-- : undefined}-->
<div class="embeddedMarker" />
<InboxNotificationPresenter
value={group[0]}