mirror of
https://github.com/jeffvli/feishin.git
synced 2026-07-21 18:06:30 +02:00
fix row column/border styles when album group enabled
This commit is contained in:
@@ -51,9 +51,10 @@ export const AlbumGroupColumn = (props: ItemTableListInnerColumn) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!isFirstInGroup) {
|
if (!isFirstInGroup) {
|
||||||
// For non-first rows, add border-bottom on the last row of the group
|
// No vertical border. Bottom border only on the last row of the group so
|
||||||
const needsBorder =
|
// mid-group lines don't cut through overflowing artwork.
|
||||||
props.enableHorizontalBorders &&
|
const needsBottomBorder =
|
||||||
|
!!props.enableHorizontalBorders &&
|
||||||
isLastInAlbumGroup(
|
isLastInAlbumGroup(
|
||||||
props.rowIndex,
|
props.rowIndex,
|
||||||
props.getRowItem,
|
props.getRowItem,
|
||||||
@@ -65,7 +66,7 @@ export const AlbumGroupColumn = (props: ItemTableListInnerColumn) => {
|
|||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
...props.style,
|
...props.style,
|
||||||
...(needsBorder
|
...(needsBottomBorder
|
||||||
? { borderBottom: '1px solid var(--theme-colors-border)' }
|
? { borderBottom: '1px solid var(--theme-colors-border)' }
|
||||||
: {}),
|
: {}),
|
||||||
// When the cover is enlarged it overflows down from the
|
// When the cover is enlarged it overflows down from the
|
||||||
|
|||||||
@@ -629,7 +629,9 @@ function showHorizontalBorderFor(props: ItemTableListInnerColumn, isLastRow: boo
|
|||||||
if (!props.enableHorizontalBorders || !props.enableHeader || props.rowIndex <= 0) {
|
if (!props.enableHorizontalBorders || !props.enableHeader || props.rowIndex <= 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (isAlbumGroupingActive(props.columns)) {
|
// Album group uses group top/bottom edges only (no mid-group lines that would
|
||||||
|
// cut through artwork). Other columns keep per-row borders.
|
||||||
|
if (props.type === TableColumn.ALBUM_GROUP) {
|
||||||
return isLastInAlbumGroup(
|
return isLastInAlbumGroup(
|
||||||
props.rowIndex,
|
props.rowIndex,
|
||||||
props.getRowItem,
|
props.getRowItem,
|
||||||
@@ -747,7 +749,8 @@ export const TableColumnTextContainer = (
|
|||||||
};
|
};
|
||||||
|
|
||||||
const showHorizontalBorder = showHorizontalBorderFor(props, isLastRow);
|
const showHorizontalBorder = showHorizontalBorderFor(props, isLastRow);
|
||||||
const showVerticalBorder = !!props.enableVerticalBorders && !isLastColumn;
|
const showVerticalBorder =
|
||||||
|
!!props.enableVerticalBorders && !isLastColumn && props.type !== TableColumn.ALBUM_GROUP;
|
||||||
|
|
||||||
const cell = (
|
const cell = (
|
||||||
<div
|
<div
|
||||||
@@ -913,7 +916,8 @@ export const TableColumnContainer = (
|
|||||||
};
|
};
|
||||||
|
|
||||||
const showHorizontalBorder = showHorizontalBorderFor(props, isLastRow);
|
const showHorizontalBorder = showHorizontalBorderFor(props, isLastRow);
|
||||||
const showVerticalBorder = !!props.enableVerticalBorders && !isLastColumn;
|
const showVerticalBorder =
|
||||||
|
!!props.enableVerticalBorders && !isLastColumn && props.type !== TableColumn.ALBUM_GROUP;
|
||||||
|
|
||||||
const cell = (
|
const cell = (
|
||||||
<div
|
<div
|
||||||
|
|||||||
Reference in New Issue
Block a user