tiny-markdown-editor 0.2.1 → 0.2.3

package/lib/TinyMDE.d.ts

@@ -42,6 +42,7 @@ export declare class Editor {
     lastCommandState: Record<string, boolean | null> | null;
     private customInlineGrammar;
     private mergedInlineGrammar;
+    private hasFocus;
     listeners: {
         change: EventHandler<ChangeEvent>[];
         selection: EventHandler<SelectionEvent>[];

package/lib/TinyMDE.js

@@ -16,6 +16,7 @@ class Editor {
         this.lastCommandState = null;
         this.customInlineGrammar = {};
         this.mergedInlineGrammar = grammar_1.inlineGrammar;
+        this.hasFocus = true;
         this.listeners = {
             change: [],
             selection: [],
@@ -35,6 +36,7 @@ class Editor {
         this.linkLabels = [];
         this.lineDirty = [];
         this.lastCommandState = null;
+        this.hasFocus = true;
         this.customInlineGrammar = props.customInlineGrammar || {};
         this.mergedInlineGrammar = (0, grammar_1.createMergedInlineGrammar)(this.customInlineGrammar);
         this.listeners = {
@@ -174,7 +176,13 @@ class Editor {
         }
         this.e.addEventListener("input", (e) => this.handleInputEvent(e));
         this.e.addEventListener("compositionend", (e) => this.handleInputEvent(e));
-        document.addEventListener("selectionchange", (e) => this.handleSelectionChangeEvent(e));
+        document.addEventListener("selectionchange", (e) => {
+            if (this.hasFocus) {
+                this.handleSelectionChangeEvent(e);
+            }
+        });
+        this.e.addEventListener("blur", () => this.hasFocus = false);
+        this.e.addEventListener("focus", () => this.hasFocus = true);
         this.e.addEventListener("paste", (e) => this.handlePaste(e));
         this.e.addEventListener("drop", (e) => this.handleDrop(e));
         this.lineElements = this.e.childNodes;
@@ -378,7 +386,7 @@ class Editor {
         }
     }
     getSelection(getAnchor = false) {
-        var _a;
+        var _a, _b;
         const selection = window.getSelection();
         let startNode = getAnchor ? selection.anchorNode : selection.focusNode;
         if (!startNode)
@@ -403,16 +411,25 @@ class Editor {
             node = node.parentElement;
         }
         let row = 0;
-        if (node.dataset &&
-            node.dataset.lineNum &&
-            (!node.previousSibling ||
-                (((_a = node.previousSibling.dataset) === null || _a === void 0 ? void 0 : _a.lineNum) !== node.dataset.lineNum))) {
-            row = parseInt(node.dataset.lineNum);
-        }
-        else {
-            while (node.previousSibling) {
-                row++;
-                node = node.previousSibling;
+        // If the node doesn't have a previous sibling, it must be the first line
+        if (node.previousSibling) {
+            const currentLineNumData = (_a = node.dataset) === null || _a === void 0 ? void 0 : _a.lineNum;
+            const previousLineNumData = (_b = node.previousSibling.dataset) === null || _b === void 0 ? void 0 : _b.lineNum;
+            if (currentLineNumData && previousLineNumData) {
+                const currentLineNum = parseInt(currentLineNumData);
+                const previousLineNum = parseInt(previousLineNumData);
+                if (currentLineNum === previousLineNum + 1) {
+                    row = currentLineNum;
+                }
+                else {
+                    // If the current line is NOT the previous line + 1, then either 
+                    // the current line got split in two or merged with the previous line
+                    // Either way, we need to recalculate the row number
+                    while (node.previousSibling) {
+                        row++;
+                        node = node.previousSibling;
+                    }
+                }
             }
         }
         return { row: row, col: col };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiny-markdown-editor",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "TinyMDE: A tiny, ultra low dependency, embeddable HTML/JavaScript Markdown editor.",
   "main": "lib/index.js",
   "files": [
@@ -15,7 +15,11 @@
     "editor"
   ],
   "scripts": {
-    "test": "npx gulp test",
+    "test": "npx gulp && npx jest",
+    "test:chromium": "npx gulp && npx jest --selectProjects chromium",
+    "test:firefox": "npx gulp && npx jest --selectProjects firefox",
+    "test:webkit": "npx gulp && npx jest --selectProjects webkit",
+    "test:single": "npx gulp test",
     "build": "npx gulp",
     "dev": "npx gulp dev",
     "typecheck": "npx tsc --noEmit",
@@ -44,19 +48,20 @@
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-typescript": "^7.27.1",
     "@octokit/rest": "^22.0.0",
+    "@playwright/test": "^1.54.1",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-typescript": "^12.1.1",
     "@rollup/stream": "^3.0.1",
     "@types/jest": "^29.5.14",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "autoprefixer": "^10.4.21",
     "cssnano": "^7.0.7",
     "del": "^8.0.0",
     "dotenv": "^16.5.0",
     "eslint": "^9.28.0",
-    "@typescript-eslint/eslint-plugin": "^8.20.0",
-    "@typescript-eslint/parser": "^8.20.0",
     "express": "^5.1.0",
     "gulp": "^5.0.1",
     "gulp-babel": "^8.0.0",
@@ -67,9 +72,8 @@
     "gulp-typescript": "^6.0.0-alpha.1",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
-    "jest-puppeteer": "^11.0.0",
+    "playwright": "^1.54.1",
     "postcss-import": "^16.1.0",
-    "puppeteer": "^24.10.0",
     "rollup": "^4.41.1",
     "rollup-plugin-eslint": "^7.0.0",
     "terser": "^5.40.0",