Fixes: Allow BlockInsert on final block (previously didnt work in Prod)

app/components/Editor/components/BlockInsert.js

@@ -22,6 +22,8 @@ function findClosestRootNode(value, ev) {
     if (bounds.top > ev.clientY) return previous;
     previous = { node, element, bounds };
   }
+
+  return previous;
 }
 
 @observer
@@ -100,10 +102,21 @@ export default class BlockInsert extends Component {
         }
       });
 
-      change
-        .collapseToStartOf(this.closestRootNode)
-        .collapseToEndOfPreviousBlock()
-        .insertBlock({ type: 'block-toolbar', isVoid: true });
+      change.collapseToStartOf(this.closestRootNode);
+
+      // if we're on an empty paragraph then just replace it with the block
+      // toolbar. Otherwise insert the toolbar as an extra Node.
+      if (
+        !this.closestRootNode.text &&
+        this.closestRootNode.type === 'paragraph'
+      ) {
+        change.setNodeByKey(this.closestRootNode.key, {
+          type: 'block-toolbar',
+          isVoid: true,
+        });
+      } else {
+        change.insertBlock({ type: 'block-toolbar', isVoid: true });
+      }
     });
   };
 

app/components/Editor/components/ClickablePadding/index.js

@@ -1,3 +0,0 @@
-// @flow
-import ClickablePadding from './ClickablePadding';
-export default ClickablePadding;

app/components/Editor/components/Toolbar/BlockToolbar.js

@@ -72,7 +72,7 @@ class BlockToolbar extends Component {
 
       editor.value.document.nodes.forEach(node => {
         if (node.type === 'block-toolbar') {
-          change.removeNodeByKey(node.key);
+          change.removeNodeByKey(node.key, undefined, { normalize: false });
         }
       });