Don't draw focus background if focus ring is disabled (#886)

glideapps · Jan 29, 2024 · ff67bc2 · ff67bc2
1 parent f731d0d
commit ff67bc2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/packages/core/src/internal/data-grid/render/data-grid-lib.ts b/packages/core/src/internal/data-grid/render/data-grid-lib.ts
@@ -115,11 +115,20 @@ function cellIsInRect(location: Item, cell: InnerGridCell, rect: Rectangle): boo
     );
 }
 
-export function cellIsInRange(location: Item, cell: InnerGridCell, selection: GridSelection): number {
+export function cellIsInRange(
+    location: Item,
+    cell: InnerGridCell,
+    selection: GridSelection,
+    includeSingleSelection: boolean
+): number {
     let result = 0;
     if (selection.current === undefined) return result;
 
-    if (cellIsInRect(location, cell, selection.current.range)) result++;
+    const range = selection.current.range;
+
+    if ((includeSingleSelection || range.height * range.width > 1) && cellIsInRect(location, cell, range)) {
+        result++;
+    }
     for (const r of selection.current.rangeStack) {
         if (cellIsInRect(location, cell, r)) {
             result++;

diff --git a/packages/core/src/internal/data-grid/render/data-grid-render.cells.ts b/packages/core/src/internal/data-grid/render/data-grid-render.cells.ts
@@ -274,15 +274,15 @@ export function drawCells(
                     ctx.beginPath();
 
                     const isSelected = cellIsSelected(cellIndex, cell, selection);
-                    let accentCount = cellIsInRange(cellIndex, cell, selection);
+                    let accentCount = cellIsInRange(cellIndex, cell, selection, drawFocus);
                     const spanIsHighlighted =
                         cell.span !== undefined &&
                         selection.columns.some(
                             index => cell.span !== undefined && index >= cell.span[0] && index <= cell.span[1] //alloc
                         );
                     if (isSelected && !isFocused && drawFocus) {
                         accentCount = 0;
-                    } else if (isSelected) {
+                    } else if (isSelected && drawFocus) {
                         accentCount = Math.max(accentCount, 1);
                     }
                     if (spanIsHighlighted) {