mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 23:24:55 +01:00
604654ccb4
This PR adds a new notification cleaning mode, super perfectly tuned for accessibility, and removes the previous notification cleaning functionality as it's now redundant. * w.i.p. notif clearing mode * Better CSS for selected notification and shorter text if Stretch is off * wip for rebase ~ * all working in notif clearing mode, except the actual removal * bulk delete route for piggo * cleaning + refactor. endpoint gives 422 for some reason * formatting * use the right route * fix broken destroy_multiple * load more notifs after succ cleaning * satisfy eslint * Removed CSS for the old notif delete button * Tabindex=0 is mandatory In order to make it possible to tab to this element you must have tab index = 0. Removing this violates WCAG and makes it impossible to use the interface without good eyesight and a mouse. So nobody with certain mobility impairments, vision impairments, or brain injuries would be able to use this feature if you don't have tabindex=0 * Corrected aria-label Previous label implied a different behavior from what actually happens * aria role localization & made the overlay behave like a checkbox * checkboxes css and better contrast * color tuning for the notif overlay * fanceh checkboxes etc and nice backgrounds * SHUT UP TRAVIS
125 lines
3.0 KiB
JavaScript
125 lines
3.0 KiB
JavaScript
/*
|
|
|
|
`<NotificationFollow>`
|
|
======================
|
|
|
|
This component renders a follow notification.
|
|
|
|
__Props:__
|
|
|
|
- __`id` (`PropTypes.number.isRequired`) :__
|
|
This is the id of the notification.
|
|
|
|
- __`onDeleteNotification` (`PropTypes.func.isRequired`) :__
|
|
The function to call when a notification should be
|
|
dismissed/deleted.
|
|
|
|
- __`account` (`PropTypes.object.isRequired`) :__
|
|
The account associated with the follow notification, ie the account
|
|
which followed the user.
|
|
|
|
- __`intl` (`PropTypes.object.isRequired`) :__
|
|
Our internationalization object, inserted by `@injectIntl`.
|
|
|
|
*/
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
|
|
/*
|
|
|
|
Imports:
|
|
--------
|
|
|
|
*/
|
|
|
|
// Package imports //
|
|
import React from 'react';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import PropTypes from 'prop-types';
|
|
import { FormattedMessage } from 'react-intl';
|
|
import escapeTextContentForBrowser from 'escape-html';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
|
|
// Mastodon imports //
|
|
import emojify from '../../../mastodon/emoji';
|
|
import Permalink from '../../../mastodon/components/permalink';
|
|
import AccountContainer from '../../../mastodon/containers/account_container';
|
|
|
|
// Our imports //
|
|
import NotificationOverlayContainer from '../notification/overlay/container';
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
|
|
/*
|
|
|
|
Implementation:
|
|
---------------
|
|
|
|
*/
|
|
|
|
export default class NotificationFollow extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
id : PropTypes.number.isRequired,
|
|
account : ImmutablePropTypes.map.isRequired,
|
|
notification : ImmutablePropTypes.map.isRequired,
|
|
};
|
|
|
|
/*
|
|
|
|
### `render()`
|
|
|
|
This actually renders the component.
|
|
|
|
*/
|
|
|
|
render () {
|
|
const { account, notification } = this.props;
|
|
|
|
/*
|
|
|
|
`link` is a container for the account's `displayName`, which links to
|
|
the account timeline using a `<Permalink>`.
|
|
|
|
*/
|
|
|
|
const displayName = account.get('display_name') || account.get('username');
|
|
const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) };
|
|
const link = (
|
|
<Permalink
|
|
className='notification__display-name'
|
|
href={account.get('url')}
|
|
title={account.get('acct')}
|
|
to={`/accounts/${account.get('id')}`}
|
|
dangerouslySetInnerHTML={displayNameHTML}
|
|
/>
|
|
);
|
|
|
|
/*
|
|
|
|
We can now render our component.
|
|
|
|
*/
|
|
|
|
return (
|
|
<div className='notification notification-follow'>
|
|
<NotificationOverlayContainer notification={notification} />
|
|
<div className='notification__message'>
|
|
<div className='notification__favourite-icon-wrapper'>
|
|
<i className='fa fa-fw fa-user-plus' />
|
|
</div>
|
|
|
|
<FormattedMessage
|
|
id='notification.follow'
|
|
defaultMessage='{name} followed you'
|
|
values={{ name: link }}
|
|
/>
|
|
</div>
|
|
|
|
<AccountContainer id={account.get('id')} withNote={false} />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|