Skip to content

Commit a520df0

Browse files
authored
Merge pull request #602 from data-driven-forms/separate-nav-sub-section
Add spacing to nested links in docs nav
2 parents 3f482a2 + cea3763 commit a520df0

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

packages/react-renderer-demo/src/components/navigation/mapper.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,23 @@ import { useRouter } from 'next/router';
1717
import { navStyles } from './nav-styles';
1818
import { query } from './find-connected-links';
1919
import useMapperLink from '../../hooks/use-mapper-link';
20+
import clsx from 'clsx';
2021

2122
const useStyles = makeStyles(navStyles);
2223

23-
const Item = ({ href, linkText, component, divider }) => {
24+
const Item = ({ href, linkText, component, divider, level }) => {
2425
const classes = useStyles();
2526
const router = useRouter();
2627
const link = useMapperLink(href.replace('/?', '?'));
27-
2828
return (
2929
<ListItem
3030
divider={divider}
3131
button
3232
selected={href.replace('/?', '?') === router.asPath.replace(query, '')}
3333
key={href || linkText}
34-
className={classes.nested}
34+
className={clsx(classes.item, {
35+
[classes.nested]: level > 0
36+
})}
3537
component={forwardRef((props, ref) => (
3638
<RouterNavLink ref={ref} key={component} href={link}>
3739
<Link style={{ color: 'rgba(0, 0, 0, 0.87)' }} {...props} href={link} />
@@ -75,7 +77,17 @@ const FinalList = ({ title, level, link, fields, previousLinks = [], renderItems
7577
);
7678
};
7779

78-
const SubHeader = ({ title }) => <ListSubheader>{title}</ListSubheader>;
80+
const useSubHeaderStyles = makeStyles((theme) => ({
81+
subHeader: {
82+
color: theme.palette.text.primary,
83+
paddingLeft: 24
84+
}
85+
}));
86+
87+
const SubHeader = ({ title }) => {
88+
const classes = useSubHeaderStyles();
89+
return <ListSubheader className={classes.subHeader}>{title}</ListSubheader>;
90+
};
7991

8092
const Mapper = {
8193
Wrapper: FinalList,

packages/react-renderer-demo/src/components/navigation/nav-styles.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,17 @@ export const navStyles = (theme) => ({
3535
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
3636
fontSize: '0.875rem'
3737
},
38-
nested: {
38+
item: {
3939
padding: '8px 16px !important',
4040
justifyContent: 'flex-start !important',
4141
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
4242
fontSize: '0.875rem'
4343
},
44+
nested: {
45+
padding: '8px 16px 8px 32px !important'
46+
},
4447
listItem: {
45-
padding: '8px 16px !important',
48+
padding: '8px 16px 8px 16px !important',
4649
justifyContent: 'flex-start !important'
4750
},
4851
searchButton: {

0 commit comments

Comments
 (0)