From 21b5fbd89bbd422c2afcc2294f86c85ad1f292c1 Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Wed, 11 Nov 2026 21:30:04 -0500 Subject: [PATCH 1/2] perf: reuse rowspan hosts during vertical scrolling --- .../example-0032-row-span-many-columns.cy.ts | 31 +++++++++++++++++ src/__tests__/slickGrid.spec.ts | 34 +++++++++++++++++-- src/slick.grid.ts | 11 +++++- 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/example-0032-row-span-many-columns.cy.ts b/cypress/e2e/example-0032-row-span-many-columns.cy.ts index 4888c81b..87c044ff 100644 --- a/cypress/e2e/example-0032-row-span-many-columns.cy.ts +++ b/cypress/e2e/example-0032-row-span-many-columns.cy.ts @@ -36,6 +36,37 @@ describe('Example - colspan & rowspan spanning many columns', { retries: 0 }, () .each(($child, index) => expect($child.text()).to.eq(fullTitles[index])); }); + it('keeps spanning cells above active and hovered covered rows', () => { + const expectSpanAtRow = (selector: string, rowIndex: number) => { + cy.get(selector).should(($span) => { + const span = $span[0]; + const row = span.ownerDocument.querySelector(`#myGrid .slick-row[data-row="${rowIndex}"]`)!; + const spanRect = span.getBoundingClientRect(); + const rowRect = row.getBoundingClientRect(); + const painted = span.ownerDocument.elementFromPoint(spanRect.left + spanRect.width / 2, rowRect.top + rowRect.height / 2); + expect(painted === span || span.contains(painted)).to.eq(true); + }); + }; + + cy.get('#myGrid .slick-row[data-row="3"] > .slick-cell.l2').click(); + expectSpanAtRow('#myGrid .slick-row[data-row="2"] > .slick-cell.l0.rowspan', 3); + cy.get('#myGrid .slick-row[data-row="4"] > .slick-cell.l2').realHover(); + expectSpanAtRow('#myGrid .slick-row[data-row="2"] > .slick-cell.l0.rowspan', 4); + expectSpanAtRow('#myGrid .slick-row[data-row="3"] > .slick-cell.l3.rowspan', 4); + cy.get('h2').realHover(); + }); + + it('retains the tall rowspan host while scrolling vertically', () => { + let host: HTMLElement; + cy.get('#myGrid .slick-row[data-row="8"]').then(($row) => { host = $row[0]; }); + cy.get('#myGrid .slick-viewport-top.slick-viewport-left').scrollTo(0, 900); + cy.get('#myGrid .slick-row[data-row="8"]').should(($row) => { + expect($row[0]).to.equal(host); + expect($row.find('.slick-cell.l3.rowspan')).to.have.length(1); + }); + cy.get('#myGrid .slick-viewport-top.slick-viewport-left').scrollTo(0, 0); + }); + it('should clamp an off-screen resize to the viewport and continue widening at 10px per 30ms', () => { let widthAtViewportEdge = 0; const headerSelector = '#myGrid .slick-header-columns .slick-header-column:first-child'; diff --git a/src/__tests__/slickGrid.spec.ts b/src/__tests__/slickGrid.spec.ts index 32436e74..95d1c35a 100644 --- a/src/__tests__/slickGrid.spec.ts +++ b/src/__tests__/slickGrid.spec.ts @@ -397,6 +397,34 @@ describe('SlickGrid core file', () => { expect(grid.getCellFromEvent({ target: spanCell } as unknown as Event)).toEqual({ row: 0, cell: 1 }); }); + it('retains an offscreen span host and renders its newly visible columns', () => { + const dataView = new SlickDataView({ + globalItemMetadataProvider: { getRowMetadata: (_item, row) => (row === 0 ? { columns: { 0: { rowspan: 3 }, 1: { rowspan: 3 } } } : undefined) }, + }); + dataView.setItems([{ id: 0 }, { id: 1 }, { id: 2 }]); + grid = new SlickGrid(container, dataView, [ + { id: 'id', field: 'id', width: 100 }, + { id: 'other', field: 'id', width: 100 }, + ], { ...defaultOptions, enableCellRowSpan: true }); + grid.init(); + const internalGrid = grid as any; + const range = { top: 1, bottom: 1, leftPx: 0, rightPx: 50 }; + internalGrid.removeRowFromCache(0); + internalGrid.removeRowFromCache(1); + internalGrid.renderRows(range); + const host = container.querySelector('.slick-row[data-row="0"]'); + expect(host?.querySelector('.slick-cell.rowspan')).toBeTruthy(); + expect(host?.querySelector('.slick-cell.l1')).toBeNull(); + + internalGrid.cleanUpAndRenderCells({ ...range, leftPx: 100, rightPx: 200 }); + expect(host?.querySelector('.slick-cell.l1.rowspan')).toBeTruthy(); + + internalGrid.removeRowFromCache(1); + internalGrid.scrollLeft = internalGrid.lastRenderedScrollLeft + 10; + internalGrid.renderRows(range); + expect(container.querySelector('.slick-row[data-row="0"]')).toBe(host); + }); + it('should be able to instantiate SlickGrid and get columns', () => { const columns = [ { id: 'firstName', field: 'firstName', name: 'First Name', headerCssClass: 'header-class', headerCellAttrs: { 'some-attr': 3 } }, @@ -2722,8 +2750,8 @@ describe('SlickGrid core file', () => { expect(remapRowspanSpy).toHaveBeenCalled(); expect(slickCell0).toBeTruthy(); - expect(slickCells.length).toBe(48); - expect(getDataSpy).toHaveBeenCalledTimes(32); + expect(slickCells.length).toBe(54); + expect(getDataSpy).toHaveBeenCalledTimes(31); }); describe('getViewportHeight() method', () => { @@ -2942,7 +2970,7 @@ describe('SlickGrid core file', () => { grid.setActiveCell(0, 0); grid.editActiveCell(InputEditor as any, true); expect(container.querySelector('.editor-text')?.getAttribute('aria-label')).toBe('Name & title'); - grid.getEditController().cancelCurrentEdit(); + grid.getEditController()?.cancelCurrentEdit(); editorColumns[0].editorAriaLabel = 'Custom editor'; grid.editActiveCell(InputEditor as any, true); expect(container.querySelector('.editor-text')?.getAttribute('aria-label')).toBe('Custom editor'); diff --git a/src/slick.grid.ts b/src/slick.grid.ts index ad1ab599..f91aa359 100644 --- a/src/slick.grid.ts +++ b/src/slick.grid.ts @@ -6604,6 +6604,13 @@ export class SlickGrid = Column, O e } } + // Span hosts above the render range still need horizontally virtualized cells. + for (const row of Object.keys(this.rowsCache).map(Number)) { + if (this.rowsCache[row].rowSpanHost && !rowsToProcess.includes(row)) { + rowsToProcess.push(row); + } + } + for (const row of rowsToProcess) { cacheEntry = this.rowsCache[row]; if (cacheEntry) { @@ -6763,7 +6770,9 @@ export class SlickGrid = Column, O e const mandatorySpanRows = this.setDifference(renderingRows, mustRenderRows); if (mandatorySpanRows.size > 0) { mandatorySpanRows.forEach((r) => { - this.removeRowFromCache(r); // remove any previous element to avoid duplicates in DOM + if (this.rowsCache[r]) { + return; + } rows.push(r); this.rowsCache[r] = this.createEmptyCachingRow(); this.appendRowHtml(divArray, r, range, dataLength); From 76a58a6ac89f2e908f118f8ef63f9d122f142d7e Mon Sep 17 00:00:00 2001 From: 6Pac Claude Code <6pac@dharpa.com> Date: Thu, 12 Nov 2026 17:44:35 +0930 Subject: [PATCH 2/2] perf: collect the rows to process in a Set Avoids an includes() lookup per cached span host when gathering the rows whose cells are cleaned up and rendered. Co-Authored-By: Claude Opus 5.5 --- src/slick.grid.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/slick.grid.ts b/src/slick.grid.ts index f91aa359..2742ebc3 100644 --- a/src/slick.grid.ts +++ b/src/slick.grid.ts @@ -6605,13 +6605,14 @@ export class SlickGrid = Column, O e } // Span hosts above the render range still need horizontally virtualized cells. + const rowsToProcessSet = new Set(rowsToProcess); for (const row of Object.keys(this.rowsCache).map(Number)) { - if (this.rowsCache[row].rowSpanHost && !rowsToProcess.includes(row)) { - rowsToProcess.push(row); + if (this.rowsCache[row].rowSpanHost) { + rowsToProcessSet.add(row); } } - for (const row of rowsToProcess) { + for (const row of rowsToProcessSet) { cacheEntry = this.rowsCache[row]; if (cacheEntry) { // cellRenderQueue populated in renderRows() needs to be cleared first