Skip to content

Commit 049154e

Browse files
committed
refactor(AnalyticalTable): simplify styling and css selectors
1 parent 97158a3 commit 049154e

File tree

4 files changed

+65
-76
lines changed

4 files changed

+65
-76
lines changed

packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const styles = {
2222
th: {
2323
backgroundColor: ThemingParameters.sapList_HeaderBackground,
2424
height: CssSizeVariables.sapWcrAnalyticalTableRowHeight,
25-
fontWeight: 'normal',
2625
color: ThemingParameters.sapList_HeaderTextColor,
2726
borderTop: `1px solid ${ThemingParameters.sapList_BorderColor}`,
2827
borderBottom: `1px solid ${ThemingParameters.sapList_BorderColor}`,
@@ -41,52 +40,39 @@ const styles = {
4140
},
4241
tbody: {
4342
position: 'relative',
44-
zIndex: 0,
4543
backgroundColor: ThemingParameters.sapList_Background,
4644
overflowX: 'hidden',
4745
overflowY: 'auto'
4846
},
4947
alternateRowColor: {
50-
backgroundColor: ThemingParameters.sapList_HeaderBackground
48+
backgroundColor: ThemingParameters.sapList_AlternatingBackground
5149
},
52-
emptyRow: {},
5350
tr: {
5451
position: 'absolute',
5552
top: 0,
5653
left: 0,
5754
width: '100%',
58-
zIndex: 0,
5955
color: ThemingParameters.sapList_TextColor,
6056
borderBottom: `1px solid ${ThemingParameters.sapList_BorderColor}`,
6157
boxSizing: 'border-box',
6258
display: 'flex',
6359
height: CssSizeVariables.sapWcrAnalyticalTableRowHeight,
60+
'&:hover': {
61+
backgroundColor: ThemingParameters.sapList_Hover_Background
62+
},
6463
'&[data-is-selected]': {
6564
borderBottom: `1px solid ${ThemingParameters.sapList_SelectionBorderColor}`,
66-
backgroundColor: `${ThemingParameters.sapList_SelectionBackgroundColor} !important`
65+
backgroundColor: ThemingParameters.sapList_SelectionBackgroundColor
6766
},
6867
'&[data-is-selected]:hover': {
69-
backgroundColor: `${ThemingParameters.sapList_Hover_SelectionBackground} !important`
70-
}
71-
},
72-
tableGroupHeader: {
73-
'&$tr': {
74-
backgroundColor: `${ThemingParameters.sapList_TableGroupHeaderBackground} !important`,
75-
border: `1px solid ${ThemingParameters.sapList_TableGroupHeaderBorderColor}`,
76-
color: ThemingParameters.sapList_TextColor,
77-
'& $tableCell': {
78-
borderRight: 'none'
79-
}
68+
backgroundColor: ThemingParameters.sapList_Hover_SelectionBackground
8069
}
8170
},
82-
selectable: {
83-
'& $tr:hover:not($emptyRow)': {
84-
backgroundColor: ThemingParameters.sapList_Hover_Background,
85-
'&:not($selectionModeRowSelector)': {
86-
cursor: 'pointer'
87-
}
71+
trActive: {
72+
'&:hover': {
73+
cursor: 'pointer'
8874
},
89-
'& $tr:active:not([data-is-selected]):not($tableGroupHeader):not($emptyRow):not($selectionModeRowSelector)': {
75+
'&:active': {
9076
backgroundColor: ThemingParameters.sapList_Active_Background,
9177
'& $tableCell': {
9278
borderRight: `1px solid ${ThemingParameters.sapList_Active_Background}`,
@@ -95,7 +81,16 @@ const styles = {
9581
}
9682
}
9783
},
98-
selectionModeRowSelector: {},
84+
tableGroupHeader: {
85+
'&$tr': {
86+
backgroundColor: `${ThemingParameters.sapList_TableGroupHeaderBackground}`,
87+
border: `1px solid ${ThemingParameters.sapList_TableGroupHeaderBorderColor}`,
88+
color: ThemingParameters.sapList_TextColor,
89+
'& $tableCell': {
90+
borderRight: 'none'
91+
}
92+
}
93+
},
9994
tableCell: {
10095
height: CssSizeVariables.sapWcrAnalyticalTableRowHeight,
10196
boxSizing: 'border-box',

0 commit comments

Comments
 (0)