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

"Lazy" resize rows & columns with a guide line #4396

Merged
merged 1 commit into from
Mar 11, 2024
Merged

"Lazy" resize rows & columns with a guide line #4396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 17 additions & 11 deletions src/js/core/row/Row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,20 +138,11 @@ export default class Row extends CoreFeature{

//get heights when doing bulk row style calcs in virtual DOM
calcHeight(force){
var maxHeight = 0,
minHeight;

if(this.table.options.rowHeight){
this.height = this.table.options.rowHeight;
}else{
minHeight = this.table.options.resizableRows ? this.element.clientHeight : 0;

this.cells.forEach(function(cell){
var height = cell.getHeight();
if(height > maxHeight){
maxHeight = height;
}
});
var minHeight = this.calcMinHeight(),
maxHeight = this.calcMaxHeight();

if(force){
this.height = Math.max(maxHeight, minHeight);
Expand All @@ -163,6 +154,21 @@ export default class Row extends CoreFeature{
this.heightStyled = this.height ? this.height + "px" : "";
this.outerHeight = this.element.offsetHeight;
}

calcMinHeight(){
return this.table.options.resizableRows ? this.element.clientHeight : 0;
}

calcMaxHeight(){
var maxHeight = 0;
this.cells.forEach(function(cell){
var height = cell.getHeight();
if(height > maxHeight){
maxHeight = height;
}
});
return maxHeight;
}

//set of cells
setCellHeight(){
Expand Down
126 changes: 82 additions & 44 deletions src/js/modules/ResizeColumns/ResizeColumns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class ResizeColumns extends Module{
this.initialized = false;
this.registerColumnOption("resizable", true);
this.registerTableOption("resizableColumnFit", false);
this.registerTableOption("resizableColumnGuide", false);
}

initialize(){
Expand Down Expand Up @@ -208,60 +209,97 @@ class ResizeColumns extends Module{
}
}

resize(e, column){
var x = typeof e.clientX === "undefined" ? e.touches[0].clientX : e.clientX,
startDiff = x - this.startX,
moveDiff = x - this.latestX,
blockedBefore, blockedAfter;

this.latestX = x;

if(this.table.rtl){
startDiff = -startDiff;
moveDiff = -moveDiff;
}

blockedBefore = column.width == column.minWidth || column.width == column.maxWidth;

column.setWidth(this.startWidth + startDiff);

blockedAfter = column.width == column.minWidth || column.width == column.maxWidth;

if(moveDiff < 0){
this.nextColumn = this.initialNextColumn;
}

if(this.table.options.resizableColumnFit && this.nextColumn && !(blockedBefore && blockedAfter)){
let colWidth = this.nextColumn.getWidth();

if(moveDiff > 0){
if(colWidth <= this.nextColumn.minWidth){
this.nextColumn = this.nextColumn.nextColumn();
}
}

if(this.nextColumn){
this.nextColumn.setWidth(this.nextColumn.getWidth() - moveDiff);
}
}

this.table.columnManager.rerenderColumns(true);

if(!this.table.browserSlow && column.modules.resize && column.modules.resize.variableHeight){
column.checkCellHeights();
}
}

calcGuidePosition(e, column, handle) {
var mouseX = typeof e.clientX === "undefined" ? e.touches[0].clientX : e.clientX,
handleX = handle.getBoundingClientRect().x - this.table.element.getBoundingClientRect().x,
tableX = this.table.element.getBoundingClientRect().x,
columnX = column.element.getBoundingClientRect().left - tableX,
mouseDiff = mouseX - this.startX,
pos = Math.max(handleX + mouseDiff, columnX + column.minWidth);

if(column.maxWidth){
pos = Math.min(pos, columnX + column.maxWidth);
}

return pos;
}

_checkResizability(column){
return column.definition.resizable;
}

_mouseDown(e, column, handle){
var self = this;

var self = this,
guideEl;

if(self.table.options.resizableColumnGuide){
guideEl = document.createElement("span");
guideEl.classList.add('tabulator-col-resize-guide');
self.table.element.appendChild(guideEl);
setTimeout(() => {
guideEl.style.left = self.calcGuidePosition(e, column, handle) + "px";
})
}

self.table.element.classList.add("tabulator-block-select");

function mouseMove(e){
var x = typeof e.screenX === "undefined" ? e.touches[0].screenX : e.screenX,
startDiff = x - self.startX,
moveDiff = x - self.latestX,
blockedBefore, blockedAfter;

self.latestX = x;

if(self.table.rtl){
startDiff = -startDiff;
moveDiff = -moveDiff;
}

blockedBefore = column.width == column.minWidth || column.width == column.maxWidth;

column.setWidth(self.startWidth + startDiff);

blockedAfter = column.width == column.minWidth || column.width == column.maxWidth;

if(moveDiff < 0){
self.nextColumn = self.initialNextColumn;
}

if(self.table.options.resizableColumnFit && self.nextColumn && !(blockedBefore && blockedAfter)){
let colWidth = self.nextColumn.getWidth();

if(moveDiff > 0){
if(colWidth <= self.nextColumn.minWidth){
self.nextColumn = self.nextColumn.nextColumn();
}
}

if(self.nextColumn){
self.nextColumn.setWidth(self.nextColumn.getWidth() - moveDiff);
}
}

self.table.columnManager.rerenderColumns(true);

if(!self.table.browserSlow && column.modules.resize && column.modules.resize.variableHeight){
column.checkCellHeights();
if(self.table.options.resizableColumnGuide){
guideEl.style.left = self.calcGuidePosition(e, column, handle) + "px";
}else{
self.resize(e, column);
}
}

function mouseUp(e){
if(self.table.options.resizableColumnGuide){
self.resize(e, column);
guideEl.remove();
}

//block editor from taking action while resizing is taking place
if(self.startColumn.modules.edit){
Expand Down Expand Up @@ -295,7 +333,7 @@ class ResizeColumns extends Module{
self.startColumn.modules.edit.blocked = true;
}

self.startX = typeof e.screenX === "undefined" ? e.touches[0].screenX : e.screenX;
self.startX = typeof e.clientX === "undefined" ? e.touches[0].clientX : e.clientX;
self.latestX = self.startX;
self.startWidth = column.getWidth();

Expand Down
41 changes: 38 additions & 3 deletions src/js/modules/ResizeRows/ResizeRows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class ResizeRows extends Module{
this.prevHandle = null;

this.registerTableOption("resizableRows", false); //resizable rows
this.registerTableOption("resizableRowGuide", false);
}

initialize(){
Expand Down Expand Up @@ -62,16 +63,50 @@ class ResizeRows extends Module{
rowEl.appendChild(prevHandle);
}

resize(e, row) {
row.setHeight(self.startHeight + ((typeof e.clientY === "undefined" ? e.touches[0].clientY : e.clientY) - self.startY));
}

calcGuidePosition(e, row, handle) {
var mouseY = typeof e.clientY === "undefined" ? e.touches[0].clientY : e.clientY,
handleY = handle.getBoundingClientRect().y - this.table.element.getBoundingClientRect().y,
tableY = this.table.element.getBoundingClientRect().y,
rowY = row.element.getBoundingClientRect().top - tableY,
mouseDiff = mouseY - this.startY,
minHeight = row.calcMinHeight(),
maxHeight = row.calcMaxHeight();

return Math.min(Math.max(handleY + mouseDiff, rowY + minHeight), rowY + maxHeight);
}

_mouseDown(e, row, handle){
var self = this;
var self = this,
guideEl;

if(self.table.options.resizableRowGuide){
guideEl = document.createElement("span");
guideEl.classList.add('tabulator-row-resize-guide');
self.table.element.appendChild(guideEl);
setTimeout(() => {
guideEl.style.top = self.calcGuidePosition(e, row, handle) + "px";
})
}

self.table.element.classList.add("tabulator-block-select");

function mouseMove(e){
row.setHeight(self.startHeight + ((typeof e.screenY === "undefined" ? e.touches[0].screenY : e.screenY) - self.startY));
if(self.table.options.resizableRowGuide){
guideEl.style.top = self.calcGuidePosition(e, row, handle) + "px";
}else{
self.resize(e, row);
}
}

function mouseUp(e){
if(self.table.options.resizableRowGuide){
self.resize(e, row);
guideEl.remove();
}

// //block editor from taking action while resizing is taking place
// if(self.startColumn.modules.edit){
Expand All @@ -96,7 +131,7 @@ class ResizeRows extends Module{
// self.startColumn.modules.edit.blocked = true;
// }

self.startY = typeof e.screenY === "undefined" ? e.touches[0].screenY : e.screenY;
self.startY = typeof e.clientY === "undefined" ? e.touches[0].clientY : e.clientY;
self.startHeight = row.getHeight();

document.body.addEventListener("mousemove", mouseMove);
Expand Down
24 changes: 23 additions & 1 deletion src/scss/tabulator.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ $sortArrowHover: #555 !default;
$sortArrowActive: #666 !default;
$sortArrowInactive: #bbb !default;

$columnResizeGuideColor:#999 !default;

//row theming
$rowBackgroundColor:#fff !default; //table row background color
$rowAltBackgroundColor:#EFEFEF !default; //table row background color
Expand Down Expand Up @@ -1580,4 +1582,24 @@ body.tabulator-print-fullscreen-hide>*:not(.tabulator-print-fullscreen){
}
}
}
}
}

.tabulator-col-resize-guide {
position: absolute;
top: 0;
width: 4px;
height: 100%;
margin-left: -0.5px;
background-color: $columnResizeGuideColor;
opacity: .5;
}

.tabulator-row-resize-guide {
position: absolute;
left: 0;
width: 100%;
height: 4px;
margin-top: -0.5px;
background-color: $columnResizeGuideColor;
opacity: .5;
}
Loading