diff --git a/src/app/components/upload-card/UploadCardRenderer.tsx b/src/app/components/upload-card/UploadCardRenderer.tsx index f4020f13..1d068575 100644 --- a/src/app/components/upload-card/UploadCardRenderer.tsx +++ b/src/app/components/upload-card/UploadCardRenderer.tsx @@ -1,5 +1,5 @@ import { ReactNode, useEffect, useState } from 'react'; -import { Box, Chip, Icon, IconButton, Icons, Text, color, config, toRem } from 'folds'; +import { Box, Chip, Icon, IconButton, Icons, Text, Tooltip, color, config, toRem } from 'folds'; import { UploadStatus, UploadSuccess, useBindUploadAtom } from '$state/upload'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { TUploadContent } from '$utils/matrix'; @@ -216,12 +216,31 @@ export function UploadCardRenderer({ )} {isDescribed && ( { - setDesc(fileItem, htmlBio, htmlBio); + value={fileItem.formatted_body || fileItem.body} + onSave={(plainText, htmlContent) => { + setDesc(fileItem, plainText, htmlContent); + setIsDescribed(false); }} /> )} + {!isDescribed && fileItem.body && fileItem.body.length > 0 && ( + + + {fileItem.body} + + + )} } > diff --git a/src/app/components/upload-card/UploadDescriptionEditor.css.tsx b/src/app/components/upload-card/UploadDescriptionEditor.css.tsx index d456b718..04037a7b 100644 --- a/src/app/components/upload-card/UploadDescriptionEditor.css.tsx +++ b/src/app/components/upload-card/UploadDescriptionEditor.css.tsx @@ -1,28 +1,28 @@ import { style, globalStyle } from '@vanilla-extract/css'; import { config } from 'folds'; -export const BioEditorContainer = style({ +export const DescriptionEditorContainer = style({ backgroundColor: 'var(--sable-bg-container)', borderRadius: config.radii.R400, overflow: 'hidden', }); -globalStyle(`${BioEditorContainer} div[class*="EditorTextarea"]`, { +globalStyle(`${DescriptionEditorContainer} div[class*="EditorTextarea"]`, { backgroundColor: 'var(--sable-bg-container) !important', border: 'none !important', }); -globalStyle(`${BioEditorContainer} [class*="Toolbar"]`, { +globalStyle(`${DescriptionEditorContainer} [class*="Toolbar"]`, { backgroundColor: 'var(--sable-bg-container) !important', padding: 'var(--space-S100) !important', borderTop: '1px solid var(--sable-outline-variant) !important', }); -globalStyle(`${BioEditorContainer} [class*="Toolbar"] button`, { +globalStyle(`${DescriptionEditorContainer} [class*="Toolbar"] button`, { backgroundColor: 'transparent !important', boxShadow: 'none !important', }); -globalStyle(`${BioEditorContainer} [class*="Toolbar"] button:hover`, { +globalStyle(`${DescriptionEditorContainer} [class*="Toolbar"] button:hover`, { backgroundColor: 'var(--sable-surface-variant) !important', }); diff --git a/src/app/components/upload-card/UploadDescriptionEditor.tsx b/src/app/components/upload-card/UploadDescriptionEditor.tsx index b702cefd..4893ba38 100644 --- a/src/app/components/upload-card/UploadDescriptionEditor.tsx +++ b/src/app/components/upload-card/UploadDescriptionEditor.tsx @@ -39,14 +39,19 @@ import { EmojiBoard } from '$components/emoji-board'; import { mobileOrTablet } from '$utils/user-agent'; import * as css from './UploadDescriptionEditor.css'; -type BioEditorProps = { +type DescriptionEditorProps = { value?: string | any; isSaving?: boolean; imagePackRooms?: any[]; - onSave: (htmlContent: string) => void; + onSave: (plaintext: string, htmlContent: string) => void; }; -export function DescriptionEditor({ value, isSaving, imagePackRooms, onSave }: BioEditorProps) { +export function DescriptionEditor({ + value, + isSaving, + imagePackRooms, + onSave, +}: DescriptionEditorProps) { const editor = useEditor(); const [enterForNewline] = useSetting(settingsAtom, 'enterForNewline'); const [isMarkdown] = useSetting(settingsAtom, 'isMarkdown'); @@ -54,7 +59,6 @@ export function DescriptionEditor({ value, isSaving, imagePackRooms, onSave }: B const [autocompleteQuery, setAutocompleteQuery] = useState>(); - const [hasChanged, setHasChanged] = useState(false); const prevValue = useRef(value); const initialized = useRef(false); @@ -69,8 +73,7 @@ export function DescriptionEditor({ value, isSaving, imagePackRooms, onSave }: B }) ); - onSave(customHtml || plainText); - setHasChanged(false); + onSave(plainText, customHtml || plainText); }, [editor, isMarkdown, onSave]); useEffect(() => { @@ -109,7 +112,6 @@ export function DescriptionEditor({ value, isSaving, imagePackRooms, onSave }: B Transforms.select(editor, Editor.start(editor, [])); initialized.current = true; - setHasChanged(false); } }, [value, editor, isMarkdown]); @@ -146,12 +148,15 @@ export function DescriptionEditor({ value, isSaving, imagePackRooms, onSave }: B const handleEmoticonSelect = (key: string, shortcode: string) => { editor.insertNode(createEmoticonElement(key, shortcode)); moveCursor(editor); - setHasChanged(true); }; return ( - + {autocompleteQuery?.prefix === AutocompletePrefix.Emoticon && ( - {hasChanged && ( - : undefined - } - > - {isSaving ? 'Saving' : 'Save'} - - )} + : undefined + } + > + {isSaving ? 'Saving' : 'Save'} +