ponkotsu-md-editor 0.1.32 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20516b4cf7de7bf33b5db048a4a440ac8610cd6beb8c0f1467e4285aff2f5c01
-  data.tar.gz: ffe60497f34d0a334893df718e780dc1185520702050404de42cd58438d7f475
+  metadata.gz: 7eecce4eaa3fa335351b001fa799cce67dd9e4e0af7ec5f0ea71a30faa6aab3b
+  data.tar.gz: a6c888c21cb85a1a9dbc38757549f333488d269fd9e908777056de1eef64eaa4
 SHA512:
-  metadata.gz: 71e0526ff22119d58f15996cfc5eaeda4670efc11d2cba467dcfea8a6ec73799aef89e82112ea8e03c1562142dce004bd13fa1707cc945b430e8cadc93645836
-  data.tar.gz: dcbd053ab758b2f967f9454542a165f35e919f15ce8918a845011f8bae8ff2a153767fe150d52f7ef3d414dc869ce7b4081a9ea11164fbc1bab6890df81d8a34
+  metadata.gz: f2f6e162c7a2a0a9e5824b0d6b629723e47a361a892e31ab86a9ed4178377c1d587fdd5165348cf26a38ab558c35ca7f4ebd79e9d4ede7dd8d04a5083bbf7b69
+  data.tar.gz: 2a8afd5b6c514318d5f2059742aadb5771d40e46d67d1490bc6c7fa4d2f2edb24464995300ddb7960a929b32d6f2fffb0a72c22f4c9924ce1ead5fdb68c2a898

data/app/assets/javascripts/markdown_editor.js

@@ -283,36 +283,71 @@
                     selectedText = textarea.value.substring(start, end);
                 }
 
+                // fullTextの定義をここで行う
+                const fullText = isContentEditable ?
+                    (textarea.innerText || textarea.textContent || '') :
+                    textarea.value;
+
                 // Bold（**）の場合のみ、選択範囲の両端に余分な空白・改行があれば除外
                 if (before === '**' && after === '**' && selectedText.length > 0) {
                     let left = 0;
                     let right = selectedText.length;
-                    // 先頭が「\n 」ならスペース除去
-                    if (selectedText.startsWith('\n ')) {
-                        left += 2;
-                    } else if (selectedText[0] === ' ' && (start > 0 && fullText[start-1] === '\n')) {
-                        left += 1;
+                    // 先頭: 連続する「改行＋スペース」をすべて除去
+                    while (true) {
+                        if (selectedText.startsWith('\n ')) {
+                            left += 2;
+                            selectedText = selectedText.substring(2);
+                        } else if (selectedText.startsWith('\n')) {
+                            left += 1;
+                            selectedText = selectedText.substring(1);
+                        } else if (selectedText.startsWith(' ')) {
+                            // 直前が改行なら除去
+                            if (start + left > 0 && fullText[start + left - 1] === '\n') {
+                                left += 1;
+                                selectedText = selectedText.substring(1);
+                            } else {
+                                break;
+                            }
+                        } else {
+                            break;
+                        }
                     }
-                    // 末尾が「 \n」ならスペース除去
-                    if (selectedText.endsWith(' \n')) {
-                        right -= 2;
-                    } else if (selectedText[selectedText.length-1] === ' ' && (end < fullText.length && fullText[end] === '\n')) {
-                        right -= 1;
+                    // 末尾: 連続する「スペース＋改行」をすべて除去
+                    while (true) {
+                        if (selectedText.endsWith(' \n')) {
+                            right -= 2;
+                            selectedText = selectedText.substring(0, selectedText.length - 2);
+                        } else if (selectedText.endsWith('\n')) {
+                            right -= 1;
+                            selectedText = selectedText.substring(0, selectedText.length - 1);
+                        } else if (selectedText.endsWith(' ')) {
+                            // 直後が改行なら除去
+                            if (end - (selectedText.length - right) < fullText.length && fullText[end - (selectedText.length - right)] === '\n') {
+                                right -= 1;
+                                selectedText = selectedText.substring(0, selectedText.length - 1);
+                            } else {
+                                break;
+                            }
+                        } else {
+                            break;
+                        }
                     }
                     // 既存の両端trimも併用（ただしスペース・改行のみ）
-                    while (left < right && /[\s\n]/.test(selectedText[left])) left++;
-                    while (right > left && /[\s\n]/.test(selectedText[right-1])) right--;
+                    while (left < right && /[\s\n]/.test(selectedText[0])) {
+                        left++;
+                        selectedText = selectedText.substring(1);
+                    }
+                    while (right > left && /[\s\n]/.test(selectedText[selectedText.length-1])) {
+                        right--;
+                        selectedText = selectedText.substring(0, selectedText.length-1);
+                    }
                     if (left !== 0 || right !== selectedText.length) {
                         start += left;
                         end -= (selectedText.length - right);
-                        selectedText = selectedText.substring(left, right);
+                        // selectedTextはすでにtrim済み
                     }
                 }
 
-                const fullText = isContentEditable ?
-                    (textarea.innerText || textarea.textContent || '') :
-                    textarea.value;
-
                 const beforeText = fullText.substring(0, start);
                 const afterText = fullText.substring(end);
                 const newText = before + selectedText + after;

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

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

metadata

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