fix: review

Author: Raubzeug

src/utils/__test__/getColumnWidth.test.ts

@@ -2,7 +2,7 @@ import {
     HEADER_PADDING,
     MAX_COLUMN_WIDTH,
     PIXELS_PER_CHARACTER,
-    SORT_ICON_PADDING,
+    SORT_ICON_TO_CHARACTERS,
     getColumnWidth,
 } from '../getColumnWidth';
 
@@ -23,7 +23,7 @@ describe('getColumnWidth', () => {
     it('calculates correct width for columns with sorting', () => {
         const result = getColumnWidth({data: [], name: 'test', sortable: true});
         expect(result).toBe(
-            HEADER_PADDING + SORT_ICON_PADDING + 'test'.length * PIXELS_PER_CHARACTER,
+            HEADER_PADDING + ('test'.length + SORT_ICON_TO_CHARACTERS) * PIXELS_PER_CHARACTER,
         );
     });
     it('calculates correct width for columns with sorting and column name wider than header', () => {

src/utils/getColumnWidth.ts

@@ -1,6 +1,6 @@
 export const MAX_COLUMN_WIDTH = 600;
 export const HEADER_PADDING = 20;
-export const SORT_ICON_PADDING = 18;
+export const SORT_ICON_TO_CHARACTERS = 2;
 export const PIXELS_PER_CHARACTER = 10;
 
 export function getColumnWidth({
@@ -16,7 +16,9 @@ export function getColumnWidth({
 }) {
     const headerContentLength = typeof header === 'string' ? header.length : name.length;
 
-    let maxColumnContentLength = headerContentLength;
+    let maxColumnContentLength = sortable
+        ? headerContentLength + SORT_ICON_TO_CHARACTERS
+        : headerContentLength;
 
     if (data) {
         for (const row of data) {
@@ -27,20 +29,14 @@ export function getColumnWidth({
 
             maxColumnContentLength = Math.max(maxColumnContentLength, cellLength);
 
-            const sortPadding =
-                sortable && maxColumnContentLength <= headerContentLength ? SORT_ICON_PADDING : 0;
-
             if (
-                maxColumnContentLength * PIXELS_PER_CHARACTER + HEADER_PADDING + sortPadding >=
+                maxColumnContentLength * PIXELS_PER_CHARACTER + HEADER_PADDING >=
                 MAX_COLUMN_WIDTH
             ) {
                 return MAX_COLUMN_WIDTH;
             }
         }
     }
 
-    const sortPadding =
-        sortable && maxColumnContentLength <= headerContentLength ? SORT_ICON_PADDING : 0;
-
-    return maxColumnContentLength * PIXELS_PER_CHARACTER + HEADER_PADDING + sortPadding;
+    return maxColumnContentLength * PIXELS_PER_CHARACTER + HEADER_PADDING;
 }