vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-10 04:30:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove table borders from last row / column

Browse Source
This commit is contained in:
jeffvli
2025-11-13 14:29:06 -08:00
parent 8afb72ed14
commit 39f8be8d4e
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/item-list/item-table-list/item-table-list-column.tsx
+24 -4
View File
@@ -342,6 +342,13 @@ export const TableColumnTextContainer = (
const isDragging = props.isDragging ?? false; const isDragging = props.isDragging ?? false;
const mergedRef = useMergedRef(containerRef, props.dragRef ?? null); 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(() => { useEffect(() => {
if (!isDataRow || !containerRef.current) return; if (!isDataRow || !containerRef.current) return;
@@ -464,8 +471,11 @@ export const TableColumnTextContainer = (
[styles.rowHoverHighlightEnabled]: isDataRow && props.enableRowHoverHighlight, [styles.rowHoverHighlightEnabled]: isDataRow && props.enableRowHoverHighlight,
[styles.rowSelected]: isDataRow && isSelected, [styles.rowSelected]: isDataRow && isSelected,
[styles.withHorizontalBorder]: [styles.withHorizontalBorder]:
props.enableHorizontalBorders && props.enableHeader && props.rowIndex > 0, props.enableHorizontalBorders &&
[styles.withVerticalBorder]: props.enableVerticalBorders, props.enableHeader &&
props.rowIndex > 0 &&
!isLastRow,
[styles.withVerticalBorder]: props.enableVerticalBorders && !isLastColumn,
})} })}
data-row-index={isDataRow ? `${props.tableId}-${props.rowIndex}` : undefined} data-row-index={isDataRow ? `${props.tableId}-${props.rowIndex}` : undefined}
onClick={handleCellClick} onClick={handleCellClick}
@@ -510,6 +520,13 @@ export const TableColumnContainer = (
const isDragging = props.isDragging ?? false; const isDragging = props.isDragging ?? false;
const mergedRef = useMergedRef(containerRef, props.dragRef ?? null); 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(() => { useEffect(() => {
if (!isDataRow || !containerRef.current) return; if (!isDataRow || !containerRef.current) return;
@@ -632,8 +649,11 @@ export const TableColumnContainer = (
[styles.rowHoverHighlightEnabled]: isDataRow && props.enableRowHoverHighlight, [styles.rowHoverHighlightEnabled]: isDataRow && props.enableRowHoverHighlight,
[styles.rowSelected]: isDataRow && isSelected, [styles.rowSelected]: isDataRow && isSelected,
[styles.withHorizontalBorder]: [styles.withHorizontalBorder]:
props.enableHorizontalBorders && props.enableHeader && props.rowIndex > 0, props.enableHorizontalBorders &&
[styles.withVerticalBorder]: props.enableVerticalBorders, props.enableHeader &&
props.rowIndex > 0 &&
!isLastRow,
[styles.withVerticalBorder]: props.enableVerticalBorders && !isLastColumn,
})} })}
data-row-index={isDataRow ? `${props.tableId}-${props.rowIndex}` : undefined} data-row-index={isDataRow ? `${props.tableId}-${props.rowIndex}` : undefined}
onClick={handleCellClick} onClick={handleCellClick}