UBERF-5603 (#4754)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>

plugins/calendar-resources/src/components/DayCalendar.svelte

@@ -37,7 +37,7 @@
     ticker,
     isWeekend
   } from '@hcengineering/ui'
-  import { Menu } from '@hcengineering/view-resources'
+  import { Menu, showMenu } from '@hcengineering/view-resources'
   import { createEventDispatcher, onDestroy, onMount } from 'svelte'
   import type {
     CalendarADGrid,
@@ -759,12 +759,6 @@
       dispatch('dragEnter', { date: new Date(new Date(newTime).setMinutes(stickyMinutes, 0, 0)) })
     }
   }
-
-  function showMenu (ev: MouseEvent, event: Event) {
-    ev.preventDefault()
-    closeTooltip()
-    showPopup(Menu, { object: event }, getEventPositionElement(ev))
-  }
 </script>
 
 <Scroller
@@ -1011,7 +1005,7 @@
                 mouseDownElement(e, ev, 'top')
               }}
               on:contextmenu={(e) => {
-                showMenu(e, ev)
+                showMenu(e, { object: ev })
               }}
             />
             <div
@@ -1022,7 +1016,7 @@
                 mouseDownElement(e, ev, 'bottom')
               }}
               on:contextmenu={(e) => {
-                showMenu(e, ev)
+                showMenu(e, { object: ev })
               }}
             />
             <EventElement

plugins/calendar-resources/src/components/EventElement.svelte

@@ -16,16 +16,9 @@
   import calendar, { CalendarEventPresenter, Event } from '@hcengineering/calendar'
   import { Doc } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
-  import {
-    Component,
-    MILLISECONDS_IN_MINUTE,
-    closeTooltip,
-    getEventPositionElement,
-    showPopup,
-    tooltip
-  } from '@hcengineering/ui'
+  import { Component, MILLISECONDS_IN_MINUTE, showPopup, tooltip } from '@hcengineering/ui'
   import view, { ObjectEditor } from '@hcengineering/view'
-  import { Menu } from '@hcengineering/view-resources'
+  import { showMenu } from '@hcengineering/view-resources'
   import { calendarStore, isVisible } from '../utils'
   import EventPresenter from './EventPresenter.svelte'
 
@@ -55,13 +48,11 @@
 
   let div: HTMLDivElement
 
-  function showMenu (ev: MouseEvent) {
-    ev.preventDefault()
-    closeTooltip()
-    showPopup(Menu, { object: event }, getEventPositionElement(ev))
-  }
-
   $: visible = isVisible(event, $calendarStore)
+
+  function contextMenu (e: MouseEvent): void {
+    showMenu(e, { object: event })
+  }
 </script>
 
 {#if event}
@@ -74,7 +65,7 @@
     class:empty
     use:tooltip={{ component: EventPresenter, props: { value: event, hideDetails: !visible } }}
     on:click|stopPropagation={click}
-    on:contextmenu={showMenu}
+    on:contextmenu={contextMenu}
   >
     {#if !empty && presenter?.presenter}
       <Component is={presenter.presenter} props={{ event, narrow, oneRow, hideDetails: !visible }} />