showMenu refactor - context is now available inside menu

This commit is contained in:
Jan Prochazka
2020-12-03 09:33:29 +01:00
parent e4b605162e
commit 327f2140cf
11 changed files with 144 additions and 65 deletions

View File

@@ -4,7 +4,7 @@ import _ from 'lodash';
import React from 'react';
import styled from 'styled-components';
import { FontIcon } from '../icons';
import { showMenu } from '../modals/DropDownMenu';
// import { showMenu } from '../modals/DropDownMenu';
import useTheme from '../theme/useTheme';
import { useSetOpenedTabs, useAppObjectParams } from '../utility/globalState';
@@ -60,7 +60,7 @@ export function AppObjectCore({
if (!Menu) return;
event.preventDefault();
showMenu(event.pageX, event.pageY, <Menu data={data} makeAppObj={makeAppObj} {...appObjectParams} />);
// showMenu(event.pageX, event.pageY, <Menu data={data} makeAppObj={makeAppObj} {...appObjectParams} />);
};
const Component = component == 'div' ? AppObjectDiv : AppObjectSpan;

View File

@@ -4,8 +4,10 @@ import { DropDownMenuItem } from '../modals/DropDownMenu';
import { openNewTab } from '../utility/common';
import ImportExportModal from '../modals/ImportExportModal';
import { getDefaultFileFormat } from '../utility/fileformats';
import { useSetOpenedTabs } from '../utility/globalState';
function Menu({ data, setOpenedTabs, showModal, extensions }) {
function Menu({ data, showModal, extensions }) {
const setOpenedTabs = useSetOpenedTabs();
const { connection, name } = data;
const tooltip = `${connection.displayName || connection.server}\n${name}`;