miklo
/
soapbox
sforkowany z mirror/soapbox
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

Merge branch 'mentions-modal' into 'develop' 

Turn some pages into modals

See merge request soapbox-pub/soapbox-fe!958
strip-front-mentions
marcin mikołajczak 2022-01-06 17:43:46 +00:00
rodzic 831a3418f9 f28a6c5256
commit df47c0c789
22 zmienionych plików z 578 dodań i 490 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

37
app/soapbox/components/modal_root.js
Wyświetl plik

@ -1,6 +1,7 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import 'wicg-inert'; import 'wicg-inert';
import { createBrowserHistory } from 'history';
import { injectIntl, FormattedMessage, defineMessages } from 'react-intl'; import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from '../actions/modal'; import { openModal } from '../actions/modal';
@ -43,6 +44,7 @@ class ModalRoot extends React.PureComponent {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
hasComposeContent: PropTypes.bool, hasComposeContent: PropTypes.bool,
type: PropTypes.string, type: PropTypes.string,
onCancel: PropTypes.func,
}; };
state = { state = {
@ -102,12 +104,15 @@ class ModalRoot extends React.PureComponent {
componentDidMount() { componentDidMount() {
window.addEventListener('keyup', this.handleKeyUp, false); window.addEventListener('keyup', this.handleKeyUp, false);
window.addEventListener('keydown', this.handleKeyDown, false); window.addEventListener('keydown', this.handleKeyDown, false);
this.history = this.context.router ? this.context.router.history : createBrowserHistory();
} }
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (!!this.props.children && !prevProps.children) { if (!!this.props.children && !prevProps.children) {
this.activeElement = document.activeElement; this.activeElement = document.activeElement;
this.getSiblings().forEach(sibling => sibling.setAttribute('inert', true)); this.getSiblings().forEach(sibling => sibling.setAttribute('inert', true));
this._handleModalOpen();
} else if (!prevProps.children) { } else if (!prevProps.children) {
this.setState({ revealed: false }); this.setState({ revealed: false });
} }
@ -116,12 +121,16 @@ class ModalRoot extends React.PureComponent {
this.activeElement.focus(); this.activeElement.focus();
this.activeElement = null; this.activeElement = null;
this.getSiblings().forEach(sibling => sibling.removeAttribute('inert')); this.getSiblings().forEach(sibling => sibling.removeAttribute('inert'));
this._handleModalClose();
} }
if (this.props.children) { if (this.props.children) {
requestAnimationFrame(() => { requestAnimationFrame(() => {
this.setState({ revealed: true }); this.setState({ revealed: true });
}); });
this._ensureHistoryBuffer();
} }
} }
@ -130,6 +139,34 @@ class ModalRoot extends React.PureComponent {
window.removeEventListener('keydown', this.handleKeyDown); window.removeEventListener('keydown', this.handleKeyDown);
} }
_handleModalOpen() {
this._modalHistoryKey = Date.now();
this.unlistenHistory = this.history.listen((_, action) => {
if (action === 'POP') {
this.handleOnClose();
if (this.props.onCancel) this.props.onCancel();
}
});
}
_handleModalClose() {
if (this.unlistenHistory) {
this.unlistenHistory();
}
const { state } = this.history.location;
if (state && state.soapboxModalKey === this._modalHistoryKey) {
this.history.goBack();
}
}
_ensureHistoryBuffer() {
const { pathname, state } = this.history.location;
if (!state || state.soapboxModalKey !== this._modalHistoryKey) {
this.history.push(pathname, { ...state, soapboxModalKey: this._modalHistoryKey });
}
}
getSiblings = () => { getSiblings = () => {
return Array(...this.node.parentElement.childNodes).filter(node => node !== this.node); return Array(...this.node.parentElement.childNodes).filter(node => node !== this.node);
} }

27
app/soapbox/components/status_reply_mentions.js
Wyświetl plik

@ -1,15 +1,35 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux';
import { FormattedMessage, injectIntl } from 'react-intl'; import { FormattedMessage, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper'; import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
import { openModal } from 'soapbox/actions/modal';
export default @injectIntl const mapDispatchToProps = (dispatch) => ({
onOpenMentionsModal(username, statusId) {
dispatch(openModal('MENTIONS', {
username,
statusId,
}));
},
});
export default @connect(null, mapDispatchToProps)
@injectIntl
class StatusReplyMentions extends ImmutablePureComponent { class StatusReplyMentions extends ImmutablePureComponent {
static propTypes = { static propTypes = {
status: ImmutablePropTypes.map.isRequired, status: ImmutablePropTypes.map.isRequired,
onOpenMentionsModal: PropTypes.func,
}
handleOpenMentionsModal = () => {
const { status, onOpenMentionsModal } = this.props;
onOpenMentionsModal(status.getIn(['account', 'acct']), status.get('id'));
} }
render() { render() {
@ -54,6 +74,7 @@ class StatusReplyMentions extends ImmutablePureComponent {
} }
} }
// The typical case with a reply-to and a list of mentions. // The typical case with a reply-to and a list of mentions.
return ( return (
<div className='reply-mentions'> <div className='reply-mentions'>
@ -68,9 +89,9 @@ class StatusReplyMentions extends ImmutablePureComponent {
{' '} {' '}
</>)), </>)),
more: to.size > 2 && ( more: to.size > 2 && (
<Link to={`/@${status.getIn(['account', 'acct'])}/posts/${status.get('id')}/mentions`}> <span type='button' role='presentation' onClick={this.handleOpenMentionsModal}>
<FormattedMessage id='reply_mentions.more' defaultMessage='and {count} more' values={{ count: to.size - 2 }} /> <FormattedMessage id='reply_mentions.more' defaultMessage='and {count} more' values={{ count: to.size - 2 }} />
</Link> </span>
), ),
}} }}
/> />

7
app/soapbox/containers/soapbox.js
Wyświetl plik

@ -29,9 +29,6 @@ import { createGlobals } from 'soapbox/globals';
const validLocale = locale => Object.keys(messages).includes(locale); const validLocale = locale => Object.keys(messages).includes(locale);
const previewMediaState = 'previewMediaModal';
const previewVideoState = 'previewVideoModal';
export const store = configureStore(); export const store = configureStore();
// Configure global functions for developers // Configure global functions for developers
@ -117,8 +114,8 @@ class SoapboxMount extends React.PureComponent {
this.maybeUpdateMessages(prevProps); this.maybeUpdateMessages(prevProps);
} }
shouldUpdateScroll(_, { location }) { shouldUpdateScroll(prevRouterProps, { location }) {
return location.state !== previewMediaState && location.state !== previewVideoState; return !(location.state?.soapboxModalKey && location.state?.soapboxModalKey !== prevRouterProps?.location?.state?.soapboxModalKey);
} }
render() { render() {

72
app/soapbox/features/favourites/index.js
Wyświetl plik

@ -1,72 +0,0 @@
import React from 'react';
import { connect } from 'react-redux';
import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import LoadingIndicator from '../../components/loading_indicator';
import { fetchFavourites } from '../../actions/interactions';
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
import AccountContainer from '../../containers/account_container';
import Column from '../ui/components/column';
import ScrollableList from '../../components/scrollable_list';
const messages = defineMessages({
heading: { id: 'column.favourites', defaultMessage: 'Likes' },
});
const mapStateToProps = (state, props) => ({
accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
});
export default @connect(mapStateToProps)
@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
intl: PropTypes.object.isRequired,
params: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.orderedSet,
};
componentDidMount() {
this.props.dispatch(fetchFavourites(this.props.params.statusId));
}
componentDidUpdate(prevProps) {
const { statusId } = this.props.params;
const { prevStatusId } = prevProps.params;
if (statusId !== prevStatusId && statusId) {
this.props.dispatch(fetchFavourites(statusId));
}
}
render() {
const { intl, accountIds } = this.props;
if (!accountIds) {
return (
<Column>
<LoadingIndicator />
</Column>
);
}
const emptyMessage = <FormattedMessage id='empty_column.favourites' defaultMessage='No one has liked this post yet. When someone does, they will show up here.' />;
return (
<Column heading={intl.formatMessage(messages.heading)}>
<ScrollableList
scrollKey='favourites'
emptyMessage={emptyMessage}
>
{accountIds.map(id =>
<AccountContainer key={id} id={id} withNote={false} />,
)}
</ScrollableList>
</Column>
);
}
}

96
app/soapbox/features/mentions/index.js
Wyświetl plik

@ -1,96 +0,0 @@
import React from 'react';
import { connect } from 'react-redux';
import { OrderedSet as ImmutableOrderedSet } from 'immutable';
import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import LoadingIndicator from '../../components/loading_indicator';
import MissingIndicator from '../../components/missing_indicator';
import { fetchStatus } from '../../actions/statuses';
import { injectIntl, defineMessages } from 'react-intl';
import AccountContainer from '../../containers/account_container';
import Column from '../ui/components/column';
import ScrollableList from '../../components/scrollable_list';
import { makeGetStatus } from '../../selectors';
const messages = defineMessages({
heading: { id: 'column.mentions', defaultMessage: 'Mentions' },
});
const mapStateToProps = (state, props) => {
const getStatus = makeGetStatus();
const status = getStatus(state, {
id: props.params.statusId,
username: props.params.username,
});
return {
status,
accountIds: status ? ImmutableOrderedSet(status.get('mentions').map(m => m.get('id'))) : null,
};
};
export default @connect(mapStateToProps)
@injectIntl
class Mentions extends ImmutablePureComponent {
static propTypes = {
intl: PropTypes.object.isRequired,
params: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.orderedSet,
status: ImmutablePropTypes.map,
};
fetchData = () => {
const { dispatch, params } = this.props;
const { statusId } = params;
dispatch(fetchStatus(statusId));
}
componentDidMount() {
this.fetchData();
}
componentDidUpdate(prevProps) {
const { params } = this.props;
if (params.statusId !== prevProps.params.statusId) {
this.fetchData();
}
}
render() {
const { intl, accountIds, status } = this.props;
if (!accountIds) {
return (
<Column>
<LoadingIndicator />
</Column>
);
}
if (!status) {
return (
<Column>
<MissingIndicator />
</Column>
);
}
return (
<Column heading={intl.formatMessage(messages.heading)}>
<ScrollableList
scrollKey='reblogs'
>
{accountIds.map(id =>
<AccountContainer key={id} id={id} withNote={false} />,
)}
</ScrollableList>
</Column>
);
}
}

128
app/soapbox/features/reactions/index.js
Wyświetl plik

@ -1,128 +0,0 @@
import React from 'react';
import { connect } from 'react-redux';
import { OrderedSet as ImmutableOrderedSet } from 'immutable';
import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
import LoadingIndicator from '../../components/loading_indicator';
import MissingIndicator from '../../components/missing_indicator';
import { fetchFavourites, fetchReactions } from '../../actions/interactions';
import { fetchStatus } from '../../actions/statuses';
import AccountContainer from '../../containers/account_container';
import Column from '../ui/components/column';
import ScrollableList from '../../components/scrollable_list';
import { makeGetStatus } from '../../selectors';
const messages = defineMessages({
heading: { id: 'column.reactions', defaultMessage: 'Reactions' },
});
const mapStateToProps = (state, props) => {
const getStatus = makeGetStatus();
const status = getStatus(state, {
id: props.params.statusId,
username: props.params.username,
});
const favourites = state.getIn(['user_lists', 'favourited_by', props.params.statusId]);
const reactions = state.getIn(['user_lists', 'reactions', props.params.statusId]);
const allReactions = favourites && reactions && ImmutableOrderedSet(favourites ? [{ accounts: favourites, count: favourites.size, name: '👍' }] : []).union(reactions || []);
return {
status,
reactions: allReactions,
accounts: allReactions && (props.params.reaction
? allReactions.find(reaction => reaction.name === props.params.reaction).accounts.map(account => ({ id: account, reaction: props.params.reaction }))
: allReactions.map(reaction => reaction.accounts.map(account => ({ id: account, reaction: reaction.name }))).flatten()),
};
};
export default @connect(mapStateToProps)
@injectIntl
class Reactions extends ImmutablePureComponent {
static contextTypes = {
router: PropTypes.object.isRequired,
};
static propTypes = {
params: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired,
reactions: ImmutablePropTypes.orderedSet,
accounts: ImmutablePropTypes.orderedSet,
status: ImmutablePropTypes.map,
};
fetchData = () => {
const { dispatch, params } = this.props;
const { statusId } = params;
dispatch(fetchFavourites(statusId));
dispatch(fetchReactions(statusId));
dispatch(fetchStatus(statusId));
}
componentDidMount() {
this.fetchData();
}
componentDidUpdate(prevProps) {
const { params } = this.props;
if (params.statusId !== prevProps.params.statusId) {
this.fetchData();
}
}
handleFilterChange = (reaction) => () => {
const { params } = this.props;
const { username, statusId } = params;
this.context.router.history.replace(`/@${username}/posts/${statusId}/reactions/${reaction}`);
};
render() {
const { intl, params, reactions, accounts, status } = this.props;
if (!accounts) {
return (
<Column>
<LoadingIndicator />
</Column>
);
}
if (!status) {
return (
<Column>
<MissingIndicator />
</Column>
);
}
const emptyMessage = <FormattedMessage id='status.reactions.empty' defaultMessage='No one has reacted to this post yet. When someone does, they will show up here.' />;
return (
<Column heading={intl.formatMessage(messages.heading)}>
{
reactions.size > 0 && (
<div className='reaction__filter-bar'>
<button className={!params.reaction ? 'active' : ''} onClick={this.handleFilterChange('')}>All</button>
{reactions?.filter(reaction => reaction.count).map(reaction => <button key={reaction.name} className={params.reaction === reaction.name ? 'active' : ''} onClick={this.handleFilterChange(reaction.name)}>{reaction.name} {reaction.count}</button>)}
</div>
)
}
<ScrollableList
scrollKey='reactions'
emptyMessage={emptyMessage}
>
{accounts.map((account) =>
<AccountContainer key={`${account.id}-${account.reaction}`} id={account.id} withNote={false} reaction={account.reaction} />,
)}
</ScrollableList>
</Column>
);
}
}

100
app/soapbox/features/reblogs/index.js
Wyświetl plik

@ -1,100 +0,0 @@
import React from 'react';
import { connect } from 'react-redux';
import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import LoadingIndicator from '../../components/loading_indicator';
import MissingIndicator from '../../components/missing_indicator';
import { fetchReblogs } from '../../actions/interactions';
import { fetchStatus } from '../../actions/statuses';
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
import AccountContainer from '../../containers/account_container';
import Column from '../ui/components/column';
import ScrollableList from '../../components/scrollable_list';
import { makeGetStatus } from '../../selectors';
const messages = defineMessages({
heading: { id: 'column.reblogs', defaultMessage: 'Reposts' },
});
const mapStateToProps = (state, props) => {
const getStatus = makeGetStatus();
const status = getStatus(state, {
id: props.params.statusId,
username: props.params.username,
});
return {
status,
accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
};
};
export default @connect(mapStateToProps)
@injectIntl
class Reblogs extends ImmutablePureComponent {
static propTypes = {
intl: PropTypes.object.isRequired,
params: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.orderedSet,
status: ImmutablePropTypes.map,
};
fetchData = () => {
const { dispatch, params } = this.props;
const { statusId } = params;
dispatch(fetchReblogs(statusId));
dispatch(fetchStatus(statusId));
}
componentDidMount() {
this.fetchData();
}
componentDidUpdate(prevProps) {
const { params } = this.props;
if (params.statusId !== prevProps.params.statusId) {
this.fetchData();
}
}
render() {
const { intl, accountIds, status } = this.props;
if (!accountIds) {
return (
<Column>
<LoadingIndicator />
</Column>
);
}
if (!status) {
return (
<Column>
<MissingIndicator />
</Column>
);
}
const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has reposted this post yet. When someone does, they will show up here.' />;
return (
<Column heading={intl.formatMessage(messages.heading)}>
<ScrollableList
scrollKey='reblogs'
emptyMessage={emptyMessage}
>
{accountIds.map(id =>
<AccountContainer key={id} id={id} withNote={false} />,
)}
</ScrollableList>
</Column>
);
}
}

79
app/soapbox/features/status/components/status_interaction_bar.js
Wyświetl plik

@ -8,9 +8,9 @@ import emojify from 'soapbox/features/emoji/emoji';
import { reduceEmoji } from 'soapbox/utils/emoji_reacts'; import { reduceEmoji } from 'soapbox/utils/emoji_reacts';
import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import { Link } from 'react-router-dom';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import { getSoapboxConfig } from 'soapbox/actions/soapbox'; import { getSoapboxConfig } from 'soapbox/actions/soapbox';
import { openModal } from 'soapbox/actions/modal';
const mapStateToProps = state => { const mapStateToProps = state => {
const instance = state.get('instance'); const instance = state.get('instance');
@ -21,7 +21,29 @@ const mapStateToProps = state => {
}; };
}; };
export default @connect(mapStateToProps) const mapDispatchToProps = (dispatch) => ({
onOpenReblogsModal(username, statusId) {
dispatch(openModal('REBLOGS', {
username,
statusId,
}));
},
onOpenFavouritesModal(username, statusId) {
dispatch(openModal('FAVOURITES', {
username,
statusId,
}));
},
onOpenReactionsModal(username, statusId, reaction) {
dispatch(openModal('REACTIONS', {
username,
statusId,
reaction,
}));
},
});
export default @connect(mapStateToProps, mapDispatchToProps)
class StatusInteractionBar extends ImmutablePureComponent { class StatusInteractionBar extends ImmutablePureComponent {
static propTypes = { static propTypes = {
@ -29,6 +51,8 @@ class StatusInteractionBar extends ImmutablePureComponent {
me: SoapboxPropTypes.me, me: SoapboxPropTypes.me,
allowedEmoji: ImmutablePropTypes.list, allowedEmoji: ImmutablePropTypes.list,
features: PropTypes.object.isRequired, features: PropTypes.object.isRequired,
onOpenReblogsModal: PropTypes.func,
onOpenReactionsModal: PropTypes.func,
} }
getNormalizedReacts = () => { getNormalizedReacts = () => {
@ -41,22 +65,40 @@ class StatusInteractionBar extends ImmutablePureComponent {
).reverse(); ).reverse();
} }
handleOpenReblogsModal = () => {
const { status, onOpenReblogsModal } = this.props;
onOpenReblogsModal(status.getIn(['account', 'acct']), status.get('id'));
}
getReposts = () => { getReposts = () => {
const { status } = this.props; const { status } = this.props;
if (status.get('reblogs_count')) { if (status.get('reblogs_count')) {
return ( return (
<Link to={`/@${status.getIn(['account', 'acct'])}/posts/${status.get('id')}/reblogs`} className='emoji-react emoji-react--reblogs'> <span
className='emoji-react emoji-react--reblogs'
type='button'
role='presentation'
onClick={this.handleOpenReblogsModal}
>
<Icon src={require('feather-icons/dist/icons/repeat.svg')} /> <Icon src={require('feather-icons/dist/icons/repeat.svg')} />
<span className='emoji-reacts__count'> <span className='emoji-reacts__count'>
<FormattedNumber value={status.get('reblogs_count')} /> <FormattedNumber value={status.get('reblogs_count')} />
</span> </span>
</Link> </span>
); );
} }
return ''; return '';
} }
handleOpenFavouritesModal = () => {
const { status, onOpenFavouritesModal } = this.props;
onOpenFavouritesModal(status.getIn(['account', 'acct']), status.get('id'));
}
getFavourites = () => { getFavourites = () => {
const { features, status } = this.props; const { features, status } = this.props;
@ -72,9 +114,14 @@ class StatusInteractionBar extends ImmutablePureComponent {
if (features.exposableReactions) { if (features.exposableReactions) {
return ( return (
<Link to={`/@${status.getIn(['account', 'acct'])}/posts/${status.get('id')}/likes`} className='emoji-react emoji-react--favourites'> <span
className='emoji-react emoji-react--favourites'
type='button'
role='presentation'
onClick={this.handleOpenFavouritesModal}
>
{favourites} {favourites}
</Link> </span>
); );
} else { } else {
return ( return (
@ -88,8 +135,14 @@ class StatusInteractionBar extends ImmutablePureComponent {
return ''; return '';
} }
handleOpenReactionsModal = (reaction) => () => {
const { status, onOpenReactionsModal } = this.props;
onOpenReactionsModal(status.getIn(['account', 'acct']), status.get('id'), reaction.get('name'));
}
getEmojiReacts = () => { getEmojiReacts = () => {
const { status, features } = this.props; const { features } = this.props;
const emojiReacts = this.getNormalizedReacts(); const emojiReacts = this.getNormalizedReacts();
const count = emojiReacts.reduce((acc, cur) => ( const count = emojiReacts.reduce((acc, cur) => (
@ -112,7 +165,17 @@ class StatusInteractionBar extends ImmutablePureComponent {
); );
if (features.exposableReactions) { if (features.exposableReactions) {
return <Link to={`/@${status.getIn(['account', 'acct'])}/posts/${status.get('id')}/reactions/${e.get('name')}`} className='emoji-react' key={i}>{emojiReact}</Link>; return (
<span
className='emoji-react'
type='button'
role='presentation'
key={i}
onClick={this.handleOpenReactionsModal(e)}
>
{emojiReact}
</span>
);
} }
return <span className='emoji-react' key={i}>{emojiReact}</span>; return <span className='emoji-react' key={i}>{emojiReact}</span>;

90
app/soapbox/features/ui/components/favourites_modal.js 100644
Wyświetl plik

@ -0,0 +1,90 @@
import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
import IconButton from 'soapbox/components/icon_button';
import LoadingIndicator from 'soapbox/components/loading_indicator';
import AccountContainer from 'soapbox/containers/account_container';
import ScrollableList from 'soapbox/components/scrollable_list';
import { fetchFavourites } from 'soapbox/actions/interactions';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
const mapStateToProps = (state, props) => {
return {
accountIds: state.getIn(['user_lists', 'favourited_by', props.statusId]),
};
};
export default @connect(mapStateToProps)
@injectIntl
class FavouritesModal extends React.PureComponent {
static propTypes = {
onClose: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
statusId: PropTypes.string.isRequired,
username: PropTypes.string.isRequired,
dispatch: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.orderedSet,
};
fetchData = () => {
const { dispatch, statusId } = this.props;
dispatch(fetchFavourites(statusId));
}
componentDidMount() {
this.fetchData();
}
onClickClose = () => {
this.props.onClose('FAVOURITES');
};
render() {
const { intl, accountIds } = this.props;
let body;
if (!accountIds) {
body = <LoadingIndicator />;
} else {
const emptyMessage = <FormattedMessage id='empty_column.favourites' defaultMessage='No one has liked this post yet. When someone does, they will show up here.' />;
body = (
<ScrollableList
scrollKey='favourites'
emptyMessage={emptyMessage}
>
{accountIds.map(id =>
<AccountContainer key={id} id={id} withNote={false} />,
)}
</ScrollableList>
);
}
return (
<div className='modal-root__modal reactions-modal'>
<div className='compose-modal__header'>
<h3 className='compose-modal__header__title'>
<FormattedMessage id='column.favourites' defaultMessage='likes' />
</h3>
<IconButton
className='compose-modal__close'
title={intl.formatMessage(messages.close)}
src={require('@tabler/icons/icons/x.svg')}
onClick={this.onClickClose} size={20}
/>
</div>
{body}
</div>
);
}
}

24
app/soapbox/features/ui/components/media_modal.js
Wyświetl plik

@ -18,8 +18,6 @@ const messages = defineMessages({
next: { id: 'lightbox.next', defaultMessage: 'Next' }, next: { id: 'lightbox.next', defaultMessage: 'Next' },
}); });
export const previewState = 'previewMediaModal';
export default @injectIntl export default @injectIntl
class MediaModal extends ImmutablePureComponent { class MediaModal extends ImmutablePureComponent {
@ -32,10 +30,6 @@ class MediaModal extends ImmutablePureComponent {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
}; };
static contextTypes = {
router: PropTypes.object,
};
state = { state = {
index: null, index: null,
navigationHidden: false, navigationHidden: false,
@ -75,28 +69,10 @@ class MediaModal extends ImmutablePureComponent {
componentDidMount() { componentDidMount() {
window.addEventListener('keydown', this.handleKeyDown, false); window.addEventListener('keydown', this.handleKeyDown, false);
if (this.context.router) {
const history = this.context.router.history;
history.push(history.location.pathname, previewState);
this.unlistenHistory = history.listen(() => {
this.props.onClose();
});
}
} }
componentWillUnmount() { componentWillUnmount() {
window.removeEventListener('keydown', this.handleKeyDown); window.removeEventListener('keydown', this.handleKeyDown);
if (this.context.router) {
this.unlistenHistory();
if (this.context.router.history.location.state === previewState) {
this.context.router.history.goBack();
}
}
} }
getIndex() { getIndex() {

94
app/soapbox/features/ui/components/mentions_modal.js 100644
Wyświetl plik

@ -0,0 +1,94 @@
import React from 'react';
import { connect } from 'react-redux';
import { OrderedSet as ImmutableOrderedSet } from 'immutable';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
import IconButton from 'soapbox/components/icon_button';
import LoadingIndicator from 'soapbox/components/loading_indicator';
import AccountContainer from 'soapbox/containers/account_container';
import ScrollableList from 'soapbox/components/scrollable_list';
import { makeGetStatus } from 'soapbox/selectors';
import { fetchStatus } from 'soapbox/actions/statuses';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
const mapStateToProps = (state, props) => {
const getStatus = makeGetStatus();
const status = getStatus(state, {
id: props.statusId,
username: props.username,
});
return {
accountIds: status ? ImmutableOrderedSet(status.get('mentions').map(m => m.get('id'))) : null,
};
};
export default @connect(mapStateToProps)
@injectIntl
class MentionsModal extends React.PureComponent {
static propTypes = {
onClose: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
statusId: PropTypes.string.isRequired,
username: PropTypes.string.isRequired,
dispatch: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.orderedSet,
};
fetchData = () => {
const { dispatch, statusId } = this.props;
dispatch(fetchStatus(statusId));
}
componentDidMount() {
this.fetchData();
}
onClickClose = () => {
this.props.onClose('MENTIONS');
};
render() {
const { intl, accountIds } = this.props;
let body;
if (!accountIds) {
body = <LoadingIndicator />;
} else {
body = (
<ScrollableList
scrollKey='mentions'
>
{accountIds.map(id =>
<AccountContainer key={id} id={id} withNote={false} />,
)}
</ScrollableList>
);
}
return (
<div className='modal-root__modal reactions-modal'>
<div className='compose-modal__header'>
<h3 className='compose-modal__header__title'>
<FormattedMessage id='column.mentions' defaultMessage='Mentions' />
</h3>
<IconButton
className='compose-modal__close'
title={intl.formatMessage(messages.close)}
src={require('@tabler/icons/icons/x.svg')}
onClick={this.onClickClose} size={20}
/>
</div>
{body}
</div>
);
}
}

8
app/soapbox/features/ui/components/modal_root.js
Wyświetl plik

@ -25,6 +25,10 @@ import {
UnauthorizedModal, UnauthorizedModal,
EditFederationModal, EditFederationModal,
ComponentModal, ComponentModal,
ReactionsModal,
FavouritesModal,
ReblogsModal,
MentionsModal,
} from '../../../features/ui/util/async-components'; } from '../../../features/ui/util/async-components';
const MODAL_COMPONENTS = { const MODAL_COMPONENTS = {
@ -47,6 +51,10 @@ const MODAL_COMPONENTS = {
'CRYPTO_DONATE': CryptoDonateModal, 'CRYPTO_DONATE': CryptoDonateModal,
'EDIT_FEDERATION': EditFederationModal, 'EDIT_FEDERATION': EditFederationModal,
'COMPONENT': ComponentModal, 'COMPONENT': ComponentModal,
'REBLOGS': ReblogsModal,
'FAVOURITES': FavouritesModal,
'REACTIONS': ReactionsModal,
'MENTIONS': MentionsModal,
}; };
export default class ModalRoot extends React.PureComponent { export default class ModalRoot extends React.PureComponent {

119
app/soapbox/features/ui/components/reactions_modal.js 100644
Wyświetl plik

@ -0,0 +1,119 @@
import React from 'react';
import { connect } from 'react-redux';
import { List as ImmutableList } from 'immutable';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
import IconButton from 'soapbox/components/icon_button';
import LoadingIndicator from 'soapbox/components/loading_indicator';
import AccountContainer from 'soapbox/containers/account_container';
import ScrollableList from 'soapbox/components/scrollable_list';
import { fetchFavourites, fetchReactions } from 'soapbox/actions/interactions';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
const mapStateToProps = (state, props) => {
const favourites = state.getIn(['user_lists', 'favourited_by', props.statusId]);
const reactions = state.getIn(['user_lists', 'reactions', props.statusId]);
const allReactions = favourites && reactions && ImmutableList(favourites ? [{ accounts: favourites, count: favourites.size, name: '👍' }] : []).concat(reactions || []);
return {
reactions: allReactions,
};
};
export default @connect(mapStateToProps)
@injectIntl
class ReactionsModal extends React.PureComponent {
static propTypes = {
onClose: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
statusId: PropTypes.string.isRequired,
username: PropTypes.string.isRequired,
reaction: PropTypes.string,
dispatch: PropTypes.func.isRequired,
reactions: ImmutablePropTypes.list,
};
state = {
reaction: this.props.reaction,
}
fetchData = () => {
const { dispatch, statusId } = this.props;
dispatch(fetchFavourites(statusId));
dispatch(fetchReactions(statusId));
}
componentDidMount() {
this.fetchData();
}
onClickClose = () => {
this.props.onClose('REACTIONS');
};
handleFilterChange = (reaction) => () => {
this.setState({ reaction });
};
render() {
const { intl, reactions } = this.props;
const { reaction } = this.state;
const accounts = reactions && (reaction
? reactions.find(reaction => reaction.name === this.state.reaction).accounts.map(account => ({ id: account, reaction: this.state.reaction }))
: reactions.map(reaction => reaction.accounts.map(account => ({ id: account, reaction: reaction.name }))).flatten());
let body;
if (!accounts) {
body = <LoadingIndicator />;
} else {
const emptyMessage = <FormattedMessage id='status.reactions.empty' defaultMessage='No one has reacted to this post yet. When someone does, they will show up here.' />;
body = (<>
{
reactions.size > 0 && (
<div className='reaction__filter-bar'>
<button className={!reaction ? 'active' : ''} onClick={this.handleFilterChange('')}>All</button>
{reactions?.filter(reaction => reaction.count).map(reaction => <button key={reaction.name} className={this.state.reaction === reaction.name ? 'active' : ''} onClick={this.handleFilterChange(reaction.name)}>{reaction.name} {reaction.count}</button>)}
</div>
)
}
<ScrollableList
scrollKey='reactions'
emptyMessage={emptyMessage}
>
{accounts.map((account) =>
<AccountContainer key={`${account.id}-${account.reaction}`} id={account.id} withNote={false} reaction={account.reaction} />,
)}
</ScrollableList>
</>);
}
return (
<div className='modal-root__modal reactions-modal'>
<div className='compose-modal__header'>
<h3 className='compose-modal__header__title'>
<FormattedMessage id='column.reactions' defaultMessage='Reactions' />
</h3>
<IconButton
className='compose-modal__close'
title={intl.formatMessage(messages.close)}
src={require('@tabler/icons/icons/x.svg')}
onClick={this.onClickClose} size={20}
/>
</div>
{body}
</div>
);
}
}

92
app/soapbox/features/ui/components/reblogs_modal.js 100644
Wyświetl plik

@ -0,0 +1,92 @@
import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
import IconButton from 'soapbox/components/icon_button';
import LoadingIndicator from 'soapbox/components/loading_indicator';
import AccountContainer from 'soapbox/containers/account_container';
import ScrollableList from 'soapbox/components/scrollable_list';
import { fetchReblogs } from 'soapbox/actions/interactions';
import { fetchStatus } from 'soapbox/actions/statuses';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
const mapStateToProps = (state, props) => {
return {
accountIds: state.getIn(['user_lists', 'reblogged_by', props.statusId]),
};
};
export default @connect(mapStateToProps)
@injectIntl
class ReblogsModal extends React.PureComponent {
static propTypes = {
onClose: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
statusId: PropTypes.string.isRequired,
username: PropTypes.string.isRequired,
dispatch: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.orderedSet,
};
fetchData = () => {
const { dispatch, statusId } = this.props;
dispatch(fetchReblogs(statusId));
dispatch(fetchStatus(statusId));
}
componentDidMount() {
this.fetchData();
}
onClickClose = () => {
this.props.onClose('REBLOGS');
};
render() {
const { intl, accountIds } = this.props;
let body;
if (!accountIds) {
body = <LoadingIndicator />;
} else {
const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has reposted this post yet. When someone does, they will show up here.' />;
body = (
<ScrollableList
scrollKey='reblogs'
emptyMessage={emptyMessage}
>
{accountIds.map(id =>
<AccountContainer key={id} id={id} withNote={false} />,
)}
</ScrollableList>
);
}
return (
<div className='modal-root__modal reactions-modal'>
<div className='compose-modal__header'>
<h3 className='compose-modal__header__title'>
<FormattedMessage id='column.reblogs' defaultMessage='Reposts' />
</h3>
<IconButton
className='compose-modal__close'
title={intl.formatMessage(messages.close)}
src={require('@tabler/icons/icons/x.svg')}
onClick={this.onClickClose} size={20}
/>
</div>
{body}
</div>
);
}
}

28
app/soapbox/features/ui/components/video_modal.js
Wyświetl plik

@ -5,8 +5,6 @@ import Video from 'soapbox/features/video';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
export const previewState = 'previewVideoModal';
export default class VideoModal extends ImmutablePureComponent { export default class VideoModal extends ImmutablePureComponent {
static propTypes = { static propTypes = {
@ -17,32 +15,6 @@ export default class VideoModal extends ImmutablePureComponent {
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
}; };
static contextTypes = {
router: PropTypes.object,
};
componentDidMount() {
if (this.context.router) {
const history = this.context.router.history;
history.push(history.location.pathname, previewState);
this.unlistenHistory = history.listen(() => {
this.props.onClose();
});
}
}
componentWillUnmount() {
if (this.context.router) {
this.unlistenHistory();
if (this.context.router.history.location.state === previewState) {
this.context.router.history.goBack();
}
}
}
handleStatusClick = e => { handleStatusClick = e => {
const { status, account } = this.props; const { status, account } = this.props;
if (e.button === 0 && !(e.ctrlKey || e.metaKey)) { if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {

8
app/soapbox/features/ui/index.js
Wyświetl plik

@ -56,10 +56,6 @@ import {
HomeTimeline, HomeTimeline,
Followers, Followers,
Following, Following,
Reblogs,
Reactions,
Mentions,
Favourites,
DirectTimeline, DirectTimeline,
Conversations, Conversations,
HashtagTimeline, HashtagTimeline,
@ -298,10 +294,6 @@ class SwitchingColumnsArea extends React.PureComponent {
<WrappedRoute path='/@:username/favorites' component={FavouritedStatuses} page={ProfilePage} content={children} /> <WrappedRoute path='/@:username/favorites' component={FavouritedStatuses} page={ProfilePage} content={children} />
<WrappedRoute path='/@:username/pins' component={PinnedStatuses} page={ProfilePage} content={children} /> <WrappedRoute path='/@:username/pins' component={PinnedStatuses} page={ProfilePage} content={children} />
<WrappedRoute path='/@:username/posts/:statusId' publicRoute exact page={StatusPage} component={Status} content={children} /> <WrappedRoute path='/@:username/posts/:statusId' publicRoute exact page={StatusPage} component={Status} content={children} />
<WrappedRoute path='/@:username/posts/:statusId/reblogs' page={DefaultPage} component={Reblogs} content={children} />
<WrappedRoute path='/@:username/posts/:statusId/likes' page={DefaultPage} component={Favourites} content={children} />
<WrappedRoute path='/@:username/posts/:statusId/reactions/:reaction?' page={DefaultPage} component={Reactions} content={children} />
<WrappedRoute path='/@:username/posts/:statusId/mentions' page={DefaultPage} component={Mentions} content={children} />
<Redirect from='/@:username/:statusId' to='/@:username/posts/:statusId' /> <Redirect from='/@:username/:statusId' to='/@:username/posts/:statusId' />
<WrappedRoute path='/statuses/new' page={DefaultPage} component={NewStatus} content={children} exact /> <WrappedRoute path='/statuses/new' page={DefaultPage} component={NewStatus} content={children} exact />

32
app/soapbox/features/ui/util/async-components.js
Wyświetl plik

@ -94,22 +94,6 @@ export function Following() {
return import(/* webpackChunkName: "features/following" */'../../following'); return import(/* webpackChunkName: "features/following" */'../../following');
} }
export function Reblogs() {
return import(/* webpackChunkName: "features/reblogs" */'../../reblogs');
}
export function Reactions() {
return import(/* webpackChunkName: "features/reactions" */'../../reactions');
}
export function Mentions() {
return import(/* webpackChunkName: "features/mentions" */'../../mentions');
}
export function Favourites() {
return import(/* webpackChunkName: "features/favourites" */'../../favourites');
}
export function FollowRequests() { export function FollowRequests() {
return import(/* webpackChunkName: "features/follow_requests" */'../../follow_requests'); return import(/* webpackChunkName: "features/follow_requests" */'../../follow_requests');
} }
@ -214,6 +198,22 @@ export function ComponentModal() {
return import(/* webpackChunkName: "features/ui" */'../components/component_modal'); return import(/* webpackChunkName: "features/ui" */'../components/component_modal');
} }
export function ReblogsModal() {
return import(/* webpackChunkName: "features/ui" */'../components/reblogs_modal');
}
export function FavouritesModal() {
return import(/* webpackChunkName: "features/ui" */'../components/favourites_modal');
}
export function ReactionsModal() {
return import(/* webpackChunkName: "features/ui" */'../components/reactions_modal');
}
export function MentionsModal() {
return import(/* webpackChunkName: "features/ui" */'../components/mentions_modal');
}
export function ListEditor() { export function ListEditor() {
return import(/* webpackChunkName: "features/list_editor" */'../../list_editor'); return import(/* webpackChunkName: "features/list_editor" */'../../list_editor');
} }

4
app/styles/components/emoji-reacts.scss
Wyświetl plik

@ -19,6 +19,10 @@
+ .emoji-react { + .emoji-react {
margin-right: -8px; margin-right: -8px;
} }
&[type='button'] {
cursor: pointer;
}
} }
.emoji-react--reblogs, .emoji-react--reblogs,

16
app/styles/components/modal.scss
Wyświetl plik

@ -339,7 +339,10 @@
.confirmation-modal, .confirmation-modal,
.report-modal, .report-modal,
.actions-modal, .actions-modal,
.mute-modal { .mute-modal,
.reactions-modal,
.reblogs-modal,
.mentions-modal {
position: relative; position: relative;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
@ -385,6 +388,17 @@
} }
} }
.reactions-modal,
.reblogs-modal,
.mentions-modal {
height: 80vh;
max-height: 650px;
.slist {
overflow: auto;
}
}
.boost-modal__container { .boost-modal__container {
overflow-x: scroll; overflow-x: scroll;
padding: 10px; padding: 10px;

4
app/styles/components/reply-mentions.scss
Wyświetl plik

@ -20,5 +20,9 @@
.reply-mentions { .reply-mentions {
display: block; display: block;
margin: 4px 0 0 0; margin: 4px 0 0 0;
span {
cursor: pointer;
}
} }
} }

1
package.json
Wyświetl plik

@ -85,6 +85,7 @@
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"exif-js": "^2.3.0", "exif-js": "^2.3.0",
"feather-icons": "^4.28.0", "feather-icons": "^4.28.0",
"history": "^4.10.1",
"html-webpack-harddisk-plugin": "^2.0.0", "html-webpack-harddisk-plugin": "^2.0.0",
"html-webpack-plugin": "^5.3.2", "html-webpack-plugin": "^5.3.2",
"http-link-header": "^1.0.2", "http-link-header": "^1.0.2",

2
yarn.lock
Wyświetl plik

@ -4588,7 +4588,7 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
history@^4.7.2: history@^4.10.1, history@^4.7.2:
version "4.10.1" version "4.10.1"
resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==