ponkotsu-md-editor 0.2.16 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44c0d57085b26248050128b50dd4e4651198ed4d6805cc40eb4a6db417e20a91
-  data.tar.gz: 7ebe6787dc0b1591c08995be8640f68ad6aaec0e25d1cce0212631db5dc54064
+  metadata.gz: 0cee3f1cda79e611392ecd15c3f373a0e65de3ae4895c875878c47108a265ab8
+  data.tar.gz: 194fb5f55df7e26a535a1209303e0316bc3d107f1635a1ec077782ea77c6b451
 SHA512:
-  metadata.gz: fc5a9675a51a6b64f976a7af0b3b8ef1b273906f48f4ce086353bbe65ee2a7400acd9cf970c66979762511653a36520375ec74693dbe1567a7639c7a4aa94016
-  data.tar.gz: a0c6d1de3b9dd58f7b4e0d3f6e06d8aa2834ff3da5cbdc24a0ad3a1a4e27010e4b12f70a33f881c1e438cc32cd0b5002f09cd5a24bd8abe0d0fe7303c102afe5
+  metadata.gz: 313668a4f9c9d78b212ee0c28413f0854fa1e4656137bb2b6f2397b201e131f3e413536f786daf2c00acba0719108b1c5b4ce296017367fab3c26b30b4431340
+  data.tar.gz: 166ddd5ecd7ad645305069a5c3649e5b949ae82eaacf99eef700a187f8a56c8195f5dbdce668d7897733acb3047d18968a1b3d29dd04d860346a93f4ab60ae58

data/app/assets/javascripts/markdown_editor.js

@@ -1,6 +1,19 @@
 (function() {
     'use strict';
 
+    // Debounce function for delayed execution
+    function debounce(func, wait) {
+        let timeout;
+        return function executedFunction(...args) {
+            const later = () => {
+                clearTimeout(timeout);
+                func(...args);
+            };
+            clearTimeout(timeout);
+            timeout = setTimeout(later, wait);
+        };
+    }
+
     // Safe DOM element retrieval
     function getElement(selector) {
         try {
@@ -23,7 +36,7 @@
                 const syncToHidden = () => {
                     hiddenField.value = (textarea.innerText || '').replaceAll('\u00A0', ' ');
                 };
-                textarea.addEventListener('input', syncToHidden);
+                textarea.addEventListener('input', debounce(syncToHidden, 150));
                 textarea.addEventListener('blur', syncToHidden);
                 // 初期化時にも同期
                 syncToHidden();
@@ -42,7 +55,7 @@
                 updatePlaceholderVisibility();
 
                 // 入力時にプレースホルダの表示/非表示を制御
-                textarea.addEventListener('input', updatePlaceholderVisibility);
+                textarea.addEventListener('input', debounce(updatePlaceholderVisibility, 150));
                 textarea.addEventListener('blur', updatePlaceholderVisibility);
             }
         } else {
@@ -86,20 +99,44 @@
                         beforeEndRange.setEnd(range.endContainer, range.endOffset);
                         let endPos = beforeEndRange.toString().length;
 
-                        // --- 再スキャンで<br>と改行の取りこぼしを防ぐ ---
                         function scanOffset(pos) {
+                            // キャッシュを追加
+                            if (this._scanOffsetCache && this._scanOffsetCache.pos === pos) {
+                                return this._scanOffsetCache.result;
+                            }
+
+                            // HTML全体を一度だけ取得（これは良い改善）
+                            const fullHTML = textarea.innerHTML;
+                            const fullText = textarea.innerText;
+
                             let offset = pos;
                             let lastAdded = -1;
-                            while (true) {
-                                const htmlUpTo = textarea.innerHTML.substring(0, offset);
+                            let iterations = 0;
+                            const MAX_ITERATIONS = 100; // より安全な上限
+
+                            while (iterations < MAX_ITERATIONS) {
+                                const htmlUpTo = fullHTML.substring(0, offset);
+                                const textUpTo = fullText.substring(0, offset);
+
+                                // 元の正規表現を維持（安全性優先）
                                 const brCount = (htmlUpTo.match(/<br\s*\/?>(?![\w\W]*<)/g) || []).length;
-                                const textUpTo = textarea.innerText.substring(0, offset);
                                 const nlCount = (textUpTo.match(/\n/g) || []).length;
+
                                 const added = brCount + nlCount;
                                 if (added === lastAdded) break;
+
                                 offset = pos + added;
                                 lastAdded = added;
+                                iterations++;
+                            }
+
+                            if (iterations >= MAX_ITERATIONS) {
+                                console.warn('scanOffset: Maximum iterations reached, possible infinite loop');
                             }
+
+                            // 結果をキャッシュ
+                            this._scanOffsetCache = { pos: pos, result: offset };
+
                             return offset;
                         }
                         startPos = scanOffset(startPos);
@@ -117,7 +154,7 @@
                     caretPosition.end = textarea.selectionEnd;
                 }
             };
-            textarea.addEventListener('input', saveCaretPosition);
+            textarea.addEventListener('input', debounce(saveCaretPosition, 100));
             textarea.addEventListener('keyup', saveCaretPosition);
             textarea.addEventListener('click', saveCaretPosition);
         }
@@ -692,7 +729,16 @@
             }
         }
 
+        const analyzeHtmlCache = new Map();
+
         function analyzeHtml(target, isCountEmptyDiv = false) {
+
+            const cacheKey = `${target}_${isCountEmptyDiv}`;
+
+            if (analyzeHtmlCache.has(cacheKey)) {
+                return analyzeHtmlCache.get(cacheKey);
+            }
+
             let lines = [];
             let remain = target;
 
@@ -758,6 +804,12 @@
                 }
             }
 
+            if (analyzeHtmlCache.size > 100) {
+                const firstKey = analyzeHtmlCache.keys().next().value;
+                analyzeHtmlCache.delete(firstKey);
+            }
+
+            analyzeHtmlCache.set(cacheKey, lines);
             return lines;
         }
 
@@ -1975,19 +2027,6 @@
             }
         }
 
-        // Debounce function for delayed execution
-        function debounce(func, wait) {
-            let timeout;
-            return function executedFunction(...args) {
-                const later = () => {
-                    clearTimeout(timeout);
-                    func(...args);
-                };
-                clearTimeout(timeout);
-                timeout = setTimeout(later, wait);
-            };
-        }
-
         // Keyboard shortcuts
         if (textarea) {
             textarea.addEventListener('keydown', function(e) {

data/lib/ponkotsu/md/editor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PonkotsuMdEditor
-  VERSION = "0.2.16"
+  VERSION = "0.2.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ponkotsu-md-editor
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.18
 platform: ruby
 authors:
 - dhq_boiler