Skip to content

Commit

Permalink
Merge pull request #27 from Workfront/bottom-border-last-row
Browse files Browse the repository at this point in the history
fix: make visible bottom border of last row
  • Loading branch information
SoseAdobe committed Jun 21, 2023
2 parents 4e827ef + 4730496 commit e9b6819
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions packages/core/src/data-grid/data-grid-render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ function clipDamage(
const h = bottom - top;

if (h > 0) {
ctx.rect(finalX, top, finalWidth, h);
ctx.rect(finalX, top, finalWidth, h - 1);
}
}
}
Expand Down Expand Up @@ -1764,7 +1764,7 @@ function drawFocusRing(
ctx.clip();
}
ctx.beginPath();
ctx.rect(cellX + 0.5, drawY + 0.5, cellWidth, rh);
ctx.rect(cellX + 0.5, drawY + 0.5, cellWidth, rh - 1);
ctx.strokeStyle = col.themeOverride?.accentColor ?? theme.accentColor;
ctx.lineWidth = 1;
ctx.stroke();
Expand Down Expand Up @@ -2518,16 +2518,13 @@ export function drawGrid(arg: DrawGridArg, lastArg: DrawGridArg | undefined) {
lastBuffer: doubleBuffer ? (targetBuffer === bufferA ? "a" : "b") : undefined,
};


if(isResizing){
if (isResizing) {
walkColumns(effectiveCols, 0, translateX, 0, totalHeaderHeight, (c, x) => {

if(c.sourceIndex === resizeCol) {
drawColumnResizeOutline(overlayCtx, x+c.width, 0, totalHeaderHeight+1, theme );
drawColumnResizeOutline(targetCtx, x+c.width, totalHeaderHeight, height, theme );
if (c.sourceIndex === resizeCol) {
drawColumnResizeOutline(overlayCtx, x + c.width, 0, totalHeaderHeight + 1, theme);
drawColumnResizeOutline(targetCtx, x + c.width, totalHeaderHeight, height, theme);
}
});

}

targetCtx.restore();
Expand Down

0 comments on commit e9b6819

Please sign in to comment.