Fix range collapsing after moving end position inward.

Fixes #34
bwrrp · Jun 23, 2017 · 1959ca7 · 1959ca7
1 parent a3ddaff
commit 1959ca7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "slimdom",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Fast, tiny DOM implementation in pure JS",
   "author": "Stef Busking",
   "license": "MIT",

diff --git a/src/Range.ts b/src/Range.ts
@@ -146,7 +146,7 @@ export default class Range {
 		const rootOfRange = getRootOfRange(this);
 		if (
 			rootOfNode !== rootOfRange ||
-			compareBoundaryPointPositions(node, offset, this.endContainer, this.endOffset) === POSITION_BEFORE
+			compareBoundaryPointPositions(node, offset, this.startContainer, this.startOffset) === POSITION_BEFORE
 		) {
 			this.startContainer = node;
 			this.startOffset = offset;

diff --git a/test/Range.tests.ts b/test/Range.tests.ts
@@ -34,13 +34,23 @@ describe('Range', () => {
 		});
 
 		it('end after start is ok', () => {
+			// Move end forward
 			range.setEnd(element, 1);
 			chai.assert.equal(range.endContainer, element);
 			chai.assert.equal(range.endOffset, 1);
 			chai.assert.equal(range.startContainer, document);
 			chai.assert.equal(range.startOffset, 0);
 			chai.assert.equal(range.collapsed, false);
 			chai.assert.equal(range.commonAncestorContainer, document);
+
+			// Move end back
+			range.setEnd(element, 0);
+			chai.assert.equal(range.endContainer, element);
+			chai.assert.equal(range.endOffset, 0);
+			chai.assert.equal(range.startContainer, document);
+			chai.assert.equal(range.startOffset, 0);
+			chai.assert.equal(range.collapsed, false);
+			chai.assert.equal(range.commonAncestorContainer, document);
 		});
 
 		it('end before start moves start', () => {
@@ -54,6 +64,28 @@ describe('Range', () => {
 			chai.assert.equal(range.commonAncestorContainer, element);
 		});
 
+		it('start before end is ok', () => {
+			range.setEnd(document, 1);
+
+			// Move start forward
+			range.setStart(element, 1);
+			chai.assert.equal(range.startContainer, element);
+			chai.assert.equal(range.startOffset, 1);
+			chai.assert.equal(range.endContainer, document);
+			chai.assert.equal(range.endOffset, 1);
+			chai.assert.equal(range.collapsed, false);
+			chai.assert.equal(range.commonAncestorContainer, document);
+
+			// Move start back
+			range.setStart(element, 0);
+			chai.assert.equal(range.startContainer, element);
+			chai.assert.equal(range.startOffset, 0);
+			chai.assert.equal(range.endContainer, document);
+			chai.assert.equal(range.endOffset, 1);
+			chai.assert.equal(range.collapsed, false);
+			chai.assert.equal(range.commonAncestorContainer, document);
+		});
+
 		it('throws if the container is a doctype', () => {
 			const doctype = document.implementation.createDocumentType('html', '', '');
 			chai.assert.throws(() => range.setStart(doctype, 0), 'InvalidNodeTypeError');