Merge branch 'eclipsesource:master' into feature/mui-react-multi-choi…

…ce-enum-label-description
eclipsesource · Feb 27, 2024 · a052234 · a052234
2 parents 569d755 + 21dd591
commit a052234
Show file tree

Hide file tree

Showing 27 changed files with 7,146 additions and 15,322 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,49 +8,20 @@
     "typescriptreact",
     "vue"
   ],
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
-  "[javascriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[jsonc]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
-  "[vue]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
   "search.exclude": {
     "**/docs": true,
     "**/node_modules": true,
     "**/lib": true
   },
   "typescript.tsdk": "node_modules/typescript/lib",
   "[javascript][javascriptreact][typescript][typescriptreact][vue]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.codeActionsOnSave": {
       "source.fixAll.eslint": "explicit"
     }

diff --git a/packages/angular-material/package.json b/packages/angular-material/package.json
@@ -108,7 +108,7 @@
     "@typescript-eslint/parser": "^5.54.1",
     "babel-loader": "^8.0.6",
     "copy-webpack-plugin": "^11.0.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",

diff --git a/packages/angular-test/package.json b/packages/angular-test/package.json
@@ -21,7 +21,7 @@
     "@angular/core": "^16.0.0",
     "@angular/platform-browser": "^16.0.0",
     "@angular/platform-browser-dynamic": "^16.0.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -87,7 +87,7 @@
     "@typescript-eslint/parser": "^5.54.1",
     "ava": "~2.4.0",
     "copy-webpack-plugin": "^5.0.5",
-    "eslint": "^7.32.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -78,7 +78,7 @@
     "@typescript-eslint/parser": "^5.54.1",
     "ava": "~2.4.0",
     "document-register-element": "^1.14.3",
-    "eslint": "^7.32.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",

diff --git a/packages/examples-react/package.json b/packages/examples-react/package.json
@@ -22,7 +22,7 @@
     "@types/react-dom": "^17.0.9",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
-    "eslint": "^7.32.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -54,7 +54,7 @@
     "@types/node": "^18.19.4",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
-    "eslint": "^7.32.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",

diff --git a/packages/material-renderers/package.json b/packages/material-renderers/package.json
@@ -113,7 +113,7 @@
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
     "copy-webpack-plugin": "^5.0.5",
     "enzyme": "^3.11.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.56.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",

diff --git a/packages/material-renderers/src/complex/MaterialTableControl.tsx b/packages/material-renderers/src/complex/MaterialTableControl.tsx
@@ -42,6 +42,7 @@ import {
   TableCell,
   TableHead,
   TableRow,
+  Tooltip,
   Typography,
 } from '@mui/material';
 import {
@@ -319,35 +320,55 @@ const NonEmptyRowComponent = ({
             {showSortButtons ? (
               <Fragment>
                 <Grid item>
-                  <IconButton
-                    aria-label={translations.upAriaLabel}
-                    onClick={moveUp}
-                    disabled={!enableUp}
-                    size='large'
+                  <Tooltip
+                    id='tooltip-up'
+                    title={translations.up}
+                    placement='bottom'
+                    open={enableUp ? undefined : false}
                   >
-                    <ArrowUpward />
-                  </IconButton>
+                    <IconButton
+                      aria-label={translations.upAriaLabel}
+                      onClick={moveUp}
+                      disabled={!enableUp}
+                      size='large'
+                    >
+                      <ArrowUpward />
+                    </IconButton>
+                  </Tooltip>
                 </Grid>
                 <Grid item>
-                  <IconButton
-                    aria-label={translations.downAriaLabel}
-                    onClick={moveDown}
-                    disabled={!enableDown}
-                    size='large'
+                  <Tooltip
+                    id='tooltip-down'
+                    title={translations.down}
+                    placement='bottom'
+                    open={enableDown ? undefined : false}
                   >
-                    <ArrowDownward />
-                  </IconButton>
+                    <IconButton
+                      aria-label={translations.downAriaLabel}
+                      onClick={moveDown}
+                      disabled={!enableDown}
+                      size='large'
+                    >
+                      <ArrowDownward />
+                    </IconButton>
+                  </Tooltip>
                 </Grid>
               </Fragment>
             ) : null}
             <Grid item>
-              <IconButton
-                aria-label={translations.removeAriaLabel}
-                onClick={() => openDeleteDialog(childPath, rowIndex)}
-                size='large'
+              <Tooltip
+                id='tooltip-remove'
+                title={translations.removeTooltip}
+                placement='bottom'
               >
-                <DeleteIcon />
-              </IconButton>
+                <IconButton
+                  aria-label={translations.removeAriaLabel}
+                  onClick={() => openDeleteDialog(childPath, rowIndex)}
+                  size='large'
+                >
+                  <DeleteIcon />
+                </IconButton>
+              </Tooltip>
             </Grid>
           </Grid>
         </NoBorderTableCell>

diff --git a/packages/material-renderers/src/layouts/ExpandPanelRenderer.tsx b/packages/material-renderers/src/layouts/ExpandPanelRenderer.tsx
@@ -39,6 +39,7 @@ import {
   Avatar,
   Grid,
   IconButton,
+  Tooltip,
 } from '@mui/material';
 import {
   ExpandMore as ExpandMoreIcon,
@@ -169,41 +170,61 @@ const ExpandPanelRendererComponent = (props: ExpandPanelProps) => {
                   {showSortButtons && enabled ? (
                     <Fragment>
                       <Grid item>
-                        <IconButton
-                          onClick={moveUp(path, index)}
-                          style={iconStyle}
-                          disabled={!enableMoveUp}
-                          aria-label={translations.upAriaLabel}
-                          size='large'
+                        <Tooltip
+                          id='tooltip-up'
+                          title={translations.up}
+                          placement='bottom'
+                          open={enableMoveUp ? undefined : false}
                         >
-                          <ArrowUpward />
-                        </IconButton>
+                          <IconButton
+                            onClick={moveUp(path, index)}
+                            style={iconStyle}
+                            disabled={!enableMoveUp}
+                            aria-label={translations.upAriaLabel}
+                            size='large'
+                          >
+                            <ArrowUpward />
+                          </IconButton>
+                        </Tooltip>
                       </Grid>
                       <Grid item>
-                        <IconButton
-                          onClick={moveDown(path, index)}
-                          style={iconStyle}
-                          disabled={!enableMoveDown}
-                          aria-label={translations.downAriaLabel}
-                          size='large'
+                        <Tooltip
+                          id='tooltip-down'
+                          title={translations.down}
+                          placement='bottom'
+                          open={enableMoveDown ? undefined : false}
                         >
-                          <ArrowDownward />
-                        </IconButton>
+                          <IconButton
+                            onClick={moveDown(path, index)}
+                            style={iconStyle}
+                            disabled={!enableMoveDown}
+                            aria-label={translations.downAriaLabel}
+                            size='large'
+                          >
+                            <ArrowDownward />
+                          </IconButton>
+                        </Tooltip>
                       </Grid>
                     </Fragment>
                   ) : (
                     ''
                   )}
                   {enabled && (
                     <Grid item>
-                      <IconButton
-                        onClick={removeItems(path, [index])}
-                        style={iconStyle}
-                        aria-label={translations.removeAriaLabel}
-                        size='large'
+                      <Tooltip
+                        id='tooltip-remove'
+                        title={translations.removeTooltip}
+                        placement='bottom'
                       >
-                        <DeleteIcon />
-                      </IconButton>
+                        <IconButton
+                          onClick={removeItems(path, [index])}
+                          style={iconStyle}
+                          aria-label={translations.removeAriaLabel}
+                          size='large'
+                        >
+                          <DeleteIcon />
+                        </IconButton>
+                      </Tooltip>
                     </Grid>
                   )}
                 </Grid>