Skip to content
Jump to bottom

Changed color of selected row to a color that is easier to see #116

Merged
merged 3 commits into from
Nov 16, 2020
Merged

Changed color of selected row to a color that is easier to see #116

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44865c2
Changed color of selected row to a color that is easier to see
Nov 4, 2020
937dbc0
Added logic that removes selected row styling after ItemView is closed.
Nov 6, 2020
2e6f87d
Merge branch 'staging' into enhancement-selected-row-styling
campb303 Nov 16, 2020
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
32 changes: 19 additions & 13 deletions src/components/ItemTable/ItemTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import RelativeTime from "react-relative-time";
import ItemTableFilter from "../ItemTableFilter/"
import { ArrowDownward, ArrowUpward } from "@material-ui/icons";

export default function ItemTable({ data }) {
const [selectedRow, setSelecetedRow] = useState({ queue: null, number: null });
const theme = useTheme();

export default function ItemTable({ data, rowCanBeSelected }) {

const theme = useTheme();
const useStyles = makeStyles({
// Fully visible for active icons
activeSortIcon: {
Expand All @@ -21,9 +21,7 @@ export default function ItemTable({ data }) {
opacity: 0.2,
},
rowSelected: {
"&$selected, &$selected:hover": {
backgroundColor: theme.palette.primary,
},
backgroundColor: theme.palette.type === 'light' ? theme.palette.primary[100] : theme.palette.primary[600],
},
bandedRows: {
'&:nth-of-type(even)': {
Expand All @@ -34,7 +32,7 @@ export default function ItemTable({ data }) {
borderLeftWidth: "1px",
borderLeftStyle: "solid",
borderColor: theme.palette.type === "light" ? theme.palette.grey[300] : theme.palette.grey[500]
}
},
});
const classes = useStyles();

Expand Down Expand Up @@ -131,11 +129,16 @@ export default function ItemTable({ data }) {
history.push(`/${row.original.queue}/${row.original.number}`);
setSelecetedRow({ queue: row.original.queue, number: row.original.number });
}}
classes={{ root: isSelected ? classes.rowSelected : classes.bandedRows }}
selected={isSelected}
// This functionality should be achieved by using the selected prop and
// overriding the selected class but this applied the secondary color at 0.08% opacity.
// Overridding the root class is a workaround.
classes={{ root: (isSelected && rowCanBeSelected) ? classes.rowSelected : classes.bandedRows }}
{...row.getRowProps()} >
{row.cells.map(cell => (
<TableCell classes={{ root: classes.columnBorders }} {...cell.getCellProps()}>
<TableCell
classes={{ root: classes.columnBorders }}
{...cell.getCellProps()}
>
{cell.render("Cell")}
</TableCell>
))}
Expand All @@ -150,9 +153,12 @@ export default function ItemTable({ data }) {

ItemTable.propTypes = {
/** Array of items from all active queues to display in table. */
"items": PropTypes.array
"items": PropTypes.array,
/** State variable indicating if rows can be selected. When false, all rows are deselected. */
"rowCanBeSelected": PropTypes.bool
};

ItemTable.defaultProps = {
"items": []
"items": [],
"rowCanBeSelected": true
};