@ai-matrx/rich-editor 0.2.10 → 0.2.11

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.2.11
+### Bold (and every inline mark) toggles like a real editor
+
+- A selection that is partly bold becomes ONE bold span: the bold inside it loses its markers and one pair wraps the whole (`Alpha **bravo** delta` -> `**Alpha bravo delta**`, never `**Alpha **bravo** delta**`). A selection reaching into a bold span joins it.
+- A selection inside one bold span unbolds just that part (`**a [b] c**` -> `**a** b **c**`), and the toolbar's pressed state is on there.
+- Same rule for italic, strike and inline code — one command layer, every host.
+
+
 ## 0.2.10
 ### The caret survives a view switch
 

package/dist/core/markdown-format.js

@@ -94,6 +94,83 @@ function mapPos(pos, changes, assoc) {
 function sorted(changes) {
   return [...changes].sort((a, b) => a.from - b.from || a.to - b.to);
 }
+function markSpansOnLine(text, pos, spec) {
+  const lineStart = text.lastIndexOf("\n", pos - 1) + 1;
+  const nl = text.indexOf("\n", pos);
+  const lineEnd = nl === -1 ? text.length : nl;
+  const spans = [];
+  const open = {};
+  let i = lineStart;
+  while (i < lineEnd) {
+    const ch = text[i];
+    if (ch === "`" && !spec.chars.includes("`")) {
+      const close = text.indexOf("`", i + 1);
+      i = close === -1 || close >= lineEnd ? i + 1 : close + 1;
+      continue;
+    }
+    if (!spec.chars.includes(ch)) {
+      i += 1;
+      continue;
+    }
+    const len = runLength(text, i, 1, ch);
+    if (spec.runs.includes(len)) {
+      const start = open[ch];
+      if (start === void 0) {
+        open[ch] = i + len;
+      } else {
+        if (i > start) spans.push({ innerFrom: start, innerTo: i });
+        open[ch] = void 0;
+      }
+    }
+    i += len;
+  }
+  return spans;
+}
+function contentOf(seg, spans, spec) {
+  let { from, to } = seg;
+  for (const sp of spans) {
+    if (from >= sp.innerFrom - spec.size && from < sp.innerFrom) from = sp.innerFrom;
+    if (to > sp.innerTo && to <= sp.innerTo + spec.size) to = sp.innerTo;
+  }
+  return { from, to: Math.max(from, to) };
+}
+function mergeOn(seg, spans, spec, changes) {
+  const touched = spans.filter((sp) => sp.innerFrom <= seg.to && sp.innerTo >= seg.from);
+  const from = Math.min(seg.from, ...touched.map((sp) => sp.innerFrom));
+  const to = Math.max(seg.to, ...touched.map((sp) => sp.innerTo));
+  let keepOpen = false;
+  let keepClose = false;
+  for (const sp of touched) {
+    if (sp.innerFrom === from && !keepOpen) keepOpen = true;
+    else changes.push({ from: sp.innerFrom - spec.size, to: sp.innerFrom, insert: "" });
+    if (sp.innerTo === to && !keepClose) keepClose = true;
+    else changes.push({ from: sp.innerTo, to: sp.innerTo + spec.size, insert: "" });
+  }
+  if (!keepOpen) changes.push({ from, to: from, insert: spec.marker });
+  if (!keepClose) changes.push({ from: to, to, insert: spec.marker });
+  return { from, to };
+}
+function splitOff(text, seg, sp, spec, changes) {
+  if (seg.from <= sp.innerFrom) {
+    changes.push({ from: sp.innerFrom - spec.size, to: sp.innerFrom, insert: "" });
+  } else {
+    let at = seg.from;
+    while (at > sp.innerFrom && /\s/.test(text[at - 1] ?? "")) at -= 1;
+    if (at === sp.innerFrom) changes.push({ from: sp.innerFrom - spec.size, to: sp.innerFrom, insert: "" });
+    else changes.push({ from: at, to: at, insert: spec.marker });
+  }
+  if (seg.to >= sp.innerTo) {
+    changes.push({ from: sp.innerTo, to: sp.innerTo + spec.size, insert: "" });
+  } else {
+    let at = seg.to;
+    while (at < sp.innerTo && /\s/.test(text[at] ?? "")) at += 1;
+    if (at === sp.innerTo) changes.push({ from: sp.innerTo, to: sp.innerTo + spec.size, insert: "" });
+    else changes.push({ from: at, to: at, insert: spec.marker });
+  }
+}
+function spanHolding(seg, spans) {
+  return spans.find((sp) => sp.innerFrom <= seg.from && seg.to <= sp.innerTo) ?? null;
+}
 function inlineCommand(text, from, to, spec) {
   if (from === to) {
     const word = wordAt(text, from);
@@ -109,21 +186,43 @@ function inlineCommand(text, from, to, spec) {
   const segments = inlineSegments(text, from, to);
   if (segments.length === 0) return { changes: [], anchor: from, head: to };
   const wraps = segments.map((seg) => wrapOf(text, seg, spec));
-  const allOn = wraps.every((w) => w !== null);
+  if (wraps.every((w) => w !== null)) {
+    const changes2 = [];
+    wraps.forEach((w) => {
+      changes2.push({ from: w.innerFrom - spec.size, to: w.innerFrom, insert: "" });
+      changes2.push({ from: w.innerTo, to: w.innerTo + spec.size, insert: "" });
+    });
+    const ordered2 = sorted(changes2);
+    const anchor2 = mapPos(wraps[0].innerFrom, ordered2, 1);
+    const head2 = mapPos(wraps[wraps.length - 1].innerTo, ordered2, -1);
+    return { changes: ordered2, anchor: anchor2, head: Math.max(anchor2, head2) };
+  }
+  const lineSpans = segments.map((seg) => markSpansOnLine(text, seg.from, spec));
+  const contents = segments.map((seg, i) => contentOf(seg, lineSpans[i], spec));
+  const holders = contents.map((c, i) => wraps[i] ? null : spanHolding(c, lineSpans[i]));
+  const allOn = wraps.every((w, i) => w !== null || holders[i] !== null);
   const changes = [];
+  let startAt = contents[0].from;
+  let endAt = contents[contents.length - 1].to;
   segments.forEach((seg, i) => {
     const w = wraps[i];
-    if (allOn && w) {
-      changes.push({ from: w.innerFrom - spec.size, to: w.innerFrom, insert: "" });
-      changes.push({ from: w.innerTo, to: w.innerTo + spec.size, insert: "" });
+    if (allOn) {
+      if (w) {
+        changes.push({ from: w.innerFrom - spec.size, to: w.innerFrom, insert: "" });
+        changes.push({ from: w.innerTo, to: w.innerTo + spec.size, insert: "" });
+      } else {
+        splitOff(text, contents[i], holders[i], spec, changes);
+      }
     } else if (!w) {
-      changes.push({ from: seg.from, to: seg.from, insert: spec.marker });
-      changes.push({ from: seg.to, to: seg.to, insert: spec.marker });
+      const merged = mergeOn(contents[i], lineSpans[i], spec, changes);
+      if (i === 0) startAt = merged.from;
+      if (i === segments.length - 1) endAt = merged.to;
+    } else {
+      if (i === 0) startAt = w.innerFrom;
+      if (i === segments.length - 1) endAt = w.innerTo;
     }
   });
   const ordered = sorted(changes);
-  const startAt = allOn ? wraps[0].innerFrom : segments[0].from;
-  const endAt = allOn ? wraps[wraps.length - 1].innerTo : segments[segments.length - 1].to;
   const anchor = mapPos(startAt, ordered, 1);
   const head = mapPos(endAt, ordered, -1);
   return { changes: ordered, anchor, head: Math.max(anchor, head) };
@@ -293,7 +392,12 @@ function isFormatActive(text, from, to, command) {
       const range = a === b ? wordAt(text, a) : { from: a, to: b };
       if (!range) return false;
       const segs = inlineSegments(text, range.from, range.to);
-      return segs.length > 0 && segs.every((s) => wrapOf(text, s, INLINE[command]) !== null);
+      const spec = INLINE[command];
+      return segs.length > 0 && segs.every((s) => {
+        if (wrapOf(text, s, spec) !== null) return true;
+        const spans = markSpansOnLine(text, s.from, spec);
+        return spanHolding(contentOf(s, spans, spec), spans) !== null;
+      });
     }
     case "link":
       return WHOLE_LINK.test(text.slice(a, b)) || text[a - 1] === "[" && text.slice(b, b + 2) === "](";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-matrx/rich-editor",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "The AI Matrx editor: Visual (Tiptap), Source (CodeMirror), Preview, the markdown formatting command layer, and edit-in-place — over @ai-matrx/rich-content. Consumers that only render never install it.",
   "type": "module",
   "license": "MIT",
@@ -90,11 +90,11 @@
     "@tiptap/suggestion": "^3.31.3",
     "github-slugger": "^2.0.0",
     "lucide-react": "^1.48.0",
+    "@ai-matrx/agents": "latest",
+    "@ai-matrx/alchemy": "latest",
     "@ai-matrx/content-ir": "latest",
     "@ai-matrx/design-system": "latest",
-    "@ai-matrx/alchemy": "latest",
     "@ai-matrx/kit": "latest",
-    "@ai-matrx/agents": "latest",
     "@ai-matrx/print": "latest",
     "@ai-matrx/rich-content": "latest"
   },