Merge pull request #2936 from ecency/nt/preserving-poll

Nt/preserving poll

Author: feruzm

src/components/markdownEditor/children/editorToolbar.tsx

@@ -30,6 +30,7 @@ type Props = {
   paramFiles: any[];
   isEditing: boolean;
   isPreviewActive: boolean;
+  isEditMode: boolean;
   setIsUploading: (isUploading: boolean) => void;
   handleMediaInsert: (data: MediaInsertData[]) => void;
   handleOnAddLinkPress: () => void;
@@ -44,6 +45,7 @@ export const EditorToolbar = ({
   paramFiles,
   isEditing,
   isPreviewActive,
+  isEditMode,
   setIsUploading,
   handleMediaInsert,
   handleOnAddLinkPress,
@@ -284,14 +286,16 @@ export const EditorToolbar = ({
               name="text-short"
             />
 
-            <IconButton
-              size={18}
-              style={[styles.rightIcons, !!pollDraft?.title && styles.iconBottomBar]}
-              iconStyle={styles.icon}
-              iconType="SimpleLineIcons"
-              name="chart"
-              onPress={_showPollsExtension}
-            />
+            {!isEditMode && (
+              <IconButton
+                size={18}
+                style={[styles.rightIcons, !!pollDraft?.title && styles.iconBottomBar]}
+                iconStyle={styles.icon}
+                iconType="SimpleLineIcons"
+                name="chart"
+                onPress={_showPollsExtension}
+              />
+            )}
 
             <IconButton
               onPress={_showImageUploads}

src/components/markdownEditor/view/markdownEditorView.tsx

@@ -447,6 +447,7 @@ const MarkdownEditorView = ({
           postBody={bodyTextRef.current}
           isPreviewActive={isPreviewActive}
           paramFiles={paramFiles}
+          isEditMode={isEdit}
           setIsUploading={setIsUploading}
           handleMediaInsert={_handleMediaInsert}
           handleOnAddLinkPress={_handleOnAddLinkPress}

src/screens/editor/container/editorContainer.tsx

@@ -961,6 +961,8 @@ class EditorContainer extends Component<EditorContainerProps, any> {
         videoThumbUrls: speakContentBuilder.thumbUrlsRef.current,
         thumbUrl,
         fetchRatios: true,
+        postType: jsonMetadata.type,
+        contentType: jsonMetadata.content_type,
       });
 
       let jsonMeta = {};

src/utils/editor.ts

@@ -229,6 +229,7 @@ export const extractMetadata = async ({
   videoThumbUrls,
   fetchRatios,
   postType,
+  contentType,
   videoPublishMeta,
   pollDraft,
 }: {
@@ -237,14 +238,15 @@ export const extractMetadata = async ({
   videoThumbUrls: string[];
   fetchRatios?: boolean;
   postType?: PostTypes;
+  contentType?: ContentType;
   videoPublishMeta?: ThreeSpeakVideo;
   pollDraft?: PollDraft;
 }) => {
   // NOTE: keepting regex to extract usernames as reference for later usage if any
   // const userReg = /(^|\s)(@[a-z][-.a-z\d]+[a-z\d])/gim;
 
   let out: PostMetadata = {
-    content_type: ContentType.GENERAL,
+    content_type: contentType || ContentType.GENERAL,
   };
 
   const mUrls = extractUrls(body);