From 8c163be070b18d58d1e954afb2bf2832f74f75bb Mon Sep 17 00:00:00 2001 From: jeffvli Date: Thu, 13 Nov 2025 14:29:06 -0800 Subject: [PATCH] remove table borders from last row / column --- .../item-table-list-column.tsx | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/renderer/components/item-list/item-table-list/item-table-list-column.tsx b/src/renderer/components/item-list/item-table-list/item-table-list-column.tsx index 20ed4aa2b..81fd31c6b 100644 --- a/src/renderer/components/item-list/item-table-list/item-table-list-column.tsx +++ b/src/renderer/components/item-list/item-table-list/item-table-list-column.tsx @@ -342,6 +342,13 @@ export const TableColumnTextContainer = ( const isDragging = props.isDragging ?? false; const mergedRef = useMergedRef(containerRef, props.dragRef ?? null); + const isLastColumn = props.columnIndex === props.columns.length - 1; + const isLastRow = + isDataRow && + (props.enableHeader + ? props.rowIndex === props.data.length + : props.rowIndex === props.data.length - 1); + useEffect(() => { if (!isDataRow || !containerRef.current) return; @@ -464,8 +471,11 @@ export const TableColumnTextContainer = ( [styles.rowHoverHighlightEnabled]: isDataRow && props.enableRowHoverHighlight, [styles.rowSelected]: isDataRow && isSelected, [styles.withHorizontalBorder]: - props.enableHorizontalBorders && props.enableHeader && props.rowIndex > 0, - [styles.withVerticalBorder]: props.enableVerticalBorders, + props.enableHorizontalBorders && + props.enableHeader && + props.rowIndex > 0 && + !isLastRow, + [styles.withVerticalBorder]: props.enableVerticalBorders && !isLastColumn, })} data-row-index={isDataRow ? `${props.tableId}-${props.rowIndex}` : undefined} onClick={handleCellClick} @@ -510,6 +520,13 @@ export const TableColumnContainer = ( const isDragging = props.isDragging ?? false; const mergedRef = useMergedRef(containerRef, props.dragRef ?? null); + const isLastColumn = props.columnIndex === props.columns.length - 1; + const isLastRow = + isDataRow && + (props.enableHeader + ? props.rowIndex === props.data.length + : props.rowIndex === props.data.length - 1); + useEffect(() => { if (!isDataRow || !containerRef.current) return; @@ -632,8 +649,11 @@ export const TableColumnContainer = ( [styles.rowHoverHighlightEnabled]: isDataRow && props.enableRowHoverHighlight, [styles.rowSelected]: isDataRow && isSelected, [styles.withHorizontalBorder]: - props.enableHorizontalBorders && props.enableHeader && props.rowIndex > 0, - [styles.withVerticalBorder]: props.enableVerticalBorders, + props.enableHorizontalBorders && + props.enableHeader && + props.rowIndex > 0 && + !isLastRow, + [styles.withVerticalBorder]: props.enableVerticalBorders && !isLastColumn, })} data-row-index={isDataRow ? `${props.tableId}-${props.rowIndex}` : undefined} onClick={handleCellClick}