Skip to content

Commit

Permalink
Merge pull request #1185 from Domino987/patch-5
Browse files Browse the repository at this point in the history
Fix for #1182
  • Loading branch information
mbrn authored Oct 20, 2019
2 parents b090108 + a4a6e88 commit 8882766
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/material-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ export default class MaterialTable extends React.Component {
calculatedProps.components = { ...MaterialTable.defaultProps.components, ...calculatedProps.components };
calculatedProps.icons = { ...MaterialTable.defaultProps.icons, ...calculatedProps.icons };
calculatedProps.options = { ...MaterialTable.defaultProps.options, ...calculatedProps.options };

const localization = calculatedProps.localization.body;
const localization = { ...MaterialTable.defaultProps.localization.body, ...calculatedProps.localization.body };

calculatedProps.actions = [...(calculatedProps.actions || [])];
if (calculatedProps.editable) {
Expand Down

0 comments on commit 8882766

Please sign in to comment.