diff --git a/app/javascript/mastodon/actions/blocks.js b/app/javascript/mastodon/actions/blocks.js
index 66421ed45583b510da0da82c75ebc86fc63888be..e293657ad36ef96c4861db92228a090d25acb6ac 100644
--- a/app/javascript/mastodon/actions/blocks.js
+++ b/app/javascript/mastodon/actions/blocks.js
@@ -95,6 +95,6 @@ export function initBlockModal(account) {
account,
});
- dispatch(openModal('BLOCK'));
+ dispatch(openModal({ modalType: 'BLOCK' }));
};
}
diff --git a/app/javascript/mastodon/actions/boosts.js b/app/javascript/mastodon/actions/boosts.js
index c0f0f3acc512f86151108c2b69914be1a0a74c0d..1fc2e391e2682702700ac6f064e48cc859eea424 100644
--- a/app/javascript/mastodon/actions/boosts.js
+++ b/app/javascript/mastodon/actions/boosts.js
@@ -14,7 +14,10 @@ export function initBoostModal(props) {
privacy,
});
- dispatch(openModal('BOOST', props));
+ dispatch(openModal({
+ modalType: 'BOOST',
+ modalProps: props,
+ }));
};
}
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 22454cf3df8a876ad54bebcfb2d9b619dc0d980e..2ad7678caa2f92d5d7c3ba2fbbfae61fa2d876c0 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -381,7 +381,10 @@ export function initMediaEditModal(id) {
id,
});
- dispatch(openModal('FOCAL_POINT', { id }));
+ dispatch(openModal({
+ modalType: 'FOCAL_POINT',
+ modalProps: { id },
+ }));
};
}
diff --git a/app/javascript/mastodon/actions/filters.js b/app/javascript/mastodon/actions/filters.js
index 3774ee042a1b08bd0c22ec8e3357f2262856e70d..a11956ac564c6ae5732e16b68ca8e4edfa6f10f3 100644
--- a/app/javascript/mastodon/actions/filters.js
+++ b/app/javascript/mastodon/actions/filters.js
@@ -15,9 +15,12 @@ export const FILTERS_CREATE_SUCCESS = 'FILTERS_CREATE_SUCCESS';
export const FILTERS_CREATE_FAIL = 'FILTERS_CREATE_FAIL';
export const initAddFilter = (status, { contextType }) => dispatch =>
- dispatch(openModal('FILTER', {
- statusId: status?.get('id'),
- contextType: contextType,
+ dispatch(openModal({
+ modalType: 'FILTER',
+ modalProps: {
+ statusId: status?.get('id'),
+ contextType: contextType,
+ },
}));
export const fetchFilters = () => (dispatch, getState) => {
diff --git a/app/javascript/mastodon/actions/modal.js b/app/javascript/mastodon/actions/modal.js
deleted file mode 100644
index ef2ae0e4c7fe6c229eefc0cf49046014671ae8e6..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/actions/modal.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export const MODAL_OPEN = 'MODAL_OPEN';
-export const MODAL_CLOSE = 'MODAL_CLOSE';
-
-export function openModal(type, props) {
- return {
- type: MODAL_OPEN,
- modalType: type,
- modalProps: props,
- };
-}
-
-export function closeModal(type, options = { ignoreFocus: false }) {
- return {
- type: MODAL_CLOSE,
- modalType: type,
- ignoreFocus: options.ignoreFocus,
- };
-}
diff --git a/app/javascript/mastodon/actions/modal.ts b/app/javascript/mastodon/actions/modal.ts
new file mode 100644
index 0000000000000000000000000000000000000000..af34f5d6afa9346ca4fe706932cd2214bbc873c6
--- /dev/null
+++ b/app/javascript/mastodon/actions/modal.ts
@@ -0,0 +1,17 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import type { MODAL_COMPONENTS } from '../features/ui/components/modal_root';
+
+export type ModalType = keyof typeof MODAL_COMPONENTS;
+
+interface OpenModalPayload {
+ modalType: ModalType;
+ modalProps: unknown;
+}
+export const openModal = createAction<OpenModalPayload>('MODAL_OPEN');
+
+interface CloseModalPayload {
+ modalType: ModalType | undefined;
+ ignoreFocus: boolean;
+}
+export const closeModal = createAction<CloseModalPayload>('MODAL_CLOSE');
diff --git a/app/javascript/mastodon/actions/mutes.js b/app/javascript/mastodon/actions/mutes.js
index e61a14af24bf1442feb66fb5a8effbaea14689fd..fb041078b844882e2a7c6b9f47ea1e52c4cc597a 100644
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@@ -97,7 +97,7 @@ export function initMuteModal(account) {
account,
});
- dispatch(openModal('MUTE'));
+ dispatch(openModal({ modalType: 'MUTE' }));
};
}
diff --git a/app/javascript/mastodon/actions/reports.js b/app/javascript/mastodon/actions/reports.js
index b3f9bf1ac3126430d27674f8a8c653da7fc4569b..756b8cd05e1648d77c2ac7facc5f5363e917fadc 100644
--- a/app/javascript/mastodon/actions/reports.js
+++ b/app/javascript/mastodon/actions/reports.js
@@ -7,9 +7,12 @@ export const REPORT_SUBMIT_SUCCESS = 'REPORT_SUBMIT_SUCCESS';
export const REPORT_SUBMIT_FAIL = 'REPORT_SUBMIT_FAIL';
export const initReport = (account, status) => dispatch =>
- dispatch(openModal('REPORT', {
- accountId: account.get('id'),
- statusId: status?.get('id'),
+ dispatch(openModal({
+ modalType: 'REPORT',
+ modalProps: {
+ accountId: account.get('id'),
+ statusId: status?.get('id'),
+ },
}));
export const submitReport = (params, onSuccess, onFail) => (dispatch, getState) => {
diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx
index 42d3d93fe89a02bd07296396014fdf5a0cbbc045..987b7c8272b1ba85bc9e6ea2d707490dd7afea0b 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.jsx
+++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx
@@ -15,7 +15,10 @@ import DropdownMenu from './containers/dropdown_menu_container';
const mapDispatchToProps = (dispatch, { statusId }) => ({
onItemClick (index) {
- dispatch(openModal('COMPARE_HISTORY', { index, statusId }));
+ dispatch(openModal({
+ modalType: 'COMPARE_HISTORY',
+ modalProps: { index, statusId },
+ }));
},
});
diff --git a/app/javascript/mastodon/containers/account_container.jsx b/app/javascript/mastodon/containers/account_container.jsx
index 09a755e877b3da53798710f7964bb5b5432fec2e..a134452e77210fee9e68ac8d7b3e8d175951787c 100644
--- a/app/javascript/mastodon/containers/account_container.jsx
+++ b/app/javascript/mastodon/containers/account_container.jsx
@@ -35,10 +35,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
onFollow (account) {
if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
if (unfollowModal) {
- dispatch(openModal('CONFIRM', {
- message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
- confirm: intl.formatMessage(messages.unfollowConfirm),
- onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+ confirm: intl.formatMessage(messages.unfollowConfirm),
+ onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ },
}));
} else {
dispatch(unfollowAccount(account.get('id')));
diff --git a/app/javascript/mastodon/containers/domain_container.jsx b/app/javascript/mastodon/containers/domain_container.jsx
index 9a55b72cc33a5c8c7aa981b34d583de8ef0bca0f..c719a5775c7c168627c0479ecb0c8be8c6904414 100644
--- a/app/javascript/mastodon/containers/domain_container.jsx
+++ b/app/javascript/mastodon/containers/domain_container.jsx
@@ -18,10 +18,13 @@ const makeMapStateToProps = () => {
const mapDispatchToProps = (dispatch, { intl }) => ({
onBlockDomain (domain) {
- dispatch(openModal('CONFIRM', {
- message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
- confirm: intl.formatMessage(messages.blockDomainConfirm),
- onConfirm: () => dispatch(blockDomain(domain)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
+ confirm: intl.formatMessage(messages.blockDomainConfirm),
+ onConfirm: () => dispatch(blockDomain(domain)),
+ },
}));
},
diff --git a/app/javascript/mastodon/containers/dropdown_menu_container.js b/app/javascript/mastodon/containers/dropdown_menu_container.js
index 5dd5273b278fca7bb003622021c9249c764782a2..6cf180cd539305e8d5148b117efb65025a82ff0b 100644
--- a/app/javascript/mastodon/containers/dropdown_menu_container.js
+++ b/app/javascript/mastodon/containers/dropdown_menu_container.js
@@ -18,15 +18,21 @@ const mapDispatchToProps = (dispatch, { status, items, scrollKey }) => ({
dispatch(fetchRelationships([status.getIn(['account', 'id'])]));
}
- dispatch(isUserTouching() ? openModal('ACTIONS', {
- status,
- actions: items,
- onClick: onItemClick,
+ dispatch(isUserTouching() ? openModal({
+ modalType: 'ACTIONS',
+ modalProps: {
+ status,
+ actions: items,
+ onClick: onItemClick,
+ },
}) : openDropdownMenu(id, keyboard, scrollKey));
},
onClose(id) {
- dispatch(closeModal('ACTIONS'));
+ dispatch(closeModal({
+ modalType: 'ACTIONS',
+ ignoreFocus: false,
+ }));
dispatch(closeDropdownMenu(id));
},
});
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 2d4baafa1bba6dbdd2e581002456e0413418df17..3026dde0a849ef79168679e1b7f788790a7f3a98 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -82,10 +82,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
let state = getState();
if (state.getIn(['compose', 'text']).trim().length !== 0) {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.replyMessage),
- confirm: intl.formatMessage(messages.replyConfirm),
- onConfirm: () => dispatch(replyCompose(status, router)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.replyMessage),
+ confirm: intl.formatMessage(messages.replyConfirm),
+ onConfirm: () => dispatch(replyCompose(status, router)) },
}));
} else {
dispatch(replyCompose(status, router));
@@ -134,9 +136,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
},
onEmbed (status) {
- dispatch(openModal('EMBED', {
- url: status.get('url'),
- onError: error => dispatch(showAlertForError(error)),
+ dispatch(openModal({
+ modalType: 'EMBED',
+ modalProps: {
+ url: status.get('url'),
+ onError: error => dispatch(showAlertForError(error)),
+ },
}));
},
@@ -144,10 +149,13 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
if (!deleteModal) {
dispatch(deleteStatus(status.get('id'), history, withRedraft));
} else {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
- confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
- onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
+ confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
+ onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+ },
}));
}
},
@@ -156,10 +164,13 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
dispatch((_, getState) => {
let state = getState();
if (state.getIn(['compose', 'text']).trim().length !== 0) {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.editMessage),
- confirm: intl.formatMessage(messages.editConfirm),
- onConfirm: () => dispatch(editStatus(status.get('id'), history)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.editMessage),
+ confirm: intl.formatMessage(messages.editConfirm),
+ onConfirm: () => dispatch(editStatus(status.get('id'), history)),
+ },
}));
} else {
dispatch(editStatus(status.get('id'), history));
@@ -184,11 +195,17 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
},
onOpenMedia (statusId, media, index, lang) {
- dispatch(openModal('MEDIA', { statusId, media, index, lang }));
+ dispatch(openModal({
+ modalType: 'MEDIA',
+ modalProps: { statusId, media, index, lang },
+ }));
},
onOpenVideo (statusId, media, lang, options) {
- dispatch(openModal('VIDEO', { statusId, media, lang, options }));
+ dispatch(openModal({
+ modalType: 'VIDEO',
+ modalProps: { statusId, media, lang, options },
+ }));
},
onBlock (status) {
@@ -237,10 +254,13 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
},
onBlockDomain (domain) {
- dispatch(openModal('CONFIRM', {
- message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
- confirm: intl.formatMessage(messages.blockDomainConfirm),
- onConfirm: () => dispatch(blockDomain(domain)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
+ confirm: intl.formatMessage(messages.blockDomainConfirm),
+ onConfirm: () => dispatch(blockDomain(domain)),
+ },
}));
},
@@ -253,10 +273,13 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
},
onInteractionModal (type, status) {
- dispatch(openModal('INTERACTION', {
- type,
- accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type,
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
}));
},
diff --git a/app/javascript/mastodon/features/account_gallery/index.jsx b/app/javascript/mastodon/features/account_gallery/index.jsx
index 16fb9ef577ec086f7f3758c239ae1be3d1ee549f..27de4740cade48d9d23e7ab1ff59d57433a882b4 100644
--- a/app/javascript/mastodon/features/account_gallery/index.jsx
+++ b/app/javascript/mastodon/features/account_gallery/index.jsx
@@ -143,14 +143,23 @@ class AccountGallery extends ImmutablePureComponent {
const lang = attachment.getIn(['status', 'language']);
if (attachment.get('type') === 'video') {
- dispatch(openModal('VIDEO', { media: attachment, statusId, lang, options: { autoPlay: true } }));
+ dispatch(openModal({
+ modalType: 'VIDEO',
+ modalProps: { media: attachment, statusId, lang, options: { autoPlay: true } },
+ }));
} else if (attachment.get('type') === 'audio') {
- dispatch(openModal('AUDIO', { media: attachment, statusId, lang, options: { autoPlay: true } }));
+ dispatch(openModal({
+ modalType: 'AUDIO',
+ modalProps: { media: attachment, statusId, lang, options: { autoPlay: true } },
+ }));
} else {
const media = attachment.getIn(['status', 'media_attachments']);
const index = media.findIndex(x => x.get('id') === attachment.get('id'));
- dispatch(openModal('MEDIA', { media, index, statusId, lang }));
+ dispatch(openModal({
+ modalType: 'MEDIA',
+ modalProps: { media, index, statusId, lang },
+ }));
}
};
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
index 6442a4f82ff16af8831e22dedad7a67201d2ad10..2b3a66c55e3bf706c3acf8fc7a57d7091b97b90d 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@@ -48,20 +48,26 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
onFollow (account) {
if (account.getIn(['relationship', 'following'])) {
if (unfollowModal) {
- dispatch(openModal('CONFIRM', {
- message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
- confirm: intl.formatMessage(messages.unfollowConfirm),
- onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+ confirm: intl.formatMessage(messages.unfollowConfirm),
+ onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ },
}));
} else {
dispatch(unfollowAccount(account.get('id')));
}
} else if (account.getIn(['relationship', 'requested'])) {
if (unfollowModal) {
- dispatch(openModal('CONFIRM', {
- message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
- confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
- onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+ confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+ onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ },
}));
} else {
dispatch(unfollowAccount(account.get('id')));
@@ -72,10 +78,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onInteractionModal (account) {
- dispatch(openModal('INTERACTION', {
- type: 'follow',
- accountId: account.get('id'),
- url: account.get('url'),
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'follow',
+ accountId: account.get('id'),
+ url: account.get('url'),
+ },
}));
},
@@ -132,10 +141,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onBlockDomain (domain) {
- dispatch(openModal('CONFIRM', {
- message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
- confirm: intl.formatMessage(messages.blockDomainConfirm),
- onConfirm: () => dispatch(blockDomain(domain)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
+ confirm: intl.formatMessage(messages.blockDomainConfirm),
+ onConfirm: () => dispatch(blockDomain(domain)),
+ },
}));
},
@@ -144,21 +156,30 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onAddToList (account) {
- dispatch(openModal('LIST_ADDER', {
- accountId: account.get('id'),
+ dispatch(openModal({
+ modalType: 'LIST_ADDER',
+ modalProps: {
+ accountId: account.get('id'),
+ },
}));
},
onChangeLanguages (account) {
- dispatch(openModal('SUBSCRIBED_LANGUAGES', {
- accountId: account.get('id'),
+ dispatch(openModal({
+ modalType: 'SUBSCRIBED_LANGUAGES',
+ modalProps: {
+ accountId: account.get('id'),
+ },
}));
},
onOpenAvatar (account) {
- dispatch(openModal('IMAGE', {
- src: account.get('avatar'),
- alt: account.get('acct'),
+ dispatch(openModal({
+ modalType: 'IMAGE',
+ modalProps: {
+ src: account.get('avatar'),
+ alt: account.get('acct'),
+ },
}));
},
diff --git a/app/javascript/mastodon/features/compose/containers/navigation_container.js b/app/javascript/mastodon/features/compose/containers/navigation_container.js
index f881c4fa139b4da23864b1a7d96f15d76b019c91..70b4026d140c1cdd76fe2022ce0f72c9601f8d2c 100644
--- a/app/javascript/mastodon/features/compose/containers/navigation_container.js
+++ b/app/javascript/mastodon/features/compose/containers/navigation_container.js
@@ -21,11 +21,14 @@ const mapStateToProps = state => {
const mapDispatchToProps = (dispatch, { intl }) => ({
onLogout () {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.logoutMessage),
- confirm: intl.formatMessage(messages.logoutConfirm),
- closeWhenConfirm: false,
- onConfirm: () => logOut(),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.logoutMessage),
+ confirm: intl.formatMessage(messages.logoutConfirm),
+ closeWhenConfirm: false,
+ onConfirm: () => logOut(),
+ },
}));
},
});
diff --git a/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
index 1ca3fe550a7e3af1075de6e5e2a3139dd39b27dd..6d26abf4f6623bec0aeabc00b0fd9e4ac9caca51 100644
--- a/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js
@@ -16,8 +16,14 @@ const mapDispatchToProps = dispatch => ({
},
isUserTouching,
- onModalOpen: props => dispatch(openModal('ACTIONS', props)),
- onModalClose: () => dispatch(closeModal()),
+ onModalOpen: props => dispatch(openModal({
+ modalType: 'ACTIONS',
+ modalProps: props,
+ })),
+ onModalClose: () => dispatch(closeModal({
+ modalType: undefined,
+ ignoreFocus: false,
+ })),
});
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index 192355886298414405b56a5298d2bea9f2feee0c..8997f1bc6c18eaea10923b21c5b26d010c7e9868 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -71,11 +71,14 @@ class Compose extends PureComponent {
e.preventDefault();
e.stopPropagation();
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.logoutMessage),
- confirm: intl.formatMessage(messages.logoutConfirm),
- closeWhenConfirm: false,
- onConfirm: () => logOut(),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.logoutMessage),
+ confirm: intl.formatMessage(messages.logoutConfirm),
+ closeWhenConfirm: false,
+ onConfirm: () => logOut(),
+ },
}));
return false;
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
index 978c031aabcd89ea43e28fd852b72fcceef02537..456fc7d7cc2a2ce465d73a293f59c31aaa35687a 100644
--- a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
+++ b/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
@@ -41,10 +41,13 @@ const mapDispatchToProps = (dispatch, { intl, conversationId }) => ({
let state = getState();
if (state.getIn(['compose', 'text']).trim().length !== 0) {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.replyMessage),
- confirm: intl.formatMessage(messages.replyConfirm),
- onConfirm: () => dispatch(replyCompose(status, router)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.replyMessage),
+ confirm: intl.formatMessage(messages.replyConfirm),
+ onConfirm: () => dispatch(replyCompose(status, router)),
+ },
}));
} else {
dispatch(replyCompose(status, router));
diff --git a/app/javascript/mastodon/features/directory/components/account_card.jsx b/app/javascript/mastodon/features/directory/components/account_card.jsx
index 87ddcf94f71065b8fc5df69ef5008b986d02ec87..cf1c63f9e46b42e57266917af73fbd1e5b636f1e 100644
--- a/app/javascript/mastodon/features/directory/components/account_card.jsx
+++ b/app/javascript/mastodon/features/directory/components/account_card.jsx
@@ -50,27 +50,32 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
if (account.getIn(['relationship', 'following'])) {
if (unfollowModal) {
dispatch(
- openModal('CONFIRM', {
- message: (
- <FormattedMessage
- id='confirmations.unfollow.message'
- defaultMessage='Are you sure you want to unfollow {name}?'
- values={{ name: <strong>@{account.get('acct')}</strong> }}
- />
- ),
- confirm: intl.formatMessage(messages.unfollowConfirm),
- onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
- }),
+ openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: (
+ <FormattedMessage
+ id='confirmations.unfollow.message'
+ defaultMessage='Are you sure you want to unfollow {name}?'
+ values={{ name: <strong>@{account.get('acct')}</strong> }}
+ />
+ ),
+ confirm: intl.formatMessage(messages.unfollowConfirm),
+ onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ } }),
);
} else {
dispatch(unfollowAccount(account.get('id')));
}
} else if (account.getIn(['relationship', 'requested'])) {
if (unfollowModal) {
- dispatch(openModal('CONFIRM', {
- message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
- confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
- onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: <FormattedMessage id='confirmations.cancel_follow_request.message' defaultMessage='Are you sure you want to withdraw your request to follow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+ confirm: intl.formatMessage(messages.cancelFollowRequestConfirm),
+ onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+ },
}));
} else {
dispatch(unfollowAccount(account.get('id')));
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index db6a3c4a53cc454ffb1956c21021f601ad5d2374..be03b8f5fe53f71fcea07dfc4c097725d8a9ddbe 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -18,8 +18,11 @@ const mapStateToProps = (state, { accountId }) => ({
const mapDispatchToProps = (dispatch) => ({
onSignupClick() {
- dispatch(closeModal());
- dispatch(openModal('CLOSED_REGISTRATIONS'));
+ dispatch(closeModal({
+ modalType: undefined,
+ ignoreFocus: false,
+ }));
+ dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
},
});
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index 1d80a9cd50843b322b8e4ac91c5bd898cbd4999a..f41e8e6f23477807f893ab372056a92d376d4df8 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -114,24 +114,30 @@ class ListTimeline extends PureComponent {
};
handleEditClick = () => {
- this.props.dispatch(openModal('LIST_EDITOR', { listId: this.props.params.id }));
+ this.props.dispatch(openModal({
+ modalType: 'LIST_EDITOR',
+ modalProps: { listId: this.props.params.id },
+ }));
};
handleDeleteClick = () => {
const { dispatch, columnId, intl } = this.props;
const { id } = this.props.params;
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.deleteMessage),
- confirm: intl.formatMessage(messages.deleteConfirm),
- onConfirm: () => {
- dispatch(deleteList(id));
-
- if (columnId) {
- dispatch(removeColumn(columnId));
- } else {
- this.context.router.history.push('/lists');
- }
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.deleteMessage),
+ confirm: intl.formatMessage(messages.deleteConfirm),
+ onConfirm: () => {
+ dispatch(deleteList(id));
+
+ if (columnId) {
+ dispatch(removeColumn(columnId));
+ } else {
+ this.context.router.history.push('/lists');
+ }
+ },
},
}));
};
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index 292767badb169dcce267088abd73440ad2fbcab3..b63796a8b285c4b1e0cb172d6e549cda61cdb003 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -59,10 +59,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onClear () {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.clearMessage),
- confirm: intl.formatMessage(messages.clearConfirm),
- onConfirm: () => dispatch(clearNotifications()),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.clearMessage),
+ confirm: intl.formatMessage(messages.clearConfirm),
+ onConfirm: () => dispatch(clearNotifications()),
+ },
}));
},
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index 1743edae9960d33954d644654b462abc74dd7220..c167d93dce2b6b19ced5ea8fbd1af972d042d7c2 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -74,19 +74,25 @@ class Footer extends ImmutablePureComponent {
if (signedIn) {
if (askReplyConfirmation) {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.replyMessage),
- confirm: intl.formatMessage(messages.replyConfirm),
- onConfirm: this._performReply,
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.replyMessage),
+ confirm: intl.formatMessage(messages.replyConfirm),
+ onConfirm: this._performReply,
+ },
}));
} else {
this._performReply();
}
} else {
- dispatch(openModal('INTERACTION', {
- type: 'reply',
- accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'reply',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
}));
}
};
@@ -102,10 +108,13 @@ class Footer extends ImmutablePureComponent {
dispatch(favourite(status));
}
} else {
- dispatch(openModal('INTERACTION', {
- type: 'favourite',
- accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'favourite',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
}));
}
};
@@ -128,10 +137,13 @@ class Footer extends ImmutablePureComponent {
dispatch(initBoostModal({ status, onReblog: this._performReblog }));
}
} else {
- dispatch(openModal('INTERACTION', {
- type: 'reblog',
- accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'reblog',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
}));
}
};
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index ddae8c028395a6717f9040b023e024e134e56e5f..e76790a9f6e7403f5fa3d6081839e7f1d6f68624 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -60,10 +60,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
dispatch((_, getState) => {
let state = getState();
if (state.getIn(['compose', 'text']).trim().length !== 0) {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.replyMessage),
- confirm: intl.formatMessage(messages.replyConfirm),
- onConfirm: () => dispatch(replyCompose(status, router)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.replyMessage),
+ confirm: intl.formatMessage(messages.replyConfirm),
+ onConfirm: () => dispatch(replyCompose(status, router)),
+ },
}));
} else {
dispatch(replyCompose(status, router));
@@ -104,9 +107,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onEmbed (status) {
- dispatch(openModal('EMBED', {
- url: status.get('url'),
- onError: error => dispatch(showAlertForError(error)),
+ dispatch(openModal({
+ modalType: 'EMBED',
+ modalProps: {
+ url: status.get('url'),
+ onError: error => dispatch(showAlertForError(error)),
+ },
}));
},
@@ -114,10 +120,13 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
if (!deleteModal) {
dispatch(deleteStatus(status.get('id'), history, withRedraft));
} else {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
- confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
- onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
+ confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
+ onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+ },
}));
}
},
@@ -131,11 +140,17 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onOpenMedia (media, index, lang) {
- dispatch(openModal('MEDIA', { media, index, lang }));
+ dispatch(openModal({
+ modalType: 'MEDIA',
+ modalProps: { media, index, lang },
+ }));
},
onOpenVideo (media, lang, options) {
- dispatch(openModal('VIDEO', { media, lang, options }));
+ dispatch(openModal({
+ modalType: 'VIDEO',
+ modalProps: { media, lang, options },
+ }));
},
onBlock (status) {
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 1d26f7a69d01401244351eb5cc75f97a79b003f2..0ed94d34c0ae861e1b94b3cbb882b1c052ea9ce5 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -251,10 +251,13 @@ class Status extends ImmutablePureComponent {
dispatch(favourite(status));
}
} else {
- dispatch(openModal('INTERACTION', {
- type: 'favourite',
- accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'favourite',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
}));
}
};
@@ -273,19 +276,25 @@ class Status extends ImmutablePureComponent {
if (signedIn) {
if (askReplyConfirmation) {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.replyMessage),
- confirm: intl.formatMessage(messages.replyConfirm),
- onConfirm: () => dispatch(replyCompose(status, this.context.router.history)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.replyMessage),
+ confirm: intl.formatMessage(messages.replyConfirm),
+ onConfirm: () => dispatch(replyCompose(status, this.context.router.history)),
+ },
}));
} else {
dispatch(replyCompose(status, this.context.router.history));
}
} else {
- dispatch(openModal('INTERACTION', {
- type: 'reply',
- accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'reply',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
}));
}
};
@@ -309,10 +318,13 @@ class Status extends ImmutablePureComponent {
}
}
} else {
- dispatch(openModal('INTERACTION', {
- type: 'reblog',
- accountId: status.getIn(['account', 'id']),
- url: status.get('url'),
+ dispatch(openModal({
+ modalType: 'INTERACTION',
+ modalProps: {
+ type: 'reblog',
+ accountId: status.getIn(['account', 'id']),
+ url: status.get('url'),
+ },
}));
}
};
@@ -331,10 +343,13 @@ class Status extends ImmutablePureComponent {
if (!deleteModal) {
dispatch(deleteStatus(status.get('id'), history, withRedraft));
} else {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
- confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
- onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
+ confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
+ onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+ },
}));
}
};
@@ -352,11 +367,17 @@ class Status extends ImmutablePureComponent {
};
handleOpenMedia = (media, index, lang) => {
- this.props.dispatch(openModal('MEDIA', { statusId: this.props.status.get('id'), media, index, lang }));
+ this.props.dispatch(openModal({
+ modalType: 'MEDIA',
+ modalProps: { statusId: this.props.status.get('id'), media, index, lang },
+ }));
};
handleOpenVideo = (media, lang, options) => {
- this.props.dispatch(openModal('VIDEO', { statusId: this.props.status.get('id'), media, lang, options }));
+ this.props.dispatch(openModal({
+ modalType: 'VIDEO',
+ modalProps: { statusId: this.props.status.get('id'), media, lang, options },
+ }));
};
handleHotkeyOpenMedia = e => {
@@ -425,7 +446,10 @@ class Status extends ImmutablePureComponent {
};
handleEmbed = (status) => {
- this.props.dispatch(openModal('EMBED', { url: status.get('url') }));
+ this.props.dispatch(openModal({
+ modalType: 'EMBED',
+ modalProps: { url: status.get('url') },
+ }));
};
handleUnmuteClick = account => {
@@ -437,10 +461,13 @@ class Status extends ImmutablePureComponent {
};
handleBlockDomainClick = domain => {
- this.props.dispatch(openModal('CONFIRM', {
- message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
- confirm: this.props.intl.formatMessage(messages.blockDomainConfirm),
- onConfirm: () => this.props.dispatch(blockDomain(domain)),
+ this.props.dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
+ confirm: this.props.intl.formatMessage(messages.blockDomainConfirm),
+ onConfirm: () => this.props.dispatch(blockDomain(domain)),
+ },
}));
};
diff --git a/app/javascript/mastodon/features/ui/components/block_modal.jsx b/app/javascript/mastodon/features/ui/components/block_modal.jsx
index 962b19344e0167860a283e965f6886f36dfe22f8..7cfd252e0bab79448b5b0b64be9eac7a63615d25 100644
--- a/app/javascript/mastodon/features/ui/components/block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/block_modal.jsx
@@ -33,7 +33,10 @@ const mapDispatchToProps = dispatch => {
},
onClose() {
- dispatch(closeModal());
+ dispatch(closeModal({
+ modalType: undefined,
+ ignoreFocus: false,
+ }));
},
};
};
diff --git a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
index 4a55f25cbe8176d612330e6ccdcb130e2ca4812b..740537fa6ef64549a977794eebee0ffe1b57f78e 100644
--- a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
@@ -23,7 +23,10 @@ const mapStateToProps = (state, { statusId }) => ({
const mapDispatchToProps = dispatch => ({
onClose() {
- dispatch(closeModal());
+ dispatch(closeModal({
+ modalType: undefined,
+ ignoreFocus: false,
+ }));
},
});
diff --git a/app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx b/app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx
index 6c4fefb0d52626a19272c192bee9930cad20507a..6a71bb2465ea54526b39abc7e5d3e28e8b7fe537 100644
--- a/app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx
+++ b/app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx
@@ -23,11 +23,14 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = (dispatch, { intl }) => ({
onLogout () {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.logoutMessage),
- confirm: intl.formatMessage(messages.logoutConfirm),
- closeWhenConfirm: false,
- onConfirm: () => logOut(),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.logoutMessage),
+ confirm: intl.formatMessage(messages.logoutConfirm),
+ closeWhenConfirm: false,
+ onConfirm: () => logOut(),
+ },
}));
},
});
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index 04651bab18a1ca63c24c321e05692ebb589b9e18..bb6747c00c6211c12ecd4b3dc91f6148d95deeec 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -26,7 +26,7 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = (dispatch) => ({
openClosedRegistrationsModal() {
- dispatch(openModal('CLOSED_REGISTRATIONS'));
+ dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
},
});
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.jsx b/app/javascript/mastodon/features/ui/components/link_footer.jsx
index 4ae6f1dcf49d5208279d35d82661cfd9f5ecccf9..b025174409f1358fe315eb0fa658ea14a8dc23ab 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.jsx
+++ b/app/javascript/mastodon/features/ui/components/link_footer.jsx
@@ -19,11 +19,14 @@ const messages = defineMessages({
const mapDispatchToProps = (dispatch, { intl }) => ({
onLogout () {
- dispatch(openModal('CONFIRM', {
- message: intl.formatMessage(messages.logoutMessage),
- confirm: intl.formatMessage(messages.logoutConfirm),
- closeWhenConfirm: false,
- onConfirm: () => logOut(),
+ dispatch(openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: intl.formatMessage(messages.logoutMessage),
+ confirm: intl.formatMessage(messages.logoutConfirm),
+ closeWhenConfirm: false,
+ onConfirm: () => logOut(),
+ },
}));
},
});
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 5700e0f54c78f184036d93ca0ed8fad09bde7bd4..d5edb45b36412d74b2b4d65035bf80c4e369ea48 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -32,7 +32,7 @@ import MediaModal from './media_modal';
import ModalLoading from './modal_loading';
import VideoModal from './video_modal';
-const MODAL_COMPONENTS = {
+export const MODAL_COMPONENTS = {
'MEDIA': () => Promise.resolve({ default: MediaModal }),
'VIDEO': () => Promise.resolve({ default: VideoModal }),
'AUDIO': () => Promise.resolve({ default: AudioModal }),
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index dd21fa0465e48f5289575b30b620c27d0aa53065..708bd757cf17f7cd0795a1dcc222aa437f15fc67 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -34,7 +34,10 @@ const mapDispatchToProps = dispatch => {
},
onClose() {
- dispatch(closeModal());
+ dispatch(closeModal({
+ modalType: undefined,
+ ignoreFocus: false,
+ }));
},
onToggleNotifications() {
diff --git a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
index 25de95fd3746101926cd02206c5b210b6ec46cca..dad36134cfab4666e85bfb0c214ed914fe0e18f7 100644
--- a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
@@ -11,7 +11,7 @@ const SignInBanner = () => {
const dispatch = useAppDispatch();
const openClosedRegistrationsModal = useCallback(
- () => dispatch(openModal('CLOSED_REGISTRATIONS')),
+ () => dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' })),
[dispatch],
);
diff --git a/app/javascript/mastodon/features/ui/containers/modal_container.js b/app/javascript/mastodon/features/ui/containers/modal_container.js
index b14d0410d1b0047183dcb55d3ed40a3a38e343b4..1c3872cd50436fa51f98954fc3cc09a9dc71151a 100644
--- a/app/javascript/mastodon/features/ui/containers/modal_container.js
+++ b/app/javascript/mastodon/features/ui/containers/modal_container.js
@@ -13,14 +13,22 @@ const mapDispatchToProps = dispatch => ({
onClose (confirmationMessage, ignoreFocus = false) {
if (confirmationMessage) {
dispatch(
- openModal('CONFIRM', {
- message: confirmationMessage.message,
- confirm: confirmationMessage.confirm,
- onConfirm: () => dispatch(closeModal(undefined, { ignoreFocus })),
- }),
+ openModal({
+ modalType: 'CONFIRM',
+ modalProps: {
+ message: confirmationMessage.message,
+ confirm: confirmationMessage.confirm,
+ onConfirm: () => dispatch(closeModal({
+ modalType: undefined,
+ ignoreFocus: { ignoreFocus },
+ })),
+ } }),
);
} else {
- dispatch(closeModal(undefined, { ignoreFocus }));
+ dispatch(closeModal({
+ modalType: undefined,
+ ignoreFocus: { ignoreFocus },
+ }));
}
},
});
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index 29c9abe68b29c3107b0cb5e449fb57703f5a8fa9..16047b26d84fb72ca1b985bf99f7f524bfb7840e 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -25,7 +25,7 @@ import markers from './markers';
import media_attachments from './media_attachments';
import meta from './meta';
import { missedUpdatesReducer } from './missed_updates';
-import modal from './modal';
+import { modalReducer } from './modal';
import mutes from './mutes';
import notifications from './notifications';
import picture_in_picture from './picture_in_picture';
@@ -50,7 +50,7 @@ const reducers = {
meta,
alerts,
loadingBar: loadingBarReducer,
- modal,
+ modal: modalReducer,
user_lists,
domain_lists,
status_lists,
diff --git a/app/javascript/mastodon/reducers/modal.js b/app/javascript/mastodon/reducers/modal.js
deleted file mode 100644
index 348f5389919e090b19799f11f19c5832970385ca..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/reducers/modal.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Stack as ImmutableStack, Map as ImmutableMap } from 'immutable';
-
-import { COMPOSE_UPLOAD_CHANGE_SUCCESS } from '../actions/compose';
-import { MODAL_OPEN, MODAL_CLOSE } from '../actions/modal';
-import { TIMELINE_DELETE } from '../actions/timelines';
-
-const initialState = ImmutableMap({
- ignoreFocus: false,
- stack: ImmutableStack(),
-});
-
-const popModal = (state, { modalType, ignoreFocus }) => {
- if (modalType === undefined || modalType === state.getIn(['stack', 0, 'modalType'])) {
- return state.set('ignoreFocus', !!ignoreFocus).update('stack', stack => stack.shift());
- } else {
- return state;
- }
-};
-
-const pushModal = (state, modalType, modalProps) => {
- return state.withMutations(map => {
- map.set('ignoreFocus', false);
- map.update('stack', stack => stack.unshift(ImmutableMap({ modalType, modalProps })));
- });
-};
-
-export default function modal(state = initialState, action) {
- switch(action.type) {
- case MODAL_OPEN:
- return pushModal(state, action.modalType, action.modalProps);
- case MODAL_CLOSE:
- return popModal(state, action);
- case COMPOSE_UPLOAD_CHANGE_SUCCESS:
- return popModal(state, { modalType: 'FOCAL_POINT', ignoreFocus: false });
- case TIMELINE_DELETE:
- return state.update('stack', stack => stack.filterNot((modal) => modal.get('modalProps').statusId === action.id));
- default:
- return state;
- }
-}
diff --git a/app/javascript/mastodon/reducers/modal.ts b/app/javascript/mastodon/reducers/modal.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6afbcc367c63f9e0e045ffd0d28e4851035f39c6
--- /dev/null
+++ b/app/javascript/mastodon/reducers/modal.ts
@@ -0,0 +1,94 @@
+import { Record as ImmutableRecord, Stack } from 'immutable';
+
+import type { PayloadAction } from '@reduxjs/toolkit';
+
+import { COMPOSE_UPLOAD_CHANGE_SUCCESS } from '../actions/compose';
+import type { ModalType } from '../actions/modal';
+import { openModal, closeModal } from '../actions/modal';
+import { TIMELINE_DELETE } from '../actions/timelines';
+
+type ModalProps = Record<string, unknown>;
+interface Modal {
+ modalType: ModalType;
+ modalProps: ModalProps;
+}
+
+const Modal = ImmutableRecord<Modal>({
+ modalType: 'ACTIONS',
+ modalProps: ImmutableRecord({})(),
+});
+
+interface ModalState {
+ ignoreFocus: boolean;
+ stack: Stack<ImmutableRecord<Modal>>;
+}
+
+const initialState = ImmutableRecord<ModalState>({
+ ignoreFocus: false,
+ stack: Stack(),
+})();
+type State = typeof initialState;
+
+interface PopModalOption {
+ modalType: ModalType | undefined;
+ ignoreFocus: boolean;
+}
+const popModal = (
+ state: State,
+ { modalType, ignoreFocus }: PopModalOption
+): State => {
+ if (
+ modalType === undefined ||
+ modalType === state.get('stack').get(0)?.get('modalType')
+ ) {
+ return state
+ .set('ignoreFocus', !!ignoreFocus)
+ .update('stack', (stack) => stack.shift());
+ } else {
+ return state;
+ }
+};
+
+const pushModal = (
+ state: State,
+ modalType: ModalType,
+ modalProps: ModalProps
+): State => {
+ return state.withMutations((record) => {
+ record.set('ignoreFocus', false);
+ record.update('stack', (stack) =>
+ stack.unshift(Modal({ modalType, modalProps }))
+ );
+ });
+};
+
+export function modalReducer(
+ state: State = initialState,
+ action: PayloadAction<{
+ modalType: ModalType;
+ ignoreFocus: boolean;
+ modalProps: Record<string, unknown>;
+ }>
+) {
+ switch (action.type) {
+ case openModal.type:
+ return pushModal(
+ state,
+ action.payload.modalType,
+ action.payload.modalProps
+ );
+ case closeModal.type:
+ return popModal(state, action.payload);
+ case COMPOSE_UPLOAD_CHANGE_SUCCESS:
+ return popModal(state, { modalType: 'FOCAL_POINT', ignoreFocus: false });
+ case TIMELINE_DELETE:
+ return state.update('stack', (stack) =>
+ stack.filterNot(
+ // @ts-expect-error TIMELINE_DELETE action is not typed yet.
+ (modal) => modal.get('modalProps').statusId === action.id
+ )
+ );
+ default:
+ return state;
+ }
+}