From d93eeff13b7e2f702f3c33c64a482204107076b9 Mon Sep 17 00:00:00 2001
From: syeritsyan <syeritsyan@adobe.com>
Date: Tue, 20 Jun 2023 23:27:22 +0400
Subject: [PATCH 1/2] fix: make visible bottom border of last row

---
 .../core/src/data-grid/data-grid-render.tsx    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/data-grid/data-grid-render.tsx b/packages/core/src/data-grid/data-grid-render.tsx
index e85dfcae5..7f3b958b5 100644
--- a/packages/core/src/data-grid/data-grid-render.tsx
+++ b/packages/core/src/data-grid/data-grid-render.tsx
@@ -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);
                         }
                     }
                 }
@@ -1763,10 +1763,11 @@ function drawFocusRing(
                         ctx.rect(clipX, 0, width - clipX, height);
                         ctx.clip();
                     }
+                    const lineWidth = 1;
                     ctx.beginPath();
-                    ctx.rect(cellX + 0.5, drawY + 0.5, cellWidth, rh);
+                    ctx.rect(cellX + 0.5, drawY + 0.5, cellWidth, rh - lineWidth);
                     ctx.strokeStyle = col.themeOverride?.accentColor ?? theme.accentColor;
-                    ctx.lineWidth = 1;
+                    ctx.lineWidth = lineWidth;
                     ctx.stroke();
 
                     if (fillHandle) {
@@ -2518,16 +2519,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();

From 4730496446a21a3b8bc9bcb129a225b9dd47ce22 Mon Sep 17 00:00:00 2001
From: syeritsyan <syeritsyan@adobe.com>
Date: Wed, 21 Jun 2023 10:32:42 +0400
Subject: [PATCH 2/2] fix: make visible bottom border of last row

---
 packages/core/src/data-grid/data-grid-render.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/data-grid/data-grid-render.tsx b/packages/core/src/data-grid/data-grid-render.tsx
index 7f3b958b5..ef7beeef8 100644
--- a/packages/core/src/data-grid/data-grid-render.tsx
+++ b/packages/core/src/data-grid/data-grid-render.tsx
@@ -1763,11 +1763,10 @@ function drawFocusRing(
                         ctx.rect(clipX, 0, width - clipX, height);
                         ctx.clip();
                     }
-                    const lineWidth = 1;
                     ctx.beginPath();
-                    ctx.rect(cellX + 0.5, drawY + 0.5, cellWidth, rh - lineWidth);
+                    ctx.rect(cellX + 0.5, drawY + 0.5, cellWidth, rh - 1);
                     ctx.strokeStyle = col.themeOverride?.accentColor ?? theme.accentColor;
-                    ctx.lineWidth = lineWidth;
+                    ctx.lineWidth = 1;
                     ctx.stroke();
 
                     if (fillHandle) {