[3437] Fix after code review

Bug: eclipse-sirius#3437 Signed-off-by: Denis Nikiforov <[email protected]> Signed-off-by: Michaël Charfadi <[email protected]>
AresEkb · Aug 2, 2024 · b54ccf3 · b54ccf3
1 parent 5f785ee
commit b54ccf3
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 1,496 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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/forms/frontend/sirius-components-forms/src/propertysections/TreePropertySection.tsx b/packages/forms/frontend/sirius-components-forms/src/propertysections/TreePropertySection.tsx
@@ -24,10 +24,10 @@ import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import Checkbox from '@mui/material/Checkbox';
 import Typography from '@mui/material/Typography';
 import { Theme } from '@mui/material/styles';
-import { makeStyles } from 'tss-react/mui';
 import { SimpleTreeView } from '@mui/x-tree-view/SimpleTreeView';
 import { TreeItem as MuiTreeItem } from '@mui/x-tree-view/TreeItem';
 import React, { useEffect } from 'react';
+import { makeStyles } from 'tss-react/mui';
 import { PropertySectionComponent, PropertySectionComponentProps } from '../form/Form.types';
 import { GQLTree } from '../form/FormEventFragments.types';
 import { PropertySectionLabel } from './PropertySectionLabel';
@@ -60,6 +60,12 @@ const useTreeItemWidgetStyles = makeStyles()((theme) => ({
     width: theme.spacing(2),
     height: theme.spacing(2),
   },
+  content: {
+    paddingLeft: 0,
+    paddingTop: 0,
+    paddingRight: 0,
+    paddingBottom: 0,
+  },
   disabled: {},
 }));
 
@@ -171,7 +177,7 @@ const TreeItem = ({ node, nodes, readOnly, editingContextId, formId, widgetId }:
 
   const childNodes = nodes.filter((childNode) => childNode.parentId === node.id);
   return (
-    <MuiTreeItem itemId={node.id} label={label}>
+    <MuiTreeItem itemId={node.id} label={label} classes={{ content: classes.content }}>
       {childNodes.map((childNode) => (
         <TreeItem
           node={childNode}

diff --git a/packages/gantt/frontend/sirius-components-gantt/package.json b/packages/gantt/frontend/sirius-components-gantt/package.json
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "@apollo/client": "3.10.4",
-    "@ObeoNetwork/gantt-task-react": "0.4.19",
+    "@ObeoNetwork/gantt-task-react": "0.5.0",
     "@eclipse-sirius/sirius-components-core": "*",
     "@mui/material": "5.15.19",
     "@mui/icons-material": "5.15.19",
@@ -47,7 +47,7 @@
     "@eclipse-sirius/sirius-components-tsconfig": "*",
     "@mui/material": "5.15.19",
     "@mui/icons-material": "5.15.19",
-    "@ObeoNetwork/gantt-task-react": "0.4.19",
+    "@ObeoNetwork/gantt-task-react": "0.5.0",
     "@types/react": "17.0.37",
     "@vitejs/plugin-react": "4.3.0",
     "@xstate/react": "1.6.3",

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
@@ -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
@@ -96,6 +96,11 @@ export const siriusWebTheme = createTheme(
           variant: 'standard',
         },
       },
+      MuiLink: {
+        defaultProps: {
+          underline: 'hover',
+        },
+      },
     },
   },
   baseTheme

diff --git a/packages/sirius-web/frontend/sirius-web/package.json b/packages/sirius-web/frontend/sirius-web/package.json
@@ -29,7 +29,7 @@
     "@eclipse-sirius/sirius-web-papaya": "*",
     "@mui/icons-material": "5.15.19",
     "@mui/material": "5.15.19",
-    "@ObeoNetwork/gantt-task-react": "0.4.19",
+    "@ObeoNetwork/gantt-task-react": "0.5.0",
     "@ObeoNetwork/react-trello": "2.4.11",
     "@types/react": "17.0.37",
     "@types/react-router-dom": "5.3.3",

diff --git 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
@@ -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>

diff --git a/vscode-extension/package.json b/vscode-extension/package.json
@@ -137,7 +137,7 @@
     "@eclipse-sirius/sirius-components-validation": "*",
     "@mui/icons-material": "5.15.19",
     "@mui/material": "5.15.19",
-    "@ObeoNetwork/gantt-task-react": "0.4.19",
+    "@ObeoNetwork/gantt-task-react": "0.5.0",
     "@ObeoNetwork/react-trello": "2.4.11",
     "@types/react": "17.0.37",
     "@types/react-router-dom": "5.3.3",