@dxos/react-ui-editor 0.3.10-main.cb1d9e2 → 0.3.10-main.dcfebef
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/index.mjs +15 -12
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/types/src/components/TextEditor/extensions/markdown/bundle.d.ts.map +1 -1
- package/dist/types/src/hooks/automerge/PatchSemaphore.d.ts +3 -0
- package/dist/types/src/hooks/automerge/PatchSemaphore.d.ts.map +1 -1
- package/dist/types/src/hooks/automerge/automerge.stories.d.ts +8 -1
- package/dist/types/src/hooks/automerge/automerge.stories.d.ts.map +1 -1
- package/dist/types/src/hooks/automerge/index.d.ts +1 -1
- package/dist/types/src/hooks/automerge/index.d.ts.map +1 -1
- package/dist/types/src/hooks/automerge/plugin.d.ts.map +1 -1
- package/dist/types/src/hooks/automerge/translation/automerge-to-codemirror.d.ts +5 -0
- package/dist/types/src/hooks/automerge/translation/automerge-to-codemirror.d.ts.map +1 -0
- package/dist/types/src/hooks/automerge/translation/codemirror-to-automerge.d.ts +6 -0
- package/dist/types/src/hooks/automerge/translation/codemirror-to-automerge.d.ts.map +1 -0
- package/dist/types/src/hooks/automerge/translation/index.d.ts +3 -0
- package/dist/types/src/hooks/automerge/translation/index.d.ts.map +1 -0
- package/package.json +20 -20
- package/src/components/TextEditor/extensions/markdown/bundle.ts +9 -6
- package/src/hooks/automerge/PatchSemaphore.ts +12 -9
- package/src/hooks/automerge/automerge.stories.tsx +3 -2
- package/src/hooks/automerge/index.ts +1 -1
- package/src/hooks/automerge/plugin.ts +1 -0
- package/src/hooks/automerge/{amToCodemirror.ts → translation/automerge-to-codemirror.ts} +10 -2
- package/src/hooks/automerge/{codeMirrorToAm.ts → translation/codemirror-to-automerge.ts} +7 -4
- package/src/hooks/automerge/translation/index.ts +6 -0
- package/dist/types/src/hooks/automerge/amToCodemirror.d.ts +0 -6
- package/dist/types/src/hooks/automerge/amToCodemirror.d.ts.map +0 -1
- package/dist/types/src/hooks/automerge/codeMirrorToAm.d.ts +0 -7
- package/dist/types/src/hooks/automerge/codeMirrorToAm.d.ts.map +0 -1
|
@@ -348,7 +348,7 @@ var listener = ({ onChange }) => StateField2.define({
|
|
|
348
348
|
|
|
349
349
|
// packages/ui/react-ui-editor/src/components/TextEditor/extensions/markdown/bundle.ts
|
|
350
350
|
import { closeBrackets as closeBrackets2, closeBracketsKeymap } from "@codemirror/autocomplete";
|
|
351
|
-
import { defaultKeymap, history, indentWithTab } from "@codemirror/commands";
|
|
351
|
+
import { defaultKeymap, history, historyKeymap, indentWithTab } from "@codemirror/commands";
|
|
352
352
|
import { markdownLanguage as markdownLanguage2, markdown } from "@codemirror/lang-markdown";
|
|
353
353
|
import { bracketMatching as bracketMatching2, defaultHighlightStyle as defaultHighlightStyle2, indentOnInput, syntaxHighlighting as syntaxHighlighting2 } from "@codemirror/language";
|
|
354
354
|
import { languages } from "@codemirror/language-data";
|
|
@@ -564,14 +564,17 @@ var markdownBundle = ({ themeMode, placeholder: _placeholder }) => {
|
|
|
564
564
|
history(),
|
|
565
565
|
indentOnInput(),
|
|
566
566
|
rectangularSelection(),
|
|
567
|
-
//
|
|
567
|
+
// https://codemirror.net/docs/ref/#view.keymap
|
|
568
568
|
keymap4.of([
|
|
569
|
-
|
|
569
|
+
// https://codemirror.net/docs/ref/#commands.defaultKeymap
|
|
570
570
|
...defaultKeymap,
|
|
571
|
-
//
|
|
572
|
-
|
|
573
|
-
//
|
|
571
|
+
// https://codemirror.net/docs/ref/#commands.historyKeymap
|
|
572
|
+
...historyKeymap,
|
|
573
|
+
// https://codemirror.net/docs/ref/#autocomplete.closeBracketsKeymap
|
|
574
|
+
...closeBracketsKeymap,
|
|
575
|
+
// https://codemirror.net/docs/ref/#search.searchKeymap
|
|
574
576
|
...searchKeymap,
|
|
577
|
+
// https://codemirror.net/docs/ref/#commands.indentWithTab
|
|
575
578
|
indentWithTab
|
|
576
579
|
]),
|
|
577
580
|
// Main extension.
|
|
@@ -1076,9 +1079,9 @@ import * as automerge2 from "@dxos/automerge/automerge";
|
|
|
1076
1079
|
// packages/ui/react-ui-editor/src/hooks/automerge/PatchSemaphore.ts
|
|
1077
1080
|
import { next as automerge } from "@dxos/automerge/automerge";
|
|
1078
1081
|
|
|
1079
|
-
// packages/ui/react-ui-editor/src/hooks/automerge/
|
|
1082
|
+
// packages/ui/react-ui-editor/src/hooks/automerge/translation/automerge-to-codemirror.ts
|
|
1080
1083
|
import { ChangeSet } from "@codemirror/state";
|
|
1081
|
-
var
|
|
1084
|
+
var automergeToCodemirror = (view, selection, target, patches) => {
|
|
1082
1085
|
for (const patch of patches) {
|
|
1083
1086
|
const changeSpec = handlePatch(patch, target, view.state);
|
|
1084
1087
|
if (changeSpec != null) {
|
|
@@ -1183,9 +1186,9 @@ var charPath = (textPath, candidatePath) => {
|
|
|
1183
1186
|
return null;
|
|
1184
1187
|
};
|
|
1185
1188
|
|
|
1186
|
-
// packages/ui/react-ui-editor/src/hooks/automerge/
|
|
1189
|
+
// packages/ui/react-ui-editor/src/hooks/automerge/translation/codemirror-to-automerge.ts
|
|
1187
1190
|
import { next as am } from "@dxos/automerge/automerge";
|
|
1188
|
-
var
|
|
1191
|
+
var codemirrorToAutomerge = (field, handle, transactions, state) => {
|
|
1189
1192
|
const { lastHeads, path } = state.field(field);
|
|
1190
1193
|
let hasChanges = false;
|
|
1191
1194
|
for (const tr of transactions) {
|
|
@@ -1229,12 +1232,12 @@ var PatchSemaphore = class {
|
|
|
1229
1232
|
annotations: reconcileAnnotationType.of(true)
|
|
1230
1233
|
});
|
|
1231
1234
|
}
|
|
1232
|
-
let newHeads =
|
|
1235
|
+
let newHeads = codemirrorToAutomerge(this._field, handle, transactions, view.state);
|
|
1233
1236
|
if (newHeads === null || newHeads === void 0) {
|
|
1234
1237
|
newHeads = automerge.getHeads(handle.docSync());
|
|
1235
1238
|
}
|
|
1236
1239
|
const diff = automerge.equals(oldHeads, newHeads) ? [] : automerge.diff(handle.docSync(), oldHeads, newHeads);
|
|
1237
|
-
|
|
1240
|
+
automergeToCodemirror(view, selection, path, diff);
|
|
1238
1241
|
view.dispatch({
|
|
1239
1242
|
effects: updateHeads(newHeads),
|
|
1240
1243
|
annotations: reconcileAnnotationType.of({})
|