Rich Text Editor (WIP) x3

app/javascript/gabsocial/components/autosuggest_textbox.js

@@ -201,7 +201,7 @@ export default class AutosuggestTextbox extends ImmutablePureComponent {
   }
 
   setTextbox = (c) => {
-    this.textbox = c;
+    this.textbox = c
   }
 
   render() {

app/javascript/gabsocial/components/composer.js

@@ -4,6 +4,7 @@ import {
   CompositeDecorator,
   RichUtils,
   convertToRaw,
+  ContentState,
 } from 'draft-js'
 import draftToMarkdown from '../features/ui/util/draft-to-markdown'
 import { urlRegex } from '../features/ui/util/url_regex'
@@ -27,11 +28,11 @@ function handleStrategy(contentBlock, callback, contentState) {
   findWithRegex(HANDLE_REGEX, contentBlock, callback)
 }
 
-function hashtagStrategy (contentBlock, callback, contentState) {
+function hashtagStrategy(contentBlock, callback, contentState) {
   findWithRegex(HASHTAG_REGEX, contentBlock, callback)
 }
 
-function urlStrategy (contentBlock, callback, contentState) {
+function urlStrategy(contentBlock, callback, contentState) {
   findWithRegex(urlRegex, contentBlock, callback)
 }
 
@@ -70,22 +71,15 @@ const compositeDecorator = new CompositeDecorator([
   }
 ])
 
-const HANDLE_REGEX = /\@[\w]+/g;
-const HASHTAG_REGEX = /\#[\w\u0590-\u05ff]+/g;
+const HANDLE_REGEX = /\@[\w]+/g
+const HASHTAG_REGEX = /\#[\w\u0590-\u05ff]+/g
 
-const mapDispatchToProps = (dispatch) => ({
-
-})
-
-export default
-@connect(null, mapDispatchToProps)
-class Composer extends PureComponent {
+export default class Composer extends PureComponent {
 
   static propTypes = {
     inputRef: PropTypes.func,
     disabled: PropTypes.bool,
     placeholder: PropTypes.string,
-    autoFocus: PropTypes.bool,
     value: PropTypes.string,
     onChange: PropTypes.func,
     onKeyDown: PropTypes.func,
@@ -97,40 +91,35 @@ class Composer extends PureComponent {
   }
 
   state = {
-    markdownText: '',
-    plainText: '',
     editorState: EditorState.createEmpty(compositeDecorator),
-  }
-  
-  static getDerivedStateFromProps(nextProps, prevState) {
-    // if (!nextProps.isHidden && nextProps.isIntersecting && !prevState.fetched) {
-    //   return {
-    //     fetched: true
-    //   }
-    // }
-
-    return null
+    plainText: this.props.value,
   }
 
-  componentDidUpdate (prevProps) {
-    if (prevProps.value !== this.props.value) {
-      // const editorState = EditorState.push(this.state.editorState, ContentState.createFromText(this.props.value));
-      // this.setState({ editorState })
+  componentDidUpdate() {
+    if (this.state.plainText !== this.props.value) {
+      let editorState
+      if (!this.props.value) {
+        editorState = EditorState.createEmpty(compositeDecorator)
+      } else {
+        editorState = EditorState.push(this.state.editorState, ContentState.createFromText(this.props.value))
+      }
+      this.setState({
+        editorState,
+        plainText: this.props.value,
+      })
     }
   }
 
-  // EditorState.createWithContent(ContentState.createFromText('Hello'))
+  onChange = (editorState) => {
+    const content = editorState.getCurrentContent()
+    const plainText = content.getPlainText('\u0001')
 
-  onChange = (editorState, b, c, d) => {
-    this.setState({ editorState })
+    this.setState({ editorState, plainText })
 
-    const content = editorState.getCurrentContent();
-    const text = content.getPlainText('\u0001')
-    
     const selectionState = editorState.getSelection()
     const selectionStart = selectionState.getStartOffset()
 
-    const rawObject = convertToRaw(content);
+    const rawObject = convertToRaw(content)
     const markdownString = draftToMarkdown(rawObject, {
       escapeMarkdownCharacters: false,
       preserveNewlines: false,
@@ -143,24 +132,11 @@ class Composer extends PureComponent {
           inline: ['del', 'ins'],
         }
       }
-    });
+    })
 
-    console.log("text:", markdownString)
-    // console.log("html:", html)
-
-    this.props.onChange(null, text, markdownString, selectionStart)
+    this.props.onChange(null, plainText, markdownString, selectionStart)
   }
 
-  // **bold**
-  // *italic*
-  // __underline__
-  // ~~strike~~
-  // # header
-  // > quote
-  // ```
-  // code
-  // ```
-
   focus = () => {
     this.textbox.editor.focus()
   }
@@ -177,27 +153,24 @@ class Composer extends PureComponent {
     return false
   }
 
-  handleOnTogglePopoutEditor = () => {
-    //
-  }
-
   onTab = (e) => {
     const maxDepth = 4
     this.onChange(RichUtils.onTab(e, this.state.editorState, maxDepth))
   }
 
   setRef = (n) => {
-    this.textbox = n
+    try {
+      this.textbox = n
+      this.props.inputRef(n) 
+    } catch (error) {
+      //
+    }
   }
 
   render() {
     const {
-      inputRef,
       disabled,
       placeholder,
-      autoFocus,
-      value,
-      onChange,
       onKeyDown,
       onKeyUp,
       onFocus,
@@ -217,8 +190,6 @@ class Composer extends PureComponent {
       pt15: !small,
       px15: !small,
       px10: small,
-      pt5: small,
-      pb5: small,
       pb10: !small,
     })
 

app/javascript/gabsocial/components/modal/pro_upgrade_modal.js

@@ -42,6 +42,7 @@ class ProUpgradeModal extends ImmutablePureComponent {
           <Text>• Larger Video and Image Uploads</Text>
           <Text>• Receive the PRO Badge</Text>
           <Text>• Remove in-feed promotions</Text>
+          <Text>• Compose Rich Text posts (Bold, Italic, Underline and more)</Text>
         </div>
 
         <Button

app/javascript/gabsocial/components/rich_text_editor_bar.js

@@ -38,35 +38,35 @@ const RTE_ITEMS = [
   //   icon: 'circle',
   // },
   {
-    label: 'H1',
+    label: 'Title',
     style: 'header-one',
     type: 'block',
     icon: 'text-size',
   },
-  {
-    label: 'Blockquote',
-    style: 'blockquote',
-    type: 'block',
-    icon: 'blockquote',
-  },
-  {
-    label: 'Code Block',
-    style: 'code-block',
-    type: 'block',
-    icon: 'code',
-  },
-  {
-    label: 'UL',
-    style: 'unordered-list-item',
-    type: 'block',
-    icon: 'ul-list',
-  },
-  {
-    label: 'OL',
-    style: 'ordered-list-item',
-    type: 'block',
-    icon: 'ol-list',
-  },
+  // {
+  //   label: 'Blockquote',
+  //   style: 'blockquote',
+  //   type: 'block',
+  //   icon: 'blockquote',
+  // },
+  // {
+  //   label: 'Code Block',
+  //   style: 'code-block',
+  //   type: 'block',
+  //   icon: 'code',
+  // },
+  // {
+  //   label: 'UL',
+  //   style: 'unordered-list-item',
+  //   type: 'block',
+  //   icon: 'ul-list',
+  // },
+  // {
+  //   label: 'OL',
+  //   style: 'ordered-list-item',
+  //   type: 'block',
+  //   icon: 'ol-list',
+  // },
 ]
 
 const mapStateToProps = (state) => {

app/javascript/gabsocial/components/timeline_compose_block.js

@@ -46,7 +46,7 @@ class TimelineComposeBlock extends ImmutablePureComponent {
       return (
         <section className={_s.default}>
           <div className={[_s.default, _s.flexRow].join(' ')}>
-            <ComposeFormContainer {...rest} />
+            <ComposeFormContainer {...rest} modal={modal} />
           </div>
         </section>
       )