Skip to content

fix: eliminate O(n) lag on rectangular selection in large tables #4899

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

Open
KrzysztofDusko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: eliminate O(n) lag on rectangular selection in large tables #4899

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
11 changes: 9 additions & 2 deletions src/js/core/RowManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,15 @@ export default class RowManager extends CoreFeature{
}

getRowFromPosition(position){
return this.getDisplayRows().find((row) => {
return row.type === "row" && row.getPosition() === position && row.isDisplayed();
var displayRows = this.getDisplayRows();
var row = displayRows[position - 1];

if (row && row.type === "row" && row.getPosition() === position) {
return row;
}

return displayRows.find((row) => {
return row.type === "row" && row.getPosition() === position;
});
}

Expand Down
52 changes: 45 additions & 7 deletions src/js/modules/SelectRange/SelectRange.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export default class SelectRange extends Module {
this.maxRanges = 0;
this.activeRange = false;
this.blockKeydown = false;
this._rafId = null;
this._pendingCell = null;
this._pendingColumn = null;
this._tableRowsCache = null;

this.keyDownEvent = this._handleKeyDown.bind(this);
this.mouseUpEvent = this._handleMouseUp.bind(this);
Expand Down Expand Up @@ -232,6 +236,11 @@ export default class SelectRange extends Module {
_handleMouseUp(e){
this.mousedown = false;
document.removeEventListener("mouseup", this.mouseUpEvent);

if (this._rafId) {
cancelAnimationFrame(this._rafId);
this._rafId = null;
}
}

_handleKeyDown(e) {
Expand Down Expand Up @@ -340,11 +349,20 @@ export default class SelectRange extends Module {
if (column === this.rowHeader || !this.mousedown || this.selecting === 'all') {
return;
}

this.activeRange.setBounds(false, column, true);

this._pendingColumn = column;

if (!this._rafId) {
this._rafId = requestAnimationFrame(() => {
this._rafId = null;
if (this._pendingColumn) {
this.activeRange.setBounds(false, this._pendingColumn, true);
this._pendingColumn = null;
}
});
}
}

///////////////////////////////////

//////// Cell Functionality ///////
///////////////////////////////////

Expand Down Expand Up @@ -374,8 +392,18 @@ export default class SelectRange extends Module {
if (!this.mousedown || this.selecting === "all") {
return;
}

this.activeRange.setBounds(false, cell, true);

this._pendingCell = cell;

if (!this._rafId) {
this._rafId = requestAnimationFrame(() => {
this._rafId = null;
if (this._pendingCell) {
this.activeRange.setBounds(false, this._pendingCell, true);
this._pendingCell = null;
}
});
}
}

handleCellClick(e, cell){
Expand Down Expand Up @@ -900,7 +928,10 @@ export default class SelectRange extends Module {
}

getTableRows() {
return this.table.rowManager.getDisplayRows().filter(row=> row.type === "row");
if (!this._tableRowsCache) {
this._tableRowsCache = this.table.rowManager.getDisplayRows().filter(row => row.type === "row");
}
return this._tableRowsCache;
}

getTableColumns() {
Expand All @@ -924,6 +955,8 @@ export default class SelectRange extends Module {
}

resetRanges() {
this._tableRowsCache = null;

var range, cell, visibleCells;

this.ranges.forEach((range) => range.destroy());
Expand All @@ -949,6 +982,11 @@ export default class SelectRange extends Module {
tableDestroyed(){
document.removeEventListener("mouseup", this.mouseUpEvent);
this.table.rowManager.element.removeEventListener("keydown", this.keyDownEvent);
if (this._rafId) {
cancelAnimationFrame(this._rafId);
this._rafId = null;
}
this._tableRowsCache = null;
}

selectedRows(component) {
Expand Down