WIP

Author: Betree

components/RichTextEditor.tsx

@@ -28,6 +28,8 @@ type RichTextEditorContainerProps = {
   withStickyToolbar?: boolean;
   /** Version of the editor */
   version: 'default' | 'simplified';
+  /** If true, the image upload button will be displayed - even in simplified mode */
+  imageUploadEnabled?: boolean;
   /** If position is sticky, this prop defines the `top` property. Support responsive arrays */
   toolbarTop?: number | string | number[] | string[];
   /** Useful to compensate the height of the toolbar when editing inline */
@@ -75,6 +77,7 @@ type RichTextEditorProps = RichTextEditorContainerProps & {
   disabled?: boolean;
 
   videoEmbedEnabled?: boolean;
+  imageUploadEnabled?: boolean;
   'data-cy': string;
   /** Called when an image is being uploaded to set a boolean */
   setUploading?: (uploading: boolean) => void;
@@ -179,9 +182,11 @@ const TrixEditorContainer = styled.div<RichTextEditorContainerProps>`
     ${props =>
       props.version === 'simplified' &&
       css({
-        '.trix-button-group--file-tools': {
-          display: 'none',
-        },
+        ...(!props.imageUploadEnabled && {
+          '.trix-button-group--file-tools': {
+            display: 'none',
+          },
+        }),
         '.trix-button-group--block-tools .trix-button:not(.trix-button--icon-number-list):not(.trix-button--icon-bullet-list)':
           {
             display: 'none',
@@ -548,7 +553,7 @@ export default class RichTextEditor extends React.Component<RichTextEditorProps,
       }
 
       return;
-    } else if (this.props.version === 'simplified') {
+    } else if (this.props.version === 'simplified' && !this.props.imageUploadEnabled) {
       // Don't upload files in simplified mode
       attachment.remove();
       return;
@@ -698,6 +703,7 @@ export default class RichTextEditor extends React.Component<RichTextEditorProps,
       showCount,
       maxLength,
       editorMaxHeight,
+      imageUploadEnabled,
     } = this.props;
 
     return !this.state.id ? (
@@ -715,6 +721,7 @@ export default class RichTextEditor extends React.Component<RichTextEditorProps,
         editorMaxHeight={editorMaxHeight}
         withBorders={withBorders}
         version={version}
+        imageUploadEnabled={imageUploadEnabled}
         isDisabled={disabled}
         error={error}
         data-cy={this.props['data-cy']}

components/contribution-flow/ContributionFlowPublicMessage.js

@@ -3,7 +3,7 @@ import { useMutation } from '@apollo/client';
 import { themeGet } from '@styled-system/theme-get';
 import { Field, Form, Formik } from 'formik';
 import { truncate } from 'lodash';
-import { defineMessages, FormattedMessage, injectIntl, useIntl } from 'react-intl';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { styled } from 'styled-components';
 
 import { confettiFireworks } from '../../lib/confettis';
@@ -147,4 +147,4 @@ const ContributionFlowPublicMessage = ({ order, publicMessage }) => {
   );
 };
 
-export default injectIntl(ContributionFlowPublicMessage);
+export default ContributionFlowPublicMessage;