diff --git a/client/src/components/Card/Card.jsx b/client/src/components/Card/Card.jsx index 762ab902..4efb17ad 100755 --- a/client/src/components/Card/Card.jsx +++ b/client/src/components/Card/Card.jsx @@ -1,11 +1,10 @@ -import React, { useCallback, useRef, useState } from 'react'; +import React, { useCallback, useRef } from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import { Button, Icon } from 'semantic-ui-react'; import { Link } from 'react-router-dom'; import { Draggable } from 'react-beautiful-dnd'; -import { ControlledMenu, MenuItem, useMenuState } from '@szhsin/react-menu'; import { startTimer, stopTimer } from '../../utils/timer'; import Paths from '../../constants/Paths'; import Tasks from './Tasks'; @@ -18,8 +17,6 @@ import Timer from '../Timer'; import styles from './Card.module.scss'; -import '@szhsin/react-menu/dist/index.css'; - const Card = React.memo( ({ id, @@ -55,22 +52,11 @@ const Card = React.memo( }) => { const nameEdit = useRef(null); - const [menuProps, toggleMenu] = useMenuState(); - const [anchorPoint, setAnchorPoint] = useState({ x: 0, y: 0 }); - - const handleClick = useCallback( - (e) => { - if (menuProps.state === 'open') { - e.preventDefault(); - e.stopPropagation(); - } - - if (document.activeElement) { - document.activeElement.blur(); - } - }, - [menuProps.state], - ); + const handleClick = useCallback(() => { + if (document.activeElement) { + document.activeElement.blur(); + } + }, []); const handleToggleTimerClick = useCallback( (event) => { @@ -99,15 +85,7 @@ const Card = React.memo( const contentNode = ( <> {coverUrl && } - -
{ - e.preventDefault(); - setAnchorPoint({ x: e.clientX, y: e.clientY }); - toggleMenu(true); - }} - > +
{labels.length > 0 && ( {labels.map((label) => ( @@ -120,11 +98,8 @@ const Card = React.memo( ))} )} -
{name}
- {tasks.length > 0 && } - {(dueDate || timer || notificationsTotal > 0) && ( {notificationsTotal > 0 && ( @@ -156,7 +131,6 @@ const Card = React.memo( )} )} - {users.length > 0 && ( {users.map((user) => ( @@ -169,16 +143,6 @@ const Card = React.memo( ))} )} - - toggleMenu(false)} - > - Delete Card -
); @@ -199,7 +163,6 @@ const Card = React.memo( > {contentNode} - {canEdit && (