@inkandswitch/patchwork-pkg-base 0.0.47 → 0.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkandswitch/patchwork-pkg-base",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "type": "module",
   "description": "Base packages for the Patchwork system",
   "repository": {

package/packages/codemirror-markdown/dist/extensions/markdown.js

@@ -3070,34 +3070,52 @@ import { EditorView as EditorView4, keymap } from "@codemirror/view";
 
 // src/extensions/formatting.ts
 import { EditorSelection as EditorSelection3 } from "@codemirror/state";
+var MARKS = ["**", "__", "~~", "*", "_", "`"];
 var toggleWrap = (mark) => ({ state, dispatch }) => {
   const selection = state.changeByRange((range) => {
-    const before = state.sliceDoc(range.from - mark.length, range.from);
-    const after = state.sliceDoc(range.to, range.to + mark.length);
-    const inside = state.sliceDoc(range.from, range.from + mark.length) === mark && state.sliceDoc(range.to - mark.length, range.to) === mark && range.to - range.from >= mark.length * 2;
-    if (before === mark && after === mark) {
-      return {
-        changes: [
-          { from: range.from - mark.length, to: range.from },
-          { from: range.to, to: range.to + mark.length }
-        ],
-        range: EditorSelection3.range(
-          range.from - mark.length,
-          range.to - mark.length
-        )
-      };
+    let from = range.from;
+    let to = range.to;
+    for (; ; ) {
+      const found = MARKS.find(
+        (m) => state.sliceDoc(from - m.length, from) === m && state.sliceDoc(to, to + m.length) === m
+      );
+      if (!found) break;
+      if (found === mark) {
+        return {
+          changes: [
+            { from: from - mark.length, to: from },
+            { from: to, to: to + mark.length }
+          ],
+          range: EditorSelection3.range(
+            range.from - mark.length,
+            range.to - mark.length
+          )
+        };
+      }
+      from -= found.length;
+      to += found.length;
     }
-    if (inside) {
-      return {
-        changes: [
-          { from: range.from, to: range.from + mark.length },
-          { from: range.to - mark.length, to: range.to }
-        ],
-        range: EditorSelection3.range(
-          range.from,
-          range.to - mark.length * 2
-        )
-      };
+    from = range.from;
+    to = range.to;
+    for (; ; ) {
+      const found = MARKS.find(
+        (m) => to - from >= m.length * 2 && state.sliceDoc(from, from + m.length) === m && state.sliceDoc(to - m.length, to) === m
+      );
+      if (!found) break;
+      if (found === mark) {
+        return {
+          changes: [
+            { from, to: from + mark.length },
+            { from: to - mark.length, to }
+          ],
+          range: EditorSelection3.range(
+            range.from,
+            range.to - mark.length * 2
+          )
+        };
+      }
+      from += found.length;
+      to -= found.length;
     }
     return {
       changes: [
@@ -3173,6 +3191,20 @@ var markdownStyles = (style) => ({
   ".cm-content li": {
     marginBottom: 0
   },
+  ".cm-bullet": {
+    display: "inline-block",
+    width: "1ch"
+  },
+  ".cm-bullet::before": {
+    content: '""',
+    display: "inline-block",
+    width: "0.4em",
+    height: "0.4em",
+    borderRadius: "50%",
+    background: "currentColor",
+    color: "var(--text-editor-line)",
+    verticalAlign: "0.15em"
+  },
   ".cm-activeLine": {
     backgroundColor: "inherit"
   },
@@ -3370,7 +3402,6 @@ var bullets = ViewPlugin2.fromClass(
 var BulletWidget = class extends WidgetType {
   toDOM() {
     const span = document.createElement("span");
-    span.textContent = "\u2022";
     span.className = "cm-bullet";
     return span;
   }