From b2d222480c15ebbb1b0964f0c5774cfec53a2a60 Mon Sep 17 00:00:00 2001
From: Denis Nikiforov <denis.nikif@gmail.com>
Date: Thu, 1 Aug 2024 13:11:09 +1100
Subject: [PATCH] [3437] Fix after code review

Bug: https://github.com/eclipse-sirius/sirius-web/issues/3437
Signed-off-by: Denis Nikiforov <denis.nikif@gmail.com>
---
 package-lock.json                                      |  1 -
 .../frontend/sirius-components-forms/package.json      |  1 -
 .../src/diagrams/DiagramFilter.tsx                     |  1 -
 .../sirius-web-application/src/theme/siriusWebTheme.ts |  5 +++++
 .../src/treeitems/TreeItemAction.tsx                   | 10 +++++-----
 .../src/views/TreeFiltersMenu.tsx                      |  3 +--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54d9a19c2ff..5358a2b2459 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8522,7 +8522,6 @@
         "@apollo/client": "3.10.4",
         "@eclipse-sirius/sirius-components-charts": "*",
         "@eclipse-sirius/sirius-components-core": "*",
-        "@emotion/react": "11.11.4",
         "@lexical/react": "0.8.1",
         "@mui/icons-material": "5.15.19",
         "@mui/material": "5.15.19",
diff --git a/packages/forms/frontend/sirius-components-forms/package.json b/packages/forms/frontend/sirius-components-forms/package.json
index 023172b255d..f39311aca80 100644
--- a/packages/forms/frontend/sirius-components-forms/package.json
+++ b/packages/forms/frontend/sirius-components-forms/package.json
@@ -35,7 +35,6 @@
     "@apollo/client": "3.10.4",
     "@eclipse-sirius/sirius-components-core": "*",
     "@eclipse-sirius/sirius-components-charts": "*",
-    "@emotion/react": "11.11.4",
     "@lexical/react": "0.8.1",
     "@mui/material": "5.15.19",
     "@mui/icons-material": "5.15.19",
diff --git a/packages/sirius-web/frontend/sirius-web-application/src/diagrams/DiagramFilter.tsx b/packages/sirius-web/frontend/sirius-web-application/src/diagrams/DiagramFilter.tsx
index 422b525a469..07e018f46bd 100644
--- a/packages/sirius-web/frontend/sirius-web-application/src/diagrams/DiagramFilter.tsx
+++ b/packages/sirius-web/frontend/sirius-web-application/src/diagrams/DiagramFilter.tsx
@@ -52,7 +52,6 @@ export const DiagramFilter = ({ editingContextId, diagramId }: DiagramPanelActio
         open={isOpen}
         anchorEl={anchorRef.current}
         placement="bottom-start"
-        transition
         disablePortal
         style={{ zIndex: '9999' }}>
         <Paper style={{ maxHeight: '50vh', overflow: 'auto' }}>
diff --git a/packages/sirius-web/frontend/sirius-web-application/src/theme/siriusWebTheme.ts b/packages/sirius-web/frontend/sirius-web-application/src/theme/siriusWebTheme.ts
index 7a6f6218525..02fe1150623 100644
--- a/packages/sirius-web/frontend/sirius-web-application/src/theme/siriusWebTheme.ts
+++ b/packages/sirius-web/frontend/sirius-web-application/src/theme/siriusWebTheme.ts
@@ -96,6 +96,11 @@ export const siriusWebTheme = createTheme(
           variant: 'standard',
         },
       },
+      MuiLink: {
+        defaultProps: {
+          underline: 'hover',
+        },
+      },
     },
   },
   baseTheme
diff --git a/packages/trees/frontend/sirius-components-trees/src/treeitems/TreeItemAction.tsx b/packages/trees/frontend/sirius-components-trees/src/treeitems/TreeItemAction.tsx
index 713d7f170ca..27211f69bfe 100644
--- a/packages/trees/frontend/sirius-components-trees/src/treeitems/TreeItemAction.tsx
+++ b/packages/trees/frontend/sirius-components-trees/src/treeitems/TreeItemAction.tsx
@@ -10,14 +10,14 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-import IconButton from '@material-ui/core/IconButton';
-import { makeStyles } from '@material-ui/core/styles';
-import MoreVertIcon from '@material-ui/icons/MoreVert';
+import IconButton from '@mui/material/IconButton';
+import { makeStyles } from 'tss-react/mui';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { useState } from 'react';
 import { TreeItemActionProps, TreeItemActionState } from './TreeItemAction.types';
 import { TreeItemContextMenu } from './TreeItemContextMenu';
 
-const useTreeItemActionStyle = makeStyles((theme) => ({
+const useTreeItemActionStyle = makeStyles()((theme) => ({
   more: {
     hover: {
       backgroundColor: theme.palette.action.hover,
@@ -38,7 +38,7 @@ export const TreeItemAction = ({
   onExpandAll,
   onEnterEditingMode,
 }: TreeItemActionProps) => {
-  const classes = useTreeItemActionStyle();
+  const { classes } = useTreeItemActionStyle();
   const [state, setState] = useState<TreeItemActionState>({
     showContextMenu: false,
     menuAnchor: null,
diff --git a/packages/trees/frontend/sirius-components-trees/src/views/TreeFiltersMenu.tsx b/packages/trees/frontend/sirius-components-trees/src/views/TreeFiltersMenu.tsx
index 14c326caec1..971d84d7979 100644
--- a/packages/trees/frontend/sirius-components-trees/src/views/TreeFiltersMenu.tsx
+++ b/packages/trees/frontend/sirius-components-trees/src/views/TreeFiltersMenu.tsx
@@ -80,8 +80,7 @@ export const TreeFiltersMenu = ({ filters, onTreeFilterMenuItemClick }: TreeFilt
         open={open}
         anchorEl={anchorRef.current}
         role={undefined}
-        placement={'bottom-start'}
-        transition>
+        placement={'bottom-start'}>
         {({ TransitionProps }) => (
           <Fade {...TransitionProps} timeout={350}>
             <Paper>