From 409431d7e8ad320ee7a05c8d6cdb9789ee4d5be4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 7 Jun 2020 14:57:13 -0500 Subject: [PATCH] Focal Point: make conditional based on BE, fixes #159 --- app/soapbox/features/compose/components/upload.js | 3 ++- app/soapbox/features/compose/containers/upload_container.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/soapbox/features/compose/components/upload.js b/app/soapbox/features/compose/components/upload.js index c0c798890..fcfc5e0db 100644 --- a/app/soapbox/features/compose/components/upload.js +++ b/app/soapbox/features/compose/components/upload.js @@ -27,6 +27,7 @@ class Upload extends ImmutablePureComponent { onDescriptionChange: PropTypes.func.isRequired, onOpenFocalPoint: PropTypes.func.isRequired, onSubmit: PropTypes.func.isRequired, + features: PropTypes.map, }; state = { @@ -102,7 +103,7 @@ class Upload extends ImmutablePureComponent {
- {media.get('type') === 'image' && } + {this.props.features.focalPoint && media.get('type') === 'image' && }
diff --git a/app/soapbox/features/compose/containers/upload_container.js b/app/soapbox/features/compose/containers/upload_container.js index 205d9147c..500a8f2f5 100644 --- a/app/soapbox/features/compose/containers/upload_container.js +++ b/app/soapbox/features/compose/containers/upload_container.js @@ -3,9 +3,11 @@ import Upload from '../components/upload'; import { undoUploadCompose, changeUploadCompose } from '../../../actions/compose'; import { openModal } from '../../../actions/modal'; import { submitCompose } from '../../../actions/compose'; +import { getFeatures } from 'soapbox/utils/features'; const mapStateToProps = (state, { id }) => ({ media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id), + features: getFeatures(state.get('instance')), }); const mapDispatchToProps = dispatch => ({