matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'drafts' into fork

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-04-28 15:27:01 +02:00
parent 18b3a73a49 1265f99ef4
commit 231fe8c0f3
22 changed files with 472 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/features/compose/components/compose-form.tsx
View File

@ -1,7 +1,7 @@
import clsx from 'clsx';
import { CLEAR_EDITOR_COMMAND, TextNode, type LexicalEditor, $getRoot } from 'lexical';
import { CLEAR_EDITOR_COMMAND, TextNode, type LexicalEditor } from 'lexical';
import React, { Suspense, useCallback, useEffect, useRef, useState } from 'react';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
import { Link, useHistory } from 'react-router-dom';
import { length } from 'stringz';
@ -86,6 +86,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
is_uploading: isUploading,
schedule: scheduledAt,
group_id: groupId,
text,
} = compose;
const prevSpoiler = usePrevious(spoiler);
@ -102,7 +103,6 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
const editorRef = useRef<LexicalEditor>(null);
const { isDraggedOver } = useDraggedFiles(formRef);
const text = editorRef.current?.getEditorState().read(() => $getRoot().getTextContent()) ?? '';
const fulltext = [spoilerText, countableText(text)].join('');
const isEmpty = !(fulltext.trim() || anyMedia);

5
src/features/compose/editor/plugins/state-plugin.tsx
View File

@ -15,9 +15,10 @@ const StatePlugin: React.FC<IStatePlugin> = ({ composeId }) => {
useEffect(() => {
editor.registerUpdateListener(({ editorState }) => {
const isEmpty = editorState.read(() => $getRoot().getTextContent()) === '';
const text = editorState.read(() => $getRoot().getTextContent());
const isEmpty = text === '';
const data = isEmpty ? null : JSON.stringify(editorState.toJSON());
dispatch(setEditorState(composeId, data));
dispatch(setEditorState(composeId, data, text));
});
}, [editor]);