diff --git a/examples/resizable-columns/index.js b/examples/resizable-columns/index.js index 14ac16c3b..33bf544bd 100644 --- a/examples/resizable-columns/index.js +++ b/examples/resizable-columns/index.js @@ -4,10 +4,14 @@ import MUIDataTable from "../../src/"; import FormControl from '@material-ui/core/FormControl'; import TextField from '@material-ui/core/TextField'; +import Switch from '@material-ui/core/Switch'; +import FormGroup from '@material-ui/core/FormGroup'; +import FormControlLabel from '@material-ui/core/FormControlLabel'; function Example(props) { const [marginLeft, setMarginLeft] = useState(10); + const [selectableRows, setSelectableRows] = useState("multiple"); const [counter, setCounter] = useState(1); const incrCount = () => { // We update an arbitrary value here to test table resizing on state updates @@ -78,6 +82,7 @@ function Example(props) { filter: true, filterType: 'dropdown', resizableColumns: true, + selectableRows: selectableRows, draggableColumns: { enabled: true, } @@ -85,9 +90,22 @@ function Example(props) { return ( <> - - setMarginLeft(e.target.value)} /> - + + + setMarginLeft(e.target.value)} /> + + setSelectableRows(event.target.checked ? "multiple" : "none")} + value="true" + color="primary" + /> + } + label="Selectable Rows" + /> +
diff --git a/src/components/TableResize.js b/src/components/TableResize.js index 809f52294..2a4557977 100644 --- a/src/components/TableResize.js +++ b/src/components/TableResize.js @@ -179,7 +179,8 @@ class TableResize extends React.Component { }; const isLastColumn = (id, finalCells) => { - return id === finalCells.length - 2; + let len = (selectableRows === 'none') ? 1 : 2; + return id === finalCells.length - len; }; if (isFirstColumn(selectableRows, idNumber) && isLastColumn(idNumber, finalCells)) { diff --git a/test/MUIDataTable.test.js b/test/MUIDataTable.test.js index 396162e14..b84611561 100644 --- a/test/MUIDataTable.test.js +++ b/test/MUIDataTable.test.js @@ -238,7 +238,6 @@ describe('', function() { viewColumns: true, sortCompare: null, sortThirdClickReset: false, - }, { display: 'true',