summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/odlux/framework
diff options
context:
space:
mode:
authorAijana Schumann <aijana.schumann@highstreet-technologies.com>2020-11-04 17:29:38 +0100
committerAijana Schumann <aijana.schumann@highstreet-technologies.com>2020-11-04 17:29:38 +0100
commitf1d9bf460d550308211982c83ed6d7e4fdd06507 (patch)
treebf1a22e3ce5adc61c28ff35939ae4ba4bc78afdc /sdnr/wt/odlux/framework
parent9b1055626a47b3aaabe0d9151d4c4d27598c1dad (diff)
Update material-ui and material-icons version
Update material-ui and material-icons to latest version Issue-ID: CCSDK-2884 Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com> Change-Id: Ic20e63f12e2ccaf985e43c99009fff9938a9fd02
Diffstat (limited to 'sdnr/wt/odlux/framework')
-rw-r--r--sdnr/wt/odlux/framework/package.json4
-rw-r--r--sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx2
2 files changed, 3 insertions, 3 deletions
diff --git a/sdnr/wt/odlux/framework/package.json b/sdnr/wt/odlux/framework/package.json
index 511b97778..3ecd34c23 100644
--- a/sdnr/wt/odlux/framework/package.json
+++ b/sdnr/wt/odlux/framework/package.json
@@ -28,8 +28,8 @@
"@types/react": "16.9.19",
"@types/react-dom": "16.9.5",
"@types/react-router-dom": "4.3.1",
- "@material-ui/core": "4.9.0",
- "@material-ui/icons": "4.5.1",
+ "@material-ui/core": "4.11.0",
+ "@material-ui/icons": "4.9.1",
"@types/classnames": "2.2.6",
"@types/flux": "3.1.8",
"@types/jquery": "3.3.10",
diff --git a/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx b/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx
index a4080b51b..59dc49c50 100644
--- a/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx
+++ b/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx
@@ -108,7 +108,7 @@ class TableToolbarComponent extends React.Component<ITableToolbarComponentProps,
<div className={classes.actions}>
{this.props.customActionButtons
? this.props.customActionButtons.map((action, ind) => (
- <Tooltip key={`custom-action-${ind}`} title={action.tooltip}>
+ <Tooltip key={`custom-action-${ind}`} title={action.tooltip || ''}>
<IconButton aria-label={buttonPrefix + `custom-action-${ind}`} onClick={() => action.onClick()}>
<action.icon />
</IconButton>