ponkotsu-md-editor 0.2.12 → 0.2.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5fe84b9fe54e8791ee3cfb0f3096fdd9566208bd265fd0d093be065ff39165ed
4
- data.tar.gz: ce88ee2432c913c87714b25bc3c8c2b6431075cecf8a044fa5f6edcce7b27ffb
3
+ metadata.gz: 8078da6365f13a76b0111c70a7776fe9565481372d78194160c0c6cea5cd19aa
4
+ data.tar.gz: d656943a6c65aaad77b92f937bebd45523c8d83e842a414a1278a03e35df02dd
5
5
  SHA512:
6
- metadata.gz: 23d476191b01b111ee339f8cca4ca877280f0d08ef1b7205271417b01e205ffba975a99b773ccb8a87771a972ab39b0238698a7db6f3816cf6b512931d8a0bf1
7
- data.tar.gz: 10c1d71b98464e97333d2fe90aecaab06713d30132885d6287616d83e5ecf03b878c1967a6f9c49b660f8e789414b40b37a535aed694f3ea51ec97c257dce1a7
6
+ metadata.gz: 32a273187dad0b38054f345996c67859e77d28ecf76f0a0c2d37711290fa24ad111962bba5d012d2e537f82139f4784a2163de281a613ee069bfe12624d3cb0d
7
+ data.tar.gz: 6c4e545743465d120dd428965a15283f8586367618c37c604bd00cf9001eff624f55786f4fc1bb9876737d6d728dda27d9226d17d372c1fd84a750dbd741537a
@@ -79,12 +79,26 @@
79
79
  const beforeStartRange = document.createRange();
80
80
  beforeStartRange.selectNodeContents(textarea);
81
81
  beforeStartRange.setEnd(range.startContainer, range.startOffset);
82
- const startPos = beforeStartRange.toString().length;
82
+ let startPos = beforeStartRange.toString().length;
83
83
  // end位置
84
84
  const beforeEndRange = document.createRange();
85
85
  beforeEndRange.selectNodeContents(textarea);
86
86
  beforeEndRange.setEnd(range.endContainer, range.endOffset);
87
- const endPos = beforeEndRange.toString().length;
87
+ let endPos = beforeEndRange.toString().length;
88
+
89
+ // <br>タグと改行(\n)の数をstart/endそれぞれでカウント
90
+ const htmlUpToStart = textarea.innerHTML.substring(0, startPos);
91
+ const brCountStart = (htmlUpToStart.match(/<br\s*\/?>(?![\w\W]*<)/g) || []).length;
92
+ const textUpToStart = textarea.innerText.substring(0, startPos);
93
+ const nlCountStart = (textUpToStart.match(/\n/g) || []).length;
94
+ startPos += brCountStart + nlCountStart;
95
+
96
+ const htmlUpToEnd = textarea.innerHTML.substring(0, endPos);
97
+ const brCountEnd = (htmlUpToEnd.match(/<br\s*\/?>(?![\w\W]*<)/g) || []).length;
98
+ const textUpToEnd = textarea.innerText.substring(0, endPos);
99
+ const nlCountEnd = (textUpToEnd.match(/\n/g) || []).length;
100
+ endPos += brCountEnd + nlCountEnd;
101
+
88
102
  caretPosition.start = startPos;
89
103
  caretPosition.end = endPos;
90
104
  } else {
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module PonkotsuMdEditor
4
- VERSION = "0.2.12"
4
+ VERSION = "0.2.13"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ponkotsu-md-editor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.12
4
+ version: 0.2.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - dhq_boiler