Merge branch 'main' into create-cspr-modification-form

gridsuite · Oct 3, 2024 · da9d063 · da9d063
2 parents 409f6b4 + d2ef17e
commit da9d063
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@gridsuite/commons-ui": "0.66.0",
+        "@gridsuite/commons-ui": "0.66.1",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",

diff --git a/src/components/spreadsheet/custom-columns/custom-columns-config.tsx b/src/components/spreadsheet/custom-columns/custom-columns-config.tsx
@@ -6,7 +6,7 @@
  */
 
 import { FormattedMessage } from 'react-intl';
-import { Badge, Button } from '@mui/material';
+import { Badge, IconButton } from '@mui/material';
 import { Calculate as CalculateIcon } from '@mui/icons-material';
 import { useSelector } from 'react-redux';
 import { TABLES_NAMES } from '../utils/config-tables';
@@ -26,8 +26,10 @@ export default function CustomColumnsConfig({ indexTab }: Readonly<CustomColumns
 
     return (
         <>
-            <Button color="inherit" onClick={dialogOpen.setTrue}>
+            <span>
                 <FormattedMessage id="spreadsheet/custom_column/main_button" />
+            </span>
+            <IconButton aria-label="dialog" onClick={dialogOpen.setTrue}>
                 <Badge
                     color="secondary"
                     anchorOrigin={{
@@ -38,7 +40,8 @@ export default function CustomColumnsConfig({ indexTab }: Readonly<CustomColumns
                 >
                     <CalculateIcon />
                 </Badge>
-            </Button>
+            </IconButton>
+
             <CustomColumnDialog
                 indexTab={indexTab}
                 open={dialogOpen}

diff --git a/src/components/spreadsheet/table-wrapper.jsx b/src/components/spreadsheet/table-wrapper.jsx
@@ -1132,7 +1132,7 @@ const TableWrapper = (props) => {
                         />
                     </Grid>
                     {developerMode && (
-                        <Grid item>
+                        <Grid item sx={{ marginLeft: '15px' }}>
                             <CustomColumnsConfig indexTab={tabIndex} />
                         </Grid>
                     )}