Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Tabs] Improve accessibility #16384

Merged
merged 4 commits into from
Jul 17, 2019
Merged

[Tabs] Improve accessibility #16384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c3507d
[Tabs] Improve accessibility
mbrookes Mar 27, 2019
14be4ae
fix build fail
oliviertassinari Jul 13, 2019
6d10ea6
migrate the other demos
oliviertassinari Jul 15, 2019
8d02f31
rename tablist -> tablistContainer
oliviertassinari Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions docs/src/pages/components/buttons/FloatingActionButtonZoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,39 @@ import AddIcon from '@material-ui/icons/Add';
import EditIcon from '@material-ui/icons/Edit';
import UpIcon from '@material-ui/icons/KeyboardArrowUp';
import { green } from '@material-ui/core/colors';
import Box from '@material-ui/core/Box';

function TabContainer(props) {
const { children, dir } = props;
function TabPanel(props) {
const { children, value, index, ...other } = props;

return (
<Typography component="div" dir={dir} style={{ padding: 8 * 3 }}>
{children}
<Typography
component="div"
role="tabpanel"
hidden={value !== index}
id={`action-tabpanel-${index}`}
aria-labelledby={`action-tab-${index}`}
{...other}
>
<Box p={3}>{children}</Box>
</Typography>
);
}

TabContainer.propTypes = {
TabPanel.propTypes = {
children: PropTypes.node.isRequired,
dir: PropTypes.string.isRequired,
index: PropTypes.any.isRequired,
value: PropTypes.any.isRequired,
};

function a11yProps(index) {
return {
id: `action-tab-${index}`,
'aria-controls': `action-tabpanel-${index}`,
};
}

const useStyles = makeStyles(theme => ({
root: {
backgroundColor: theme.palette.background.paper,
Expand Down Expand Up @@ -98,20 +115,27 @@ export default function FloatingActionButtonZoom() {
indicatorColor="primary"
textColor="primary"
variant="fullWidth"
aria-label="Action tabs example"
>
<Tab label="Item One" />
<Tab label="Item Two" />
<Tab label="Item Three" />
<Tab label="Item One" {...a11yProps(0)} />
<Tab label="Item Two" {...a11yProps(1)} />
<Tab label="Item Three" {...a11yProps(2)} />
</Tabs>
</AppBar>
<SwipeableViews
axis={theme.direction === 'rtl' ? 'x-reverse' : 'x'}
index={value}
onChangeIndex={handleChangeIndex}
>
<TabContainer dir={theme.direction}>Item One</TabContainer>
<TabContainer dir={theme.direction}>Item Two</TabContainer>
<TabContainer dir={theme.direction}>Item Three</TabContainer>
<TabPanel value={value} index={0} dir={theme.direction}>
Item One
</TabPanel>
<TabPanel value={value} index={1} dir={theme.direction}>
Item Two
</TabPanel>
<TabPanel value={value} index={2} dir={theme.direction}>
Item Three
</TabPanel>
</SwipeableViews>
{fabs.map((fab, index) => (
<Zoom
Expand Down
52 changes: 39 additions & 13 deletions docs/src/pages/components/buttons/FloatingActionButtonZoom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,46 @@ import AddIcon from '@material-ui/icons/Add';
import EditIcon from '@material-ui/icons/Edit';
import UpIcon from '@material-ui/icons/KeyboardArrowUp';
import { green } from '@material-ui/core/colors';
import Box from '@material-ui/core/Box';

interface TabContainerProps {
interface TabPanelProps {
children?: React.ReactNode;
dir: TypographyProps['dir'];
dir?: string;
index: any;
value: any;
}

function TabContainer(props: TabContainerProps) {
const { children, dir } = props;
function TabPanel(props: TabPanelProps) {
const { children, value, index, ...other } = props;

return (
<Typography component="div" dir={dir} style={{ padding: 8 * 3 }}>
{children}
<Typography
component="div"
role="tabpanel"
hidden={value !== index}
id={`action-tabpanel-${index}`}
aria-labelledby={`action-tab-${index}`}
{...other}
>
<Box p={3}>{children}</Box>
</Typography>
);
}

TabContainer.propTypes = {
TabPanel.propTypes = {
children: PropTypes.node.isRequired,
dir: PropTypes.string.isRequired,
index: PropTypes.any.isRequired,
value: PropTypes.any.isRequired,
};

function a11yProps(index: any) {
return {
id: `action-tab-${index}`,
'aria-controls': `action-tabpanel-${index}`,
};
}

const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
Expand Down Expand Up @@ -105,20 +124,27 @@ export default function FloatingActionButtonZoom() {
indicatorColor="primary"
textColor="primary"
variant="fullWidth"
aria-label="Action tabs example"
>
<Tab label="Item One" />
<Tab label="Item Two" />
<Tab label="Item Three" />
<Tab label="Item One" {...a11yProps(0)} />
<Tab label="Item Two" {...a11yProps(1)} />
<Tab label="Item Three" {...a11yProps(2)} />
</Tabs>
</AppBar>
<SwipeableViews
axis={theme.direction === 'rtl' ? 'x-reverse' : 'x'}
index={value}
onChangeIndex={handleChangeIndex}
>
<TabContainer dir={theme.direction}>Item One</TabContainer>
<TabContainer dir={theme.direction}>Item Two</TabContainer>
<TabContainer dir={theme.direction}>Item Three</TabContainer>
<TabPanel value={value} index={0} dir={theme.direction}>
Item One
</TabPanel>
<TabPanel value={value} index={1} dir={theme.direction}>
Item Two
</TabPanel>
<TabPanel value={value} index={2} dir={theme.direction}>
Item Three
</TabPanel>
</SwipeableViews>
{fabs.map((fab, index) => (
<Zoom
Expand Down
10 changes: 5 additions & 5 deletions docs/src/pages/components/tabs/CustomizedTabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const useStyles = makeStyles(theme => ({
root: {
flexGrow: 1,
},
typography: {
padding: {
padding: theme.spacing(3),
},
demo1: {
Expand All @@ -98,20 +98,20 @@ export default function CustomizedTabs() {
return (
<div className={classes.root}>
<div className={classes.demo1}>
<AntTabs value={value} onChange={handleChange}>
<AntTabs value={value} onChange={handleChange} aria-label="Ant example">
<AntTab label="Tab 1" />
<AntTab label="Tab 2" />
<AntTab label="Tab 3" />
</AntTabs>
<Typography className={classes.typography} />
<Typography className={classes.padding} />
</div>
<div className={classes.demo2}>
<StyledTabs value={value} onChange={handleChange}>
<StyledTabs value={value} onChange={handleChange} aria-label="Styled tabs example">
<StyledTab label="Workflows" />
<StyledTab label="Datasets" />
<StyledTab label="Connections" />
</StyledTabs>
<Typography className={classes.typography} />
<Typography className={classes.padding} />
</div>
</div>
);
Expand Down
10 changes: 5 additions & 5 deletions docs/src/pages/components/tabs/CustomizedTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const useStyles = makeStyles((theme: Theme) =>
root: {
flexGrow: 1,
},
typography: {
padding: {
padding: theme.spacing(3),
},
demo1: {
Expand All @@ -113,20 +113,20 @@ export default function CustomizedTabs() {
return (
<div className={classes.root}>
<div className={classes.demo1}>
<AntTabs value={value} onChange={handleChange}>
<AntTabs value={value} onChange={handleChange} aria-label="Ant example">
<AntTab label="Tab 1" />
<AntTab label="Tab 2" />
<AntTab label="Tab 3" />
</AntTabs>
<Typography className={classes.typography} />
<Typography className={classes.padding} />
</div>
<div className={classes.demo2}>
<StyledTabs value={value} onChange={handleChange}>
<StyledTabs value={value} onChange={handleChange} aria-label="Styled tabs example">
<StyledTab label="Workflows" />
<StyledTab label="Datasets" />
<StyledTab label="Connections" />
</StyledTabs>
<Typography className={classes.typography} />
<Typography className={classes.padding} />
</div>
</div>
);
Expand Down
8 changes: 7 additions & 1 deletion docs/src/pages/components/tabs/DisabledTabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ export default function DisabledTabs() {

return (
<Paper square>
<Tabs value={value} indicatorColor="primary" textColor="primary" onChange={handleChange}>
<Tabs
value={value}
indicatorColor="primary"
textColor="primary"
onChange={handleChange}
aria-label="Disabled tabs example"
>
<Tab label="Active" />
<Tab label="Disabled" disabled />
<Tab label="Active" />
Expand Down
8 changes: 7 additions & 1 deletion docs/src/pages/components/tabs/DisabledTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ export default function DisabledTabs() {

return (
<Paper square>
<Tabs value={value} indicatorColor="primary" textColor="primary" onChange={handleChange}>
<Tabs
value={value}
indicatorColor="primary"
textColor="primary"
onChange={handleChange}
aria-label="Disabled tabs example"
>
<Tab label="Active" />
<Tab label="Disabled" disabled />
<Tab label="Active" />
Expand Down
46 changes: 36 additions & 10 deletions docs/src/pages/components/tabs/FullWidthTabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,39 @@ import AppBar from '@material-ui/core/AppBar';
import Tabs from '@material-ui/core/Tabs';
import Tab from '@material-ui/core/Tab';
import Typography from '@material-ui/core/Typography';
import Box from '@material-ui/core/Box';

function TabPanel(props) {
const { children, value, index, ...other } = props;

function TabContainer({ children, dir }) {
return (
<Typography component="div" dir={dir} style={{ padding: 8 * 3 }}>
{children}
<Typography
component="div"
role="tabpanel"
hidden={value !== index}
id={`full-width-tabpanel-${index}`}
aria-labelledby={`full-width-tab-${index}`}
{...other}
>
<Box p={3}>{children}</Box>
</Typography>
);
}

TabContainer.propTypes = {
TabPanel.propTypes = {
children: PropTypes.node.isRequired,
dir: PropTypes.string.isRequired,
index: PropTypes.any.isRequired,
value: PropTypes.any.isRequired,
};

function a11yProps(index) {
return {
id: `full-width-tab-${index}`,
'aria-controls': `full-width-tabpanel-${index}`,
};
}

const useStyles = makeStyles(theme => ({
root: {
backgroundColor: theme.palette.background.paper,
Expand Down Expand Up @@ -49,20 +68,27 @@ export default function FullWidthTabs() {
indicatorColor="primary"
textColor="primary"
variant="fullWidth"
aria-label="Full width tabs example"
>
<Tab label="Item One" />
<Tab label="Item Two" />
<Tab label="Item Three" />
<Tab label="Item One" {...a11yProps(0)} />
<Tab label="Item Two" {...a11yProps(1)} />
<Tab label="Item Three" {...a11yProps(2)} />
</Tabs>
</AppBar>
<SwipeableViews
axis={theme.direction === 'rtl' ? 'x-reverse' : 'x'}
index={value}
onChangeIndex={handleChangeIndex}
>
<TabContainer dir={theme.direction}>Item One</TabContainer>
<TabContainer dir={theme.direction}>Item Two</TabContainer>
<TabContainer dir={theme.direction}>Item Three</TabContainer>
<TabPanel value={value} index={0} dir={theme.direction}>
Item One
</TabPanel>
<TabPanel value={value} index={1} dir={theme.direction}>
Item Two
</TabPanel>
<TabPanel value={value} index={2} dir={theme.direction}>
Item Three
</TabPanel>
</SwipeableViews>
</div>
);
Expand Down
Loading