easy-richtextarea 4.0.15 → 4.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "easy-richtextarea",
   "author": "James Smith",
-  "version": "4.0.15",
+  "version": "4.0.17",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/easy-richtextarea",
   "description": "A textarea element that handles and hands off events well.",

package/src/operation/delete.js

@@ -23,6 +23,24 @@ export default class DeleteOperation {
     return this.position;
   }
 
+  transformContent(content) {
+    let start, end;
+
+    start = 0;
+
+    end = this.position;
+
+    const leftContent = content.substring(start, end),
+          contentLength = this.content.length;
+
+    start = this.position + contentLength;
+
+    const rightContent = content.substring(start),
+          transformedContent = leftContent + rightContent;
+
+    return transformedContent;
+  }
+
   transformOperation(operation) {
     const type = operation.getType();
 
@@ -98,24 +116,6 @@ export default class DeleteOperation {
     }
   }
 
-  transformContent(content) {
-    let start, end;
-
-    start = 0;
-
-    end = this.position;
-
-    const leftContent = content.substring(start, end),
-          contentLength = this.content.length;
-
-    start = this.position + contentLength;
-
-    const rightContent = content.substring(start),
-          transformedContent = leftContent + rightContent;
-
-    return transformedContent;
-  }
-
   transformSelection(selection) {
     let transformedSelection;
 
@@ -138,7 +138,9 @@ export default class DeleteOperation {
 
         transformedSelection = selection.shifted(offset).endPositionShifted(endOffset);
       } else {
-        transformedSelection = selection.emptied();
+        const offset = startPosition - selectionStartPosition;
+
+        transformedSelection = selection.emptied().shifted(offset);
       }
     } else if (selectionEndPosition > endPosition) {
       const endOffset = -contentLength;

package/src/operation/empty.js

@@ -11,6 +11,12 @@ export default class EmptyOperation {
     return this.type;
   }
 
+  transformContent(content) {
+    const transformedContent = content; ///
+
+    return transformedContent;
+  }
+
   transformOperation(operation) {
     return ((tau, rho) => {
 
@@ -19,12 +25,6 @@ export default class EmptyOperation {
     })(operation, this);
   }
 
-  transformContent(content) {
-    const transformedContent = content; ///
-
-    return transformedContent;
-  }
-
   transformSelection(selection) {
     const transformedSelection = selection.clone();
 

package/src/operation/insert.js

@@ -24,6 +24,24 @@ export default class InsertOperation {
     return this.position;
   }
 
+  transformContent(content) {
+    let start,
+         end;
+
+    start = 0;
+
+    end = this.position;
+
+    const leftContent = content.substring(start, end);
+
+    start = this.position;
+
+    const rightContent = content.substring(start),
+          transformedContent = leftContent + this.content + rightContent;
+
+    return transformedContent;
+  }
+
   transformOperation(operation) {
     const type = operation.getType();
 
@@ -81,24 +99,6 @@ export default class InsertOperation {
     }
   }
 
-  transformContent(content) {
-    let start,
-        end;
-
-    start = 0;
-
-    end = this.position;
-
-    const leftContent = content.substring(start, end);
-
-    start = this.position;
-
-    const rightContent = content.substring(start),
-          transformedContent = leftContent + this.content + rightContent;
-
-    return transformedContent;
-  }
-
   transformSelection(selection) {
     let transformedSelection;
 

package/src/richTextarea.js

@@ -245,10 +245,14 @@ export default class RichTextarea extends Element {
     const operation = this.undoBuffer.undo();
 
     if (operation !== null) {
-      const undoable = false;
+      const undoable = false,
+            selection = Selection.fromOperation(operation),
+            setPreviousSelection = false;
 
       this.applyOperation(operation);
 
+      this.setSelection(selection, setPreviousSelection);
+
       this.intermediateHandler(event, element, undoable);
     }
   }
@@ -257,10 +261,14 @@ export default class RichTextarea extends Element {
     const operation = this.undoBuffer.redo();
 
     if (operation !== null) {
-      const undoable = false;
+      const undoable = false,
+            selection = Selection.fromOperation(operation),
+            setPreviousSelection = false;
 
       this.applyOperation(operation);
 
+      this.setSelection(selection, setPreviousSelection);
+
       this.intermediateHandler(event, element, undoable);
     }
   }

package/src/selection.js

@@ -116,6 +116,17 @@ export default class Selection {
     return selection;
   }
 
+  static fromOperation(operation) {
+    const content = operation.getContent(),
+          position = operation.getPosition(),
+          contentLength = content.length,
+          startPosition = position + contentLength,
+          endPosition = startPosition,  ///
+          selection = new Selection(startPosition, endPosition);
+
+    return selection;
+  }
+
   static fromSelection(selection) {
     const startPosition = selection.getStartPosition(),
           endPosition = selection.getEndPosition();
@@ -135,13 +146,6 @@ export default class Selection {
 
   }
 
-  static fromStartPosition(startPosition) {
-    const endPosition = startPosition,  ///
-          selection = new Selection(startPosition, endPosition);
-
-    return selection;
-  }
-
   static fromStartPositionAndEndPosition(startPosition, endPosition) {
     const selection = new Selection(startPosition, endPosition);
 

package/test/operation/delete.js

@@ -2,7 +2,7 @@
 
 const { assert } = require("chai"),
       { arrayUtilities } = require("necessary"),
-      { EmptyOperation, DeleteOperation, InsertOperation } = require("../../lib/browser");  ///
+      { Selection, EmptyOperation, DeleteOperation, InsertOperation } = require("../../lib/browser");  ///
 
 const { first } = arrayUtilities;
 
@@ -270,8 +270,113 @@ describe("DeleteOperation", () => {
     });
   });
 
+  describe("#transformSelection", () => {
+    let deleteOperation;
+
+    beforeEach(() => {
+      const content = "jUb",
+            position = 4;
+
+      deleteOperation = DeleteOperation.fromContentAndPosition(content, position);
+    });
+
+    describe("the selection is to its left", () => {
+      it("leaves the selection intact", () => {
+        const startPosition = 1,
+              endPosition = 2,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = deleteOperation.transformSelection(selection),
+              expectedSelection = selection,
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection overlaps its left", () => {
+      it("trims the selection's right", () => {
+        const startPosition = 1,
+              endPosition = 5,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = deleteOperation.transformSelection(selection),
+              expectedStartPosition = 1,
+              expectedEndPosition = 4,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection overlaps it completely", () => {
+      it("trims the selections's right by its length", () => {
+        const startPosition = 1,
+              endPosition = 10,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = deleteOperation.transformSelection(selection),
+              expectedStartPosition = 1,
+              expectedEndPosition = 7,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection overlaps its right", () => {
+      it("trims the selections's left and moves the selection left by its length", () => {
+        const startPosition = 5,
+              endPosition = 8,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = deleteOperation.transformSelection(selection),
+              expectedStartPosition = 4,
+              expectedEndPosition = 5,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection is completely to its right", () => {
+      it("moves the selection left by its length", () => {
+        const startPosition = 8,
+              endPosition = 10,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = deleteOperation.transformSelection(selection),
+              expectedStartPosition = 5,
+              expectedEndPosition = 7,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection is completely overlapped", () => {
+      it("moves both the selection's start and end points to its left edge", () => {
+        const startPosition = 5,
+              endPosition = 6,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = deleteOperation.transformSelection(selection),
+              expectedStartPosition = 4,
+              expectedEndPosition = 4,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+  });
+
   describe("fromJSON, toJSON", () => {
-    it("transforms from and to JSON, leaving the operation unchanged", () => {
+    it("transforms from and to JSON, leaving the operation intact", () => {
       const expectedJSON = {
 				      "type": "delete",
               "content": "bcd",

package/test/operation/empty.js

@@ -2,7 +2,7 @@
 
 const { assert } = require("chai"),
       { arrayUtilities } = require("necessary"),
-      { EmptyOperation, DeleteOperation, InsertOperation } = require("../../lib/browser");  ///
+      { Selection, EmptyOperation, DeleteOperation, InsertOperation } = require("../../lib/browser");  ///
 
 const { first } = arrayUtilities;
 
@@ -68,8 +68,28 @@ describe("EmptyOperation", () => {
     });
   });
 
+  describe("#transformSelection", () => {
+    let emptyOperation;
+
+    beforeEach(() => {
+      emptyOperation = EmptyOperation.fromNothing();
+    });
+
+    it("leaves the selection intact", () => {
+      const startPosition = 3,
+            endPosition = 6,
+            selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+            transformedSelection = emptyOperation.transformSelection(selection),
+            expectedSelection = selection,  ///
+            transformedSelectionJSON = transformedSelection.toJSON(),
+            expectedSelectionJSON = expectedSelection.toJSON();
+
+      assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+    });
+  });
+
   describe("fromJSON, toJSON", () => {
-    it("transforms from and to JSON, leaving the operation unchanged", () => {
+    it("transforms from and to JSON, leaving the operation intact", () => {
       const expectedJSON = {
               "type": "empty"
             },

package/test/operation/insert.js

@@ -2,7 +2,7 @@
 
 const { assert } = require("chai"),
       { arrayUtilities } = require("necessary"),
-      { EmptyOperation, DeleteOperation, InsertOperation } = require("../../lib/browser");  ///
+      { Selection, EmptyOperation, DeleteOperation, InsertOperation } = require("../../lib/browser");  ///
 
 const { first, second } = arrayUtilities;
 
@@ -202,8 +202,97 @@ describe("InsertOperation", () => {
     });
   });
 
+  describe("#transformSelection", () => {
+    let insertOperation;
+
+    beforeEach(() => {
+      const content = "JHg",
+            position = 4;
+
+      insertOperation = InsertOperation.fromContentAndPosition(content, position);
+    });
+
+    describe("the selection is to its left", () => {
+      it("leaves the selection intact", () => {
+        const startPosition = 1,
+              endPosition = 2,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = insertOperation.transformSelection(selection),
+              expectedSelection = selection,  ///
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection overlaps its left", () => {
+      it("moves the selections's right by its length", () => {
+        const startPosition = 1,
+              endPosition = 5,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = insertOperation.transformSelection(selection),
+              expectedStartPosition = 1,
+              expectedEndPosition = 8,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection overlaps it completely, moves the selections's right by its length", () => {
+      it("the selection overlaps it completely, moves the selections's right by its length", () => {
+        const startPosition = 1,
+              endPosition = 10,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = insertOperation.transformSelection(selection),
+              expectedStartPosition = 1,
+              expectedEndPosition = 13,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection overlaps its right", () => {
+      it("moves the selection right by its length", () => {
+        const startPosition = 5,
+              endPosition = 8,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = insertOperation.transformSelection(selection),
+              expectedStartPosition = 8,
+              expectedEndPosition = 11,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+
+    describe("the selection is completely to its right", () => {
+      it("moves the selection right by its length", () => {
+        const startPosition = 8,
+              endPosition = 10,
+              selection = Selection.fromStartPositionAndEndPosition(startPosition, endPosition),
+              transformedSelection = insertOperation.transformSelection(selection),
+              expectedStartPosition = 11,
+              expectedEndPosition = 13,
+              expectedSelection = Selection.fromStartPositionAndEndPosition(expectedStartPosition, expectedEndPosition),
+              transformedSelectionJSON = transformedSelection.toJSON(),
+              expectedSelectionJSON = expectedSelection.toJSON();
+
+        assert.deepEqual(transformedSelectionJSON, expectedSelectionJSON);
+      });
+    });
+  });
+
   describe("fromJSON, toJSON", () => {
-    it("transforms from and to JSON, leaving the operation unchanged", () => {
+    it("transforms from and to JSON, leaving the operation intact", () => {
       const expectedJSON = {
               "type": "insert",
               "content": "a",