Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix intermediary responsive layout, accessibility on navigation in web UI (#19324)

Browse source 
* Fix intermediary responsive layout, accessibility on navigation in web UI

* `yarn test:jest -u`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
This commit is contained in:
Eugen Rochko 2022-10-09 15:55:32 +02:00 • committed by GitHub
parent 2b00ccdbd5
commit 0765324622
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 109 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/javascript/mastodon/features/ui/components/column_link.js
View file

@ -1,37 +1,41 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Link } from 'react-router-dom';
import { NavLink } from 'react-router-dom';
import Icon from 'mastodon/components/icon';
import classNames from 'classnames';
const ColumnLink = ({ icon, text, to, href, method, badge }) => {
const ColumnLink = ({ icon, text, to, href, method, badge, transparent, ...other }) => {
const className = classNames('column-link', { 'column-link--transparent': transparent });
const badgeElement = typeof badge !== 'undefined' ? <span className='column-link__badge'>{badge}</span> : null;
const iconElement = typeof icon === 'string' ? <Icon id={icon} fixedWidth className='column-link__icon' /> : icon;
if (href) {
return (
<a href={href} className='column-link' data-method={method}>
<Icon id={icon} fixedWidth className='column-link__icon' />
<a href={href} className={className} data-method={method} title={text} {...other}>
{iconElement}
{text}
{badgeElement}
</a>
);
} else {
return (
<Link to={to} className='column-link'>
<Icon id={icon} fixedWidth className='column-link__icon' />
<NavLink to={to} className={className} title={text} {...other}>
{iconElement}
{text}
{badgeElement}
</Link>
</NavLink>
);
}
};
ColumnLink.propTypes = {
icon: PropTypes.string.isRequired,
icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
text: PropTypes.string.isRequired,
to: PropTypes.string,
href: PropTypes.string,
method: PropTypes.string,
badge: PropTypes.node,
transparent: PropTypes.bool,
};
export default ColumnLink;