From fa2afbd629a08eea84d17aa8af8fd6041b976e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sun, 1 Jan 2023 23:01:21 +0100 Subject: [PATCH] wip lexical MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/actions/compose.ts | 5 +- .../components/autosuggest-textarea.tsx | 4 +- .../compose/components/compose-form.tsx | 67 +++-- .../compose/components/markdown-button.tsx | 37 --- app/soapbox/features/compose/editor/index.tsx | 38 ++- app/styles/application.scss | 1 + app/styles/components/compose-form.scss | 244 ------------------ app/styles/components/lexical.scss | 232 +++++++++++++++++ app/styles/ui.scss | 4 + yarn.lock | 142 +++++++++- 10 files changed, 443 insertions(+), 331 deletions(-) delete mode 100644 app/soapbox/features/compose/components/markdown-button.tsx create mode 100644 app/styles/components/lexical.scss diff --git a/app/soapbox/actions/compose.ts b/app/soapbox/actions/compose.ts index 38efc838e..2ac11fc5b 100644 --- a/app/soapbox/actions/compose.ts +++ b/app/soapbox/actions/compose.ts @@ -238,6 +238,7 @@ const submitCompose = (composeId: string, routerHistory?: History, force = false (dispatch: AppDispatch, getState: () => RootState) => { if (!isLoggedIn(getState)) return; const state = getState(); + const { richText } = getFeatures(state.instance); const compose = state.compose.get(composeId)!; @@ -246,6 +247,8 @@ const submitCompose = (composeId: string, routerHistory?: History, force = false const statusId = compose.id; let to = compose.to; + const contentType = richText ? 'text/markdown' : 'text/plain'; + if (!validateSchedule(state, composeId)) { toast.error(messages.scheduleError); return; @@ -284,7 +287,7 @@ const submitCompose = (composeId: string, routerHistory?: History, force = false sensitive: compose.sensitive, spoiler_text: compose.spoiler_text, visibility: compose.privacy, - content_type: compose.content_type, + content_type: contentType, poll: compose.poll, scheduled_at: compose.schedule, to, diff --git a/app/soapbox/components/autosuggest-textarea.tsx b/app/soapbox/components/autosuggest-textarea.tsx index 620f8c88c..e43f49464 100644 --- a/app/soapbox/components/autosuggest-textarea.tsx +++ b/app/soapbox/components/autosuggest-textarea.tsx @@ -235,14 +235,14 @@ class AutosuggestTextarea extends ImmutablePureComponent } return [ -
+