blots-editor 0.0.10 → 0.0.11

package/dist/core/document/document.js

@@ -163,8 +163,19 @@ export class Document {
     /** Set the cursor, clamping out-of-range values (line to `[0, lineCount-1]`, column to end of line). */
     setCursor(line, logical) {
         const l = Math.max(0, Math.min(line, this._lines.length - 1));
-        const len = this._lines[l].text.length;
-        this._cursor = { line: l, logical: Math.max(0, Math.min(logical, len)) };
+        const text = this._lines[l].text;
+        let col = Math.max(0, Math.min(logical, text.length));
+        // The cursor must never sit between the halves of a surrogate pair —
+        // typing there would split the emoji — so snap it to the pair start.
+        if (col > 0 &&
+            col < text.length &&
+            text.charCodeAt(col) >= 0xdc00 &&
+            text.charCodeAt(col) <= 0xdfff &&
+            text.charCodeAt(col - 1) >= 0xd800 &&
+            text.charCodeAt(col - 1) <= 0xdbff) {
+            col--;
+        }
+        this._cursor = { line: l, logical: col };
         // Any cursor movement releases the manual view-scroll lock so the
         // viewport follows the cursor again.
         this._viewScrollTop = null;
@@ -189,13 +200,28 @@ export class Document {
     moveLeft() {
         const { line, logical } = this._cursor;
         if (logical > 0) {
-            this.setCursor(line, logical - 1);
+            let target = logical - 1;
+            // Step over the whole emoji: stopping at its trailing half would
+            // leave the cursor inside the pair.
+            const ch = this._lines[line].text.charCodeAt(target);
+            if (target > 0 && ch >= 0xdc00 && ch <= 0xdfff) {
+                target--;
+            }
+            this.setCursor(line, target);
         }
     }
     moveRight() {
         const { line, logical } = this._cursor;
-        if (logical < this._lines[line].text.length) {
-            this.setCursor(line, logical + 1);
+        const text = this._lines[line].text;
+        if (logical < text.length) {
+            let target = logical + 1;
+            // Step over the whole emoji: stopping at its leading half would
+            // leave the cursor inside the pair.
+            const ch = text.charCodeAt(logical);
+            if (target < text.length && ch >= 0xd800 && ch <= 0xdbff) {
+                target++;
+            }
+            this.setCursor(line, target);
         }
     }
     /** Vertical movement aligns by visual column, so wide-character lines do not drift. */

package/dist/core/document/operations.js

@@ -26,10 +26,15 @@ export class DeleteBeforeOp {
         const { line, logical } = doc.cursor;
         if (logical > 0) {
             const cur = doc.getLine(line);
-            this._deletedChar = cur[logical - 1];
+            // Deleting only the trailing half of a surrogate pair would leave a
+            // broken half-rendering char, so delete the whole code point.
+            const last = cur.charCodeAt(logical - 1);
+            const isTrail = last >= 0xdc00 && last <= 0xdfff && logical >= 2;
+            const units = isTrail ? 2 : 1;
+            this._deletedChar = cur.slice(logical - units, logical);
             this._joined = false;
-            doc.setLine(line, cur.slice(0, logical - 1) + cur.slice(logical));
-            doc.setCursor(line, logical - 1);
+            doc.setLine(line, cur.slice(0, logical - units) + cur.slice(logical));
+            doc.setCursor(line, logical - units);
         }
         else if (line > 0) {
             const prev = doc.getLine(line - 1);
@@ -45,7 +50,7 @@ export class DeleteBeforeOp {
             const { line, logical } = doc.cursor;
             const cur = doc.getLine(line);
             doc.setLine(line, cur.slice(0, logical) + this._deletedChar + cur.slice(logical));
-            doc.setCursor(line, logical + 1);
+            doc.setCursor(line, logical + this._deletedChar.length);
         }
         else {
             // Cursor sits at the end of the merged line; split it back at that point.
@@ -65,9 +70,14 @@ export class DeleteAfterOp {
         const { line, logical } = doc.cursor;
         const cur = doc.getLine(line);
         if (logical < cur.length) {
-            this._deletedChar = cur[logical];
+            // Deleting only the leading half of a surrogate pair would leave a
+            // broken half-rendering char, so delete the whole code point.
+            const first = cur.charCodeAt(logical);
+            const isLead = first >= 0xd800 && first <= 0xdbff && logical + 1 < cur.length;
+            const units = isLead ? 2 : 1;
+            this._deletedChar = cur.slice(logical, logical + units);
             this._joined = false;
-            doc.setLine(line, cur.slice(0, logical) + cur.slice(logical + 1));
+            doc.setLine(line, cur.slice(0, logical) + cur.slice(logical + units));
         }
         else if (line < doc.lineCount - 1) {
             const next = doc.getLine(line + 1);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "blots-editor",
-	"version": "0.0.10",
+	"version": "0.0.11",
 	"description": "A lightweight Markdown editor for the terminal, built on ink-cartridge",
 	"type": "module",
 	"main": "./dist/index.js",