From 29da7d096499000366db7878c8ad44cb99d69925 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 9 Apr 2019 23:38:52 +0200
Subject: [PATCH] Update the render of textable components

---
 src/dom_components/view/ComponentView.js | 13 ++++++++-----
 src/utils/Sorter.js                      | 15 +++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js
index 74f19e932..3670ed263 100644
--- a/src/dom_components/view/ComponentView.js
+++ b/src/dom_components/view/ComponentView.js
@@ -236,11 +236,14 @@ module.exports = Backbone.View.extend({
   updateAttributes() {
     const attrs = [];
     const { model, $el, el } = this;
-    const defaultAttr = { 'data-gjs-type': model.get('type') || 'default' };
-
-    if (model.get('highlightable')) {
-      defaultAttr['data-highlightable'] = 1;
-    }
+    const defaultAttr = {
+      'data-gjs-type': model.get('type') || 'default',
+      ...(model.get('highlightable') && { 'data-highlightable': 1 }),
+      ...(model.get('textable') && {
+        contenteditable: 'false',
+        'data-gjs-textable': 'true'
+      })
+    };
 
     // Remove all current attributes
     each(el.attributes, attr => attrs.push(attr.nodeName));
diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js
index 6b138fc54..bfda067e9 100644
--- a/src/utils/Sorter.js
+++ b/src/utils/Sorter.js
@@ -98,14 +98,13 @@ module.exports = Backbone.View.extend({
   },
 
   updateTextViewCursorPosition(e) {
-    const { em } = this;
-    const Canvas = em.get('Canvas');
+    const Canvas = this.em.get('Canvas');
     const targetDoc = Canvas.getDocument();
-    const poiner = getPointerEvent(e);
     let range = null;
 
     if (targetDoc.caretRangeFromPoint) {
       // Chrome
+      const poiner = getPointerEvent(e);
       range = targetDoc.caretRangeFromPoint(poiner.clientX, poiner.clientY);
     } else if (e.rangeParent) {
       // Firefox
@@ -116,7 +115,7 @@ module.exports = Backbone.View.extend({
     const sel = Canvas.getWindow().getSelection();
     Canvas.getFrameEl().focus();
     sel.removeAllRanges();
-    sel.addRange(range);
+    range && sel.addRange(range);
   },
 
   setContentEditable(model, mode) {
@@ -1073,14 +1072,6 @@ module.exports = Backbone.View.extend({
         model.getView().render();
         modelEl.setAttribute('data-gjs-textable', 'true');
         const { outerHTML } = modelEl;
-        console.log(
-          'model.toHTML()',
-          model.toHTML(),
-          'model',
-          model,
-          'outerHTML',
-          outerHTML
-        );
         activeRte.insertHTML && activeRte.insertHTML(outerHTML);
       } else {
         created = targetCollection.add(modelToDrop, opts);