editor: add support to move arrow up and down between text

4 files changed, 119 insertions, 43 deletions

diff --git a/editor/editor.d.ts b/editor/editor.d.ts
index ff1c307..59f02fa 100644
--- a/editor/editor.d.ts
+++ b/editor/editor.d.ts
@@ -15,6 +15,8 @@ export declare class Editor implements IEditor {
     private rangeBegin;
     private rangeEnd;
     private lines;
+    private sel;
+    private range;
     constructor(opts: IEditor);
     OpenFile(path: string): Response;
     SaveFile(node: IVfsNode): Response;
diff --git a/editor/editor.js b/editor/editor.js
index 540b42c..0bf86d6 100644
--- a/editor/editor.js
+++ b/editor/editor.js
@@ -9,6 +9,7 @@ var Editor = /** @class */ (function () {
         this.rangeBegin = 0;
         this.rangeEnd = 0;
         this.lines = [];
+        this.sel = null;
         this.id = opts.id;
         this.is_editable = opts.is_editable;
         this.el = document.getElementById(opts.id);
@@ -17,6 +18,8 @@ var Editor = /** @class */ (function () {
             return;
         }
         this.el.classList.add("wui-editor");
+        this.sel = window.getSelection();
+        this.range = document.createRange();
     }
     Editor.prototype.OpenFile = function (path) {
         var res = {
@@ -48,7 +51,6 @@ var Editor = /** @class */ (function () {
         return res;
     };
     Editor.prototype.insertNewline = function (x) {
-        console.log("enter new line:", x);
         var newline = new EditorLine(x, "", this);
         for (var y = x; y < this.lines.length; y++) {
             this.lines[y].setNumber(y + 2);
@@ -57,26 +59,60 @@ var Editor = /** @class */ (function () {
         this.render();
     };
     Editor.prototype.onClickText = function (text) {
-        if (this.activeText) {
-            this.activeText.contentEditable = "false";
-            this.activeText.style.borderWidth = "0";
-        }
-        text.contentEditable = "true";
-        text.style.borderWidth = "2px";
-        this.activeText = text;
-        text.focus();
+        this.sel = window.getSelection();
     };
     Editor.prototype.onKeydownText = function (x, text, ev) {
-        if (ev.key === "Escape") {
-            text.contentEditable = "false";
-            text.style.borderWidth = "0";
-            this.activeText = null;
-            return false;
-        }
-        if (ev.key === "Enter") {
-            this.insertNewline(x + 1);
-            ev.preventDefault();
-            return false;
+        switch (ev.key) {
+            case "ArrowUp":
+                if (x == 0) {
+                    return false;
+                }
+                if (!this.sel) {
+                    return false;
+                }
+                var elText = this.lines[x - 1].elText;
+                var off = this.sel.focusOffset;
+                if (off > elText.innerText.length) {
+                    off = elText.innerText.length;
+                }
+                if (elText.firstChild) {
+                    this.range.setStart(elText.firstChild, off);
+                }
+                else {
+                    this.range.setStart(elText, off);
+                }
+                this.range.collapse(true);
+                this.sel.removeAllRanges();
+                this.sel.addRange(this.range);
+                ev.preventDefault();
+                break;
+            case "ArrowDown":
+                if (x == this.lines.length - 1) {
+                    return false;
+                }
+                if (!this.sel) {
+                    return false;
+                }
+                elText = this.lines[x + 1].elText;
+                off = this.sel.focusOffset;
+                if (off > elText.innerText.length) {
+                    off = elText.innerText.length;
+                }
+                if (elText.firstChild) {
+                    this.range.setStart(elText.firstChild, off);
+                }
+                else {
+                    this.range.setStart(elText, off);
+                }
+                this.range.collapse(true);
+                this.sel.removeAllRanges();
+                this.sel.addRange(this.range);
+                ev.preventDefault();
+                break;
+            case "Enter":
+                this.insertNewline(x + 1);
+                ev.preventDefault();
+                break;
         }
         return true;
     };
@@ -85,7 +121,6 @@ var Editor = /** @class */ (function () {
     };
     Editor.prototype.onMouseUpAtLine = function (x) {
         this.rangeEnd = x;
-        console.log("range: ", this.rangeBegin, " - ", this.rangeEnd);
         if (this.rangeEnd < this.rangeBegin) {
             return;
         }
@@ -135,6 +170,7 @@ var EditorLine = /** @class */ (function () {
         this.elText = document.createElement("span");
         this.elText.classList.add("wui-line-text");
         this.elText.innerText = text;
+        this.elText.contentEditable = "true";
         this.elText.onclick = function (ev) {
             ed.onClickText(_this.elText);
         };
@@ -149,4 +185,4 @@ var EditorLine = /** @class */ (function () {
     };
     return EditorLine;
 }());
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWRpdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZWRpdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQVVBO0lBVUMsZ0JBQW1CLElBQWE7UUFBYixTQUFJLEdBQUosSUFBSSxDQUFTO1FBTnhCLGVBQVUsR0FBb0IsSUFBSSxDQUFBO1FBQ2xDLGVBQVUsR0FBdUIsSUFBSSxDQUFBO1FBQ3JDLGVBQVUsR0FBVyxDQUFDLENBQUE7UUFDdEIsYUFBUSxHQUFXLENBQUMsQ0FBQTtRQUNwQixVQUFLLEdBQWlCLEVBQUUsQ0FBQTtRQUcvQixJQUFJLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxFQUFFLENBQUE7UUFDakIsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFBO1FBRW5DLElBQUksQ0FBQyxFQUFFLEdBQUcsUUFBUSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDMUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUU7WUFDYixPQUFPLENBQUMsS0FBSyxDQUFDLCtCQUErQixFQUFFLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUN2RCxPQUFNO1NBQ047UUFDRCxJQUFJLENBQUMsRUFBRSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUE7SUFDcEMsQ0FBQztJQUVELHlCQUFRLEdBQVIsVUFBUyxJQUFZO1FBQ3BCLElBQUksR0FBRyxHQUFhO1lBQ25CLElBQUksRUFBRSxHQUFHO1NBQ1QsQ0FBQTtRQUNELElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFO1lBQ2IsT0FBTyxHQUFHLENBQUE7U0FDVjtRQUVELEdBQUcsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUM5QixJQUFJLEdBQUcsQ0FBQyxJQUFJLElBQUksR0FBRyxFQUFFO1lBQ3BCLE9BQU8sR0FBRyxDQUFBO1NBQ1Y7UUFDRCxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRTtZQUNkLE9BQU8sR0FBRyxDQUFBO1NBQ1Y7UUFFRCxJQUFJLENBQUMsVUFBVSxHQUFHLEdBQUcsQ0FBQyxJQUFnQixDQUFBO1FBRXRDLElBQUksT0FBTyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBaUIsQ0FBQTtRQUMvQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDdkMsSUFBSSxLQUFLLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUUvQixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUN0QyxJQUFJLElBQUksR0FBRyxJQUFJLFVBQVUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFBO1lBQzVDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1NBQ3JCO1FBRUQsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFBO1FBRWIsT0FBTyxHQUFHLENBQUE7SUFDWCxDQUFDO0lBRUQseUJBQVEsR0FBUixVQUFTLElBQWM7UUFDdEIsSUFBSSxHQUFHLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDbEMsT0FBTyxHQUFHLENBQUE7SUFDWCxDQUFDO0lBRUQsOEJBQWEsR0FBYixVQUFjLENBQVM7UUFDdEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUNqQyxJQUFJLE9BQU8sR0FBRyxJQUFJLFVBQVUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFBO1FBQ3pDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUMzQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUE7U0FDOUI7UUFDRCxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQ2hDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQTtJQUNkLENBQUM7SUFFRCw0QkFBVyxHQUFYLFVBQVksSUFBaUI7UUFDNUIsSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFO1lBQ3BCLElBQUksQ0FBQyxVQUFVLENBQUMsZUFBZSxHQUFHLE9BQU8sQ0FBQTtZQUN6QyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxXQUFXLEdBQUcsR0FBRyxDQUFBO1NBQ3ZDO1FBQ0QsSUFBSSxDQUFDLGVBQWUsR0FBRyxNQUFNLENBQUE7UUFDN0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFBO1FBQzlCLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFBO1FBQ3RCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUNiLENBQUM7SUFFRCw4QkFBYSxHQUFiLFVBQWMsQ0FBUyxFQUFFLElBQWlCLEVBQUUsRUFBaUI7UUFDNUQsSUFBSSxFQUFFLENBQUMsR0FBRyxLQUFLLFFBQVEsRUFBRTtZQUN4QixJQUFJLENBQUMsZUFBZSxHQUFHLE9BQU8sQ0FBQTtZQUM5QixJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsR0FBRyxHQUFHLENBQUE7WUFDNUIsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUE7WUFDdEIsT0FBTyxLQUFLLENBQUE7U0FDWjtRQUNELElBQUksRUFBRSxDQUFDLEdBQUcsS0FBSyxPQUFPLEVBQUU7WUFDdkIsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUE7WUFDekIsRUFBRSxDQUFDLGNBQWMsRUFBRSxDQUFBO1lBQ25CLE9BQU8sS0FBSyxDQUFBO1NBQ1o7UUFDRCxPQUFPLElBQUksQ0FBQTtJQUNaLENBQUM7SUFFRCxrQ0FBaUIsR0FBakIsVUFBa0IsQ0FBUztRQUMxQixJQUFJLENBQUMsVUFBVSxHQUFHLENBQUMsQ0FBQTtJQUNwQixDQUFDO0lBRUQsZ0NBQWUsR0FBZixVQUFnQixDQUFTO1FBQ3hCLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFBO1FBQ2pCLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM3RCxJQUFJLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLFVBQVUsRUFBRTtZQUNwQyxPQUFNO1NBQ047UUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsRUFBRTtZQUNiLE9BQU07U0FDTjtRQUNELElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNULE9BQU8sQ0FBQyxHQUFHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDaEMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQTtTQUM3QztRQUNELE9BQU8sQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDL0IsSUFBSSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSw4QkFBOEIsQ0FBQyxDQUFBO1NBQ3pFO1FBQ0QsT0FBTyxDQUFDLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ3hDLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUE7U0FDN0M7SUFDRixDQUFDO0lBRUQsdUJBQU0sR0FBTjtRQUNDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFO1lBQ2IsT0FBTTtTQUNOO1FBQ0QsSUFBSSxDQUFDLEVBQUUsQ0FBQyxTQUFTLEdBQUcsRUFBRSxDQUFBO1FBQ3RCLEtBQW1CLFVBQVUsRUFBVixLQUFBLElBQUksQ0FBQyxLQUFLLEVBQVYsY0FBVSxFQUFWLElBQVUsRUFBRTtZQUExQixJQUFNLElBQUksU0FBQTtZQUNkLElBQUksQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtTQUM1QjtJQUNGLENBQUM7SUFDRixhQUFDO0FBQUQsQ0FBQyxBQWpJRCxJQWlJQztBQWpJWSx3QkFBTTtBQW1JbkI7SUFLQyxvQkFBbUIsQ0FBUyxFQUFTLElBQVksRUFBRSxFQUFVO1FBQTdELGlCQTRCQztRQTVCa0IsTUFBQyxHQUFELENBQUMsQ0FBUTtRQUFTLFNBQUksR0FBSixJQUFJLENBQVE7UUFDaEQsSUFBSSxDQUFDLEVBQUUsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3ZDLElBQUksQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFBO1FBRXhDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUM5QyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtRQUM5QyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQTtRQUVwQyxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsR0FBRyxVQUFDLEVBQWM7WUFDMUMsRUFBRSxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3hCLENBQUMsQ0FBQTtRQUNELElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxHQUFHLFVBQUMsRUFBYztZQUN4QyxFQUFFLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3RCLENBQUMsQ0FBQTtRQUVELElBQUksQ0FBQyxNQUFNLEdBQUcsUUFBUSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUM1QyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLENBQUE7UUFDMUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFBO1FBRTVCLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxHQUFHLFVBQUMsRUFBYztZQUNwQyxFQUFFLENBQUMsV0FBVyxDQUFDLEtBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUM1QixDQUFDLENBQUE7UUFDRCxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsR0FBRyxVQUFDLEVBQWlCO1lBQ3pDLE9BQU8sRUFBRSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsS0FBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUM1QyxDQUFDLENBQUE7UUFFRCxJQUFJLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDbEMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2pDLENBQUM7SUFFRCw4QkFBUyxHQUFULFVBQVUsQ0FBUztRQUNsQixJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFBO0lBQ2pDLENBQUM7SUFDRixpQkFBQztBQUFELENBQUMsQUF0Q0QsSUFzQ0MifQ==
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"editor.js","sourceRoot":"","sources":["editor.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/editor/editor.ts b/editor/editor.ts
index f021db0..1d0f7c2 100644
--- a/editor/editor.ts
+++ b/editor/editor.ts
@@ -17,6 +17,8 @@ export class Editor implements IEditor {
 	private rangeBegin: number = 0
 	private rangeEnd: number = 0
 	private lines: EditorLine[] = []
+	private sel: Selection | null = null
+	private range!: Range
 
 	constructor(public opts: IEditor) {
 		this.id = opts.id
@@ -28,6 +30,9 @@ export class Editor implements IEditor {
 			return
 		}
 		this.el.classList.add("wui-editor")
+
+		this.sel = window.getSelection()
+		this.range = document.createRange()
 	}
 
 	OpenFile(path: string): Response {
@@ -68,7 +73,6 @@ export class Editor implements IEditor {
 	}
 
 	insertNewline(x: number) {
-		console.log("enter new line:", x)
 		let newline = new EditorLine(x, "", this)
 		for (let y = x; y < this.lines.length; y++) {
 			this.lines[y].setNumber(y + 2)
@@ -78,27 +82,59 @@ export class Editor implements IEditor {
 	}
 
 	onClickText(text: HTMLElement) {
-		if (this.activeText) {
-			this.activeText.contentEditable = "false"
-			this.activeText.style.borderWidth = "0"
-		}
-		text.contentEditable = "true"
-		text.style.borderWidth = "2px"
-		this.activeText = text
-		text.focus()
+		this.sel = window.getSelection()
 	}
 
 	onKeydownText(x: number, text: HTMLElement, ev: KeyboardEvent) {
-		if (ev.key === "Escape") {
-			text.contentEditable = "false"
-			text.style.borderWidth = "0"
-			this.activeText = null
-			return false
-		}
-		if (ev.key === "Enter") {
-			this.insertNewline(x + 1)
-			ev.preventDefault()
-			return false
+		switch (ev.key) {
+			case "ArrowUp":
+				if (x == 0) {
+					return false
+				}
+				if (!this.sel) {
+					return false
+				}
+				let elText = this.lines[x - 1].elText
+				let off = this.sel.focusOffset
+				if (off > elText.innerText.length) {
+					off = elText.innerText.length
+				}
+				if (elText.firstChild) {
+					this.range.setStart(elText.firstChild, off)
+				} else {
+					this.range.setStart(elText, off)
+				}
+				this.range.collapse(true)
+				this.sel.removeAllRanges()
+				this.sel.addRange(this.range)
+				ev.preventDefault()
+				break
+			case "ArrowDown":
+				if (x == this.lines.length - 1) {
+					return false
+				}
+				if (!this.sel) {
+					return false
+				}
+				elText = this.lines[x + 1].elText
+				off = this.sel.focusOffset
+				if (off > elText.innerText.length) {
+					off = elText.innerText.length
+				}
+				if (elText.firstChild) {
+					this.range.setStart(elText.firstChild, off)
+				} else {
+					this.range.setStart(elText, off)
+				}
+				this.range.collapse(true)
+				this.sel.removeAllRanges()
+				this.sel.addRange(this.range)
+				ev.preventDefault()
+				break
+			case "Enter":
+				this.insertNewline(x + 1)
+				ev.preventDefault()
+				break
 		}
 		return true
 	}
@@ -109,7 +145,6 @@ export class Editor implements IEditor {
 
 	onMouseUpAtLine(x: number) {
 		this.rangeEnd = x
-		console.log("range: ", this.rangeBegin, " - ", this.rangeEnd)
 		if (this.rangeEnd < this.rangeBegin) {
 			return
 		}
@@ -162,10 +197,12 @@ class EditorLine {
 		this.elText = document.createElement("span")
 		this.elText.classList.add("wui-line-text")
 		this.elText.innerText = text
+		this.elText.contentEditable = "true"
 
 		this.elText.onclick = (ev: MouseEvent) => {
 			ed.onClickText(this.elText)
 		}
+
 		this.elText.onkeydown = (ev: KeyboardEvent) => {
 			return ed.onKeydownText(x, this.elText, ev)
 		}
diff --git a/editor/example.html b/editor/example.html
index ac45e60..6688435 100644
--- a/editor/example.html
+++ b/editor/example.html
@@ -35,6 +35,7 @@
 				border-color: lightblue;
 				border-width: 0px;
 				border-style: solid;
+				white-space: pre-wrap;
 			}
 		</style>
 	</head>
@@ -66,10 +67,10 @@
 						path: path,
 						content: `mkdir -p \${HOME}/aur/stackdriver-collectd
 
-git -C \${HOME}/aur/stackdriver-collectd clone \
+git -C \${HOME}/aur/stackdriver-collectd clone \\
 	ssh://aur@aur.archlinux.org/stackdriver-collectd.git .
 
-sh -c "cd \${HOME}/aur/stackdriver-collectd; \
+sh -c "cd \${HOME}/aur/stackdriver-collectd; \\
 	makepkg --force --install --noconfirm"
 pacman -Ql stackdriver-collectd