Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 1393 / Draggable columns with no select column don't work correctly if there's a left margin #1395

Merged
merged 3 commits into from
Jul 9, 2020
Merged

Fix 1393 / Draggable columns with no select column don't work correctly if there's a left margin #1395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34b6a7b
fixed column drag with offset
patorjk Jul 8, 2020
01a19bb
style update
patorjk Jul 9, 2020
37cec0e
updated version
patorjk Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mui-datatables",
"version": "3.1.4",
"version": "3.1.5",
"description": "Datatables for React using Material-UI",
"main": "dist/index.js",
"files": [
Expand Down Expand Up @@ -77,6 +77,8 @@
"prismjs": "^1.20.0",
"raw-loader": "^4.0.1",
"react": "^16.13.0",
"react-dnd-test-backend": "^11.1.3",
"react-dnd-test-utils": "^11.1.3",
"react-dom": "^16.13.0",
"react-router-dom": "^5.0.1",
"react-waypoint": "^9.0.3",
Expand Down
38 changes: 29 additions & 9 deletions src/hooks/useColumnDrop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,25 @@ import { useDrop } from 'react-dnd';

const getColModel = (headCellRefs, columnOrder, columns) => {
let colModel = [];
let selectCellHead = headCellRefs[0] ? headCellRefs[0] : { offsetParent: 0, offsetWidth: 0, offsetLeft: 0 };
let leftMostCell = headCellRefs[0] ? headCellRefs[0] : null; // left most cell is the select cell, if it exists

if (leftMostCell === null) {
leftMostCell = { offsetLeft: Infinity };
let headCells = Object.entries(headCellRefs);
headCells.forEach(([key, item], idx) => {
if (item && item.offsetLeft < leftMostCell.offsetLeft) {
leftMostCell = item;
}
});

if (leftMostCell.offsetLeft === Infinity) {
leftMostCell = { offsetParent: 0, offsetWidth: 0, offsetLeft: 0 };
}
}

let ii = 0,
parentOffsetLeft = 0,
offsetParent = selectCellHead.offsetParent;
offsetParent = leftMostCell.offsetParent;
while (offsetParent) {
parentOffsetLeft = parentOffsetLeft + (offsetParent.offsetLeft || 0);
offsetParent = offsetParent.offsetParent;
Expand All @@ -20,21 +35,26 @@ const getColModel = (headCellRefs, columnOrder, columns) => {
}
}

colModel[0] = {
left: parentOffsetLeft + selectCellHead.offsetLeft,
width: selectCellHead.offsetWidth,
columnIndex: null,
ref: selectCellHead,
};
// if the select cell is present, make sure it is apart of the column model
if (headCellRefs[0]) {
colModel[0] = {
left: parentOffsetLeft + leftMostCell.offsetLeft,
width: leftMostCell.offsetWidth,
columnIndex: null,
ref: leftMostCell,
};
}

columnOrder.forEach((colIdx, idx) => {
let col = headCellRefs[colIdx + 1];
let cmIndx = colModel.length - 1;
if (columns[colIdx] && columns[colIdx].display !== 'true') {
// skip
} else {
let prevLeft =
cmIndx !== -1 ? colModel[cmIndx].left + colModel[cmIndx].width : parentOffsetLeft + leftMostCell.offsetLeft;
colModel.push({
left: colModel[cmIndx].left + colModel[cmIndx].width,
left: prevLeft,
width: col.offsetWidth,
columnIndex: colIdx,
ref: col,
Expand Down