diff --git a/packages/core/src/components/CheckboxTree/CheckboxTree.tsx b/packages/core/src/components/CheckboxTree/CheckboxTree.tsx
index 243abd4f5a..f0d1135918 100644
--- a/packages/core/src/components/CheckboxTree/CheckboxTree.tsx
+++ b/packages/core/src/components/CheckboxTree/CheckboxTree.tsx
@@ -41,14 +41,32 @@ const useStyles = makeStyles((theme: Theme) =>
'&:hover': {
backgroundColor: 'transparent',
},
+ '&:active' : {
+ animation: 'none',
+ transform: 'none'
+ },
},
nested: {
paddingLeft: theme.spacing(5),
height: '32px',
+ '&:hover' : {
+ backgroundColor: 'transparent',
+ },
},
listItemIcon: {
minWidth: 10,
},
+ listItem: {
+ '&:hover' : {
+ backgroundColor: 'transparent',
+ },
+ },
+ text: {
+ '& span, & svg': {
+ fontWeight: 'normal',
+ fontSize: 14
+ }
+ }
}),
);
@@ -180,6 +198,7 @@ const indexer = (
};
}, {});
+
export const CheckboxTree = (props: CheckboxTreeProps) => {
const { onChange } = props;
const classes = useStyles();
@@ -206,15 +225,13 @@ export const CheckboxTree = (props: CheckboxTreeProps) => {
{props.label}
- {Object.values(state).map(item => {
- const labelId = `checkbox-list-label-${item?.label}`;
-
- return (
+ {Object.values(state).map(item =>
+ onClick={() =>
dispatch({
type: 'checkCategory',
payload: item.label,
@@ -228,10 +245,9 @@ export const CheckboxTree = (props: CheckboxTreeProps) => {
checked={item.isChecked}
tabIndex={-1}
disableRipple
- inputProps={{ 'aria-labelledby': labelId }}
/>
-
+
{Object.values(item.options).length ? (
<>
{item.isOpen ? (
@@ -270,17 +286,15 @@ export const CheckboxTree = (props: CheckboxTreeProps) => {
checked={option.isChecked}
tabIndex={-1}
disableRipple
- inputProps={{ 'aria-labelledby': labelId }}
/>
-
+
))}
- );
- })}
+ )}
);
diff --git a/packages/core/src/components/Table/Filters.tsx b/packages/core/src/components/Table/Filters.tsx
index e8192b1a90..84663a4467 100644
--- a/packages/core/src/components/Table/Filters.tsx
+++ b/packages/core/src/components/Table/Filters.tsx
@@ -30,7 +30,10 @@ const useSubvalueCellStyles = makeStyles(theme => ({
flexDirection: 'column',
marginRight: theme.spacing(3),
},
- value: {},
+ value: {
+ fontWeight: 'bold',
+ fontSize: 18
+ },
header: {
display: 'flex',
alignItems: 'center',
@@ -45,9 +48,6 @@ const useSubvalueCellStyles = makeStyles(theme => ({
marginTop: theme.spacing(2),
},
},
- clear: {
- textTransform: 'none',
- },
}));
type Without = Pick>;
@@ -88,7 +88,7 @@ export const Filters = (props: Props) => {
diff --git a/packages/core/src/components/Table/Table.tsx b/packages/core/src/components/Table/Table.tsx
index 3605bc8e00..0886d8e177 100644
--- a/packages/core/src/components/Table/Table.tsx
+++ b/packages/core/src/components/Table/Table.tsx
@@ -133,6 +133,10 @@ const useFilterStyles = makeStyles
(() => ({
alignItems: 'center',
justifyContent: 'space-between',
},
+ title: {
+ fontWeight: 'bold',
+ fontSize: 18
+ }
}));
const useTableStyles = makeStyles(() => ({
@@ -281,7 +285,7 @@ export function Table({
>
-
+
Filters ({selectedFiltersLength})