diff --git a/src/demo.js b/src/demo.js index ff4416d76..177104470 100644 --- a/src/demo.js +++ b/src/demo.js @@ -25,7 +25,7 @@ class App extends Component { { id: 3, name: 'c', surname: 'baran', isMarried: true, birthDate: new Date(1987, 1, 1), birthCity: 34, sex: 'Female', type: 'child', insertDateTime: new Date(2018, 1, 1, 12, 23, 44), time: new Date(1900, 1, 1, 14, 23, 35), parentId: 1 }, { id: 4, name: 'd', surname: 'baran', isMarried: true, birthDate: new Date(1987, 1, 1), birthCity: 34, sex: 'Female', type: 'child', insertDateTime: new Date(2018, 1, 1, 12, 23, 44), time: new Date(1900, 1, 1, 14, 23, 35), parentId: 3 }, { id: 5, name: 'e', surname: 'baran', isMarried: false, birthDate: new Date(1987, 1, 1), birthCity: 34, sex: 'Female', type: 'child', insertDateTime: new Date(2018, 1, 1, 12, 23, 44), time: new Date(1900, 1, 1, 14, 23, 35) }, - { id: 6, name: 'f', surname: 'baran', isMarried: true, birthDate: new Date(1989, 1, 1), birthCity: 34, sex: 'Female', type: 'child', insertDateTime: new Date(2018, 1, 1, 12, 23, 44), time: new Date(1900, 1, 1, 14, 23, 35), parentId: 5 }, + { id: 6, name: 'f', surname: 'baran', isMarried: true, birthDate: new Date(1989, 1, 1), birthCity: 34, sex: 'Female', type: 'child', insertDateTime: new Date(2018, 1, 1, 12, 23, 44), time: new Date(1900, 1, 1, 14, 23, 35), parentId: 5 }, ], columns: [ { title: 'Adı', field: 'name' }, @@ -60,9 +60,8 @@ class App extends Component { data={this.state.data} title="Demo Title" options={{ - grouping: true, - defaultExpanded: true }} + isLoading /> @@ -76,20 +75,16 @@ class App extends Component { - - {/* new Promise(() => { - })} - title="Demo Title" - options={{ - selection: true, - }} - isLoading - /> - */} + ref={this.tableRef} + columns={this.state.columns} + data={this.state.data} + title="Demo Title" + options={{ + }} + /> + + ); } diff --git a/src/material-table.js b/src/material-table.js index 7ee88da84..0eead2deb 100644 --- a/src/material-table.js +++ b/src/material-table.js @@ -20,6 +20,7 @@ import MTableToolbar from './m-table-toolbar'; import { DragDropContext, Droppable } from 'react-beautiful-dnd'; import DataManager from './utils/data-manager'; import { debounce } from 'debounce'; +import { fade } from '@material-ui/core/styles/colorManipulator'; /* eslint-enable no-unused-vars */ @@ -549,8 +550,8 @@ class MaterialTable extends React.Component { {this.renderFooter()} {(this.state.isLoading || props.isLoading) && props.options.loadingType === 'overlay' && -
-
+
+