Skip to content

Commit

Permalink
matt & seb reviews
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari committed Jan 30, 2019
1 parent 3d58b03 commit 7cff225
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 34 deletions.
1 change: 1 addition & 0 deletions docs/src/modules/components/MarkdownLinks.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ async function handleClick(event) {

// Ignore click for new tab / new window behavior
if (
event.defaultPrevented ||
event.metaKey ||
event.ctrlKey ||
event.shiftKey ||
Expand Down
5 changes: 3 additions & 2 deletions docs/src/pages/lab/breadcrumbs/CollapsedBreadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ const styles = theme => ({
},
});

function handleClick() {
alert('You clicked a Breadcrumb.'); // eslint-disable-line no-alert
function handleClick(event) {
event.preventDefault();
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
}

function CollapsedBreadcrumbs(props) {
Expand Down
24 changes: 13 additions & 11 deletions docs/src/pages/lab/breadcrumbs/CustomSeparator.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable jsx-a11y/anchor-is-valid */

import React from 'react';
import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles';
Expand All @@ -19,8 +17,9 @@ const styles = theme => ({
},
});

function handleClick() {
alert('You clicked a Breadcrumb.'); // eslint-disable-line no-alert
function handleClick(event) {
event.preventDefault();
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
}

function CustomSeparator(props) {
Expand All @@ -31,12 +30,12 @@ function CustomSeparator(props) {
<Paper className={classes.paper}>
<Breadcrumbs separator="›" arial-label="Breadcrumb navigation">
<Breadcrumb>
<Link color="inherit" href="#" onClick={handleClick}>
<Link color="inherit" href="/" onClick={handleClick}>
Material-UI
</Link>
</Breadcrumb>
<Breadcrumb>
<Link color="inherit" href="#" onClick={handleClick}>
<Link color="inherit" href="/lab/about/" onClick={handleClick}>
Lab
</Link>
</Breadcrumb>
Expand All @@ -47,12 +46,12 @@ function CustomSeparator(props) {
<Paper className={classes.paper}>
<Breadcrumbs separator="-" arial-label="Breadcrumb navigation">
<Breadcrumb>
<Link color="inherit" href="#" onClick={handleClick}>
<Link color="inherit" href="/" onClick={handleClick}>
Material-UI
</Link>
</Breadcrumb>
<Breadcrumb>
<Link color="inherit" href="#" onClick={handleClick}>
<Link color="inherit" href="/lab/about/" onClick={handleClick}>
Lab
</Link>
</Breadcrumb>
Expand All @@ -61,14 +60,17 @@ function CustomSeparator(props) {
</Paper>
<br />
<Paper className={classes.paper}>
<Breadcrumbs separator={<NavigateNextIcon />} arial-label="Breadcrumb navigation">
<Breadcrumbs
separator={<NavigateNextIcon fontSize="small" />}
arial-label="Breadcrumb navigation"
>
<Breadcrumb>
<Link color="inherit" href="#" onClick={handleClick}>
<Link color="inherit" href="/" onClick={handleClick}>
Material-UI
</Link>
</Breadcrumb>
<Breadcrumb>
<Link color="inherit" href="#" onClick={handleClick}>
<Link color="inherit" href="/lab/about/" onClick={handleClick}>
Lab
</Link>
</Breadcrumb>
Expand Down
5 changes: 3 additions & 2 deletions docs/src/pages/lab/breadcrumbs/CustomizedBreadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ const styles = theme => ({
},
});

function handleClick() {
alert('You clicked a Breadcrumb.'); // eslint-disable-line no-alert
function handleClick(event) {
event.preventDefault();
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
}

function CustomBreadcrumb(props) {
Expand Down
29 changes: 13 additions & 16 deletions docs/src/pages/lab/breadcrumbs/IconBreadcrumbs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable jsx-a11y/anchor-is-valid */

import React from 'react';
import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles';
Expand All @@ -8,8 +6,8 @@ import Breadcrumbs from '@material-ui/lab/Breadcrumbs';
import Breadcrumb from '@material-ui/lab/Breadcrumb';
import Link from '@material-ui/core/Link';
import HomeIcon from '@material-ui/icons/Home';
import SettingsIcon from '@material-ui/icons/Settings';
import GroupIcon from '@material-ui/icons/Group';
import WhatshotIcon from '@material-ui/icons/Whatshot';
import GrainIcon from '@material-ui/icons/Grain';

const styles = theme => ({
root: {
Expand All @@ -25,8 +23,9 @@ const styles = theme => ({
},
});

function handleClick() {
alert('You clicked a Breadcrumb.'); // eslint-disable-line no-alert
function handleClick(event) {
event.preventDefault();
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
}

function IconBreadcrumbs(props) {
Expand All @@ -35,22 +34,20 @@ function IconBreadcrumbs(props) {
<Paper className={classes.root}>
<Breadcrumbs arial-label="Breadcrumb navigation">
<Breadcrumb>
<Link color="inherit" href="#" onClick={handleClick} className={classes.link}>
<Link color="inherit" href="/" onClick={handleClick} className={classes.link}>
<HomeIcon className={classes.icon} />
Home
Material-UI
</Link>
</Breadcrumb>
<Breadcrumb>
<Link color="inherit" href="#" onClick={handleClick} className={classes.link}>
<SettingsIcon className={classes.icon} />
Settings
<Link color="inherit" href="/lab/about/" onClick={handleClick} className={classes.link}>
<WhatshotIcon className={classes.icon} />
Lab
</Link>
</Breadcrumb>
<Breadcrumb>
<Link color="inherit" href="#" className={classes.link}>
<GroupIcon className={classes.icon} />
Users
</Link>
<Breadcrumb color="textPrimary" className={classes.link}>
<GrainIcon className={classes.icon} />
Breadcrumb
</Breadcrumb>
</Breadcrumbs>
</Paper>
Expand Down
9 changes: 7 additions & 2 deletions docs/src/pages/lab/breadcrumbs/SimpleBreadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,23 @@ const styles = theme => ({
},
});

function handleClick(event) {
event.preventDefault();
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
}

function SimpleBreadcrumbs(props) {
const { classes } = props;
return (
<Paper className={classes.root}>
<Breadcrumbs arial-label="Breadcrumb navigation">
<Breadcrumb>
<Link color="inherit" href="/">
<Link color="inherit" href="/" onClick={handleClick}>
Material-UI
</Link>
</Breadcrumb>
<Breadcrumb>
<Link color="inherit" href="/lab/about/">
<Link color="inherit" href="/lab/about/" onClick={handleClick}>
Lab
</Link>
</Breadcrumb>
Expand Down
9 changes: 9 additions & 0 deletions docs/src/pages/lab/breadcrumbs/breadcrumbs.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ components: Breadcrumbs, Breadcrumb

## Custom separator

The seperator can be any valid React node.
In the following examples, we are using `"›"`, `"-"` and

```jsx
import NavigateNextIcon from '@material-ui/icons/NavigateNext';
//
seperator={<NavigateNextIcon fontSize="small" />}
```

{{"demo": "pages/lab/breadcrumbs/CustomSeparator.js"}}

## Breadcrumbs with icons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ const styles = theme => ({
root: {
color: theme.palette.grey[400],
display: 'flex',
userSelect: 'none',
marginLeft: 8,
marginRight: 8,
userSelect: 'none',
},
});

Expand Down

0 comments on commit 7cff225

Please sign in to comment.