@inkandswitch/patchwork-pkg-base 0.0.41 → 0.0.43

package/packages/codemirror-base/package.json

@@ -27,7 +27,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@automerge/automerge-codemirror": "^0.2.0",
+    "@codemirror/commands": "^6.9.0",
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.4",
     "@inkandswitch/patchwork-bootloader": "^0.2.8",

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

@@ -188,92 +188,7 @@ function changeLineComment(option, state, ranges = state.selection.ranges) {
   return null;
 }
 var fromHistory = /* @__PURE__ */ Annotation.define();
-var isolateHistory = /* @__PURE__ */ Annotation.define();
 var invertedEffects = /* @__PURE__ */ Facet.define();
-var historyConfig = /* @__PURE__ */ Facet.define({
-  combine(configs) {
-    return combineConfig(configs, {
-      minDepth: 100,
-      newGroupDelay: 500,
-      joinToEvent: (_t, isAdjacent2) => isAdjacent2
-    }, {
-      minDepth: Math.max,
-      newGroupDelay: Math.min,
-      joinToEvent: (a, b) => (tr, adj) => a(tr, adj) || b(tr, adj)
-    });
-  }
-});
-var historyField_ = /* @__PURE__ */ StateField.define({
-  create() {
-    return HistoryState.empty;
-  },
-  update(state, tr) {
-    let config = tr.state.facet(historyConfig);
-    let fromHist = tr.annotation(fromHistory);
-    if (fromHist) {
-      let item = HistEvent.fromTransaction(tr, fromHist.selection), from = fromHist.side;
-      let other = from == 0 ? state.undone : state.done;
-      if (item)
-        other = updateBranch(other, other.length, config.minDepth, item);
-      else
-        other = addSelection(other, tr.startState.selection);
-      return new HistoryState(from == 0 ? fromHist.rest : other, from == 0 ? other : fromHist.rest);
-    }
-    let isolate = tr.annotation(isolateHistory);
-    if (isolate == "full" || isolate == "before")
-      state = state.isolate();
-    if (tr.annotation(Transaction.addToHistory) === false)
-      return !tr.changes.empty ? state.addMapping(tr.changes.desc) : state;
-    let event = HistEvent.fromTransaction(tr);
-    let time = tr.annotation(Transaction.time), userEvent = tr.annotation(Transaction.userEvent);
-    if (event)
-      state = state.addChanges(event, time, userEvent, config, tr);
-    else if (tr.selection)
-      state = state.addSelection(tr.startState.selection, time, userEvent, config.newGroupDelay);
-    if (isolate == "full" || isolate == "after")
-      state = state.isolate();
-    return state;
-  },
-  toJSON(value) {
-    return { done: value.done.map((e) => e.toJSON()), undone: value.undone.map((e) => e.toJSON()) };
-  },
-  fromJSON(json) {
-    return new HistoryState(json.done.map(HistEvent.fromJSON), json.undone.map(HistEvent.fromJSON));
-  }
-});
-function history(config = {}) {
-  return [
-    historyField_,
-    historyConfig.of(config),
-    EditorView.domEventHandlers({
-      beforeinput(e, view) {
-        let command2 = e.inputType == "historyUndo" ? undo : e.inputType == "historyRedo" ? redo : null;
-        if (!command2)
-          return false;
-        e.preventDefault();
-        return command2(view);
-      }
-    })
-  ];
-}
-function cmd(side, selection) {
-  return function({ state, dispatch }) {
-    if (!selection && state.readOnly)
-      return false;
-    let historyState = state.field(historyField_, false);
-    if (!historyState)
-      return false;
-    let tr = historyState.pop(side, state, selection);
-    if (!tr)
-      return false;
-    dispatch(tr);
-    return true;
-  };
-}
-var undo = /* @__PURE__ */ cmd(0, false);
-var redo = /* @__PURE__ */ cmd(1, false);
-var undoSelection = /* @__PURE__ */ cmd(0, true);
-var redoSelection = /* @__PURE__ */ cmd(1, true);
 var HistEvent = class _HistEvent {
   constructor(changes, effects, mapped, startSelection, selectionsAfter) {
     this.changes = changes;
@@ -446,13 +361,6 @@ var HistoryState = class _HistoryState {
   }
 };
 HistoryState.empty = /* @__PURE__ */ new HistoryState(none, none);
-var historyKeymap = [
-  { key: "Mod-z", run: undo, preventDefault: true },
-  { key: "Mod-y", mac: "Mod-Shift-z", run: redo, preventDefault: true },
-  { linux: "Ctrl-Shift-z", run: redo, preventDefault: true },
-  { key: "Mod-u", run: undoSelection, preventDefault: true },
-  { key: "Alt-u", mac: "Mod-Shift-u", run: redoSelection, preventDefault: true }
-];
 function updateSel(sel, by) {
   return EditorSelection.create(sel.ranges.map(by), sel.mainIndex);
 }
@@ -3436,12 +3344,10 @@ var codeblocks = ViewPlugin2.fromClass(
 function markdownExtensions() {
   return [
     ...theme("sans"),
-    history(),
     indentOnInput(),
     keymap.of([
       ...defaultKeymap,
       ...searchKeymap,
-      ...historyKeymap,
       ...foldKeymap,
       ...completionKeymap,
       indentWithTab