@focus-reactive/payload-plugin-visual-editing 1.2.0 → 1.3.0
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/README.md +265 -31
- package/dist/admin/InstantPreviewBroadcaster.js +44 -3
- package/dist/admin/InstantPreviewBroadcaster.js.map +1 -1
- package/dist/admin/PreviewPageBridge.d.ts +1 -0
- package/dist/admin/PreviewPageBridge.js +50 -0
- package/dist/admin/PreviewPageBridge.js.map +1 -0
- package/dist/admin/VisualEditingBridgeProvider.js +60 -35
- package/dist/admin/VisualEditingBridgeProvider.js.map +1 -1
- package/dist/admin/expandAndFocus.d.ts +1 -0
- package/dist/admin/expandAndFocus.js +122 -99
- package/dist/admin/expandAndFocus.js.map +1 -1
- package/dist/admin/index.d.ts +1 -0
- package/dist/admin/index.js +1 -0
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/instantPreview/previewGrants.d.ts +14 -0
- package/dist/admin/instantPreview/previewGrants.js +62 -0
- package/dist/admin/instantPreview/previewGrants.js.map +1 -0
- package/dist/admin/instantPreview/usePreviewPage.d.ts +2 -1
- package/dist/admin/instantPreview/usePreviewPage.js +12 -3
- package/dist/admin/instantPreview/usePreviewPage.js.map +1 -1
- package/dist/admin/openField/openForms.d.ts +7 -0
- package/dist/admin/openField/openForms.js +40 -0
- package/dist/admin/openField/openForms.js.map +1 -1
- package/dist/admin/previewPages.d.ts +7 -0
- package/dist/admin/previewPages.js +13 -0
- package/dist/admin/previewPages.js.map +1 -0
- package/dist/client/createOverlay.js +3 -0
- package/dist/client/createOverlay.js.map +1 -1
- package/dist/client/index.d.ts +6 -6
- package/dist/client/index.js +5 -5
- package/dist/client/index.js.map +1 -1
- package/dist/client/instantPreview/instantPreview.js +1 -1
- package/dist/client/instantPreview/instantPreview.js.map +1 -1
- package/dist/client/instantPreview/liveFields.d.ts +2 -1
- package/dist/client/instantPreview/liveFields.js +32 -5
- package/dist/client/instantPreview/liveFields.js.map +1 -1
- package/dist/client/instantPreview/liveRichTextOf.d.ts +3 -0
- package/dist/client/instantPreview/liveRichTextOf.js +3 -0
- package/dist/client/instantPreview/liveRichTextOf.js.map +1 -1
- package/dist/client/instantPreview/unsavedRender/baseValues.d.ts +12 -0
- package/dist/client/instantPreview/unsavedRender/baseValues.js +130 -0
- package/dist/client/instantPreview/unsavedRender/baseValues.js.map +1 -0
- package/dist/client/instantPreview/unsavedRender/liveRichText.d.ts +29 -0
- package/dist/client/instantPreview/unsavedRender/liveRichText.js +117 -0
- package/dist/client/instantPreview/unsavedRender/liveRichText.js.map +1 -0
- package/dist/client/instantPreview/unsavedRender/optimisticValue.d.ts +6 -0
- package/dist/client/instantPreview/unsavedRender/optimisticValue.js +20 -0
- package/dist/client/instantPreview/unsavedRender/optimisticValue.js.map +1 -0
- package/dist/client/instantPreview/unsavedRender/renderSources.d.ts +26 -0
- package/dist/client/instantPreview/unsavedRender/renderSources.js +77 -0
- package/dist/client/instantPreview/unsavedRender/renderSources.js.map +1 -0
- package/dist/client/instantPreview/unsavedRender/unsavedRender.d.ts +6 -1
- package/dist/client/instantPreview/unsavedRender/unsavedRender.js +116 -17
- package/dist/client/instantPreview/unsavedRender/unsavedRender.js.map +1 -1
- package/dist/client/instantPreview/unsavedRender/valueSource.d.ts +17 -0
- package/dist/client/instantPreview/unsavedRender/valueSource.js +38 -0
- package/dist/client/instantPreview/unsavedRender/valueSource.js.map +1 -0
- package/dist/client/overlay/constants.d.ts +1 -2
- package/dist/client/overlay/constants.js +1 -7
- package/dist/client/overlay/constants.js.map +1 -1
- package/dist/client/overlay/fieldTracker.d.ts +2 -0
- package/dist/client/overlay/fieldTracker.js +140 -42
- package/dist/client/overlay/fieldTracker.js.map +1 -1
- package/dist/client/overlay/hoverController.js +3 -3
- package/dist/client/overlay/hoverController.js.map +1 -1
- package/dist/client/overlay/markerCleaner.d.ts +5 -0
- package/dist/client/overlay/markerCleaner.js +94 -0
- package/dist/client/overlay/markerCleaner.js.map +1 -0
- package/dist/client/overlay/markerExtractor.js +1 -1
- package/dist/client/overlay/markerExtractor.js.map +1 -1
- package/dist/client/overlay/mutationPipeline.d.ts +3 -0
- package/dist/client/overlay/mutationPipeline.js +15 -9
- package/dist/client/overlay/mutationPipeline.js.map +1 -1
- package/dist/client/overlay/pageNodes.d.ts +3 -0
- package/dist/client/overlay/pageNodes.js +34 -0
- package/dist/client/overlay/pageNodes.js.map +1 -0
- package/dist/client/overlayClickHandler.js +3 -2
- package/dist/client/overlayClickHandler.js.map +1 -1
- package/dist/client/overlayScope.d.ts +14 -0
- package/dist/client/overlayScope.js +23 -0
- package/dist/client/overlayScope.js.map +1 -0
- package/dist/client/previewGrant.d.ts +5 -0
- package/dist/client/previewGrant.js +34 -0
- package/dist/client/previewGrant.js.map +1 -0
- package/dist/client/react/LiveRichText.d.ts +17 -0
- package/dist/client/react/LiveRichText.js +32 -0
- package/dist/client/react/LiveRichText.js.map +1 -0
- package/dist/client/react/UnsavedRenderBoundary.js.map +1 -0
- package/dist/client/react/VisualEditingOverlay.js +60 -0
- package/dist/client/react/VisualEditingOverlay.js.map +1 -0
- package/dist/client/react/VisualEditingProvider.d.ts +21 -0
- package/dist/client/react/VisualEditingProvider.js +83 -0
- package/dist/client/react/VisualEditingProvider.js.map +1 -0
- package/dist/client/react/VisualEditingToggle.d.ts +1 -0
- package/dist/client/react/VisualEditingToggle.js +32 -0
- package/dist/client/react/VisualEditingToggle.js.map +1 -0
- package/dist/client/react/overlayContext.d.ts +2 -0
- package/dist/client/react/overlayContext.js +4 -0
- package/dist/client/react/overlayContext.js.map +1 -0
- package/dist/client/react/useIsomorphicLayoutEffect.js.map +1 -0
- package/dist/client/react/useUnsavedRender.d.ts +16 -0
- package/dist/client/react/useUnsavedRender.js +89 -0
- package/dist/client/react/useUnsavedRender.js.map +1 -0
- package/dist/client/saveEvents.d.ts +3 -0
- package/dist/client/saveEvents.js +27 -0
- package/dist/client/saveEvents.js.map +1 -0
- package/dist/client/session.d.ts +40 -0
- package/dist/client/session.js +100 -0
- package/dist/client/session.js.map +1 -0
- package/dist/client/sessionOverlay.d.ts +9 -0
- package/dist/client/sessionOverlay.js +74 -0
- package/dist/client/sessionOverlay.js.map +1 -0
- package/dist/client/toggle.d.ts +7 -0
- package/dist/client/toggle.js +158 -0
- package/dist/client/toggle.js.map +1 -0
- package/dist/client/withVisualEditingPath.d.ts +2 -0
- package/dist/client/withVisualEditingPath.js +5 -6
- package/dist/client/withVisualEditingPath.js.map +1 -1
- package/dist/dom/index.d.ts +6 -0
- package/dist/dom/index.js +7 -0
- package/dist/dom/index.js.map +1 -0
- package/dist/dom/liveRichTextElements.d.ts +8 -0
- package/dist/dom/liveRichTextElements.js +69 -0
- package/dist/dom/liveRichTextElements.js.map +1 -0
- package/dist/dom/mountVisualEditing.d.ts +16 -0
- package/dist/dom/mountVisualEditing.js +52 -0
- package/dist/dom/mountVisualEditing.js.map +1 -0
- package/dist/excludeValues.d.ts +0 -4
- package/dist/excludeValues.js +4 -4
- package/dist/excludeValues.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.js +13 -4
- package/dist/index.js.map +1 -1
- package/dist/readUnsavedRichText.d.ts +16 -2
- package/dist/readUnsavedRichText.js +26 -7
- package/dist/readUnsavedRichText.js.map +1 -1
- package/dist/server/endpoints.d.ts +16 -0
- package/dist/server/endpoints.js +136 -0
- package/dist/server/endpoints.js.map +1 -0
- package/dist/server/markRead.js +3 -3
- package/dist/server/markRead.js.map +1 -1
- package/dist/server/markedReads.d.ts +1 -1
- package/dist/server/markedReads.js +4 -2
- package/dist/server/markedReads.js.map +1 -1
- package/dist/server/previewGrant.d.ts +9 -0
- package/dist/server/previewGrant.js +31 -0
- package/dist/server/previewGrant.js.map +1 -0
- package/dist/server/unsavedRichText/hooks.js +24 -9
- package/dist/server/unsavedRichText/hooks.js.map +1 -1
- package/dist/server/unsavedRichText/placeUnsavedState.js +1 -1
- package/dist/server/unsavedRichText/placeUnsavedState.js.map +1 -1
- package/dist/server/unsavedRichText/postedEditorState.js +3 -31
- package/dist/server/unsavedRichText/postedEditorState.js.map +1 -1
- package/dist/server/unsavedRichText/postedRequest.d.ts +2 -1
- package/dist/server/unsavedRichText/postedRequest.js +14 -4
- package/dist/server/unsavedRichText/postedRequest.js.map +1 -1
- package/dist/server/unsavedRichText/readAsUser.d.ts +7 -2
- package/dist/server/unsavedRichText/readAsUser.js +47 -16
- package/dist/server/unsavedRichText/readAsUser.js.map +1 -1
- package/dist/server/unsavedRichText/readContext.d.ts +6 -0
- package/dist/server/unsavedRichText/readContext.js +5 -0
- package/dist/server/unsavedRichText/readContext.js.map +1 -1
- package/dist/server/unsavedRichText/savedReferences.d.ts +5 -0
- package/dist/server/unsavedRichText/savedReferences.js +61 -0
- package/dist/server/unsavedRichText/savedReferences.js.map +1 -0
- package/dist/server/withDocumentControls.d.ts +10 -0
- package/dist/server/{withInstantPreview.js → withDocumentControls.js} +17 -7
- package/dist/server/withDocumentControls.js.map +1 -0
- package/dist/shared/buildAdminEditUrl.d.ts +1 -0
- package/dist/shared/buildAdminEditUrl.js +5 -1
- package/dist/shared/buildAdminEditUrl.js.map +1 -1
- package/dist/shared/protocol.d.ts +18 -0
- package/dist/shared/protocol.js +6 -0
- package/dist/shared/protocol.js.map +1 -1
- package/dist/shared/richText/editorStateTree.d.ts +2 -0
- package/dist/shared/richText/editorStateTree.js +34 -0
- package/dist/shared/richText/editorStateTree.js.map +1 -0
- package/dist/{server → shared}/richText/markTextLeaves.js +5 -5
- package/dist/shared/richText/markTextLeaves.js.map +1 -0
- package/dist/shared/richText/nodeKey.d.ts +3 -2
- package/dist/shared/richText/nodeKey.js +15 -6
- package/dist/shared/richText/nodeKey.js.map +1 -1
- package/dist/shared/richText/references.d.ts +16 -0
- package/dist/shared/richText/references.js +85 -0
- package/dist/shared/richText/references.js.map +1 -0
- package/dist/{server/unsavedRichText → shared/richText}/relatedIds.d.ts +1 -1
- package/dist/{server/unsavedRichText → shared/richText}/relatedIds.js +4 -4
- package/dist/shared/richText/relatedIds.js.map +1 -0
- package/dist/shared/richText/savedNodeFields.d.ts +3 -0
- package/dist/{server/unsavedRichText → shared/richText}/savedNodeFields.js +4 -4
- package/dist/shared/richText/savedNodeFields.js.map +1 -0
- package/dist/shared/shared.d.ts +14 -3
- package/dist/shared/shared.js +46 -1
- package/dist/shared/shared.js.map +1 -1
- package/dist/shared/stegaText.d.ts +2 -1
- package/dist/shared/stegaText.js +3 -1
- package/dist/shared/stegaText.js.map +1 -1
- package/package.json +26 -4
- package/dist/client/VisualEditingOverlay.js +0 -39
- package/dist/client/VisualEditingOverlay.js.map +0 -1
- package/dist/client/VisualEditingProvider.d.ts +0 -25
- package/dist/client/VisualEditingProvider.js +0 -68
- package/dist/client/VisualEditingProvider.js.map +0 -1
- package/dist/client/VisualEditingToggle.d.ts +0 -1
- package/dist/client/VisualEditingToggle.js +0 -153
- package/dist/client/VisualEditingToggle.js.map +0 -1
- package/dist/client/instantPreview/LiveRichText.d.ts +0 -16
- package/dist/client/instantPreview/LiveRichText.js +0 -18
- package/dist/client/instantPreview/LiveRichText.js.map +0 -1
- package/dist/client/instantPreview/unsavedRender/UnsavedRenderBoundary.js.map +0 -1
- package/dist/client/instantPreview/unsavedRender/useUnsavedRender.d.ts +0 -10
- package/dist/client/instantPreview/unsavedRender/useUnsavedRender.js +0 -118
- package/dist/client/instantPreview/unsavedRender/useUnsavedRender.js.map +0 -1
- package/dist/client/overlayContext.d.ts +0 -3
- package/dist/client/overlayContext.js +0 -5
- package/dist/client/overlayContext.js.map +0 -1
- package/dist/client/useIsomorphicLayoutEffect.js.map +0 -1
- package/dist/client/useVisualEditingOverlay.d.ts +0 -4
- package/dist/client/useVisualEditingOverlay.js +0 -33
- package/dist/client/useVisualEditingOverlay.js.map +0 -1
- package/dist/server/richText/markTextLeaves.js.map +0 -1
- package/dist/server/unsavedRichText/relatedIds.js.map +0 -1
- package/dist/server/unsavedRichText/savedNodeFields.d.ts +0 -2
- package/dist/server/unsavedRichText/savedNodeFields.js.map +0 -1
- package/dist/server/withInstantPreview.d.ts +0 -9
- package/dist/server/withInstantPreview.js.map +0 -1
- /package/dist/client/{instantPreview/unsavedRender → react}/UnsavedRenderBoundary.d.ts +0 -0
- /package/dist/client/{instantPreview/unsavedRender → react}/UnsavedRenderBoundary.js +0 -0
- /package/dist/client/{VisualEditingOverlay.d.ts → react/VisualEditingOverlay.d.ts} +0 -0
- /package/dist/client/{useIsomorphicLayoutEffect.d.ts → react/useIsomorphicLayoutEffect.d.ts} +0 -0
- /package/dist/client/{useIsomorphicLayoutEffect.js → react/useIsomorphicLayoutEffect.js} +0 -0
- /package/dist/{server → shared}/richText/markTextLeaves.d.ts +0 -0
|
@@ -24,6 +24,15 @@ const isRawRender = (values, node)=>{
|
|
|
24
24
|
const renderedText = node.textContent ?? "";
|
|
25
25
|
return renderedText === values.unsaved || values.saved.includes(renderedText);
|
|
26
26
|
};
|
|
27
|
+
const WHITESPACE_RUN = /\s+/gu;
|
|
28
|
+
const collapsedWhitespace = (text)=>text.replaceAll(WHITESPACE_RUN, " ").trim();
|
|
29
|
+
const showsRawRenderIn = (values, holder)=>{
|
|
30
|
+
const shownText = collapsedWhitespace(holder.textContent ?? "");
|
|
31
|
+
return [
|
|
32
|
+
values.unsaved,
|
|
33
|
+
...values.saved
|
|
34
|
+
].some((value)=>collapsedWhitespace(value) === shownText);
|
|
35
|
+
};
|
|
27
36
|
export const renderedByDocument = (fields)=>{
|
|
28
37
|
const grouped = new Map();
|
|
29
38
|
for (const { document, key } of fields){
|
|
@@ -39,7 +48,7 @@ export const renderedByDocument = (fields)=>{
|
|
|
39
48
|
...grouped.values()
|
|
40
49
|
];
|
|
41
50
|
};
|
|
42
|
-
export function createLiveFields(writeText, keepsShape = ()=>false) {
|
|
51
|
+
export function createLiveFields(writeText, keepsShape = ()=>false, writeTextInHolder = ()=>false) {
|
|
43
52
|
const fieldsOnPage = new Map();
|
|
44
53
|
const unannounced = new Set();
|
|
45
54
|
const shapesByRichText = new Map();
|
|
@@ -47,9 +56,25 @@ export function createLiveFields(writeText, keepsShape = ()=>false) {
|
|
|
47
56
|
const show = (node, value)=>{
|
|
48
57
|
if (node.textContent !== value) writeText(node, value);
|
|
49
58
|
};
|
|
50
|
-
const releaseNode = (
|
|
51
|
-
const key = fieldKeyOfMarker(
|
|
52
|
-
|
|
59
|
+
const releaseNode = (match)=>{
|
|
60
|
+
const key = fieldKeyOfMarker(match);
|
|
61
|
+
const onPage = key === null ? undefined : fieldsOnPage.get(fieldAddressOf(match, key));
|
|
62
|
+
if (!onPage) return;
|
|
63
|
+
onPage.nodes.delete(match.textNode);
|
|
64
|
+
if (match.holder) onPage.emptiedHolders.add(match);
|
|
65
|
+
};
|
|
66
|
+
const showUnsavedInEmptiedHolders = (onPage, values, unsaved)=>{
|
|
67
|
+
for (const match of onPage.emptiedHolders){
|
|
68
|
+
const { holder } = match;
|
|
69
|
+
if (!holder?.isConnected) {
|
|
70
|
+
onPage.emptiedHolders.delete(match);
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
const isShown = collapsedWhitespace(holder.textContent ?? "") === collapsedWhitespace(unsaved);
|
|
74
|
+
if (isShown || !showsRawRenderIn(values, holder)) continue;
|
|
75
|
+
onPage.emptiedHolders.delete(match);
|
|
76
|
+
writeTextInHolder(match, unsaved);
|
|
77
|
+
}
|
|
53
78
|
};
|
|
54
79
|
const showUnsaved = (onPage, values, unsaved)=>{
|
|
55
80
|
const rawNodes = [
|
|
@@ -60,6 +85,7 @@ export function createLiveFields(writeText, keepsShape = ()=>false) {
|
|
|
60
85
|
unsaved
|
|
61
86
|
};
|
|
62
87
|
for (const node of rawNodes)show(node, unsaved);
|
|
88
|
+
showUnsavedInEmptiedHolders(onPage, values, unsaved);
|
|
63
89
|
};
|
|
64
90
|
const recordShape = ({ field }, { fieldKey, shape })=>{
|
|
65
91
|
const richText = fieldAddressOf(field.document, fieldKey);
|
|
@@ -74,7 +100,7 @@ export function createLiveFields(writeText, keepsShape = ()=>false) {
|
|
|
74
100
|
shapesByRichText.set(richText, shapes);
|
|
75
101
|
if (shapes.fieldsByShape.size > 1) richTextsWithEarlierShapes.add(richText);
|
|
76
102
|
};
|
|
77
|
-
const trackNode = ({ textNode, richText, ...marker })=>{
|
|
103
|
+
const trackNode = ({ textNode, richText, holder: _holder, ...marker })=>{
|
|
78
104
|
const key = fieldKeyOfMarker(marker);
|
|
79
105
|
if (key === null || marker.locale !== undefined || optedOutOfLivePatching(textNode)) return;
|
|
80
106
|
const field = {
|
|
@@ -85,6 +111,7 @@ export function createLiveFields(writeText, keepsShape = ()=>false) {
|
|
|
85
111
|
let onPage = fieldsOnPage.get(fieldAddress);
|
|
86
112
|
if (!onPage) {
|
|
87
113
|
onPage = {
|
|
114
|
+
emptiedHolders: new Set(),
|
|
88
115
|
field,
|
|
89
116
|
nodes: new Set(),
|
|
90
117
|
values: null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/client/instantPreview/liveFields.ts"],"sourcesContent":["import type {\n VeDocument,\n VeFieldPatchMessage,\n VeFieldSnapshotMessage,\n VeRenderedFields,\n} from \"../../shared/protocol.js\";\nimport type { FieldMatch, RichTextShape } from \"../overlay/fieldTracker.js\";\n\nimport { DATA_VE_LIVE_ATTR, VE_FIELD_SNAPSHOT_TYPE, VE_LIVE_OFF } from \"../../shared/protocol.js\";\nimport { fieldKeyOfMarker } from \"../../shared/fieldKey.js\";\nimport { documentAddressOf, fieldAddressOf, veDocumentOf } from \"../../shared/veDocument.js\";\n\nexport const REMEMBERED_SAVED_VALUES = 8;\n\nexport type LiveField = { document: VeDocument; key: string };\n\nexport type WriteText = (node: Text, text: string) => void;\n\nexport type KeepsShape = (richTextField: string, shape: string) => boolean;\n\nexport interface LiveFields {\n track(matches: readonly FieldMatch[]): void;\n release(matches: readonly FieldMatch[]): void;\n apply(message: VeFieldSnapshotMessage | VeFieldPatchMessage): void;\n takeNewlyRendered(): VeRenderedFields[];\n takeAllRendered(): VeRenderedFields[];\n}\n\ntype KnownValues = { unsaved: string; saved: readonly string[] };\n\ntype LiveFieldOnPage = { field: LiveField; nodes: Set<Text>; values: KnownValues | null };\n\ntype ShapesOfField = { renderedLast: string; fieldsByShape: Map<string, Set<string>> };\n\nconst LIVE_PATCHING_OFF = `[${DATA_VE_LIVE_ATTR}=\"${VE_LIVE_OFF}\"]`;\n\nconst optedOutOfLivePatching = (node: Text) =>\n Boolean(node.parentElement?.closest(LIVE_PATCHING_OFF));\n\nconst withSavedValue = (values: KnownValues | null, saved: string): KnownValues => {\n if (!values) return { unsaved: saved, saved: [saved] };\n const earlier = values.saved.filter((value) => value !== saved);\n return { unsaved: values.unsaved, saved: [...earlier, saved].slice(-REMEMBERED_SAVED_VALUES) };\n};\n\nconst isRawRender = (values: KnownValues, node: Text): boolean => {\n const renderedText = node.textContent ?? \"\";\n return renderedText === values.unsaved || values.saved.includes(renderedText);\n};\n\nexport const renderedByDocument = (fields: readonly LiveField[]): VeRenderedFields[] => {\n const grouped = new Map<string, VeRenderedFields>();\n for (const { document, key } of fields) {\n const documentAddress = documentAddressOf(document);\n const fieldsOfDocument = grouped.get(documentAddress) ?? { ...document, keys: [] };\n fieldsOfDocument.keys.push(key);\n grouped.set(documentAddress, fieldsOfDocument);\n }\n return [...grouped.values()];\n};\n\nexport function createLiveFields(\n writeText: WriteText,\n keepsShape: KeepsShape = () => false\n): LiveFields {\n const fieldsOnPage = new Map<string, LiveFieldOnPage>();\n const unannounced = new Set<string>();\n const shapesByRichText = new Map<string, ShapesOfField>();\n const richTextsWithEarlierShapes = new Set<string>();\n\n const show = (node: Text, value: string) => {\n if (node.textContent !== value) writeText(node, value);\n };\n\n const releaseNode = ({ textNode, ...marker }: FieldMatch) => {\n const key = fieldKeyOfMarker(marker);\n if (key !== null) fieldsOnPage.get(fieldAddressOf(marker, key))?.nodes.delete(textNode);\n };\n\n const showUnsaved = (onPage: LiveFieldOnPage, values: KnownValues, unsaved: string) => {\n const rawNodes = [...onPage.nodes].filter(\n (node) => node.isConnected && isRawRender(values, node)\n );\n onPage.values = { ...values, unsaved };\n for (const node of rawNodes) show(node, unsaved);\n };\n\n const recordShape = ({ field }: LiveFieldOnPage, { fieldKey, shape }: RichTextShape) => {\n const richText = fieldAddressOf(field.document, fieldKey);\n const shapes = shapesByRichText.get(richText) ?? {\n renderedLast: shape,\n fieldsByShape: new Map(),\n };\n const fieldsOfShape = shapes.fieldsByShape.get(shape) ?? new Set<string>();\n fieldsOfShape.add(fieldAddressOf(field.document, field.key));\n shapes.fieldsByShape.set(shape, fieldsOfShape);\n shapes.renderedLast = shape;\n shapesByRichText.set(richText, shapes);\n if (shapes.fieldsByShape.size > 1) richTextsWithEarlierShapes.add(richText);\n };\n\n const trackNode = ({ textNode, richText, ...marker }: FieldMatch) => {\n const key = fieldKeyOfMarker(marker);\n if (key === null || marker.locale !== undefined || optedOutOfLivePatching(textNode)) return;\n const field = { document: veDocumentOf(marker), key };\n const fieldAddress = fieldAddressOf(field.document, key);\n let onPage = fieldsOnPage.get(fieldAddress);\n if (!onPage) {\n onPage = { field, nodes: new Set(), values: null };\n fieldsOnPage.set(fieldAddress, onPage);\n unannounced.add(fieldAddress);\n }\n onPage.nodes.add(textNode);\n if (onPage.values && isRawRender(onPage.values, textNode)) {\n show(textNode, onPage.values.unsaved);\n }\n if (richText) recordShape(onPage, richText);\n };\n\n const isRenderedByANode = (fieldAddress: string) =>\n (fieldsOnPage.get(fieldAddress)?.nodes.size ?? 0) > 0;\n\n const forgetEarlierShapesOf = (richText: string, shapes: ShapesOfField) => {\n for (const [shape, fieldsOfShape] of shapes.fieldsByShape) {\n if (shape === shapes.renderedLast || keepsShape(richText, shape)) continue;\n for (const fieldAddress of fieldsOfShape) {\n if (isRenderedByANode(fieldAddress)) continue;\n fieldsOfShape.delete(fieldAddress);\n fieldsOnPage.delete(fieldAddress);\n unannounced.delete(fieldAddress);\n }\n if (fieldsOfShape.size === 0) shapes.fieldsByShape.delete(shape);\n }\n };\n\n const forgetReplacedShapes = () => {\n for (const richText of richTextsWithEarlierShapes) {\n const shapes = shapesByRichText.get(richText);\n if (!shapes) continue;\n forgetEarlierShapesOf(richText, shapes);\n if (shapes.fieldsByShape.size === 1) richTextsWithEarlierShapes.delete(richText);\n }\n };\n\n const fieldsOf = (addresses: Iterable<string>) =>\n [...addresses].flatMap((address) => fieldsOnPage.get(address)?.field ?? []);\n\n return {\n track(matches) {\n for (const match of matches) trackNode(match);\n forgetReplacedShapes();\n },\n release(matches) {\n for (const match of matches) releaseNode(match);\n },\n apply(message) {\n if (message.type === VE_FIELD_SNAPSHOT_TYPE) {\n for (const { key, saved, value } of message.fields) {\n const onPage = fieldsOnPage.get(fieldAddressOf(message, key));\n if (onPage) showUnsaved(onPage, withSavedValue(onPage.values, saved), value);\n }\n return;\n }\n for (const { key, value } of message.patches) {\n const onPage = fieldsOnPage.get(fieldAddressOf(message, key));\n if (onPage?.values) showUnsaved(onPage, onPage.values, value);\n }\n },\n takeNewlyRendered() {\n const newFields = fieldsOf(unannounced);\n unannounced.clear();\n return renderedByDocument(newFields);\n },\n takeAllRendered() {\n unannounced.clear();\n return renderedByDocument(fieldsOf(fieldsOnPage.keys()));\n },\n };\n}\n"],"names":["DATA_VE_LIVE_ATTR","VE_FIELD_SNAPSHOT_TYPE","VE_LIVE_OFF","fieldKeyOfMarker","documentAddressOf","fieldAddressOf","veDocumentOf","REMEMBERED_SAVED_VALUES","LIVE_PATCHING_OFF","optedOutOfLivePatching","node","Boolean","parentElement","closest","withSavedValue","values","saved","unsaved","earlier","filter","value","slice","isRawRender","renderedText","textContent","includes","renderedByDocument","fields","grouped","Map","document","key","documentAddress","fieldsOfDocument","get","keys","push","set","createLiveFields","writeText","keepsShape","fieldsOnPage","unannounced","Set","shapesByRichText","richTextsWithEarlierShapes","show","releaseNode","textNode","marker","nodes","delete","showUnsaved","onPage","rawNodes","isConnected","recordShape","field","fieldKey","shape","richText","shapes","renderedLast","fieldsByShape","fieldsOfShape","add","size","trackNode","locale","undefined","fieldAddress","isRenderedByANode","forgetEarlierShapesOf","forgetReplacedShapes","fieldsOf","addresses","flatMap","address","track","matches","match","release","apply","message","type","patches","takeNewlyRendered","newFields","clear","takeAllRendered"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/client/instantPreview/liveFields.ts"],"sourcesContent":["import type {\n VeDocument,\n VeFieldPatchMessage,\n VeFieldSnapshotMessage,\n VeRenderedFields,\n} from \"../../shared/protocol.js\";\nimport type { FieldMatch, RichTextShape } from \"../overlay/fieldTracker.js\";\n\nimport { DATA_VE_LIVE_ATTR, VE_FIELD_SNAPSHOT_TYPE, VE_LIVE_OFF } from \"../../shared/protocol.js\";\nimport { fieldKeyOfMarker } from \"../../shared/fieldKey.js\";\nimport { documentAddressOf, fieldAddressOf, veDocumentOf } from \"../../shared/veDocument.js\";\n\nexport const REMEMBERED_SAVED_VALUES = 8;\n\nexport type LiveField = { document: VeDocument; key: string };\n\nexport type WriteText = (node: Text, text: string) => void;\n\nexport type WriteTextInHolder = (match: FieldMatch, text: string) => boolean;\n\nexport type KeepsShape = (richTextField: string, shape: string) => boolean;\n\nexport interface LiveFields {\n track(matches: readonly FieldMatch[]): void;\n release(matches: readonly FieldMatch[]): void;\n apply(message: VeFieldSnapshotMessage | VeFieldPatchMessage): void;\n takeNewlyRendered(): VeRenderedFields[];\n takeAllRendered(): VeRenderedFields[];\n}\n\ntype KnownValues = { unsaved: string; saved: readonly string[] };\n\ntype LiveFieldOnPage = {\n field: LiveField;\n nodes: Set<Text>;\n emptiedHolders: Set<FieldMatch>;\n values: KnownValues | null;\n};\n\ntype ShapesOfField = { renderedLast: string; fieldsByShape: Map<string, Set<string>> };\n\nconst LIVE_PATCHING_OFF = `[${DATA_VE_LIVE_ATTR}=\"${VE_LIVE_OFF}\"]`;\n\nconst optedOutOfLivePatching = (node: Text) =>\n Boolean(node.parentElement?.closest(LIVE_PATCHING_OFF));\n\nconst withSavedValue = (values: KnownValues | null, saved: string): KnownValues => {\n if (!values) return { unsaved: saved, saved: [saved] };\n const earlier = values.saved.filter((value) => value !== saved);\n return { unsaved: values.unsaved, saved: [...earlier, saved].slice(-REMEMBERED_SAVED_VALUES) };\n};\n\nconst isRawRender = (values: KnownValues, node: Text): boolean => {\n const renderedText = node.textContent ?? \"\";\n return renderedText === values.unsaved || values.saved.includes(renderedText);\n};\n\nconst WHITESPACE_RUN = /\\s+/gu;\n\nconst collapsedWhitespace = (text: string) => text.replaceAll(WHITESPACE_RUN, \" \").trim();\n\nconst showsRawRenderIn = (values: KnownValues, holder: Element): boolean => {\n const shownText = collapsedWhitespace(holder.textContent ?? \"\");\n return [values.unsaved, ...values.saved].some(\n (value) => collapsedWhitespace(value) === shownText\n );\n};\n\nexport const renderedByDocument = (fields: readonly LiveField[]): VeRenderedFields[] => {\n const grouped = new Map<string, VeRenderedFields>();\n for (const { document, key } of fields) {\n const documentAddress = documentAddressOf(document);\n const fieldsOfDocument = grouped.get(documentAddress) ?? { ...document, keys: [] };\n fieldsOfDocument.keys.push(key);\n grouped.set(documentAddress, fieldsOfDocument);\n }\n return [...grouped.values()];\n};\n\nexport function createLiveFields(\n writeText: WriteText,\n keepsShape: KeepsShape = () => false,\n writeTextInHolder: WriteTextInHolder = () => false\n): LiveFields {\n const fieldsOnPage = new Map<string, LiveFieldOnPage>();\n const unannounced = new Set<string>();\n const shapesByRichText = new Map<string, ShapesOfField>();\n const richTextsWithEarlierShapes = new Set<string>();\n\n const show = (node: Text, value: string) => {\n if (node.textContent !== value) writeText(node, value);\n };\n\n const releaseNode = (match: FieldMatch) => {\n const key = fieldKeyOfMarker(match);\n const onPage = key === null ? undefined : fieldsOnPage.get(fieldAddressOf(match, key));\n if (!onPage) return;\n onPage.nodes.delete(match.textNode);\n if (match.holder) onPage.emptiedHolders.add(match);\n };\n\n const showUnsavedInEmptiedHolders = (\n onPage: LiveFieldOnPage,\n values: KnownValues,\n unsaved: string\n ) => {\n for (const match of onPage.emptiedHolders) {\n const { holder } = match;\n if (!holder?.isConnected) {\n onPage.emptiedHolders.delete(match);\n continue;\n }\n const isShown =\n collapsedWhitespace(holder.textContent ?? \"\") === collapsedWhitespace(unsaved);\n if (isShown || !showsRawRenderIn(values, holder)) continue;\n onPage.emptiedHolders.delete(match);\n writeTextInHolder(match, unsaved);\n }\n };\n\n const showUnsaved = (onPage: LiveFieldOnPage, values: KnownValues, unsaved: string) => {\n const rawNodes = [...onPage.nodes].filter(\n (node) => node.isConnected && isRawRender(values, node)\n );\n onPage.values = { ...values, unsaved };\n for (const node of rawNodes) show(node, unsaved);\n showUnsavedInEmptiedHolders(onPage, values, unsaved);\n };\n\n const recordShape = ({ field }: LiveFieldOnPage, { fieldKey, shape }: RichTextShape) => {\n const richText = fieldAddressOf(field.document, fieldKey);\n const shapes = shapesByRichText.get(richText) ?? {\n renderedLast: shape,\n fieldsByShape: new Map(),\n };\n const fieldsOfShape = shapes.fieldsByShape.get(shape) ?? new Set<string>();\n fieldsOfShape.add(fieldAddressOf(field.document, field.key));\n shapes.fieldsByShape.set(shape, fieldsOfShape);\n shapes.renderedLast = shape;\n shapesByRichText.set(richText, shapes);\n if (shapes.fieldsByShape.size > 1) richTextsWithEarlierShapes.add(richText);\n };\n\n const trackNode = ({ textNode, richText, holder: _holder, ...marker }: FieldMatch) => {\n const key = fieldKeyOfMarker(marker);\n if (key === null || marker.locale !== undefined || optedOutOfLivePatching(textNode)) return;\n const field = { document: veDocumentOf(marker), key };\n const fieldAddress = fieldAddressOf(field.document, key);\n let onPage = fieldsOnPage.get(fieldAddress);\n if (!onPage) {\n onPage = { emptiedHolders: new Set(), field, nodes: new Set(), values: null };\n fieldsOnPage.set(fieldAddress, onPage);\n unannounced.add(fieldAddress);\n }\n onPage.nodes.add(textNode);\n if (onPage.values && isRawRender(onPage.values, textNode)) {\n show(textNode, onPage.values.unsaved);\n }\n if (richText) recordShape(onPage, richText);\n };\n\n const isRenderedByANode = (fieldAddress: string) =>\n (fieldsOnPage.get(fieldAddress)?.nodes.size ?? 0) > 0;\n\n const forgetEarlierShapesOf = (richText: string, shapes: ShapesOfField) => {\n for (const [shape, fieldsOfShape] of shapes.fieldsByShape) {\n if (shape === shapes.renderedLast || keepsShape(richText, shape)) continue;\n for (const fieldAddress of fieldsOfShape) {\n if (isRenderedByANode(fieldAddress)) continue;\n fieldsOfShape.delete(fieldAddress);\n fieldsOnPage.delete(fieldAddress);\n unannounced.delete(fieldAddress);\n }\n if (fieldsOfShape.size === 0) shapes.fieldsByShape.delete(shape);\n }\n };\n\n const forgetReplacedShapes = () => {\n for (const richText of richTextsWithEarlierShapes) {\n const shapes = shapesByRichText.get(richText);\n if (!shapes) continue;\n forgetEarlierShapesOf(richText, shapes);\n if (shapes.fieldsByShape.size === 1) richTextsWithEarlierShapes.delete(richText);\n }\n };\n\n const fieldsOf = (addresses: Iterable<string>) =>\n [...addresses].flatMap((address) => fieldsOnPage.get(address)?.field ?? []);\n\n return {\n track(matches) {\n for (const match of matches) trackNode(match);\n forgetReplacedShapes();\n },\n release(matches) {\n for (const match of matches) releaseNode(match);\n },\n apply(message) {\n if (message.type === VE_FIELD_SNAPSHOT_TYPE) {\n for (const { key, saved, value } of message.fields) {\n const onPage = fieldsOnPage.get(fieldAddressOf(message, key));\n if (onPage) showUnsaved(onPage, withSavedValue(onPage.values, saved), value);\n }\n return;\n }\n for (const { key, value } of message.patches) {\n const onPage = fieldsOnPage.get(fieldAddressOf(message, key));\n if (onPage?.values) showUnsaved(onPage, onPage.values, value);\n }\n },\n takeNewlyRendered() {\n const newFields = fieldsOf(unannounced);\n unannounced.clear();\n return renderedByDocument(newFields);\n },\n takeAllRendered() {\n unannounced.clear();\n return renderedByDocument(fieldsOf(fieldsOnPage.keys()));\n },\n };\n}\n"],"names":["DATA_VE_LIVE_ATTR","VE_FIELD_SNAPSHOT_TYPE","VE_LIVE_OFF","fieldKeyOfMarker","documentAddressOf","fieldAddressOf","veDocumentOf","REMEMBERED_SAVED_VALUES","LIVE_PATCHING_OFF","optedOutOfLivePatching","node","Boolean","parentElement","closest","withSavedValue","values","saved","unsaved","earlier","filter","value","slice","isRawRender","renderedText","textContent","includes","WHITESPACE_RUN","collapsedWhitespace","text","replaceAll","trim","showsRawRenderIn","holder","shownText","some","renderedByDocument","fields","grouped","Map","document","key","documentAddress","fieldsOfDocument","get","keys","push","set","createLiveFields","writeText","keepsShape","writeTextInHolder","fieldsOnPage","unannounced","Set","shapesByRichText","richTextsWithEarlierShapes","show","releaseNode","match","onPage","undefined","nodes","delete","textNode","emptiedHolders","add","showUnsavedInEmptiedHolders","isConnected","isShown","showUnsaved","rawNodes","recordShape","field","fieldKey","shape","richText","shapes","renderedLast","fieldsByShape","fieldsOfShape","size","trackNode","_holder","marker","locale","fieldAddress","isRenderedByANode","forgetEarlierShapesOf","forgetReplacedShapes","fieldsOf","addresses","flatMap","address","track","matches","release","apply","message","type","patches","takeNewlyRendered","newFields","clear","takeAllRendered"],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import type { LiveRichTextField } from "../../shared/protocol.js";
|
|
2
|
+
import type { MetaInfo } from "../../shared/shared.js";
|
|
2
3
|
export type LiveRichTextIdentity = {
|
|
3
4
|
field: LiveRichTextField;
|
|
4
5
|
shape: string;
|
|
6
|
+
meta?: MetaInfo;
|
|
7
|
+
hasReferences?: boolean;
|
|
5
8
|
};
|
|
6
9
|
export declare const liveRichTextOf: (value: unknown) => LiveRichTextIdentity | null;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { fieldKeyOfMarker } from "../../shared/fieldKey.js";
|
|
2
2
|
import { isRichTextNodeKey } from "../../shared/richText/nodeKey.js";
|
|
3
|
+
import { hasReferences } from "../../shared/richText/references.js";
|
|
3
4
|
import { shapeOf } from "../../shared/richText/shapeOf.js";
|
|
4
5
|
import { isMetaInfo, META_KEY } from "../../shared/shared.js";
|
|
5
6
|
import { isPlainObject } from "../../shared/plainObject.js";
|
|
@@ -16,6 +17,8 @@ export const liveRichTextOf = (value)=>{
|
|
|
16
17
|
const shape = shapeOf(value, keyedFieldAddressOf(field));
|
|
17
18
|
return shape === null ? null : {
|
|
18
19
|
field,
|
|
20
|
+
hasReferences: hasReferences(value),
|
|
21
|
+
meta,
|
|
19
22
|
shape
|
|
20
23
|
};
|
|
21
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/client/instantPreview/liveRichTextOf.ts"],"sourcesContent":["import type { LiveRichTextField } from \"../../shared/protocol.js\";\n\nimport { fieldKeyOfMarker } from \"../../shared/fieldKey.js\";\nimport { isRichTextNodeKey } from \"../../shared/richText/nodeKey.js\";\nimport { shapeOf } from \"../../shared/richText/shapeOf.js\";\nimport { isMetaInfo, META_KEY } from \"../../shared/shared.js\";\nimport { isPlainObject } from \"../../shared/plainObject.js\";\nimport { keyedFieldAddressOf, veDocumentOf } from \"../../shared/veDocument.js\";\n\nexport type LiveRichTextIdentity = {
|
|
1
|
+
{"version":3,"sources":["../../../src/client/instantPreview/liveRichTextOf.ts"],"sourcesContent":["import type { LiveRichTextField } from \"../../shared/protocol.js\";\nimport type { MetaInfo } from \"../../shared/shared.js\";\n\nimport { fieldKeyOfMarker } from \"../../shared/fieldKey.js\";\nimport { isRichTextNodeKey } from \"../../shared/richText/nodeKey.js\";\nimport { hasReferences } from \"../../shared/richText/references.js\";\nimport { shapeOf } from \"../../shared/richText/shapeOf.js\";\nimport { isMetaInfo, META_KEY } from \"../../shared/shared.js\";\nimport { isPlainObject } from \"../../shared/plainObject.js\";\nimport { keyedFieldAddressOf, veDocumentOf } from \"../../shared/veDocument.js\";\n\nexport type LiveRichTextIdentity = {\n field: LiveRichTextField;\n shape: string;\n meta?: MetaInfo;\n hasReferences?: boolean;\n};\n\nexport const liveRichTextOf = (value: unknown): LiveRichTextIdentity | null => {\n const meta = isPlainObject(value) ? value[META_KEY] : undefined;\n if (!isMetaInfo(meta) || meta.locale !== undefined) return null;\n\n const key = fieldKeyOfMarker(meta);\n if (key === null || isRichTextNodeKey(key)) return null;\n\n const field: LiveRichTextField = { ...veDocumentOf(meta), key };\n const shape = shapeOf(value, keyedFieldAddressOf(field));\n return shape === null ? null : { field, hasReferences: hasReferences(value), meta, shape };\n};\n"],"names":["fieldKeyOfMarker","isRichTextNodeKey","hasReferences","shapeOf","isMetaInfo","META_KEY","isPlainObject","keyedFieldAddressOf","veDocumentOf","liveRichTextOf","value","meta","undefined","locale","key","field","shape"],"mappings":"AAGA,SAASA,gBAAgB,QAAQ,2BAA2B;AAC5D,SAASC,iBAAiB,QAAQ,mCAAmC;AACrE,SAASC,aAAa,QAAQ,sCAAsC;AACpE,SAASC,OAAO,QAAQ,mCAAmC;AAC3D,SAASC,UAAU,EAAEC,QAAQ,QAAQ,yBAAyB;AAC9D,SAASC,aAAa,QAAQ,8BAA8B;AAC5D,SAASC,mBAAmB,EAAEC,YAAY,QAAQ,6BAA6B;AAS/E,OAAO,MAAMC,iBAAiB,CAACC;IAC7B,MAAMC,OAAOL,cAAcI,SAASA,KAAK,CAACL,SAAS,GAAGO;IACtD,IAAI,CAACR,WAAWO,SAASA,KAAKE,MAAM,KAAKD,WAAW,OAAO;IAE3D,MAAME,MAAMd,iBAAiBW;IAC7B,IAAIG,QAAQ,QAAQb,kBAAkBa,MAAM,OAAO;IAEnD,MAAMC,QAA2B;QAAE,GAAGP,aAAaG,KAAK;QAAEG;IAAI;IAC9D,MAAME,QAAQb,QAAQO,OAAOH,oBAAoBQ;IACjD,OAAOC,UAAU,OAAO,OAAO;QAAED;QAAOb,eAAeA,cAAcQ;QAAQC;QAAMK;IAAM;AAC3F,EAAE"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { LiveRichTextField } from "../../../shared/protocol.js";
|
|
2
|
+
import type { ValueSource } from "./valueSource.js";
|
|
3
|
+
export type Base = {
|
|
4
|
+
base: unknown;
|
|
5
|
+
};
|
|
6
|
+
export interface BaseValues {
|
|
7
|
+
watch(field: LiveRichTextField, hasReferences: boolean, onBase: () => void): () => void;
|
|
8
|
+
baseOf(field: LiveRichTextField, locale: string | undefined, state: unknown): Base | null;
|
|
9
|
+
answerFor(field: LiveRichTextField, locale: string | undefined): (value: unknown) => void;
|
|
10
|
+
stop(): void;
|
|
11
|
+
}
|
|
12
|
+
export declare function createBaseValues(adminOrigin: () => string, source: ValueSource): BaseValues;
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
import { isMessageFrom } from "../../../shared/messageSource.js";
|
|
2
|
+
import { isPlainObject } from "../../../shared/plainObject.js";
|
|
3
|
+
import { VE_DOCUMENT_SAVED_TYPE, VE_FIELD_PATCH_TYPE } from "../../../shared/protocol.js";
|
|
4
|
+
import { rootOf } from "../../../shared/richText/editorNodes.js";
|
|
5
|
+
import { fieldKeyOfRichTextNode } from "../../../shared/richText/nodeKey.js";
|
|
6
|
+
import { hasReferences } from "../../../shared/richText/references.js";
|
|
7
|
+
import { fieldAddressOf, isVeDocument, keyedFieldAddressOf } from "../../../shared/veDocument.js";
|
|
8
|
+
import { adminOriginOf, findAdminWindow } from "../../adminWindow.js";
|
|
9
|
+
const ROOT_NODE_TYPE = "root";
|
|
10
|
+
const NO_BASE = {
|
|
11
|
+
base: null
|
|
12
|
+
};
|
|
13
|
+
const patchMessageOf = (data)=>{
|
|
14
|
+
if (!isPlainObject(data) || data.type !== VE_FIELD_PATCH_TYPE || !isVeDocument(data)) return null;
|
|
15
|
+
const isLocale = data.locale === undefined || typeof data.locale === "string";
|
|
16
|
+
return isLocale && Array.isArray(data.patches) ? data : null;
|
|
17
|
+
};
|
|
18
|
+
const typedFieldKeysOf = ({ patches })=>new Set(patches.flatMap((patch)=>{
|
|
19
|
+
const fieldKey = isPlainObject(patch) && typeof patch.key === "string" ? fieldKeyOfRichTextNode(patch.key) : null;
|
|
20
|
+
return fieldKey === null ? [] : [
|
|
21
|
+
fieldKey
|
|
22
|
+
];
|
|
23
|
+
}));
|
|
24
|
+
const mergedBase = (values)=>values.length === 1 ? values[0] : {
|
|
25
|
+
root: {
|
|
26
|
+
children: values.map(rootOf).filter(Boolean),
|
|
27
|
+
type: ROOT_NODE_TYPE
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
const inLocale = (located, locale)=>located && located.locale === locale ? [
|
|
31
|
+
located.value
|
|
32
|
+
] : [];
|
|
33
|
+
export function createBaseValues(adminOrigin, source) {
|
|
34
|
+
const fields = new Map();
|
|
35
|
+
let generation = 0;
|
|
36
|
+
let isSavedSincePageLoad = false;
|
|
37
|
+
const needsSaved = (entry, state)=>(entry.hasReferences || isSavedSincePageLoad) && hasReferences(state);
|
|
38
|
+
const askForSaved = async (entry, locale)=>{
|
|
39
|
+
if (entry.asking !== null || !source.canAsk()) return;
|
|
40
|
+
const asking = {};
|
|
41
|
+
const askedIn = generation;
|
|
42
|
+
entry.asking = asking;
|
|
43
|
+
const value = await source.value({
|
|
44
|
+
field: entry.field,
|
|
45
|
+
locale
|
|
46
|
+
}).catch(()=>null);
|
|
47
|
+
if (entry.asking !== asking) return;
|
|
48
|
+
entry.asking = null;
|
|
49
|
+
if (value === null || askedIn !== generation) return;
|
|
50
|
+
entry.saved = {
|
|
51
|
+
locale,
|
|
52
|
+
value
|
|
53
|
+
};
|
|
54
|
+
for (const onBase of entry.watchers)onBase();
|
|
55
|
+
};
|
|
56
|
+
const askForTyped = (message)=>{
|
|
57
|
+
for (const fieldKey of typedFieldKeysOf(message)){
|
|
58
|
+
const entry = fields.get(fieldAddressOf(message, fieldKey));
|
|
59
|
+
const hasSaved = inLocale(entry?.saved ?? null, message.locale).length > 0;
|
|
60
|
+
if (entry?.hasReferences && !hasSaved) void askForSaved(entry, message.locale);
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
const forgetBases = ()=>{
|
|
64
|
+
generation += 1;
|
|
65
|
+
isSavedSincePageLoad = true;
|
|
66
|
+
for (const entry of fields.values()){
|
|
67
|
+
entry.saved = null;
|
|
68
|
+
entry.answered = null;
|
|
69
|
+
entry.asking = null;
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
const handleAdminMessage = (event)=>{
|
|
73
|
+
if (!isMessageFrom(event, adminOriginOf(adminOrigin()), findAdminWindow(window))) return;
|
|
74
|
+
if (isPlainObject(event.data) && event.data.type === VE_DOCUMENT_SAVED_TYPE) {
|
|
75
|
+
forgetBases();
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
const typed = patchMessageOf(event.data);
|
|
79
|
+
if (typed) askForTyped(typed);
|
|
80
|
+
};
|
|
81
|
+
window.addEventListener("message", handleAdminMessage);
|
|
82
|
+
return {
|
|
83
|
+
answerFor (field, locale) {
|
|
84
|
+
const askedIn = generation;
|
|
85
|
+
return (value)=>{
|
|
86
|
+
const entry = fields.get(keyedFieldAddressOf(field));
|
|
87
|
+
if (entry && askedIn === generation) entry.answered = {
|
|
88
|
+
locale,
|
|
89
|
+
value
|
|
90
|
+
};
|
|
91
|
+
};
|
|
92
|
+
},
|
|
93
|
+
baseOf (field, locale, state) {
|
|
94
|
+
const entry = fields.get(keyedFieldAddressOf(field));
|
|
95
|
+
if (!entry) return null;
|
|
96
|
+
const values = [
|
|
97
|
+
...inLocale(entry.saved, locale),
|
|
98
|
+
...inLocale(entry.answered, locale)
|
|
99
|
+
];
|
|
100
|
+
if (values.length > 0) return {
|
|
101
|
+
base: mergedBase(values)
|
|
102
|
+
};
|
|
103
|
+
if (!needsSaved(entry, state)) return NO_BASE;
|
|
104
|
+
void askForSaved(entry, locale);
|
|
105
|
+
return null;
|
|
106
|
+
},
|
|
107
|
+
stop: ()=>window.removeEventListener("message", handleAdminMessage),
|
|
108
|
+
watch (field, fieldHasReferences, onBase) {
|
|
109
|
+
const address = keyedFieldAddressOf(field);
|
|
110
|
+
const entry = fields.get(address) ?? {
|
|
111
|
+
answered: null,
|
|
112
|
+
asking: null,
|
|
113
|
+
field,
|
|
114
|
+
hasReferences: false,
|
|
115
|
+
saved: null,
|
|
116
|
+
watchers: new Set()
|
|
117
|
+
};
|
|
118
|
+
const watcher = ()=>onBase();
|
|
119
|
+
entry.hasReferences ||= fieldHasReferences;
|
|
120
|
+
entry.watchers.add(watcher);
|
|
121
|
+
fields.set(address, entry);
|
|
122
|
+
return ()=>{
|
|
123
|
+
entry.watchers.delete(watcher);
|
|
124
|
+
if (entry.watchers.size === 0 && fields.get(address) === entry) fields.delete(address);
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
//# sourceMappingURL=baseValues.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../src/client/instantPreview/unsavedRender/baseValues.ts"],"sourcesContent":["import type { LiveRichTextField, VeFieldPatchMessage } from \"../../../shared/protocol.js\";\nimport type { ValueSource } from \"./valueSource.js\";\n\nimport { isMessageFrom } from \"../../../shared/messageSource.js\";\nimport { isPlainObject } from \"../../../shared/plainObject.js\";\nimport { VE_DOCUMENT_SAVED_TYPE, VE_FIELD_PATCH_TYPE } from \"../../../shared/protocol.js\";\nimport { rootOf } from \"../../../shared/richText/editorNodes.js\";\nimport { fieldKeyOfRichTextNode } from \"../../../shared/richText/nodeKey.js\";\nimport { hasReferences } from \"../../../shared/richText/references.js\";\nimport { fieldAddressOf, isVeDocument, keyedFieldAddressOf } from \"../../../shared/veDocument.js\";\nimport { adminOriginOf, findAdminWindow } from \"../../adminWindow.js\";\n\nexport type Base = { base: unknown };\n\nexport interface BaseValues {\n watch(field: LiveRichTextField, hasReferences: boolean, onBase: () => void): () => void;\n baseOf(field: LiveRichTextField, locale: string | undefined, state: unknown): Base | null;\n answerFor(field: LiveRichTextField, locale: string | undefined): (value: unknown) => void;\n stop(): void;\n}\n\ntype InLocale = { locale: string | undefined; value: unknown };\n\ntype FieldBase = {\n field: LiveRichTextField;\n hasReferences: boolean;\n watchers: Set<() => void>;\n saved: InLocale | null;\n answered: InLocale | null;\n asking: object | null;\n};\n\nconst ROOT_NODE_TYPE = \"root\";\n\nconst NO_BASE: Base = { base: null };\n\nconst patchMessageOf = (data: unknown): VeFieldPatchMessage | null => {\n if (!isPlainObject(data) || data.type !== VE_FIELD_PATCH_TYPE || !isVeDocument(data)) return null;\n const isLocale = data.locale === undefined || typeof data.locale === \"string\";\n return isLocale && Array.isArray(data.patches) ? (data as VeFieldPatchMessage) : null;\n};\n\nconst typedFieldKeysOf = ({ patches }: VeFieldPatchMessage): Set<string> =>\n new Set(\n patches.flatMap((patch) => {\n const fieldKey =\n isPlainObject(patch) && typeof patch.key === \"string\"\n ? fieldKeyOfRichTextNode(patch.key)\n : null;\n return fieldKey === null ? [] : [fieldKey];\n })\n );\n\nconst mergedBase = (values: readonly unknown[]): unknown =>\n values.length === 1\n ? values[0]\n : { root: { children: values.map(rootOf).filter(Boolean), type: ROOT_NODE_TYPE } };\n\nconst inLocale = (located: InLocale | null, locale: string | undefined): unknown[] =>\n located && located.locale === locale ? [located.value] : [];\n\nexport function createBaseValues(adminOrigin: () => string, source: ValueSource): BaseValues {\n const fields = new Map<string, FieldBase>();\n let generation = 0;\n let isSavedSincePageLoad = false;\n\n const needsSaved = (entry: FieldBase, state: unknown) =>\n (entry.hasReferences || isSavedSincePageLoad) && hasReferences(state);\n\n const askForSaved = async (entry: FieldBase, locale: string | undefined) => {\n if (entry.asking !== null || !source.canAsk()) return;\n const asking = {};\n const askedIn = generation;\n entry.asking = asking;\n const value = await source.value({ field: entry.field, locale }).catch(() => null);\n if (entry.asking !== asking) return;\n entry.asking = null;\n if (value === null || askedIn !== generation) return;\n entry.saved = { locale, value };\n for (const onBase of entry.watchers) onBase();\n };\n\n const askForTyped = (message: VeFieldPatchMessage) => {\n for (const fieldKey of typedFieldKeysOf(message)) {\n const entry = fields.get(fieldAddressOf(message, fieldKey));\n const hasSaved = inLocale(entry?.saved ?? null, message.locale).length > 0;\n if (entry?.hasReferences && !hasSaved) void askForSaved(entry, message.locale);\n }\n };\n\n const forgetBases = () => {\n generation += 1;\n isSavedSincePageLoad = true;\n for (const entry of fields.values()) {\n entry.saved = null;\n entry.answered = null;\n entry.asking = null;\n }\n };\n\n const handleAdminMessage = (event: MessageEvent) => {\n if (!isMessageFrom(event, adminOriginOf(adminOrigin()), findAdminWindow(window))) return;\n if (isPlainObject(event.data) && event.data.type === VE_DOCUMENT_SAVED_TYPE) {\n forgetBases();\n return;\n }\n const typed = patchMessageOf(event.data);\n if (typed) askForTyped(typed);\n };\n window.addEventListener(\"message\", handleAdminMessage);\n\n return {\n answerFor(field, locale) {\n const askedIn = generation;\n return (value) => {\n const entry = fields.get(keyedFieldAddressOf(field));\n if (entry && askedIn === generation) entry.answered = { locale, value };\n };\n },\n baseOf(field, locale, state) {\n const entry = fields.get(keyedFieldAddressOf(field));\n if (!entry) return null;\n const values = [...inLocale(entry.saved, locale), ...inLocale(entry.answered, locale)];\n if (values.length > 0) return { base: mergedBase(values) };\n if (!needsSaved(entry, state)) return NO_BASE;\n void askForSaved(entry, locale);\n return null;\n },\n stop: () => window.removeEventListener(\"message\", handleAdminMessage),\n watch(field, fieldHasReferences, onBase) {\n const address = keyedFieldAddressOf(field);\n const entry = fields.get(address) ?? {\n answered: null,\n asking: null,\n field,\n hasReferences: false,\n saved: null,\n watchers: new Set(),\n };\n const watcher = () => onBase();\n entry.hasReferences ||= fieldHasReferences;\n entry.watchers.add(watcher);\n fields.set(address, entry);\n return () => {\n entry.watchers.delete(watcher);\n if (entry.watchers.size === 0 && fields.get(address) === entry) fields.delete(address);\n };\n },\n };\n}\n"],"names":["isMessageFrom","isPlainObject","VE_DOCUMENT_SAVED_TYPE","VE_FIELD_PATCH_TYPE","rootOf","fieldKeyOfRichTextNode","hasReferences","fieldAddressOf","isVeDocument","keyedFieldAddressOf","adminOriginOf","findAdminWindow","ROOT_NODE_TYPE","NO_BASE","base","patchMessageOf","data","type","isLocale","locale","undefined","Array","isArray","patches","typedFieldKeysOf","Set","flatMap","patch","fieldKey","key","mergedBase","values","length","root","children","map","filter","Boolean","inLocale","located","value","createBaseValues","adminOrigin","source","fields","Map","generation","isSavedSincePageLoad","needsSaved","entry","state","askForSaved","asking","canAsk","askedIn","field","catch","saved","onBase","watchers","askForTyped","message","get","hasSaved","forgetBases","answered","handleAdminMessage","event","window","typed","addEventListener","answerFor","baseOf","stop","removeEventListener","watch","fieldHasReferences","address","watcher","add","set","delete","size"],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { LiveRichTextField, LiveRichTextRequest } from "../../../shared/protocol.js";
|
|
2
|
+
import type { AdminPage } from "../adminChannel.js";
|
|
3
|
+
import type { SavedRichTextShapes } from "./savedShapes.js";
|
|
4
|
+
import type { RenderOfShape, UnsavedRenderState } from "./unsavedRender.js";
|
|
5
|
+
export type RenderUnsavedRichText<Node> = (request: LiveRichTextRequest, signal: AbortSignal) => Promise<Node | null | undefined>;
|
|
6
|
+
export type RenderUnsavedRichTextOnThePage<Node> = (request: LiveRichTextRequest) => Node | null | PromiseLike<Node | null>;
|
|
7
|
+
export type LiveRichTextOptions<Node> = {
|
|
8
|
+
field: LiveRichTextField;
|
|
9
|
+
savedShape: string;
|
|
10
|
+
shown?: UnsavedRenderState<Node>;
|
|
11
|
+
adminPage: () => AdminPage;
|
|
12
|
+
savedShapes: SavedRichTextShapes | null;
|
|
13
|
+
render: RenderUnsavedRichText<Node>;
|
|
14
|
+
optimistic?: RenderUnsavedRichTextOnThePage<Node>;
|
|
15
|
+
onChange: (snapshot: UnsavedRenderState<Node>, isRender: boolean) => void;
|
|
16
|
+
};
|
|
17
|
+
export type ShownRichText<Node> = {
|
|
18
|
+
node: Node;
|
|
19
|
+
commit: () => void;
|
|
20
|
+
};
|
|
21
|
+
export interface LiveRichText<Node> {
|
|
22
|
+
snapshot(): UnsavedRenderState<Node>;
|
|
23
|
+
shownFor(snapshot: UnsavedRenderState<Node>, saved: RenderOfShape<Node>): ShownRichText<Node>;
|
|
24
|
+
renderOnThePageAgain(): void;
|
|
25
|
+
dropUnsaved(): void;
|
|
26
|
+
stop(): void;
|
|
27
|
+
}
|
|
28
|
+
export declare const shownWithoutLiveRichText: <Node>(saved: RenderOfShape<Node>) => ShownRichText<Node>;
|
|
29
|
+
export declare function createLiveRichText<Node>({ adminPage, field, onChange, optimistic, render, savedShape, savedShapes, shown, }: LiveRichTextOptions<Node>): LiveRichText<Node>;
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import { documentAddressOf, keyedFieldAddressOf, veDocumentOf } from "../../../shared/veDocument.js";
|
|
2
|
+
import { listenToSaves } from "../../saveEvents.js";
|
|
3
|
+
import { listenToAdmin } from "../adminChannel.js";
|
|
4
|
+
import { isForAnotherLocale, readRichTextStructure } from "../liveMessages.js";
|
|
5
|
+
import { announceLiveRichText } from "./announcer.js";
|
|
6
|
+
import { createUnsavedRender, heldSavedOf, inPlaceOfSaved, NOTHING_TOLD } from "./unsavedRender.js";
|
|
7
|
+
const commitNothing = ()=>undefined;
|
|
8
|
+
const isSameRender = (one, other)=>one.node === other.node && one.shape === other.shape;
|
|
9
|
+
export const shownWithoutLiveRichText = (saved)=>({
|
|
10
|
+
commit: commitNothing,
|
|
11
|
+
node: saved.node
|
|
12
|
+
});
|
|
13
|
+
export function createLiveRichText({ adminPage, field, onChange, optimistic, render, savedShape, savedShapes, shown = NOTHING_TOLD }) {
|
|
14
|
+
const fieldAddress = keyedFieldAddressOf(field);
|
|
15
|
+
let snapshot = shown;
|
|
16
|
+
let held = null;
|
|
17
|
+
let savedOfPage = null;
|
|
18
|
+
let savedWithoutPageRender = null;
|
|
19
|
+
let savedShapeAwaitingRender = null;
|
|
20
|
+
let namedShape = savedShape;
|
|
21
|
+
let unnameSavedShape = savedShapes?.name(fieldAddress, savedShape);
|
|
22
|
+
const nameSavedShape = (shape)=>{
|
|
23
|
+
if (shape === namedShape) return;
|
|
24
|
+
unnameSavedShape?.();
|
|
25
|
+
namedShape = shape;
|
|
26
|
+
unnameSavedShape = savedShapes?.name(fieldAddress, shape);
|
|
27
|
+
};
|
|
28
|
+
const savedShownFor = (ofPage)=>savedWithoutPageRender && isSameRender(savedWithoutPageRender.ofPage, ofPage) ? savedWithoutPageRender.saved : ofPage;
|
|
29
|
+
const takeRenderOfSavedShape = ()=>{
|
|
30
|
+
const shape = savedShapeAwaitingRender;
|
|
31
|
+
if (shape === null || savedOfPage === null) return;
|
|
32
|
+
if (shape === savedShownFor(savedOfPage).shape) {
|
|
33
|
+
savedShapeAwaitingRender = null;
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
if (snapshot.unsaved?.shape !== shape) return;
|
|
37
|
+
savedShapeAwaitingRender = null;
|
|
38
|
+
savedWithoutPageRender = {
|
|
39
|
+
ofPage: savedOfPage,
|
|
40
|
+
saved: snapshot.unsaved
|
|
41
|
+
};
|
|
42
|
+
};
|
|
43
|
+
const unsavedRender = createUnsavedRender({
|
|
44
|
+
onChange: (change, isRender)=>{
|
|
45
|
+
snapshot = {
|
|
46
|
+
...snapshot,
|
|
47
|
+
...change
|
|
48
|
+
};
|
|
49
|
+
takeRenderOfSavedShape();
|
|
50
|
+
onChange(snapshot, isRender);
|
|
51
|
+
},
|
|
52
|
+
optimistic: optimistic && (({ locale, state })=>optimistic({
|
|
53
|
+
field,
|
|
54
|
+
locale,
|
|
55
|
+
state
|
|
56
|
+
})),
|
|
57
|
+
render: ({ locale, state }, signal)=>render({
|
|
58
|
+
field,
|
|
59
|
+
locale,
|
|
60
|
+
state
|
|
61
|
+
}, signal),
|
|
62
|
+
savedShape,
|
|
63
|
+
shown: snapshot
|
|
64
|
+
});
|
|
65
|
+
const stopListening = listenToAdmin({
|
|
66
|
+
adminPage,
|
|
67
|
+
announce: ()=>announceLiveRichText({
|
|
68
|
+
document: veDocumentOf(field),
|
|
69
|
+
key: field.key
|
|
70
|
+
}, adminPage()),
|
|
71
|
+
onMessage: unsavedRender.tell,
|
|
72
|
+
read: (data)=>{
|
|
73
|
+
const structure = readRichTextStructure(data);
|
|
74
|
+
return structure && keyedFieldAddressOf(structure) === fieldAddress ? structure : null;
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
const isSaveOfField = (saved)=>saved === null || documentAddressOf(saved) === documentAddressOf(field) && !isForAnotherLocale(saved, adminPage().locale);
|
|
78
|
+
const stopListeningToSaves = listenToSaves(()=>adminPage().adminOrigin, (saved)=>{
|
|
79
|
+
if (!isSaveOfField(saved)) return;
|
|
80
|
+
savedShapeAwaitingRender = snapshot.editorShape;
|
|
81
|
+
takeRenderOfSavedShape();
|
|
82
|
+
snapshot = {
|
|
83
|
+
...snapshot
|
|
84
|
+
};
|
|
85
|
+
onChange(snapshot, false);
|
|
86
|
+
});
|
|
87
|
+
return {
|
|
88
|
+
dropUnsaved: unsavedRender.dropUnsaved,
|
|
89
|
+
renderOnThePageAgain: unsavedRender.renderOnThePageAgain,
|
|
90
|
+
shownFor (shownSnapshot, savedRenderOfPage) {
|
|
91
|
+
const saved = savedShownFor(savedRenderOfPage);
|
|
92
|
+
const nextHeld = heldSavedOf(held ?? saved, saved, shownSnapshot.editorShape);
|
|
93
|
+
return {
|
|
94
|
+
commit () {
|
|
95
|
+
if (savedOfPage && !isSameRender(savedOfPage, savedRenderOfPage)) {
|
|
96
|
+
savedShapeAwaitingRender = null;
|
|
97
|
+
savedWithoutPageRender = null;
|
|
98
|
+
}
|
|
99
|
+
savedOfPage = savedRenderOfPage;
|
|
100
|
+
held = nextHeld;
|
|
101
|
+
nameSavedShape(saved.shape);
|
|
102
|
+
unsavedRender.committed(shownSnapshot, saved.shape);
|
|
103
|
+
},
|
|
104
|
+
node: inPlaceOfSaved(shownSnapshot, saved, nextHeld)
|
|
105
|
+
};
|
|
106
|
+
},
|
|
107
|
+
snapshot: ()=>snapshot,
|
|
108
|
+
stop () {
|
|
109
|
+
unsavedRender.stop();
|
|
110
|
+
stopListening();
|
|
111
|
+
stopListeningToSaves();
|
|
112
|
+
unnameSavedShape?.();
|
|
113
|
+
}
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
//# sourceMappingURL=liveRichText.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../src/client/instantPreview/unsavedRender/liveRichText.ts"],"sourcesContent":["import type { LiveRichTextField, LiveRichTextRequest } from \"../../../shared/protocol.js\";\nimport type { AdminPage } from \"../adminChannel.js\";\nimport type { SavedRichTextShapes } from \"./savedShapes.js\";\nimport type { RenderOfShape, UnsavedRenderState } from \"./unsavedRender.js\";\n\nimport type { SavedDocument } from \"../../saveEvents.js\";\n\nimport {\n documentAddressOf,\n keyedFieldAddressOf,\n veDocumentOf,\n} from \"../../../shared/veDocument.js\";\nimport { listenToSaves } from \"../../saveEvents.js\";\nimport { listenToAdmin } from \"../adminChannel.js\";\nimport { isForAnotherLocale, readRichTextStructure } from \"../liveMessages.js\";\nimport { announceLiveRichText } from \"./announcer.js\";\nimport { createUnsavedRender, heldSavedOf, inPlaceOfSaved, NOTHING_TOLD } from \"./unsavedRender.js\";\n\nexport type RenderUnsavedRichText<Node> = (\n request: LiveRichTextRequest,\n signal: AbortSignal\n) => Promise<Node | null | undefined>;\n\nexport type RenderUnsavedRichTextOnThePage<Node> = (\n request: LiveRichTextRequest\n) => Node | null | PromiseLike<Node | null>;\n\nexport type LiveRichTextOptions<Node> = {\n field: LiveRichTextField;\n savedShape: string;\n shown?: UnsavedRenderState<Node>;\n adminPage: () => AdminPage;\n savedShapes: SavedRichTextShapes | null;\n render: RenderUnsavedRichText<Node>;\n optimistic?: RenderUnsavedRichTextOnThePage<Node>;\n onChange: (snapshot: UnsavedRenderState<Node>, isRender: boolean) => void;\n};\n\nexport type ShownRichText<Node> = { node: Node; commit: () => void };\n\nexport interface LiveRichText<Node> {\n snapshot(): UnsavedRenderState<Node>;\n shownFor(snapshot: UnsavedRenderState<Node>, saved: RenderOfShape<Node>): ShownRichText<Node>;\n renderOnThePageAgain(): void;\n dropUnsaved(): void;\n stop(): void;\n}\n\nconst commitNothing = (): void => undefined;\n\ntype SavedWithoutPageRender<Node> = { ofPage: RenderOfShape<Node>; saved: RenderOfShape<Node> };\n\nconst isSameRender = <Node>(one: RenderOfShape<Node>, other: RenderOfShape<Node>): boolean =>\n one.node === other.node && one.shape === other.shape;\n\nexport const shownWithoutLiveRichText = <Node>(\n saved: RenderOfShape<Node>\n): ShownRichText<Node> => ({\n commit: commitNothing,\n node: saved.node,\n});\n\nexport function createLiveRichText<Node>({\n adminPage,\n field,\n onChange,\n optimistic,\n render,\n savedShape,\n savedShapes,\n shown = NOTHING_TOLD,\n}: LiveRichTextOptions<Node>): LiveRichText<Node> {\n const fieldAddress = keyedFieldAddressOf(field);\n let snapshot = shown;\n let held: RenderOfShape<Node> | null = null;\n let savedOfPage: RenderOfShape<Node> | null = null;\n let savedWithoutPageRender: SavedWithoutPageRender<Node> | null = null;\n let savedShapeAwaitingRender: string | null = null;\n let namedShape = savedShape;\n let unnameSavedShape = savedShapes?.name(fieldAddress, savedShape);\n\n const nameSavedShape = (shape: string) => {\n if (shape === namedShape) return;\n unnameSavedShape?.();\n namedShape = shape;\n unnameSavedShape = savedShapes?.name(fieldAddress, shape);\n };\n\n const savedShownFor = (ofPage: RenderOfShape<Node>): RenderOfShape<Node> =>\n savedWithoutPageRender && isSameRender(savedWithoutPageRender.ofPage, ofPage)\n ? savedWithoutPageRender.saved\n : ofPage;\n\n const takeRenderOfSavedShape = () => {\n const shape = savedShapeAwaitingRender;\n if (shape === null || savedOfPage === null) return;\n if (shape === savedShownFor(savedOfPage).shape) {\n savedShapeAwaitingRender = null;\n return;\n }\n if (snapshot.unsaved?.shape !== shape) return;\n savedShapeAwaitingRender = null;\n savedWithoutPageRender = { ofPage: savedOfPage, saved: snapshot.unsaved };\n };\n\n const unsavedRender = createUnsavedRender<Node>({\n onChange: (change, isRender) => {\n snapshot = { ...snapshot, ...change };\n takeRenderOfSavedShape();\n onChange(snapshot, isRender);\n },\n optimistic: optimistic && (({ locale, state }) => optimistic({ field, locale, state })),\n render: ({ locale, state }, signal) => render({ field, locale, state }, signal),\n savedShape,\n shown: snapshot,\n });\n\n const stopListening = listenToAdmin({\n adminPage,\n announce: () =>\n announceLiveRichText({ document: veDocumentOf(field), key: field.key }, adminPage()),\n onMessage: unsavedRender.tell,\n read: (data: unknown) => {\n const structure = readRichTextStructure(data);\n return structure && keyedFieldAddressOf(structure) === fieldAddress ? structure : null;\n },\n });\n\n const isSaveOfField = (saved: SavedDocument): boolean =>\n saved === null ||\n (documentAddressOf(saved) === documentAddressOf(field) &&\n !isForAnotherLocale(saved, adminPage().locale));\n\n const stopListeningToSaves = listenToSaves(\n () => adminPage().adminOrigin,\n (saved) => {\n if (!isSaveOfField(saved)) return;\n savedShapeAwaitingRender = snapshot.editorShape;\n takeRenderOfSavedShape();\n snapshot = { ...snapshot };\n onChange(snapshot, false);\n }\n );\n\n return {\n dropUnsaved: unsavedRender.dropUnsaved,\n renderOnThePageAgain: unsavedRender.renderOnThePageAgain,\n shownFor(shownSnapshot, savedRenderOfPage) {\n const saved = savedShownFor(savedRenderOfPage);\n const nextHeld = heldSavedOf(held ?? saved, saved, shownSnapshot.editorShape);\n return {\n commit() {\n if (savedOfPage && !isSameRender(savedOfPage, savedRenderOfPage)) {\n savedShapeAwaitingRender = null;\n savedWithoutPageRender = null;\n }\n savedOfPage = savedRenderOfPage;\n held = nextHeld;\n nameSavedShape(saved.shape);\n unsavedRender.committed(shownSnapshot, saved.shape);\n },\n node: inPlaceOfSaved(shownSnapshot, saved, nextHeld),\n };\n },\n snapshot: () => snapshot,\n stop() {\n unsavedRender.stop();\n stopListening();\n stopListeningToSaves();\n unnameSavedShape?.();\n },\n };\n}\n"],"names":["documentAddressOf","keyedFieldAddressOf","veDocumentOf","listenToSaves","listenToAdmin","isForAnotherLocale","readRichTextStructure","announceLiveRichText","createUnsavedRender","heldSavedOf","inPlaceOfSaved","NOTHING_TOLD","commitNothing","undefined","isSameRender","one","other","node","shape","shownWithoutLiveRichText","saved","commit","createLiveRichText","adminPage","field","onChange","optimistic","render","savedShape","savedShapes","shown","fieldAddress","snapshot","held","savedOfPage","savedWithoutPageRender","savedShapeAwaitingRender","namedShape","unnameSavedShape","name","nameSavedShape","savedShownFor","ofPage","takeRenderOfSavedShape","unsaved","unsavedRender","change","isRender","locale","state","signal","stopListening","announce","document","key","onMessage","tell","read","data","structure","isSaveOfField","stopListeningToSaves","adminOrigin","editorShape","dropUnsaved","renderOnThePageAgain","shownFor","shownSnapshot","savedRenderOfPage","nextHeld","committed","stop"],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { VeEditorState } from "../../../shared/protocol.js";
|
|
2
|
+
export type OptimisticField = {
|
|
3
|
+
fieldAddress: string;
|
|
4
|
+
meta: unknown;
|
|
5
|
+
};
|
|
6
|
+
export declare const optimisticValueOf: (state: unknown, { fieldAddress, meta }: OptimisticField, base: unknown) => VeEditorState | null;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { withBlockFieldsOf } from "../../../shared/richText/blockNodes.js";
|
|
2
|
+
import { isEditorStateTree } from "../../../shared/richText/editorStateTree.js";
|
|
3
|
+
import { markTextLeaves } from "../../../shared/richText/markTextLeaves.js";
|
|
4
|
+
import { referencesIn } from "../../../shared/richText/references.js";
|
|
5
|
+
import { withRelatedDocumentsAsIds } from "../../../shared/richText/relatedIds.js";
|
|
6
|
+
import { withSavedNodeFieldsOf } from "../../../shared/richText/savedNodeFields.js";
|
|
7
|
+
import { META_KEY } from "../../../shared/shared.js";
|
|
8
|
+
export const optimisticValueOf = (state, { fieldAddress, meta }, base)=>{
|
|
9
|
+
if (!isEditorStateTree(state)) return null;
|
|
10
|
+
const references = referencesIn(base);
|
|
11
|
+
const placed = withSavedNodeFieldsOf(withBlockFieldsOf(withRelatedDocumentsAsIds(state), base), base);
|
|
12
|
+
const populated = references.populate(placed);
|
|
13
|
+
markTextLeaves(populated, fieldAddress);
|
|
14
|
+
return {
|
|
15
|
+
...references.withoutUnresolved(populated),
|
|
16
|
+
[META_KEY]: meta
|
|
17
|
+
};
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
//# sourceMappingURL=optimisticValue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../src/client/instantPreview/unsavedRender/optimisticValue.ts"],"sourcesContent":["import type { VeEditorState } from \"../../../shared/protocol.js\";\n\nimport { withBlockFieldsOf } from \"../../../shared/richText/blockNodes.js\";\nimport { isEditorStateTree } from \"../../../shared/richText/editorStateTree.js\";\nimport { markTextLeaves } from \"../../../shared/richText/markTextLeaves.js\";\nimport { referencesIn } from \"../../../shared/richText/references.js\";\nimport { withRelatedDocumentsAsIds } from \"../../../shared/richText/relatedIds.js\";\nimport { withSavedNodeFieldsOf } from \"../../../shared/richText/savedNodeFields.js\";\nimport { META_KEY } from \"../../../shared/shared.js\";\n\nexport type OptimisticField = { fieldAddress: string; meta: unknown };\n\nexport const optimisticValueOf = (\n state: unknown,\n { fieldAddress, meta }: OptimisticField,\n base: unknown\n): VeEditorState | null => {\n if (!isEditorStateTree(state)) return null;\n const references = referencesIn(base);\n const placed = withSavedNodeFieldsOf(\n withBlockFieldsOf(withRelatedDocumentsAsIds(state), base),\n base\n );\n const populated = references.populate(placed);\n markTextLeaves(populated, fieldAddress);\n return { ...references.withoutUnresolved(populated), [META_KEY]: meta };\n};\n"],"names":["withBlockFieldsOf","isEditorStateTree","markTextLeaves","referencesIn","withRelatedDocumentsAsIds","withSavedNodeFieldsOf","META_KEY","optimisticValueOf","state","fieldAddress","meta","base","references","placed","populated","populate","withoutUnresolved"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,yCAAyC;AAC3E,SAASC,iBAAiB,QAAQ,8CAA8C;AAChF,SAASC,cAAc,QAAQ,6CAA6C;AAC5E,SAASC,YAAY,QAAQ,yCAAyC;AACtE,SAASC,yBAAyB,QAAQ,yCAAyC;AACnF,SAASC,qBAAqB,QAAQ,8CAA8C;AACpF,SAASC,QAAQ,QAAQ,4BAA4B;AAIrD,OAAO,MAAMC,oBAAoB,CAC/BC,OACA,EAAEC,YAAY,EAAEC,IAAI,EAAmB,EACvCC;IAEA,IAAI,CAACV,kBAAkBO,QAAQ,OAAO;IACtC,MAAMI,aAAaT,aAAaQ;IAChC,MAAME,SAASR,sBACbL,kBAAkBI,0BAA0BI,QAAQG,OACpDA;IAEF,MAAMG,YAAYF,WAAWG,QAAQ,CAACF;IACtCX,eAAeY,WAAWL;IAC1B,OAAO;QAAE,GAAGG,WAAWI,iBAAiB,CAACF,UAAU;QAAE,CAACR,SAAS,EAAEI;IAAK;AACxE,EAAE"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { LiveRichTextRequest } from "../../../shared/protocol.js";
|
|
2
|
+
import type { LiveRichTextIdentity } from "../liveRichTextOf.js";
|
|
3
|
+
import type { RenderUnsavedRichText, RenderUnsavedRichTextOnThePage } from "./liveRichText.js";
|
|
4
|
+
export type RenderValue<Node> = (value: unknown, signal: AbortSignal) => Node | null | undefined | PromiseLike<Node | null>;
|
|
5
|
+
export type RichTextRenders<Node> = {
|
|
6
|
+
render?: RenderUnsavedRichText<Node> | null;
|
|
7
|
+
renderValue?: RenderValue<Node>;
|
|
8
|
+
};
|
|
9
|
+
export type RenderedOnThePage<Node> = {
|
|
10
|
+
optimistic: RenderUnsavedRichTextOnThePage<Node>;
|
|
11
|
+
stop: () => void;
|
|
12
|
+
};
|
|
13
|
+
export type RenderSourcesOptions = {
|
|
14
|
+
adminOrigin: () => string;
|
|
15
|
+
payloadApi: string | undefined;
|
|
16
|
+
rendersOnThePage?: boolean;
|
|
17
|
+
};
|
|
18
|
+
export interface RenderSources {
|
|
19
|
+
htmlOfPayload: RenderUnsavedRichText<string> | null;
|
|
20
|
+
canShow(renders: RichTextRenders<unknown>): boolean;
|
|
21
|
+
render<Node>(renders: RichTextRenders<Node>, request: LiveRichTextRequest, signal: AbortSignal): Promise<Node | null | undefined>;
|
|
22
|
+
onThePage<Node>(identity: LiveRichTextIdentity, renders: RichTextRenders<Node>, onBase: () => void): RenderedOnThePage<Node> | null;
|
|
23
|
+
stop(): void;
|
|
24
|
+
}
|
|
25
|
+
export declare const RENDER_SOURCES_OF_THE_PAGE_ALONE: RenderSources;
|
|
26
|
+
export declare function listenToRenderSources({ adminOrigin, payloadApi, rendersOnThePage, }: RenderSourcesOptions): RenderSources;
|