ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-11-29 11:12:18 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into nt/hive-auth

Browse Source
This commit is contained in:
noumantahir 2024-10-28 20:23:41 +05:00
commit d04aa637df
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/markdownEditor/children/editorToolbar.tsx
View File

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

1
src/components/markdownEditor/view/markdownEditorView.tsx
View File

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

2
src/screens/editor/container/editorContainer.tsx
View File

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

4
src/utils/editor.ts
View File

@ -229,6 +229,7 @@ export const extractMetadata = async ({
videoThumbUrls, videoThumbUrls,
fetchRatios, fetchRatios,
postType, postType,
contentType,
videoPublishMeta, videoPublishMeta,
pollDraft, pollDraft,
}: { }: {
@ -237,6 +238,7 @@ export const extractMetadata = async ({
videoThumbUrls: string[]; videoThumbUrls: string[];
fetchRatios?: boolean; fetchRatios?: boolean;
postType?: PostTypes; postType?: PostTypes;
contentType?: ContentType;
videoPublishMeta?: ThreeSpeakVideo; videoPublishMeta?: ThreeSpeakVideo;
pollDraft?: PollDraft; pollDraft?: PollDraft;
}) => { }) => {
@ -244,7 +246,7 @@ export const extractMetadata = async ({
// const userReg = /(^|\s)(@[a-z][-.a-z\d]+[a-z\d])/gim; // const userReg = /(^|\s)(@[a-z][-.a-z\d]+[a-z\d])/gim;
let out: PostMetadata = { let out: PostMetadata = {
content_type: ContentType.GENERAL, content_type: contentType || ContentType.GENERAL,
}; };
const mUrls = extractUrls(body); const mUrls = extractUrls(body);