Merge branch 'master' of github.com:material-table-core/core

package.json

@@ -105,14 +105,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.19.0",
-    "@date-io/core": "^3.2.0",
-    "@date-io/date-fns": "^3.2.0",
+    "@date-io/core": "^3.0.0",
+    "@date-io/date-fns": "^3.0.0",
     "@emotion/core": "^11.0.0",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@hello-pangea/dnd": "^16.0.0",
-    "@mui/icons-material": ">=5.15.5",
-    "@mui/material": ">=5.15.5",
+    "@mui/icons-material": ">=5.10.6",
+    "@mui/material": ">=5.11.12",
     "@mui/x-date-pickers": "^6.19.0",
     "classnames": "^2.3.2",
     "date-fns": "^3.2.0",

src/components/MTableEditField/DateField.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
 import { TextField } from '@mui/material';
 import { LocalizationProvider, DatePicker } from '@mui/x-date-pickers';
 

src/components/MTableEditRow/index.js

@@ -181,7 +181,8 @@ function MTableEditRow(props) {
         style={{
           width: 42 * actions.length,
           padding: '0px 5px',
-          ...options.editCellStyle
+          ...options.editCellStyle,
+          ...options.actionsCellStyle
         }}
       >
         <props.components.Actions

src/components/MTableFilterRow/DateFilter.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
 import TextField from '@mui/material/TextField';
 import { getLocalizedFilterPlaceHolder } from './utils';
 import {

src/components/m-table-edit-field.js

@@ -7,7 +7,7 @@ import FormControl from '@mui/material/FormControl';
 import FormHelperText from '@mui/material/FormHelperText';
 import FormGroup from '@mui/material/FormGroup';
 import FormControlLabel from '@mui/material/FormControlLabel';
-import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
 import {
   LocalizationProvider,
   TimePicker,

src/material-table.js

@@ -465,9 +465,15 @@ export default class MaterialTable extends React.Component {
         (a) => a.tableData.id === orderBy
       );
       query.orderDirection = orderDirection;
-      console.warn(
-        'Properties orderBy and orderDirection had been deprecated when remote data, please start using orderByCollection instead'
-      );
+      /**
+       * THIS WILL NEED TO BE REMOVED EVENTUALLY.
+       * Warn consumer of deprecated prop.
+       */
+      if (query.orderDirection !== undefined || query.orderBy !== undefined) {
+        console.warn(
+          'Properties orderBy and orderDirection had been deprecated when remote data, please start using orderByCollection instead'
+        );
+      }
       query.orderByCollection = orderByCollection;
       this.onQueryChange(query, () => {
         this.props.onOrderChange &&
@@ -693,6 +699,8 @@ export default class MaterialTable extends React.Component {
       this.dataManager.changeRowEditing(rowData);
       this.setState(this.dataManager.getRenderState());
     } else if (mode === 'delete') {
+      this.props.editable.onRowDeleteCancelled &&
+        this.props.editable.onRowDeleteCancelled(rowData);
       this.dataManager.changeRowEditing(rowData);
       this.setState(this.dataManager.getRenderState());
     }

src/prop-types.js

@@ -203,6 +203,7 @@ export const propTypes = {
     onRowUpdate: PropTypes.func,
     onRowDelete: PropTypes.func,
     onRowAddCancelled: PropTypes.func,
+    onRowDeleteCancelled: PropTypes.func,
     onRowUpdateCancelled: PropTypes.func,
     isEditHidden: PropTypes.func,
     isDeleteHidden: PropTypes.func

types/index.d.ts

@@ -51,6 +51,7 @@ export interface MaterialTableProps<RowData extends object> {
     editTooltip?: (rowData: RowData) => string;
     deleteTooltip?: (rowData: RowData) => string;
     onRowAddCancelled?: (rowData: RowData) => void;
+    onRowDeleteCancelled?: (rowData: RowData) => void;
     onRowUpdateCancelled?: (rowData: RowData) => void;
     isEditHidden?: (rowData: RowData) => boolean;
     isDeleteHidden?: (rowData: RowData) => boolean;