mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix confirmation when closing media edition modal with unsaved changes (#26342)

pull/2363/head
Claire 2023-08-04 15:48:29 +02:00 committed by GitHub
parent 93372fee1e
commit b59053ff8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
View File

@ -434,4 +434,4 @@ class FocalPointModal extends ImmutablePureComponent {
export default connect(mapStateToProps, mapDispatchToProps, null, { export default connect(mapStateToProps, mapDispatchToProps, null, {
forwardRef: true, forwardRef: true,
})(injectIntl(FocalPointModal, { withRef: true })); })(injectIntl(FocalPointModal, { forwardRef: true }));

9
app/javascript/mastodon/features/ui/components/modal_root.jsx
View File

@ -97,14 +97,7 @@ export default class ModalRoot extends PureComponent {
handleClose = (ignoreFocus = false) => { handleClose = (ignoreFocus = false) => {
const { onClose } = this.props; const { onClose } = this.props;
let message = null; const message = this._modal?.getCloseConfirmationMessage?.();
try {
message = this._modal?.getWrappedInstance?.().getCloseConfirmationMessage?.();
} catch (_) {
// injectIntl defines `getWrappedInstance` but errors out if `withRef`
// isn't set.
// This would be much smoother with react-intl 3+ and `forwardRef`.
}
onClose(message, ignoreFocus); onClose(message, ignoreFocus);
}; };