@inkandswitch/patchwork-pkg-base 0.0.44 → 0.0.45

package/package.json

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

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

@@ -3068,6 +3068,62 @@ var searchExtensions = [
 // src/extensions/markdown.ts
 import { EditorView as EditorView4, keymap } from "@codemirror/view";
 
+// src/extensions/formatting.ts
+import { EditorSelection as EditorSelection3 } from "@codemirror/state";
+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
+        )
+      };
+    }
+    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
+        )
+      };
+    }
+    return {
+      changes: [
+        { from: range.from, insert: mark },
+        { from: range.to, insert: mark }
+      ],
+      range: EditorSelection3.range(
+        range.from + mark.length,
+        range.to + mark.length
+      )
+    };
+  });
+  dispatch(state.update(selection, { scrollIntoView: true, userEvent: "input" }));
+  return true;
+};
+var toggleBold = toggleWrap("**");
+var toggleItalic = toggleWrap("_");
+var toggleStrikethrough = toggleWrap("~~");
+var toggleCode = toggleWrap("`");
+var markdownFormattingKeymap = [
+  { key: "Mod-b", run: toggleBold, preventDefault: true },
+  { key: "Mod-i", run: toggleItalic, preventDefault: true },
+  { key: "Mod-Shift-x", run: toggleStrikethrough, preventDefault: true },
+  { key: "Mod-e", run: toggleCode, preventDefault: true }
+];
+
 // src/themes/markdown.ts
 import { RangeSetBuilder as RangeSetBuilder2 } from "@codemirror/state";
 import {
@@ -3076,7 +3132,8 @@ import {
   ViewPlugin as ViewPlugin2,
   WidgetType
 } from "@codemirror/view";
-var MARKDOWN_STYLES = {
+var bodyFont = (style) => style == "serif" ? 'var(--text-editor-family-serif, "Merriweather", serif)' : "var(--text-editor-family-sans)";
+var markdownStyles = (style) => ({
   "&": {},
   "&.cm-editor.cm-focused": {
     outline: "none"
@@ -3099,6 +3156,7 @@ var MARKDOWN_STYLES = {
     // but doesn't feel right for most documents.
     // textAlign: "justify",
     textWrap: "pretty",
+    fontFamily: bodyFont(style),
     lineHeight: "1.5rem",
     color: "var(--text-editor-line)",
     caretColor: "var(--text-editor-cursor-fill)",
@@ -3120,7 +3178,7 @@ var MARKDOWN_STYLES = {
   },
   ".frontmatter, .frontmatter *": {
     fontSize: "14px",
-    fontFamily: "var(--studio-family-code, monospace)",
+    fontFamily: "var(--text-editor-family-code)",
     color: "var(--syntax-comment, #666)",
     textDecoration: "none",
     fontWeight: "normal",
@@ -3152,21 +3210,21 @@ var MARKDOWN_STYLES = {
   ".codeblock": {
     background: "orange"
   }
-};
+});
 var baseHeadingStyles = {
-  fontFamily: '"Merriweather Sans", sans-serif',
+  fontFamily: "var(--text-editor-family-sans)",
   fontWeight: 400,
   textDecoration: "none"
 };
 var baseCodeStyles = {
-  fontFamily: "var(--studio-family-code, monospace)",
+  fontFamily: "var(--text-editor-family-code)",
   fontSize: "1em"
 };
 var markdownSyntaxHighlighting = (style) => HighlightStyle.define([
   // this is how you ensure that codeblocks are still monospace
   {
     tag: tags.content,
-    fontFamily: style == "serif" ? '"Merriweather", serif' : '"Merriweather Sans", sans-serif'
+    fontFamily: bodyFont(style)
   },
   {
     tag: tags.heading1,
@@ -3199,10 +3257,14 @@ var markdownSyntaxHighlighting = (style) => HighlightStyle.define([
     marginBottom: "1rem",
     marginTop: "2rem"
   },
+  {
+    tag: tags.processingInstruction,
+    color: "var(--text-editor-line-offset-40)"
+  },
   {
     tag: tags.comment,
     color: "var(--syntax-comment, #555)",
-    fontFamily: "var(--studio-family-code, monospace)"
+    fontFamily: "var(--text-editor-family-code)"
   },
   { tag: tags.quote, fontStyle: "var(--syntax-style-quote, italic)" },
   {
@@ -3221,7 +3283,7 @@ var markdownSyntaxHighlighting = (style) => HighlightStyle.define([
     tag: [tags.meta],
     fontWeight: 300,
     color: "var(--syntax-meta, #999)",
-    fontFamily: '"Merriweather Sans", sans-serif'
+    fontFamily: "var(--text-editor-family-sans)"
   },
   { tag: tags.keyword, ...baseCodeStyles, color: "var(--syntax-keyword, #708)" },
   {
@@ -3263,7 +3325,7 @@ var markdownSyntaxHighlighting = (style) => HighlightStyle.define([
   { tag: tags.monospace, ...baseCodeStyles }
 ]);
 var theme = (style) => [
-  EditorView3.theme(MARKDOWN_STYLES),
+  EditorView3.theme(markdownStyles(style)),
   syntaxHighlighting(markdownSyntaxHighlighting(style)),
   bullets,
   codeblocks
@@ -3346,6 +3408,7 @@ function markdownExtensions() {
     ...theme("sans"),
     indentOnInput(),
     keymap.of([
+      ...markdownFormattingKeymap,
       ...defaultKeymap,
       ...searchKeymap,
       ...foldKeymap,