From 01be84132b3daa6fed70bb5fa97a2384aa232708 Mon Sep 17 00:00:00 2001 From: Sonja Happ Date: Tue, 16 Mar 2021 15:31:24 +0100 Subject: [PATCH] Dirty fix for widget context menu position in dashboard edit mode --- src/widget/widget-context-menu.js | 74 ++++++++++++++++++------------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/src/widget/widget-context-menu.js b/src/widget/widget-context-menu.js index 5191e0d..2bb64e6 100644 --- a/src/widget/widget-context-menu.js +++ b/src/widget/widget-context-menu.js @@ -17,7 +17,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Menu, Item, Separator, useContextMenu } from 'react-contexify'; +import { Menu, Item, Separator, contextMenu } from 'react-contexify'; import Widget from './widget'; class WidgetContextMenu extends React.Component { @@ -93,6 +93,25 @@ class WidgetContextMenu extends React.Component { } }; + showMenu = e => { + let index = this.props.index + if (this.props.editing){ + contextMenu.show({ + event: e, + id: 'widgetMenu' + index, + position: { + x: 'inherit', + y: 'inherit', + } + }) + } + else { + contextMenu.show({ + event: e, + id: 'widgetMenu' + index, + }) + } + } render() { const isLocked = this.props.widget.locked; @@ -102,41 +121,36 @@ class WidgetContextMenu extends React.Component { height: '100%' }; - const { show } = useContextMenu({id:'widgetMenu'+ this.props.index} ) - function showMenu(e) { - e.preventDefault(); - show(e); - } + return ( - return (
- - Edit - Duplicate - Delete +
+ - + + Edit + Duplicate + Delete - Move above - Move to front - Move underneath - Move to back + - + Move above + Move to front + Move underneath + Move to back - Lock - Unlock - + - - - -
); + Lock + Unlock +
+
+ ); } }