From f9212446614f52ab402d8b6030ce0e58f99c54e3 Mon Sep 17 00:00:00 2001
From: Marco Bomfim <marcoabomfim3@gmail.com>
Date: Wed, 6 Nov 2019 16:24:48 -0300
Subject: [PATCH 1/2] fix(editor): Fix hashtags not working after embeded
 content

Up to this point, once you've inserted a given URL to the editor, and it renders a new embeded content, if you hit Return, and try using a tag, or mention, it would not work since the paragraph was never closed, causing a sintatic error that rendered the mentions unable to be used unless you explicitly hit return again, to escape the given text block you were in. See the PR/Issue for further info.
---
 .../Editor/defaultExtensions.spec.js          | 28 ++++++++-----------
 webapp/components/Editor/nodes/Embed.js       |  4 +--
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/webapp/components/Editor/defaultExtensions.spec.js b/webapp/components/Editor/defaultExtensions.spec.js
index 78924db55..55cb861d8 100644
--- a/webapp/components/Editor/defaultExtensions.spec.js
+++ b/webapp/components/Editor/defaultExtensions.spec.js
@@ -63,30 +63,26 @@ describe('defaultExtensions', () => {
     it('recognizes embed code', () => {
       const editor = createEditor()
       const expected = {
+        type: 'doc',
         content: [
           {
+            type: 'paragraph',
             content: [
               {
                 text: 'Baby loves cat:',
-                type: 'text',
-              },
-            ],
-            type: 'paragraph',
+                type: 'text'
+              }
+            ]
           },
           {
-            content: [
-              {
-                attrs: {
-                  dataEmbedUrl: 'https://www.youtube.com/watch?v=qkdXAtO40Fo',
-                },
-                type: 'embed',
-              },
-            ],
-            type: 'paragraph',
-          },
-        ],
-        type: 'doc',
+            type: 'embed',
+            attrs: {
+              dataEmbedUrl: 'https://www.youtube.com/watch?v=qkdXAtO40Fo'
+            }
+          }
+        ]
       }
+
       expect(editor.getJSON()).toEqual(expected)
     })
   })
diff --git a/webapp/components/Editor/nodes/Embed.js b/webapp/components/Editor/nodes/Embed.js
index 0d7a82a18..e84b717e2 100644
--- a/webapp/components/Editor/nodes/Embed.js
+++ b/webapp/components/Editor/nodes/Embed.js
@@ -38,8 +38,8 @@ export default class Embed extends Node {
           default: null,
         },
       },
-      group: 'inline',
-      inline: true,
+      group: 'block',
+      inline: false,
       parseDOM: [
         {
           tag: 'a[href].embed',

From 9b9b72d528b4e2595280ac17fcec3b7fd1b66276 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 15 Nov 2019 00:22:00 +0100
Subject: [PATCH 2/2] Fix lint

---
 webapp/components/Editor/defaultExtensions.spec.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/webapp/components/Editor/defaultExtensions.spec.js b/webapp/components/Editor/defaultExtensions.spec.js
index 55cb861d8..13f8cb0f3 100644
--- a/webapp/components/Editor/defaultExtensions.spec.js
+++ b/webapp/components/Editor/defaultExtensions.spec.js
@@ -70,17 +70,17 @@ describe('defaultExtensions', () => {
             content: [
               {
                 text: 'Baby loves cat:',
-                type: 'text'
-              }
-            ]
+                type: 'text',
+              },
+            ],
           },
           {
             type: 'embed',
             attrs: {
-              dataEmbedUrl: 'https://www.youtube.com/watch?v=qkdXAtO40Fo'
-            }
-          }
-        ]
+              dataEmbedUrl: 'https://www.youtube.com/watch?v=qkdXAtO40Fo',
+            },
+          },
+        ],
       }
 
       expect(editor.getJSON()).toEqual(expected)