Skip to content

Commit e6e9849

Browse files
committed
Fixed missing HREF on rest of anchor tags.
1 parent 91fe195 commit e6e9849

File tree

7 files changed

+60
-44
lines changed

7 files changed

+60
-44
lines changed

packages/react-renderer-demo/src/app/pages/index.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ const useStyles = makeStyles(theme => ({
2525
textAlign: 'center',
2626
marginTop: 48,
2727
},
28+
getStartedAnchor: {
29+
textDecoration: 'none',
30+
},
2831
getStartedButton: {
2932
border: `1px solid ${theme.palette.common.white}`,
3033
borderRadius: 2,
@@ -47,9 +50,11 @@ const LandingPage = () => {
4750
</Typography>
4851
<div className={ classes.getStartedLink }>
4952
<Link href="/renderer/installation">
50-
<Button variant="outlined" className={ classes.getStartedButton }>
51-
Get started
52-
</Button>
53+
<a className={ classes.getStartedAnchor }>
54+
<Button variant="outlined" className={ classes.getStartedButton }>
55+
Get started
56+
</Button>
57+
</a>
5358
</Link>
5459
</div>
5560
</div>

packages/react-renderer-demo/src/app/src/components/common/example-link.js

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33
import RouterLink from 'next/link';
4-
import Link from '@material-ui/core/Link';
54
import Button from '@material-ui/core/Button';
5+
import makeStyles from '@material-ui/core/styles/makeStyles';
66

7-
const ExampleLink = ({ to, text = 'To example' }) => (
8-
<React.Fragment>
9-
<div style={{ float: 'right' }}>
10-
<RouterLink href={ `/component-example/${to}` }>
11-
<Button><Link>{ text }</Link></Button>
12-
</RouterLink>
13-
</div>
14-
<br/>
15-
</React.Fragment>
16-
);
7+
const useStyles = makeStyles({
8+
toExampleLink: {
9+
textDecoration: 'none',
10+
},
11+
});
12+
13+
const ExampleLink = ({ to, text = 'To example' }) => {
14+
const classes = useStyles();
15+
return (
16+
<React.Fragment>
17+
<div style={{ float: 'right' }}>
18+
<RouterLink href={ `/component-example/${to}` }>
19+
<a className={ classes.toExampleLink }>
20+
<Button color="primary" >{ text }</Button>
21+
</a>
22+
</RouterLink>
23+
</div>
24+
<br/>
25+
</React.Fragment>
26+
);};
1727

1828
ExampleLink.propTypes = {
1929
to: PropTypes.string.isRequired,

packages/react-renderer-demo/src/app/src/components/mdx/share-button.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ const HashTagSvg = (props) => (
1010

1111
const ShareButton = ({ path }) => (
1212
<CopyToClipboard text={ path }>
13-
<a href={ path }>
14-
<IconButton size="medium">
15-
<SvgIcon fontSize="small" viewBox="0 0 48 48">
16-
<HashTagSvg />
17-
</SvgIcon>
18-
</IconButton>
19-
</a>
13+
<IconButton size="medium">
14+
<SvgIcon fontSize="small" viewBox="0 0 48 48">
15+
<HashTagSvg />
16+
</SvgIcon>
17+
</IconButton>
2018
</CopyToClipboard>
2119
);
2220

packages/react-renderer-demo/src/app/src/doc-components/component-mapper/form-fields-mapper.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint react/prop-types: "off" */
12
import React, { Fragment } from 'react';
23
import FormRender, { layoutComponents, componentTypes } from '@data-driven-forms/react-form-renderer';
34

@@ -30,17 +31,12 @@ const Button = ({ children, label, variant, ...props }) => <button style={ getBu
3031
const layoutComponent = {
3132
[layoutComponents.FORM_WRAPPER]: FormWrapper,
3233
[layoutComponents.BUTTON]: Button,
33-
[layoutComponents.COL]: Fragment,
34-
[layoutComponents.FORM_GROUP]: Fragment,
35-
[layoutComponents.BUTTON_GROUP]: Fragment,
36-
[layoutComponents.ICON]: Fragment,
37-
[layoutComponents.ARRAY_FIELD_WRAPPER]: Fragment,
38-
[layoutComponents.HELP_BLOCK]: Fragment,
34+
[layoutComponents.BUTTON_GROUP]: ({ key, children }) => <Fragment key={ key }>{ children }</Fragment>,
3935
[layoutComponents.TITLE]: Title,
4036
[layoutComponents.DESCRIPTION]: Description,
4137
};
4238

43-
const TextField = ({ formOptions, customProp, label, input, isRequired, meta: { error, touched }, FieldProvider, dataType, ...props }) => (
39+
const TextField = ({ formOptions, customProp, label, input, isRequired, meta: { error, touched }, FieldProvider, FieldArrayProvider, dataType, ...props }) => (
4440
<div className={ `ddorg__demo-formGroup ${isRequired ? 'required' : ''} ${error ? 'error' : ''}` }>
4541
<label htmlFor={ input.name }>{ label }</label>
4642
<input id={ input.name } { ...input } { ...props } />

packages/react-renderer-demo/src/app/src/doc-components/component-mapper/layout-mapper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { Fragment } from 'react';
1+
import React from 'react';
22
import FormRender, { layoutComponents } from '@data-driven-forms/react-form-renderer';
33

44
const wrapperStyles = {

packages/react-renderer-demo/src/app/src/doc-components/field-array/form-fields-mapper.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint react/prop-types: "off" */
12
import React, { Fragment, useState } from 'react';
23
import FormRender, { layoutComponents, componentTypes } from '@data-driven-forms/react-form-renderer';
34

@@ -30,7 +31,7 @@ const Button = ({ children, label, variant, ...props }) => <button style={ getBu
3031
const layoutComponent = {
3132
[layoutComponents.FORM_WRAPPER]: FormWrapper,
3233
[layoutComponents.BUTTON]: Button,
33-
[layoutComponents.BUTTON_GROUP]: Fragment,
34+
[layoutComponents.BUTTON_GROUP]: ({ key, children }) => <Fragment key={ key }>{ children }</Fragment>,
3435
[layoutComponents.TITLE]: Fragment,
3536
[layoutComponents.DESCRIPTION]: Fragment,
3637
};

packages/react-renderer-demo/src/app/src/helpers/list-of-contents.js

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,25 +86,31 @@ const useStyles = makeStyles(theme => ({
8686
},
8787
}));
8888

89-
const scrollListener = (setActive) => {
90-
const min = -10;
91-
const max = 20;
92-
const elem = Array.from(document.querySelectorAll('[data-mdlink]'))
93-
.find(elem => {
94-
const { top } = elem.getBoundingClientRect();
95-
return top > min && top < max;
96-
});
97-
if (elem) {
98-
setActive(elem.id);
99-
}
100-
};
101-
10289
const ListOfContents = ({ file }) => {
10390
const [ activeItem, setActive ] = useState();
91+
let isMounted = true;
92+
93+
const scrollListener = (setActive) => {
94+
const min = -10;
95+
const max = 20;
96+
const elem = Array.from(document.querySelectorAll('[data-mdlink]'))
97+
.find(elem => {
98+
const { top } = elem.getBoundingClientRect();
99+
return top > min && top < max;
100+
});
101+
if (isMounted && elem) {
102+
setActive(elem.id);
103+
}
104+
};
105+
104106
useEffect(() => {
105107
document.addEventListener('scroll', () => scrollListener(setActive));
106108
scrollListener(setActive);
107-
return () => document.removeEventListener('scroll', scrollListener);
109+
110+
return () => {
111+
isMounted = false;
112+
document.removeEventListener('scroll', scrollListener);
113+
};
108114
}, []);
109115
const classes = useStyles();
110116
const text = reqSource(`./${file}.md`).default;

0 commit comments

Comments
 (0)