From 92123bd2434f866ac5f03e6829e1857d51030715 Mon Sep 17 00:00:00 2001 From: Alex <33497058+bexsoft@users.noreply.github.com> Date: Thu, 29 Dec 2022 19:57:40 -0600 Subject: [PATCH] Changed selected styles for deleted rows (#2537) Signed-off-by: Benjamin Perez --- .../Common/FormComponents/common/styleLibrary.ts | 8 +++++--- .../Console/Common/TableWrapper/TableWrapper.tsx | 15 +++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts b/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts index fd71e770c..34ae47f3c 100644 --- a/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts +++ b/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts @@ -1459,8 +1459,10 @@ export const objectBrowserExtras = { // These classes are meant to be used as React.CSSProperties for TableWrapper export const TableRowPredefStyles: any = { deleted: { - color: "#ACACAC", - backgroundColor: "#FDFDFD", - fontStyle: "italic", + color: "#707070", + backgroundColor: "#f1f0f0", + "&.selected": { + color: "#b2b2b2", + }, }, }; diff --git a/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx b/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx index 791d89e14..f4c2088d1 100644 --- a/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx +++ b/portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx @@ -191,9 +191,14 @@ const styles = () => }, }, "& .selected": { - color: "#081C42", fontWeight: 600, }, + "&:not(.deleted) .selected": { + color: "#081C42", + }, + "&.deleted .selected": { + color: "#C51B3F", + }, }, ".headerItem": { userSelect: "none", @@ -646,9 +651,11 @@ const TableWrapper = ({ onRowClick={({ rowData }) => { clickAction(rowData); }} - rowClassName={`rowLine ${findView ? "canClick" : ""} ${ - !findView && textSelectable ? "canSelectText" : "" - }`} + rowClassName={(r) => + `rowLine ${findView ? "canClick" : ""} ${ + !findView && textSelectable ? "canSelectText" : "" + } ${rowStyle ? rowStyle(r) : ""}` + } onRowsRendered={onRowsRendered} sort={sortConfig ? sortConfig.triggerSort : undefined} sortBy={sortConfig ? sortConfig.currentSort : undefined}