-
-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Refactor-MTableGroupRow-class-to-functiona…
…l-component
- Loading branch information
Showing
54 changed files
with
8,986 additions
and
4,154 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,5 @@ node_modules | |
| types | ||
| .github | ||
| demo | ||
| dist | ||
| dist | ||
| __tests__ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,4 +5,6 @@ node_modules | |
| yarn.lock | ||
| .idea | ||
| .DS_Store | ||
| *.iml | ||
| *.iml | ||
| cypress/videos | ||
| __tests__/coverage | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| { | ||
| "singleQuote": true | ||
| "singleQuote": true, | ||
| "trailingComma": "none" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import React from 'react'; | ||
| import MaterialTable from '../src'; | ||
| import { configure } from 'enzyme'; | ||
| import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; | ||
|
|
||
| configure({ adapter: new Adapter() }); | ||
|
|
||
| test('TODO - MAKE TESTS', () => { | ||
| expect(true).toBe(true); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| import React, { createRef } from 'react'; | ||
| import MaterialTable from '../src'; | ||
| import { TEST_DATA, COLUMNS } from './utils'; | ||
| import { configure, mount, shallow } from 'enzyme'; | ||
| import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; | ||
|
|
||
| configure({ adapter: new Adapter() }); | ||
|
|
||
| describe('MTableFilterRow Tests', () => { | ||
| let TABLE_REF = createRef(); | ||
| beforeEach(() => { | ||
| // Needed to silence react-beautiful-dnd console warnings/errors | ||
| global.window['__react-beautiful-dnd-disable-dev-warnings'] = true; | ||
| TABLE_REF = createRef(); | ||
| }); | ||
|
|
||
| test('MaterialTable mounts successfully', () => { | ||
| const wrapper = mount( | ||
| <MaterialTable | ||
| tableRef={TABLE_REF} | ||
| data={TEST_DATA} | ||
| columns={COLUMNS} | ||
| options={{ filtering: true }} | ||
| /> | ||
| ); | ||
| const { filtering } = TABLE_REF.current.props.options; | ||
| expect(filtering).toBe(true); | ||
| wrapper.unmount(); | ||
| }); | ||
|
|
||
| test('Custom Filter Algo', () => { | ||
| // Update cols with custom search | ||
| const cols = [ | ||
| { | ||
| title: 'Given Name', | ||
| field: 'name', | ||
| customFilterAndSearch: (term, rowData) => term == rowData.name.length | ||
| }, | ||
| { title: 'Sirname', field: 'sirname' }, | ||
| { title: 'Age', field: 'age' } | ||
| ]; | ||
|
|
||
| const wrapper = mount( | ||
| <MaterialTable | ||
| tableRef={TABLE_REF} | ||
| data={TEST_DATA} | ||
| columns={cols} | ||
| options={{ filtering: true }} | ||
| /> | ||
| ); | ||
| const els = Array.from(wrapper.find('#m--table--filter--row')) || []; | ||
| const el = els[0]; | ||
| console.log(el.find('#m--table--filter--row')); | ||
| expect(TABLE_REF.current.dataManager.filtered).toBe(true); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import React from 'react'; | ||
| import { render } from 'react-dom'; | ||
| import MaterialTable from '../../src'; | ||
| import { ExportPdf, ExportCsv } from '../../exporters'; | ||
|
|
||
| const App = () => { | ||
| const ref = React.useRef(); | ||
| return ( | ||
| <MaterialTable | ||
| tableRef={ref} | ||
| data={[ | ||
| { | ||
| name: 'Bar', | ||
| sirname: 'Zab', | ||
| age: 44, | ||
| date: new Date('December 1, 1999') | ||
| }, | ||
| { name: 'Baz', sirname: 'Oof', age: 34, date: new Date('1/1/1970') }, | ||
| { name: 'Foo', sirname: 'Rab', age: 24, date: new Date(Date.now()) } | ||
| ]} | ||
| columns={[ | ||
| { | ||
| title: 'Given Name', | ||
| field: 'name', | ||
| customFilterAndSearch: (term, rowData) => term == rowData.name.length | ||
| }, | ||
| { title: 'Sirname', field: 'sirname' }, | ||
| { title: 'Age', field: 'age' }, | ||
| { title: 'Date', field: 'date', type: 'date' } | ||
| ]} | ||
| options={{ | ||
| filtering: true, | ||
| exportMenu: [ | ||
| { | ||
| label: 'Export PDF', | ||
| exportFunc: (cols, datas) => ExportPdf(cols, datas, 'mypdffile') | ||
| }, | ||
| { | ||
| label: 'Export CSV', | ||
| exportFunc: (cols, datas) => ExportCsv(cols, datas, 'mycsvfile') | ||
| } | ||
| ] | ||
| }} | ||
| cellEditable={{ | ||
| onCellEditApproved: (newValue, oldValue, rowData, columnDef) => { | ||
| return new Promise((resolve, reject) => { | ||
| console.log('newValue: ' + newValue); | ||
| setTimeout(resolve, 1000); | ||
| }); | ||
| } | ||
| }} | ||
| onFilterChange={(appliedFilter) => { | ||
| console.log({ appliedFilter, ref }); | ||
| }} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| module.hot.accept(); | ||
|
|
||
| render(<App />, document.querySelector('#app')); |
Oops, something went wrong.