@kids-reporter/draft-editor 1.0.34 → 1.0.35

package/lib/buttons/annotation.js

@@ -8,6 +8,7 @@ var _draftRenderer = require("@kids-reporter/draft-renderer");
 var _draftJs = require("draft-js");
 var _react = require("react");
 var _annotation = require("../entity-decorators/annotation");
+var _linkTrailingBuffer = require("../utils/link-trailing-buffer");
 var _jsxRuntime = require("react/jsx-runtime");
 const AnnotationButton = props => {
   const toggleEntity = _draftJs.RichUtils.toggleLink;
@@ -35,7 +36,9 @@ const AnnotationButton = props => {
     const newEditorState = _draftJs.EditorState.set(editorStateOfOuterEditor, {
       currentContent: contentStateWithEntity
     });
-    onChange(toggleEntity(newEditorState, newEditorState.getSelection(), entityKey));
+    let next = toggleEntity(newEditorState, newEditorState.getSelection(), entityKey);
+    next = (0, _linkTrailingBuffer.appendLinkCreateTrailingBuffer)(next);
+    onChange(next);
     setToShowInput(false);
     props.onEditFinish();
   };

package/lib/utils/link-trailing-buffer.js

@@ -5,20 +5,31 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.appendLinkCreateTrailingBuffer = appendLinkCreateTrailingBuffer;
 var _draftJs = require("draft-js");
-/** Draft has no zero-length entity; ZWSP gives a neutral tail after a new link. */
+/** Draft has no zero-length entity; ZWSP gives a neutral tail after a new mutable inline span. */
 const LINK_TRAILING_BUFFER = '\u200b';
 
 /**
- * After toggleLink, collapse to range end and insert a zero-width buffer
- * without link entity so IME / typing can continue outside the link span.
+ * After toggleLink (link, annotation, etc.), collapse to range end and insert
+ * a zero-width buffer without inline entity so IME / typing can continue outside the span.
+ * Skips insertion when a ZWSP already sits at the insertion point, or the caret
+ * is after a trailing ZWSP at block end (avoids accumulation on repeat apply).
  */
 function appendLinkCreateTrailingBuffer(editorState) {
   const sel = editorState.getSelection();
+  const endKey = sel.getEndKey();
+  const endOffset = sel.getEndOffset();
+  const block = editorState.getCurrentContent().getBlockForKey(endKey);
+  const text = block.getText();
+  const nextIsZwsp = endOffset < text.length && text.charAt(endOffset) === LINK_TRAILING_BUFFER;
+  const atBlockEndAfterZwsp = endOffset === text.length && endOffset > 0 && text.charAt(endOffset - 1) === LINK_TRAILING_BUFFER;
+  if (nextIsZwsp || atBlockEndAfterZwsp) {
+    return editorState;
+  }
   const collapsed = sel.merge({
-    anchorKey: sel.getEndKey(),
-    anchorOffset: sel.getEndOffset(),
-    focusKey: sel.getEndKey(),
-    focusOffset: sel.getEndOffset(),
+    anchorKey: endKey,
+    anchorOffset: endOffset,
+    focusKey: endKey,
+    focusOffset: endOffset,
     isBackward: false
   });
   const withSelection = _draftJs.EditorState.acceptSelection(editorState, collapsed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kids-reporter/draft-editor",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "",
   "main": "lib/index.js",
   "scripts": {