Lexical: Make Lexical editor optional

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

app/soapbox/actions/settings.ts

@@ -48,6 +48,7 @@ const defaultSettings = ImmutableMap({
 
   systemFont: false,
   demetricator: false,
+  wysiwyg: false,
 
   isDeveloper: false,
 

app/soapbox/components/autosuggest-textarea.tsx

@@ -237,7 +237,7 @@ class AutosuggestTextarea extends ImmutablePureComponent<IAutosuggesteTextarea>
     }
 
     return [
-      <div className='hidden' key='textarea'>
+      <div key='textarea'>
         <div className='relative'>
           <label>
             <span style={{ display: 'none' }}>{placeholder}</span>

app/soapbox/features/compose/components/compose-form.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { defineMessages, FormattedMessage, useIntl, type MessageDescriptor } from 'react-intl';
 import { Link, useHistory } from 'react-router-dom';
 import { length } from 'stringz';
 
@@ -17,7 +17,7 @@ import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest
 import AutosuggestTextarea from 'soapbox/components/autosuggest-textarea';
 import { Button, HStack, Stack } from 'soapbox/components/ui';
 import EmojiPickerDropdown from 'soapbox/features/emoji/containers/emoji-picker-dropdown-container';
-import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles, useFeatures, useInstance, usePrevious } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles, useFeatures, useInstance, usePrevious, useSettings } from 'soapbox/hooks';
 import { isMobile } from 'soapbox/is-mobile';
 
 import QuotedStatusContainer from '../containers/quoted-status-container';
@@ -28,6 +28,7 @@ import WarningContainer from '../containers/warning-container';
 import ComposeEditor from '../editor';
 import { countableText } from '../util/counter';
 
+import MarkdownButton from './markdown-button';
 import PollButton from './poll-button';
 import PollForm from './polls/poll-form';
 import PrivacyDropdown from './privacy-dropdown';
@@ -46,7 +47,9 @@ import type { Emoji } from 'soapbox/features/emoji';
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
 const messages = defineMessages({
-  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here (optional)' },
+  placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What\'s on your mind?' },
+  pollPlaceholder: { id: 'compose_form.poll_placeholder', defaultMessage: 'Add a poll topic…' },
+  eventPlaceholder: { id: 'compose_form.event_placeholder', defaultMessage: 'Post to this event' },
   publish: { id: 'compose_form.publish', defaultMessage: 'Post' },
   publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
   message: { id: 'compose_form.message', defaultMessage: 'Message' },
@@ -72,11 +75,14 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
 
   const compose = useCompose(id);
   const showSearch = useAppSelector((state) => state.search.submitted && !state.search.hidden);
+  const isModalOpen = useAppSelector((state) => !!(state.modals.size && state.modals.last()!.modalType === 'COMPOSE'));
   const maxTootChars = configuration.getIn(['statuses', 'max_characters']) as number;
   const scheduledStatusCount = useAppSelector((state) => state.scheduled_statuses.size);
   const features = useFeatures();
 
-  const { spoiler, spoiler_text: spoilerText, privacy, focusDate, caretPosition, is_submitting: isSubmitting, is_changing_upload: isChangingUpload, is_uploading: isUploading, schedule: scheduledAt, group_id: groupId } = compose;
+  const wysiwygEditor = useSettings().get('wysiwyg');
+
+  const { text: composeText, suggestions, spoiler, spoiler_text: spoilerText, privacy, focusDate, caretPosition, is_submitting: isSubmitting, is_changing_upload: isChangingUpload, is_uploading: isUploading, schedule: scheduledAt, group_id: groupId } = compose;
   const prevSpoiler = usePrevious(spoiler);
 
   const hasPoll = !!compose.poll;
@@ -89,10 +95,21 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
   const spoilerTextRef = useRef<AutosuggestInput>(null);
   const autosuggestTextareaRef = useRef<AutosuggestTextarea>(null);
   const editorStateRef = useRef<string>(null);
-  const text = editorStateRef.current || '';
+  const text = wysiwygEditor ? editorStateRef.current || '' : composeText;
 
   const { isDraggedOver } = useDraggedFiles(formRef);
 
+  const handleChange: React.ChangeEventHandler<HTMLTextAreaElement> = (e) => {
+    dispatch(changeCompose(id, e.target.value));
+  };
+
+  const handleKeyDown: React.KeyboardEventHandler = (e) => {
+    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
+      handleSubmit();
+      e.preventDefault(); // Prevent bubbling to other ComposeForm instances
+    }
+  };
+
   const getClickableArea = () => {
     return clickableAreaRef ? clickableAreaRef.current : formRef.current;
   };
@@ -127,7 +144,15 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
   };
 
   const handleSubmit = (e?: React.FormEvent<Element>) => {
+    if (wysiwygEditor) {
       dispatch(changeCompose(id, editorStateRef.current!));
+    } else {
+      if (text !== autosuggestTextareaRef.current?.textarea?.value) {
+        // Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
+        // Update the state to match the current text
+        dispatch(changeCompose(id, autosuggestTextareaRef.current!.textarea!.value));
+      }
+    }
 
     // Submit disabled:
     const fulltext = [spoilerText, countableText(text)].join('');
@@ -151,6 +176,10 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
     dispatch(fetchComposeSuggestions(id, token as string));
   };
 
+  const onSuggestionSelected = (tokenStart: number, token: string | null, value: string | undefined) => {
+    if (value) dispatch(selectComposeSuggestion(id, tokenStart, token, value, ['text']));
+  };
+
   const onSpoilerSuggestionSelected = (tokenStart: number, token: string | null, value: AutoSuggestion) => {
     dispatch(selectComposeSuggestion(id, tokenStart, token, value, ['spoiler_text']));
   };
@@ -214,6 +243,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
       {features.privacyScopes && !group && !groupId && <PrivacyDropdown composeId={id} />}
       {features.scheduledStatuses && <ScheduleButton composeId={id} />}
       {features.spoilers && <SpoilerButton composeId={id} />}
+      {!wysiwygEditor && features.richText && <MarkdownButton composeId={id} />}
     </HStack>
   ), [features, id]);
 
@@ -223,8 +253,27 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
   const disabledButton = disabled || isUploading || isChangingUpload || length(countedText) > maxTootChars || (countedText.length !== 0 && countedText.trim().length === 0 && !anyMedia);
   const shouldAutoFocus = autoFocus && !showSearch && !isMobile(window.innerWidth);
 
+  const composeModifiers = !condensed && (
+    <Stack space={4} className='compose-form__modifiers'>
+      <UploadForm composeId={id} />
+      <PollForm composeId={id} />
+
+      <SpoilerInput
+        composeId={id}
+        onSuggestionsFetchRequested={onSuggestionsFetchRequested}
+        onSuggestionsClearRequested={onSuggestionsClearRequested}
+        onSuggestionSelected={onSpoilerSuggestionSelected}
+        ref={spoilerTextRef}
+      />
+
+      <ScheduleFormContainer composeId={id} />
+    </Stack>
+  );
+
   let publishText: string | JSX.Element = '';
   let publishIcon: string | undefined = undefined;
+  let textareaPlaceholder: MessageDescriptor;
+
 
   if (isEditing) {
     publishText = intl.formatMessage(messages.saveChanges);
@@ -242,6 +291,15 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
     publishText = intl.formatMessage(messages.schedule);
   }
 
+  if (event) {
+    textareaPlaceholder = messages.eventPlaceholder;
+  } else if (hasPoll) {
+    textareaPlaceholder = messages.pollPlaceholder;
+  } else {
+    textareaPlaceholder = messages.placeholder;
+  }
+
+
   return (
     <Stack className='w-full' space={4} ref={formRef} onClick={handleClick} element='form' onSubmit={handleSubmit}>
       {scheduledStatusCount > 0 && !event && !group && (
@@ -271,6 +329,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
 
       {!shouldCondense && !event && !group && <ReplyMentions composeId={id} />}
 
+      {wysiwygEditor ? (
         <div>
           <ComposeEditor
             ref={editorStateRef}
@@ -284,23 +343,29 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
             onFocus={handleComposeFocus}
             onPaste={onPaste}
           />
-        {!condensed && (
-          <Stack space={4} className='compose-form__modifiers'>
-            <UploadForm composeId={id} />
-            <PollForm composeId={id} />
-
-            <SpoilerInput
-              composeId={id}
+          {composeModifiers}
+        </div>
+      ) : (
+        <AutosuggestTextarea
+          ref={(isModalOpen && shouldCondense) ? undefined : autosuggestTextareaRef}
+          placeholder={intl.formatMessage(textareaPlaceholder)}
+          disabled={disabled}
+          value={text}
+          onChange={handleChange}
+          suggestions={suggestions}
+          onKeyDown={handleKeyDown}
+          onFocus={handleComposeFocus}
           onSuggestionsFetchRequested={onSuggestionsFetchRequested}
           onSuggestionsClearRequested={onSuggestionsClearRequested}
-              onSuggestionSelected={onSpoilerSuggestionSelected}
-              ref={spoilerTextRef}
-            />
-
-            <ScheduleFormContainer composeId={id} />
-          </Stack>
+          onSuggestionSelected={onSuggestionSelected}
+          onPaste={onPaste}
+          autoFocus={shouldAutoFocus}
+          condensed={condensed}
+          id='compose-textarea'
+        >
+          {composeModifiers}
+        </AutosuggestTextarea>
       )}
-      </div>
 
       <QuotedStatusContainer composeId={id} />
 

app/soapbox/features/compose/components/markdown-button.tsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+
+import { changeComposeContentType } from 'soapbox/actions/compose';
+import { useAppDispatch, useCompose } from 'soapbox/hooks';
+
+import ComposeFormButton from './compose-form-button';
+
+const messages = defineMessages({
+  marked: { id: 'compose_form.markdown.marked', defaultMessage: 'Post markdown enabled' },
+  unmarked: { id: 'compose_form.markdown.unmarked', defaultMessage: 'Post markdown disabled' },
+});
+
+interface IMarkdownButton {
+  composeId: string
+}
+
+const MarkdownButton: React.FC<IMarkdownButton> = ({ composeId }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const active = useCompose(composeId).content_type === 'text/markdown';
+
+  const onClick = () => dispatch(changeComposeContentType(composeId, active ? 'text/plain' : 'text/markdown'));
+
+  return (
+    <ComposeFormButton
+      icon={require('@tabler/icons/markdown.svg')}
+      title={intl.formatMessage(active ? messages.marked : messages.unmarked)}
+      active={active}
+      onClick={onClick}
+    />
+  );
+
+};
+
+export default MarkdownButton;

app/soapbox/features/developers/settings-store.tsx

@@ -140,6 +140,12 @@ const SettingsStore: React.FC = () => {
         >
           <SettingToggle settings={settings} settingPath={['demetricator']} onChange={onToggleChange} />
         </ListItem>
+
+        <ListItem
+          label={<FormattedMessage id='preferences.fields.wysiwyg_label' defaultMessage='Use WYSIWYG editor' />}
+        >
+          <SettingToggle settings={settings} settingPath={['wysiwyg']} onChange={onToggleChange} />
+        </ListItem>
       </List>
     </Column>
   );

app/soapbox/schemas/soapbox/settings.ts

@@ -28,6 +28,7 @@ const settingsSchema = z.object({
   autoloadMore: z.boolean().catch(true),
   systemFont: z.boolean().catch(false),
   demetricator: z.boolean().catch(false),
+  wysiwyg: z.boolean().catch(false),
   isDeveloper: z.boolean().catch(false),
 });