@verdant-web/tiptap 0.1.4 → 0.1.6
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/esm/plugins.js +10 -3
- package/dist/esm/plugins.js.map +1 -1
- package/dist/esm/react.js +10 -3
- package/dist/esm/react.js.map +1 -1
- package/package.json +1 -1
- package/src/plugins.ts +14 -6
- package/src/react.ts +29 -23
package/dist/esm/plugins.js
CHANGED
|
@@ -12,10 +12,17 @@ const NodeIdPlugin = new Plugin({
|
|
|
12
12
|
const usedIds = new Set();
|
|
13
13
|
newState.doc.descendants((node, pos) => {
|
|
14
14
|
var _a;
|
|
15
|
-
if (!node.isText &&
|
|
15
|
+
if (!node.isText &&
|
|
16
|
+
(!node.attrs.id || usedIds.has(node.attrs.id)) &&
|
|
17
|
+
node !== newState.doc) {
|
|
16
18
|
const nodeId = id();
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
try {
|
|
20
|
+
tr.setNodeMarkup(pos, null, Object.assign(Object.assign({}, node.attrs), { id: nodeId }));
|
|
21
|
+
usedIds.add(nodeId);
|
|
22
|
+
}
|
|
23
|
+
catch (err) {
|
|
24
|
+
console.error('Error assigning node ID', err);
|
|
25
|
+
}
|
|
19
26
|
}
|
|
20
27
|
else if ((_a = node.attrs) === null || _a === void 0 ? void 0 : _a.id) {
|
|
21
28
|
usedIds.add(node.attrs.id);
|
package/dist/esm/plugins.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC;IAC/B,GAAG,EAAE,IAAI,SAAS,CAAC,UAAU,CAAC;IAC9B,iBAAiB,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;QAC5C,aAAa;QACb,IAAI,QAAQ,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG;YAAE,OAAO;QAC1C,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACvB,2CAA2C;QAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;;YACtC,
|
|
1
|
+
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC;IAC/B,GAAG,EAAE,IAAI,SAAS,CAAC,UAAU,CAAC;IAC9B,iBAAiB,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;QAC5C,aAAa;QACb,IAAI,QAAQ,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG;YAAE,OAAO;QAC1C,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACvB,2CAA2C;QAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;;YACtC,IACC,CAAC,IAAI,CAAC,MAAM;gBACZ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC9C,IAAI,KAAK,QAAQ,CAAC,GAAG,EACpB,CAAC;gBACF,MAAM,MAAM,GAAG,EAAE,EAAE,CAAC;gBACpB,IAAI,CAAC;oBACJ,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,kCACtB,IAAI,CAAC,KAAK,KACb,EAAE,EAAE,MAAM,IACT,CAAC;oBACH,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACrB,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;gBAC/C,CAAC;YACF,CAAC;iBAAM,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,EAAE,EAAE,CAAC;gBAC3B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,CAAC;IACX,CAAC;CACD,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG;IACvB,YAAY;IACZ,YAAY;IACZ,WAAW;IACX,SAAS;IACT,UAAU;IACV,aAAa;IACb,WAAW;IACX,OAAO;IACP,SAAS;IACT,OAAO;IACP,UAAU;IACV,UAAU;IACV,SAAS;CACT,CAAC;AACF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC9B,UAEI,EAAE,EACL,EAAE,CACH,SAAS,CAAC,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ;IACd,qBAAqB;QACpB,OAAO,CAAC,YAAY,CAAC,CAAC;IACvB,CAAC;IACD,mBAAmB;QAClB,OAAO;YACN;gBACC,KAAK,EAAE,OAAO,CAAC,SAAS,IAAI,eAAe;gBAC3C,UAAU,EAAE;oBACX,EAAE,EAAE;wBACH,OAAO,EAAE,IAAI;wBACb,WAAW,EAAE,KAAK;wBAClB,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC;wBACvD,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE;4BAC1B,IAAI,CAAC,UAAU,CAAC,EAAE;gCAAE,OAAO,EAAE,CAAC;4BAC9B,OAAO;gCACN,SAAS,EAAE,UAAU,CAAC,EAAE;6BACxB,CAAC;wBACH,CAAC;qBACD;iBACD;aACD;SACD,CAAC;IACH,CAAC;CACD,CAAC,CAAC"}
|
package/dist/esm/react.js
CHANGED
|
@@ -13,7 +13,7 @@ export function useSyncedEditor(parent, fieldName, { editorOptions: extraOptions
|
|
|
13
13
|
const live = useWatch(parent);
|
|
14
14
|
const field = live[fieldName];
|
|
15
15
|
const updatingRef = useRef(false);
|
|
16
|
-
const update =
|
|
16
|
+
const update = useStableCallback((editor) => {
|
|
17
17
|
if (updatingRef.current) {
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
@@ -29,13 +29,15 @@ export function useSyncedEditor(parent, fieldName, { editorOptions: extraOptions
|
|
|
29
29
|
replaceSubObjects: false,
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
|
-
}
|
|
32
|
+
});
|
|
33
33
|
const cachedInitialContent = useRef(ensureDocShape(getFieldSnapshot(field, nullDocumentDefault, fieldName)));
|
|
34
34
|
const editor = useEditor(Object.assign(Object.assign({}, extraOptions), { content: cachedInitialContent.current, onUpdate: (ctx) => {
|
|
35
35
|
var _a;
|
|
36
36
|
update(ctx.editor);
|
|
37
37
|
(_a = extraOptions === null || extraOptions === void 0 ? void 0 : extraOptions.onUpdate) === null || _a === void 0 ? void 0 : _a.call(extraOptions, ctx);
|
|
38
|
-
}
|
|
38
|
+
}, onContentError(props) {
|
|
39
|
+
console.error('Content error:', props.error);
|
|
40
|
+
} }), editorDependencies);
|
|
39
41
|
useEffect(() => {
|
|
40
42
|
function updateFromField() {
|
|
41
43
|
if (editor && !editor.isDestroyed) {
|
|
@@ -74,4 +76,9 @@ function getFieldSnapshot(field, nullDocumentDefault, fieldName) {
|
|
|
74
76
|
}
|
|
75
77
|
return content;
|
|
76
78
|
}
|
|
79
|
+
function useStableCallback(callback) {
|
|
80
|
+
const ref = useRef(callback);
|
|
81
|
+
ref.current = callback;
|
|
82
|
+
return useCallback((...args) => ref.current(...args), []);
|
|
83
|
+
}
|
|
77
84
|
//# sourceMappingURL=react.js.map
|
package/dist/esm/react.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react.js","sourceRoot":"","sources":["../../src/react.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAkBvD,MAAM,UAAU,eAAe,CAI9B,MAAW,EACX,SAAc,EACd,EACC,aAAa,EAAE,YAAY,EAC3B,kBAAkB,EAClB,mBAAmB,MAKhB,EAAE;IAEN,MAAM,aAAa,GAAG,MAAM,CAAC;QAC5B,mBAAmB;QACnB,SAAS;KACT,CAAC,CAAC;IACH,aAAa,CAAC,OAAO,GAAG;QACvB,mBAAmB;QACnB,SAAS;KACT,CAAC;IACF,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAA2B,CAAC;IACxD,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"react.js","sourceRoot":"","sources":["../../src/react.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/plugins.ts
CHANGED
|
@@ -11,13 +11,21 @@ const NodeIdPlugin = new Plugin({
|
|
|
11
11
|
// force replacement of any duplicates, too
|
|
12
12
|
const usedIds = new Set<string>();
|
|
13
13
|
newState.doc.descendants((node, pos) => {
|
|
14
|
-
if (
|
|
14
|
+
if (
|
|
15
|
+
!node.isText &&
|
|
16
|
+
(!node.attrs.id || usedIds.has(node.attrs.id)) &&
|
|
17
|
+
node !== newState.doc
|
|
18
|
+
) {
|
|
15
19
|
const nodeId = id();
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
20
|
+
try {
|
|
21
|
+
tr.setNodeMarkup(pos, null, {
|
|
22
|
+
...node.attrs,
|
|
23
|
+
id: nodeId,
|
|
24
|
+
});
|
|
25
|
+
usedIds.add(nodeId);
|
|
26
|
+
} catch (err) {
|
|
27
|
+
console.error('Error assigning node ID', err);
|
|
28
|
+
}
|
|
21
29
|
} else if (node.attrs?.id) {
|
|
22
30
|
usedIds.add(node.attrs.id);
|
|
23
31
|
}
|
package/src/react.ts
CHANGED
|
@@ -47,29 +47,26 @@ export function useSyncedEditor<
|
|
|
47
47
|
const live = useWatch(parent);
|
|
48
48
|
const field = live[fieldName] as ObjectEntity<any, any>;
|
|
49
49
|
const updatingRef = useRef(false);
|
|
50
|
-
const update =
|
|
51
|
-
(
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
50
|
+
const update = useStableCallback((editor: Editor) => {
|
|
51
|
+
if (updatingRef.current) {
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
55
54
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
[parent],
|
|
72
|
-
);
|
|
55
|
+
const newData = editor.getJSON();
|
|
56
|
+
const value = parent.get(cachedOptions.current.fieldName) as ObjectEntity<
|
|
57
|
+
any,
|
|
58
|
+
any
|
|
59
|
+
> | null;
|
|
60
|
+
if (!value) {
|
|
61
|
+
parent.set(cachedOptions.current.fieldName as any, newData);
|
|
62
|
+
} else {
|
|
63
|
+
value.update(newData, {
|
|
64
|
+
merge: false,
|
|
65
|
+
dangerouslyDisableMerge: true,
|
|
66
|
+
replaceSubObjects: false,
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
});
|
|
73
70
|
|
|
74
71
|
const cachedInitialContent = useRef(
|
|
75
72
|
ensureDocShape(getFieldSnapshot(field, nullDocumentDefault, fieldName)),
|
|
@@ -82,8 +79,11 @@ export function useSyncedEditor<
|
|
|
82
79
|
update(ctx.editor);
|
|
83
80
|
extraOptions?.onUpdate?.(ctx);
|
|
84
81
|
},
|
|
82
|
+
onContentError(props) {
|
|
83
|
+
console.error('Content error:', props.error);
|
|
84
|
+
},
|
|
85
85
|
},
|
|
86
|
-
|
|
86
|
+
editorDependencies,
|
|
87
87
|
);
|
|
88
88
|
|
|
89
89
|
useEffect(() => {
|
|
@@ -141,3 +141,9 @@ function getFieldSnapshot(
|
|
|
141
141
|
}
|
|
142
142
|
return content;
|
|
143
143
|
}
|
|
144
|
+
|
|
145
|
+
function useStableCallback<T extends (...args: any[]) => any>(callback: T) {
|
|
146
|
+
const ref = useRef(callback);
|
|
147
|
+
ref.current = callback;
|
|
148
|
+
return useCallback((...args: Parameters<T>) => ref.current(...args), []);
|
|
149
|
+
}
|