Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Rewrite actions/modal and reducers/modal with typescript (#24833)

Browse source
This commit is contained in:
fusagiko / takayamaki 2023-05-25 22:42:37 +09:00 • committed by GitHub
parent 4197b5e4c8
commit 38c6216082
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 503 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/features/ui/components/block_modal.jsx
View file

@ -33,7 +33,10 @@ const mapDispatchToProps = dispatch => {
},
onClose() {
dispatch(closeModal());
dispatch(closeModal({
modalType: undefined,
ignoreFocus: false,
}));
},
};
};

5
app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
View file

@ -23,7 +23,10 @@ const mapStateToProps = (state, { statusId }) => ({
const mapDispatchToProps = dispatch => ({
onClose() {
dispatch(closeModal());
dispatch(closeModal({
modalType: undefined,
ignoreFocus: false,
}));
},
});

13
app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx
View file

@ -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(),
},
}));
},
});

2
app/javascript/mastodon/features/ui/components/header.jsx
View file

@ -26,7 +26,7 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = (dispatch) => ({
openClosedRegistrationsModal() {
dispatch(openModal('CLOSED_REGISTRATIONS'));
dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
},
});

13
app/javascript/mastodon/features/ui/components/link_footer.jsx
View file

@ -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(),
},
}));
},
});

2
app/javascript/mastodon/features/ui/components/modal_root.jsx
View file

@ -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 }),

5
app/javascript/mastodon/features/ui/components/mute_modal.jsx
View file

@ -34,7 +34,10 @@ const mapDispatchToProps = dispatch => {
},
onClose() {
dispatch(closeModal());
dispatch(closeModal({
modalType: undefined,
ignoreFocus: false,
}));
},
onToggleNotifications() {

2
app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
View file

@ -11,7 +11,7 @@ const SignInBanner = () => {
const dispatch = useAppDispatch();
const openClosedRegistrationsModal = useCallback(
() => dispatch(openModal('CLOSED_REGISTRATIONS')),
() => dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' })),
[dispatch],
);