Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Selected Line Not Fully Highlighted in Blue #5966

Merged
merged 6 commits into from
Jun 21, 2024
Merged

Fix: Selected Line Not Fully Highlighted in Blue #5966

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d9d957
Fix: Selected Line Not Fully Highlighted in Blue
akarsanth Jun 19, 2024
29083fa
Replaced multiple instances of StyledTd with SelectableStyledTd in Re…
akarsanth Jun 19, 2024
fb3ee9a
Update CheckboxCell.tsx
akarsanth Jun 19, 2024
89fe647
Replaced hardcoded theme vars
lucasbordeau Jun 21, 2024
bb4fba4
Added border right transparent to header checkbox too
lucasbordeau Jun 21, 2024
b6abc64
Added deprecation message
lucasbordeau Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/twenty-front/src/modules/object-record/record-table/components/CheckboxCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const StyledContainer = styled.div`
height: 32px;

justify-content: center;
background-color: ${({ theme }) => theme.background.primary};
`;

export const CheckboxCell = () => {
Expand Down
1 change: 1 addition & 0 deletions ...ages/twenty-front/src/modules/object-record/record-table/components/RecordTableHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export const RecordTableHeader = ({
width: 30,
minWidth: 30,
maxWidth: 30,
borderRight: 'transparent',
}}
>
<SelectAllCheckbox />
Expand Down
39 changes: 33 additions & 6 deletions packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,24 @@ type RecordTableRowProps = {
isPendingRow?: boolean;
};

export const StyledTd = styled.td`
export const StyledTd = styled.td<{ isSelected?: boolean }>`
background: ${({ theme }) => theme.background.primary};
position: relative;
user-select: none;

${({ isSelected, theme }) =>
isSelected &&
`
background: ${theme.accent.quaternary};

`}
`;

export const StyledTr = styled.tr<{ isDragging: boolean }>`
border: 1px solid transparent;
transition: border-left-color 0.2s ease-in-out;

td:nth-of-type(-n + 2) {
background-color: ${({ theme }) => theme.background.primary};
border-right-color: ${({ theme }) => theme.background.primary};
}

Expand All @@ -58,6 +65,20 @@ export const StyledTr = styled.tr<{ isDragging: boolean }>`
`}
`;

const SelectableStyledTd = ({
isSelected,
children,
style,
}: {
isSelected: boolean;
children?: React.ReactNode;
style?: React.CSSProperties;
}) => (
<StyledTd isSelected={isSelected} style={style}>
{children}
</StyledTd>
);

export const RecordTableRow = ({
recordId,
rowIndex,
Expand Down Expand Up @@ -127,9 +148,12 @@ export const RecordTableRow = ({
>
<GripCell isDragging={draggableSnapshot.isDragging} />
</StyledTd>
<StyledTd>
<SelectableStyledTd
isSelected={currentRowSelected}
style={{ borderRight: 'transparent' }}
>
{!draggableSnapshot.isDragging && <CheckboxCell />}
</StyledTd>
</SelectableStyledTd>
{inView || draggableSnapshot.isDragging
? visibleTableColumns.map((column, columnIndex) => (
<RecordTableCellContext.Provider
Expand All @@ -145,9 +169,12 @@ export const RecordTableRow = ({
</RecordTableCellContext.Provider>
))
: visibleTableColumns.map((column) => (
<StyledTd key={column.fieldMetadataId}></StyledTd>
<StyledTd
isSelected={currentRowSelected}
key={column.fieldMetadataId}
></StyledTd>
))}
<StyledTd />
<SelectableStyledTd isSelected={currentRowSelected} />
</StyledTr>
)}
</Draggable>
Expand Down
Loading