@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.
Files changed (232) hide show
  1. package/README.md +265 -31
  2. package/dist/admin/InstantPreviewBroadcaster.js +44 -3
  3. package/dist/admin/InstantPreviewBroadcaster.js.map +1 -1
  4. package/dist/admin/PreviewPageBridge.d.ts +1 -0
  5. package/dist/admin/PreviewPageBridge.js +50 -0
  6. package/dist/admin/PreviewPageBridge.js.map +1 -0
  7. package/dist/admin/VisualEditingBridgeProvider.js +60 -35
  8. package/dist/admin/VisualEditingBridgeProvider.js.map +1 -1
  9. package/dist/admin/expandAndFocus.d.ts +1 -0
  10. package/dist/admin/expandAndFocus.js +122 -99
  11. package/dist/admin/expandAndFocus.js.map +1 -1
  12. package/dist/admin/index.d.ts +1 -0
  13. package/dist/admin/index.js +1 -0
  14. package/dist/admin/index.js.map +1 -1
  15. package/dist/admin/instantPreview/previewGrants.d.ts +14 -0
  16. package/dist/admin/instantPreview/previewGrants.js +62 -0
  17. package/dist/admin/instantPreview/previewGrants.js.map +1 -0
  18. package/dist/admin/instantPreview/usePreviewPage.d.ts +2 -1
  19. package/dist/admin/instantPreview/usePreviewPage.js +12 -3
  20. package/dist/admin/instantPreview/usePreviewPage.js.map +1 -1
  21. package/dist/admin/openField/openForms.d.ts +7 -0
  22. package/dist/admin/openField/openForms.js +40 -0
  23. package/dist/admin/openField/openForms.js.map +1 -1
  24. package/dist/admin/previewPages.d.ts +7 -0
  25. package/dist/admin/previewPages.js +13 -0
  26. package/dist/admin/previewPages.js.map +1 -0
  27. package/dist/client/createOverlay.js +3 -0
  28. package/dist/client/createOverlay.js.map +1 -1
  29. package/dist/client/index.d.ts +6 -6
  30. package/dist/client/index.js +5 -5
  31. package/dist/client/index.js.map +1 -1
  32. package/dist/client/instantPreview/instantPreview.js +1 -1
  33. package/dist/client/instantPreview/instantPreview.js.map +1 -1
  34. package/dist/client/instantPreview/liveFields.d.ts +2 -1
  35. package/dist/client/instantPreview/liveFields.js +32 -5
  36. package/dist/client/instantPreview/liveFields.js.map +1 -1
  37. package/dist/client/instantPreview/liveRichTextOf.d.ts +3 -0
  38. package/dist/client/instantPreview/liveRichTextOf.js +3 -0
  39. package/dist/client/instantPreview/liveRichTextOf.js.map +1 -1
  40. package/dist/client/instantPreview/unsavedRender/baseValues.d.ts +12 -0
  41. package/dist/client/instantPreview/unsavedRender/baseValues.js +130 -0
  42. package/dist/client/instantPreview/unsavedRender/baseValues.js.map +1 -0
  43. package/dist/client/instantPreview/unsavedRender/liveRichText.d.ts +29 -0
  44. package/dist/client/instantPreview/unsavedRender/liveRichText.js +117 -0
  45. package/dist/client/instantPreview/unsavedRender/liveRichText.js.map +1 -0
  46. package/dist/client/instantPreview/unsavedRender/optimisticValue.d.ts +6 -0
  47. package/dist/client/instantPreview/unsavedRender/optimisticValue.js +20 -0
  48. package/dist/client/instantPreview/unsavedRender/optimisticValue.js.map +1 -0
  49. package/dist/client/instantPreview/unsavedRender/renderSources.d.ts +26 -0
  50. package/dist/client/instantPreview/unsavedRender/renderSources.js +77 -0
  51. package/dist/client/instantPreview/unsavedRender/renderSources.js.map +1 -0
  52. package/dist/client/instantPreview/unsavedRender/unsavedRender.d.ts +6 -1
  53. package/dist/client/instantPreview/unsavedRender/unsavedRender.js +116 -17
  54. package/dist/client/instantPreview/unsavedRender/unsavedRender.js.map +1 -1
  55. package/dist/client/instantPreview/unsavedRender/valueSource.d.ts +17 -0
  56. package/dist/client/instantPreview/unsavedRender/valueSource.js +38 -0
  57. package/dist/client/instantPreview/unsavedRender/valueSource.js.map +1 -0
  58. package/dist/client/overlay/constants.d.ts +1 -2
  59. package/dist/client/overlay/constants.js +1 -7
  60. package/dist/client/overlay/constants.js.map +1 -1
  61. package/dist/client/overlay/fieldTracker.d.ts +2 -0
  62. package/dist/client/overlay/fieldTracker.js +140 -42
  63. package/dist/client/overlay/fieldTracker.js.map +1 -1
  64. package/dist/client/overlay/hoverController.js +3 -3
  65. package/dist/client/overlay/hoverController.js.map +1 -1
  66. package/dist/client/overlay/markerCleaner.d.ts +5 -0
  67. package/dist/client/overlay/markerCleaner.js +94 -0
  68. package/dist/client/overlay/markerCleaner.js.map +1 -0
  69. package/dist/client/overlay/markerExtractor.js +1 -1
  70. package/dist/client/overlay/markerExtractor.js.map +1 -1
  71. package/dist/client/overlay/mutationPipeline.d.ts +3 -0
  72. package/dist/client/overlay/mutationPipeline.js +15 -9
  73. package/dist/client/overlay/mutationPipeline.js.map +1 -1
  74. package/dist/client/overlay/pageNodes.d.ts +3 -0
  75. package/dist/client/overlay/pageNodes.js +34 -0
  76. package/dist/client/overlay/pageNodes.js.map +1 -0
  77. package/dist/client/overlayClickHandler.js +3 -2
  78. package/dist/client/overlayClickHandler.js.map +1 -1
  79. package/dist/client/overlayScope.d.ts +14 -0
  80. package/dist/client/overlayScope.js +23 -0
  81. package/dist/client/overlayScope.js.map +1 -0
  82. package/dist/client/previewGrant.d.ts +5 -0
  83. package/dist/client/previewGrant.js +34 -0
  84. package/dist/client/previewGrant.js.map +1 -0
  85. package/dist/client/react/LiveRichText.d.ts +17 -0
  86. package/dist/client/react/LiveRichText.js +32 -0
  87. package/dist/client/react/LiveRichText.js.map +1 -0
  88. package/dist/client/react/UnsavedRenderBoundary.js.map +1 -0
  89. package/dist/client/react/VisualEditingOverlay.js +60 -0
  90. package/dist/client/react/VisualEditingOverlay.js.map +1 -0
  91. package/dist/client/react/VisualEditingProvider.d.ts +21 -0
  92. package/dist/client/react/VisualEditingProvider.js +83 -0
  93. package/dist/client/react/VisualEditingProvider.js.map +1 -0
  94. package/dist/client/react/VisualEditingToggle.d.ts +1 -0
  95. package/dist/client/react/VisualEditingToggle.js +32 -0
  96. package/dist/client/react/VisualEditingToggle.js.map +1 -0
  97. package/dist/client/react/overlayContext.d.ts +2 -0
  98. package/dist/client/react/overlayContext.js +4 -0
  99. package/dist/client/react/overlayContext.js.map +1 -0
  100. package/dist/client/react/useIsomorphicLayoutEffect.js.map +1 -0
  101. package/dist/client/react/useUnsavedRender.d.ts +16 -0
  102. package/dist/client/react/useUnsavedRender.js +89 -0
  103. package/dist/client/react/useUnsavedRender.js.map +1 -0
  104. package/dist/client/saveEvents.d.ts +3 -0
  105. package/dist/client/saveEvents.js +27 -0
  106. package/dist/client/saveEvents.js.map +1 -0
  107. package/dist/client/session.d.ts +40 -0
  108. package/dist/client/session.js +100 -0
  109. package/dist/client/session.js.map +1 -0
  110. package/dist/client/sessionOverlay.d.ts +9 -0
  111. package/dist/client/sessionOverlay.js +74 -0
  112. package/dist/client/sessionOverlay.js.map +1 -0
  113. package/dist/client/toggle.d.ts +7 -0
  114. package/dist/client/toggle.js +158 -0
  115. package/dist/client/toggle.js.map +1 -0
  116. package/dist/client/withVisualEditingPath.d.ts +2 -0
  117. package/dist/client/withVisualEditingPath.js +5 -6
  118. package/dist/client/withVisualEditingPath.js.map +1 -1
  119. package/dist/dom/index.d.ts +6 -0
  120. package/dist/dom/index.js +7 -0
  121. package/dist/dom/index.js.map +1 -0
  122. package/dist/dom/liveRichTextElements.d.ts +8 -0
  123. package/dist/dom/liveRichTextElements.js +69 -0
  124. package/dist/dom/liveRichTextElements.js.map +1 -0
  125. package/dist/dom/mountVisualEditing.d.ts +16 -0
  126. package/dist/dom/mountVisualEditing.js +52 -0
  127. package/dist/dom/mountVisualEditing.js.map +1 -0
  128. package/dist/excludeValues.d.ts +0 -4
  129. package/dist/excludeValues.js +4 -4
  130. package/dist/excludeValues.js.map +1 -1
  131. package/dist/index.d.ts +4 -0
  132. package/dist/index.js +13 -4
  133. package/dist/index.js.map +1 -1
  134. package/dist/readUnsavedRichText.d.ts +16 -2
  135. package/dist/readUnsavedRichText.js +26 -7
  136. package/dist/readUnsavedRichText.js.map +1 -1
  137. package/dist/server/endpoints.d.ts +16 -0
  138. package/dist/server/endpoints.js +136 -0
  139. package/dist/server/endpoints.js.map +1 -0
  140. package/dist/server/markRead.js +3 -3
  141. package/dist/server/markRead.js.map +1 -1
  142. package/dist/server/markedReads.d.ts +1 -1
  143. package/dist/server/markedReads.js +4 -2
  144. package/dist/server/markedReads.js.map +1 -1
  145. package/dist/server/previewGrant.d.ts +9 -0
  146. package/dist/server/previewGrant.js +31 -0
  147. package/dist/server/previewGrant.js.map +1 -0
  148. package/dist/server/unsavedRichText/hooks.js +24 -9
  149. package/dist/server/unsavedRichText/hooks.js.map +1 -1
  150. package/dist/server/unsavedRichText/placeUnsavedState.js +1 -1
  151. package/dist/server/unsavedRichText/placeUnsavedState.js.map +1 -1
  152. package/dist/server/unsavedRichText/postedEditorState.js +3 -31
  153. package/dist/server/unsavedRichText/postedEditorState.js.map +1 -1
  154. package/dist/server/unsavedRichText/postedRequest.d.ts +2 -1
  155. package/dist/server/unsavedRichText/postedRequest.js +14 -4
  156. package/dist/server/unsavedRichText/postedRequest.js.map +1 -1
  157. package/dist/server/unsavedRichText/readAsUser.d.ts +7 -2
  158. package/dist/server/unsavedRichText/readAsUser.js +47 -16
  159. package/dist/server/unsavedRichText/readAsUser.js.map +1 -1
  160. package/dist/server/unsavedRichText/readContext.d.ts +6 -0
  161. package/dist/server/unsavedRichText/readContext.js +5 -0
  162. package/dist/server/unsavedRichText/readContext.js.map +1 -1
  163. package/dist/server/unsavedRichText/savedReferences.d.ts +5 -0
  164. package/dist/server/unsavedRichText/savedReferences.js +61 -0
  165. package/dist/server/unsavedRichText/savedReferences.js.map +1 -0
  166. package/dist/server/withDocumentControls.d.ts +10 -0
  167. package/dist/server/{withInstantPreview.js → withDocumentControls.js} +17 -7
  168. package/dist/server/withDocumentControls.js.map +1 -0
  169. package/dist/shared/buildAdminEditUrl.d.ts +1 -0
  170. package/dist/shared/buildAdminEditUrl.js +5 -1
  171. package/dist/shared/buildAdminEditUrl.js.map +1 -1
  172. package/dist/shared/protocol.d.ts +18 -0
  173. package/dist/shared/protocol.js +6 -0
  174. package/dist/shared/protocol.js.map +1 -1
  175. package/dist/shared/richText/editorStateTree.d.ts +2 -0
  176. package/dist/shared/richText/editorStateTree.js +34 -0
  177. package/dist/shared/richText/editorStateTree.js.map +1 -0
  178. package/dist/{server → shared}/richText/markTextLeaves.js +5 -5
  179. package/dist/shared/richText/markTextLeaves.js.map +1 -0
  180. package/dist/shared/richText/nodeKey.d.ts +3 -2
  181. package/dist/shared/richText/nodeKey.js +15 -6
  182. package/dist/shared/richText/nodeKey.js.map +1 -1
  183. package/dist/shared/richText/references.d.ts +16 -0
  184. package/dist/shared/richText/references.js +85 -0
  185. package/dist/shared/richText/references.js.map +1 -0
  186. package/dist/{server/unsavedRichText → shared/richText}/relatedIds.d.ts +1 -1
  187. package/dist/{server/unsavedRichText → shared/richText}/relatedIds.js +4 -4
  188. package/dist/shared/richText/relatedIds.js.map +1 -0
  189. package/dist/shared/richText/savedNodeFields.d.ts +3 -0
  190. package/dist/{server/unsavedRichText → shared/richText}/savedNodeFields.js +4 -4
  191. package/dist/shared/richText/savedNodeFields.js.map +1 -0
  192. package/dist/shared/shared.d.ts +14 -3
  193. package/dist/shared/shared.js +46 -1
  194. package/dist/shared/shared.js.map +1 -1
  195. package/dist/shared/stegaText.d.ts +2 -1
  196. package/dist/shared/stegaText.js +3 -1
  197. package/dist/shared/stegaText.js.map +1 -1
  198. package/package.json +26 -4
  199. package/dist/client/VisualEditingOverlay.js +0 -39
  200. package/dist/client/VisualEditingOverlay.js.map +0 -1
  201. package/dist/client/VisualEditingProvider.d.ts +0 -25
  202. package/dist/client/VisualEditingProvider.js +0 -68
  203. package/dist/client/VisualEditingProvider.js.map +0 -1
  204. package/dist/client/VisualEditingToggle.d.ts +0 -1
  205. package/dist/client/VisualEditingToggle.js +0 -153
  206. package/dist/client/VisualEditingToggle.js.map +0 -1
  207. package/dist/client/instantPreview/LiveRichText.d.ts +0 -16
  208. package/dist/client/instantPreview/LiveRichText.js +0 -18
  209. package/dist/client/instantPreview/LiveRichText.js.map +0 -1
  210. package/dist/client/instantPreview/unsavedRender/UnsavedRenderBoundary.js.map +0 -1
  211. package/dist/client/instantPreview/unsavedRender/useUnsavedRender.d.ts +0 -10
  212. package/dist/client/instantPreview/unsavedRender/useUnsavedRender.js +0 -118
  213. package/dist/client/instantPreview/unsavedRender/useUnsavedRender.js.map +0 -1
  214. package/dist/client/overlayContext.d.ts +0 -3
  215. package/dist/client/overlayContext.js +0 -5
  216. package/dist/client/overlayContext.js.map +0 -1
  217. package/dist/client/useIsomorphicLayoutEffect.js.map +0 -1
  218. package/dist/client/useVisualEditingOverlay.d.ts +0 -4
  219. package/dist/client/useVisualEditingOverlay.js +0 -33
  220. package/dist/client/useVisualEditingOverlay.js.map +0 -1
  221. package/dist/server/richText/markTextLeaves.js.map +0 -1
  222. package/dist/server/unsavedRichText/relatedIds.js.map +0 -1
  223. package/dist/server/unsavedRichText/savedNodeFields.d.ts +0 -2
  224. package/dist/server/unsavedRichText/savedNodeFields.js.map +0 -1
  225. package/dist/server/withInstantPreview.d.ts +0 -9
  226. package/dist/server/withInstantPreview.js.map +0 -1
  227. /package/dist/client/{instantPreview/unsavedRender → react}/UnsavedRenderBoundary.d.ts +0 -0
  228. /package/dist/client/{instantPreview/unsavedRender → react}/UnsavedRenderBoundary.js +0 -0
  229. /package/dist/client/{VisualEditingOverlay.d.ts → react/VisualEditingOverlay.d.ts} +0 -0
  230. /package/dist/client/{useIsomorphicLayoutEffect.d.ts → react/useIsomorphicLayoutEffect.d.ts} +0 -0
  231. /package/dist/client/{useIsomorphicLayoutEffect.js → react/useIsomorphicLayoutEffect.js} +0 -0
  232. /package/dist/{server → shared}/richText/markTextLeaves.d.ts +0 -0
@@ -0,0 +1,77 @@
1
+ import { isMetaInfo } from "../../../shared/shared.js";
2
+ import { keyedFieldAddressOf } from "../../../shared/veDocument.js";
3
+ import { listenToPreviewGrants } from "../../previewGrant.js";
4
+ import { createBaseValues } from "./baseValues.js";
5
+ import { optimisticValueOf } from "./optimisticValue.js";
6
+ import { valueSourceOf } from "./valueSource.js";
7
+ const NEVER_ABORTED = new AbortController().signal;
8
+ const NO_BASE = {
9
+ base: null
10
+ };
11
+ const doNothing = ()=>undefined;
12
+ const renderedOnThePage = ({ field, hasReferences, meta }, bases, renderValue, onBase)=>{
13
+ if (!isMetaInfo(meta) || typeof hasReferences !== "boolean") return null;
14
+ const valueField = {
15
+ fieldAddress: keyedFieldAddressOf(field),
16
+ meta
17
+ };
18
+ const baseIn = (locale, state)=>bases ? bases.baseOf(field, locale, state) : hasReferences ? null : NO_BASE;
19
+ return {
20
+ optimistic: ({ locale, state })=>{
21
+ const found = baseIn(locale, state);
22
+ const value = found && optimisticValueOf(state, valueField, found.base);
23
+ return value && (renderValue(value, NEVER_ABORTED) ?? null);
24
+ },
25
+ stop: bases ? bases.watch(field, hasReferences, onBase) : doNothing
26
+ };
27
+ };
28
+ const renderedThroughPayload = async ({ bases, source }, renderValue, request, signal)=>{
29
+ const answered = bases?.answerFor(request.field, request.locale);
30
+ const value = await source.value(request, signal);
31
+ if (value === null) return null;
32
+ answered?.(value);
33
+ return renderValue(value, signal);
34
+ };
35
+ const renderSourcesFrom = ({ bases, rendersOnThePage, source, stop })=>({
36
+ canShow: ({ render, renderValue })=>Boolean(render) || renderValue !== undefined && (rendersOnThePage || source !== null),
37
+ htmlOfPayload: source && ((request, signal)=>source.html(request, signal)),
38
+ onThePage: (identity, { renderValue }, onBase)=>rendersOnThePage && renderValue ? renderedOnThePage(identity, bases, renderValue, onBase) : null,
39
+ render: ({ render, renderValue }, request, signal)=>renderValue && source?.canAsk() ? renderedThroughPayload({
40
+ bases,
41
+ source
42
+ }, renderValue, request, signal) : render?.(request, signal) ?? Promise.resolve(null),
43
+ stop
44
+ });
45
+ export const RENDER_SOURCES_OF_THE_PAGE_ALONE = renderSourcesFrom({
46
+ bases: null,
47
+ rendersOnThePage: true,
48
+ source: null,
49
+ stop: doNothing
50
+ });
51
+ export function listenToRenderSources({ adminOrigin, payloadApi, rendersOnThePage = true }) {
52
+ if (!payloadApi) {
53
+ return renderSourcesFrom({
54
+ bases: null,
55
+ rendersOnThePage,
56
+ source: null,
57
+ stop: doNothing
58
+ });
59
+ }
60
+ const grants = listenToPreviewGrants(adminOrigin);
61
+ const source = valueSourceOf({
62
+ grants,
63
+ payloadApi
64
+ });
65
+ const bases = rendersOnThePage ? createBaseValues(adminOrigin, source) : null;
66
+ return renderSourcesFrom({
67
+ bases,
68
+ rendersOnThePage,
69
+ source,
70
+ stop () {
71
+ bases?.stop();
72
+ grants.stop();
73
+ }
74
+ });
75
+ }
76
+
77
+ //# sourceMappingURL=renderSources.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../../src/client/instantPreview/unsavedRender/renderSources.ts"],"sourcesContent":["import type { LiveRichTextRequest } from \"../../../shared/protocol.js\";\nimport type { LiveRichTextIdentity } from \"../liveRichTextOf.js\";\nimport type { BaseValues } from \"./baseValues.js\";\nimport type { RenderUnsavedRichText, RenderUnsavedRichTextOnThePage } from \"./liveRichText.js\";\nimport type { ValueSource } from \"./valueSource.js\";\n\nimport { isMetaInfo } from \"../../../shared/shared.js\";\nimport { keyedFieldAddressOf } from \"../../../shared/veDocument.js\";\nimport { listenToPreviewGrants } from \"../../previewGrant.js\";\nimport { createBaseValues } from \"./baseValues.js\";\nimport { optimisticValueOf } from \"./optimisticValue.js\";\nimport { valueSourceOf } from \"./valueSource.js\";\n\nexport type RenderValue<Node> = (\n value: unknown,\n signal: AbortSignal\n) => Node | null | undefined | PromiseLike<Node | null>;\n\nexport type RichTextRenders<Node> = {\n render?: RenderUnsavedRichText<Node> | null;\n renderValue?: RenderValue<Node>;\n};\n\nexport type RenderedOnThePage<Node> = {\n optimistic: RenderUnsavedRichTextOnThePage<Node>;\n stop: () => void;\n};\n\nexport type RenderSourcesOptions = {\n adminOrigin: () => string;\n payloadApi: string | undefined;\n rendersOnThePage?: boolean;\n};\n\nexport interface RenderSources {\n htmlOfPayload: RenderUnsavedRichText<string> | null;\n canShow(renders: RichTextRenders<unknown>): boolean;\n render<Node>(\n renders: RichTextRenders<Node>,\n request: LiveRichTextRequest,\n signal: AbortSignal\n ): Promise<Node | null | undefined>;\n onThePage<Node>(\n identity: LiveRichTextIdentity,\n renders: RichTextRenders<Node>,\n onBase: () => void\n ): RenderedOnThePage<Node> | null;\n stop(): void;\n}\n\ntype Sources = {\n source: ValueSource | null;\n bases: BaseValues | null;\n rendersOnThePage: boolean;\n stop: () => void;\n};\n\nconst NEVER_ABORTED = new AbortController().signal;\n\nconst NO_BASE = { base: null };\n\nconst doNothing = (): void => undefined;\n\nconst renderedOnThePage = <Node>(\n { field, hasReferences, meta }: LiveRichTextIdentity,\n bases: BaseValues | null,\n renderValue: RenderValue<Node>,\n onBase: () => void\n): RenderedOnThePage<Node> | null => {\n if (!isMetaInfo(meta) || typeof hasReferences !== \"boolean\") return null;\n const valueField = { fieldAddress: keyedFieldAddressOf(field), meta };\n const baseIn = (locale: string | undefined, state: unknown) =>\n bases ? bases.baseOf(field, locale, state) : hasReferences ? null : NO_BASE;\n return {\n optimistic: ({ locale, state }) => {\n const found = baseIn(locale, state);\n const value = found && optimisticValueOf(state, valueField, found.base);\n return value && (renderValue(value, NEVER_ABORTED) ?? null);\n },\n stop: bases ? bases.watch(field, hasReferences, onBase) : doNothing,\n };\n};\n\nconst renderedThroughPayload = async <Node>(\n { bases, source }: { bases: BaseValues | null; source: ValueSource },\n renderValue: RenderValue<Node>,\n request: LiveRichTextRequest,\n signal: AbortSignal\n): Promise<Node | null | undefined> => {\n const answered = bases?.answerFor(request.field, request.locale);\n const value = await source.value(request, signal);\n if (value === null) return null;\n answered?.(value);\n return renderValue(value, signal);\n};\n\nconst renderSourcesFrom = ({ bases, rendersOnThePage, source, stop }: Sources): RenderSources => ({\n canShow: ({ render, renderValue }) =>\n Boolean(render) || (renderValue !== undefined && (rendersOnThePage || source !== null)),\n htmlOfPayload: source && ((request, signal) => source.html(request, signal)),\n onThePage: (identity, { renderValue }, onBase) =>\n rendersOnThePage && renderValue\n ? renderedOnThePage(identity, bases, renderValue, onBase)\n : null,\n render: ({ render, renderValue }, request, signal) =>\n renderValue && source?.canAsk()\n ? renderedThroughPayload({ bases, source }, renderValue, request, signal)\n : (render?.(request, signal) ?? Promise.resolve(null)),\n stop,\n});\n\nexport const RENDER_SOURCES_OF_THE_PAGE_ALONE: RenderSources = renderSourcesFrom({\n bases: null,\n rendersOnThePage: true,\n source: null,\n stop: doNothing,\n});\n\nexport function listenToRenderSources({\n adminOrigin,\n payloadApi,\n rendersOnThePage = true,\n}: RenderSourcesOptions): RenderSources {\n if (!payloadApi) {\n return renderSourcesFrom({ bases: null, rendersOnThePage, source: null, stop: doNothing });\n }\n const grants = listenToPreviewGrants(adminOrigin);\n const source = valueSourceOf({ grants, payloadApi });\n const bases = rendersOnThePage ? createBaseValues(adminOrigin, source) : null;\n return renderSourcesFrom({\n bases,\n rendersOnThePage,\n source,\n stop() {\n bases?.stop();\n grants.stop();\n },\n });\n}\n"],"names":["isMetaInfo","keyedFieldAddressOf","listenToPreviewGrants","createBaseValues","optimisticValueOf","valueSourceOf","NEVER_ABORTED","AbortController","signal","NO_BASE","base","doNothing","undefined","renderedOnThePage","field","hasReferences","meta","bases","renderValue","onBase","valueField","fieldAddress","baseIn","locale","state","baseOf","optimistic","found","value","stop","watch","renderedThroughPayload","source","request","answered","answerFor","renderSourcesFrom","rendersOnThePage","canShow","render","Boolean","htmlOfPayload","html","onThePage","identity","canAsk","Promise","resolve","RENDER_SOURCES_OF_THE_PAGE_ALONE","listenToRenderSources","adminOrigin","payloadApi","grants"],"mappings":"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"}
@@ -17,8 +17,10 @@ export type UnsavedRenderState<Node> = {
17
17
  settledCall: object | null;
18
18
  unsaved: RenderOfShape<Node> | null;
19
19
  };
20
+ export type RenderOnThePage<Node> = (structure: UnsavedStructure) => Node | null | PromiseLike<Node | null>;
20
21
  export type UnsavedRenderOptions<Node> = {
21
22
  render: (structure: UnsavedStructure, signal: AbortSignal) => Promise<Node | null | undefined>;
23
+ optimistic?: RenderOnThePage<Node>;
22
24
  shown: UnsavedRenderState<Node>;
23
25
  savedShape: string;
24
26
  onChange: (change: Partial<UnsavedRenderState<Node>>, isRender: boolean) => void;
@@ -26,6 +28,7 @@ export type UnsavedRenderOptions<Node> = {
26
28
  export interface UnsavedRender<Node> {
27
29
  tell(structure: ToldStructure): void;
28
30
  committed(shown: UnsavedRenderState<Node>, savedShape: string): void;
31
+ renderOnThePageAgain(): void;
29
32
  dropUnsaved(): void;
30
33
  stop(): void;
31
34
  }
@@ -33,8 +36,10 @@ export declare const RENDER_TIMEOUT_MS = 10000;
33
36
  export declare const RETRY_AFTER_MS = 1000;
34
37
  export declare const MOST_RETRIES_OF_A_STRUCTURE = 5;
35
38
  export declare const COMMIT_WAIT_MS = 1000;
39
+ export declare const STRUCTURE_SETTLE_MS = 200;
40
+ export declare const SERVER_CHECK_PAUSE_MS = 350;
36
41
  export declare const NOTHING_TOLD: UnsavedRenderState<never>;
37
42
  export declare const heldSavedOf: <Node>(held: RenderOfShape<Node>, saved: RenderOfShape<Node>, editorShape: string | null) => RenderOfShape<Node>;
38
43
  export declare const inPlaceOfSaved: <Node>({ editorShape, isAwaitingRender, unsaved }: UnsavedRenderState<Node>, saved: RenderOfShape<Node>, heldSaved: RenderOfShape<Node>) => Node;
39
- export declare function createUnsavedRender<Node>({ onChange, render, savedShape, shown, }: UnsavedRenderOptions<Node>): UnsavedRender<Node>;
44
+ export declare function createUnsavedRender<Node>({ onChange, optimistic, render, savedShape, shown, }: UnsavedRenderOptions<Node>): UnsavedRender<Node>;
40
45
  export {};
@@ -2,6 +2,8 @@ export const RENDER_TIMEOUT_MS = 10_000;
2
2
  export const RETRY_AFTER_MS = 1000;
3
3
  export const MOST_RETRIES_OF_A_STRUCTURE = 5;
4
4
  export const COMMIT_WAIT_MS = 1000;
5
+ export const STRUCTURE_SETTLE_MS = 200;
6
+ export const SERVER_CHECK_PAUSE_MS = 350;
5
7
  export const NOTHING_TOLD = {
6
8
  editorShape: null,
7
9
  isAwaitingRender: false,
@@ -19,11 +21,19 @@ export const inPlaceOfSaved = ({ editorShape, isAwaitingRender, unsaved }, saved
19
21
  if (isAwaitingRender && heldSaved.shape === editorShape) return heldSaved.node;
20
22
  return unsaved && unsaved.shape !== saved.shape ? unsaved.node : saved.node;
21
23
  };
24
+ const nodeOrNothing = async (rendering)=>{
25
+ try {
26
+ return await rendering;
27
+ } catch {
28
+ return null;
29
+ }
30
+ };
31
+ const isPromiseLike = (value)=>typeof value?.then === "function";
22
32
  const abandon = (call)=>{
23
33
  call.isAbandoned = true;
24
34
  call.abort.abort();
25
35
  };
26
- export function createUnsavedRender({ onChange, render, savedShape, shown }) {
36
+ export function createUnsavedRender({ onChange, optimistic, render, savedShape, shown }) {
27
37
  let committed = {
28
38
  savedShape,
29
39
  shown
@@ -32,6 +42,10 @@ export function createUnsavedRender({ onChange, render, savedShape, shown }) {
32
42
  let unsettled = null;
33
43
  let isStopped = false;
34
44
  let retryTimer;
45
+ let startTimer;
46
+ let toldShape = null;
47
+ let toldUnsaved = null;
48
+ let shownOnThePage = null;
35
49
  let retryAfterMs = RETRY_AFTER_MS;
36
50
  let retriesLeft = MOST_RETRIES_OF_A_STRUCTURE;
37
51
  let awaitedCommit = null;
@@ -49,6 +63,7 @@ export function createUnsavedRender({ onChange, render, savedShape, shown }) {
49
63
  settledCall
50
64
  }, true);
51
65
  });
66
+ const renderedOnThePageAs = (shape)=>shownOnThePage?.shape === shape ? shownOnThePage : null;
52
67
  const settle = (shape, node, isAnotherWaiting)=>{
53
68
  if (shape !== committed.shown.editorShape && showsEditorShape()) {
54
69
  change({
@@ -58,7 +73,7 @@ export function createUnsavedRender({ onChange, render, savedShape, shown }) {
58
73
  }
59
74
  return showAfterCommit({
60
75
  isAwaitingRender: isAnotherWaiting,
61
- unsaved: node === null ? null : {
76
+ unsaved: node === null ? renderedOnThePageAs(shape) : {
62
77
  node,
63
78
  shape
64
79
  }
@@ -106,18 +121,78 @@ export function createUnsavedRender({ onChange, render, savedShape, shown }) {
106
121
  if (!call.isAbandoned) await settle(structure.shape, node, waiting !== null);
107
122
  unsettled = null;
108
123
  if (!isRendered && !waiting) retryLater(structure, renderWaiting);
109
- await renderWaiting();
124
+ if (startTimer === undefined) await renderWaiting();
110
125
  };
111
126
  const cancel = ()=>{
112
127
  waiting = null;
113
128
  clearTimeout(retryTimer);
129
+ clearTimeout(startTimer);
130
+ startTimer = undefined;
114
131
  if (unsettled) abandon(unsettled);
115
132
  };
116
- const request = (structure)=>{
133
+ const startAfter = (delayMs)=>{
134
+ startTimer = setTimeout(()=>{
135
+ startTimer = undefined;
136
+ if (!unsettled) void renderWaiting();
137
+ }, delayMs);
138
+ };
139
+ const wait = (structure)=>{
117
140
  waiting = structure;
118
141
  clearTimeout(retryTimer);
119
142
  resetRetries();
120
- if (!unsettled) void renderWaiting();
143
+ };
144
+ const request = (structure)=>{
145
+ wait(structure);
146
+ if (unsettled || startTimer !== undefined) return;
147
+ startAfter(STRUCTURE_SETTLE_MS);
148
+ };
149
+ const checkAfterPause = (structure)=>{
150
+ wait(structure);
151
+ clearTimeout(startTimer);
152
+ startAfter(SERVER_CHECK_PAUSE_MS);
153
+ };
154
+ const renderedOnThePage = (structure)=>{
155
+ try {
156
+ return optimistic?.(structure) ?? null;
157
+ } catch {
158
+ return null;
159
+ }
160
+ };
161
+ const showWhenRendered = async (shape, rendering)=>{
162
+ const node = await nodeOrNothing(rendering);
163
+ if (node === null || isStopped || toldShape !== shape) return;
164
+ shownOnThePage = {
165
+ node,
166
+ shape
167
+ };
168
+ change({
169
+ unsaved: shownOnThePage
170
+ });
171
+ };
172
+ const isRenderedAs = (shape)=>shownOnThePage?.shape === shape || committed.shown.unsaved?.shape === shape;
173
+ const tellUnsaved = (structure)=>{
174
+ const { shape } = structure;
175
+ toldUnsaved = structure;
176
+ const rendered = renderedOnThePage(structure);
177
+ if (rendered === null || isPromiseLike(rendered)) {
178
+ request(structure);
179
+ change({
180
+ editorShape: shape,
181
+ isAwaitingRender: true
182
+ });
183
+ if (rendered !== null) void showWhenRendered(shape, rendered);
184
+ return;
185
+ }
186
+ checkAfterPause(structure);
187
+ shownOnThePage = {
188
+ node: rendered,
189
+ shape
190
+ };
191
+ change({
192
+ editorShape: shape,
193
+ isAwaitingRender: true,
194
+ unsaved: shownOnThePage
195
+ });
121
196
  };
122
197
  return {
123
198
  committed (committedShown, committedSavedShape) {
@@ -130,26 +205,50 @@ export function createUnsavedRender({ onChange, render, savedShape, shown }) {
130
205
  awaitedCommit = null;
131
206
  continueWithNextCall();
132
207
  },
133
- dropUnsaved: ()=>change({
208
+ renderOnThePageAgain () {
209
+ const structure = toldUnsaved;
210
+ if (!structure || isStopped || isRenderedAs(structure.shape)) return;
211
+ const rendered = renderedOnThePage(structure);
212
+ if (rendered === null) return;
213
+ if (isPromiseLike(rendered)) {
214
+ void showWhenRendered(structure.shape, rendered);
215
+ return;
216
+ }
217
+ shownOnThePage = {
218
+ node: rendered,
219
+ shape: structure.shape
220
+ };
221
+ change({
222
+ unsaved: shownOnThePage
223
+ });
224
+ },
225
+ dropUnsaved () {
226
+ shownOnThePage = null;
227
+ change({
134
228
  unsaved: null
135
- }),
229
+ });
230
+ },
136
231
  stop () {
137
232
  isStopped = true;
138
233
  cancel();
139
234
  },
140
235
  tell ({ locale, shape, state: editorState }) {
141
- if (editorState === null) cancel();
142
- else request({
143
- locale,
144
- shape,
145
- state: editorState
146
- });
236
+ toldShape = shape;
237
+ if (editorState !== null) {
238
+ tellUnsaved({
239
+ locale,
240
+ shape,
241
+ state: editorState
242
+ });
243
+ return;
244
+ }
245
+ cancel();
246
+ toldUnsaved = null;
247
+ shownOnThePage = null;
147
248
  change({
148
249
  editorShape: shape,
149
- isAwaitingRender: editorState !== null,
150
- ...editorState === null && {
151
- unsaved: null
152
- }
250
+ isAwaitingRender: false,
251
+ unsaved: null
153
252
  });
154
253
  }
155
254
  };
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/client/instantPreview/unsavedRender/unsavedRender.ts"],"sourcesContent":["import type { VeEditorState } from \"../../../shared/protocol.js\";\n\nexport type RenderOfShape<Node> = { node: Node; shape: string };\n\ntype ToldStructure = {\n locale?: string;\n shape: string;\n state: VeEditorState | null;\n};\n\nexport type UnsavedStructure = ToldStructure & { state: VeEditorState };\n\nexport type UnsavedRenderState<Node> = {\n editorShape: string | null;\n isAwaitingRender: boolean;\n settledCall: object | null;\n unsaved: RenderOfShape<Node> | null;\n};\n\nexport type UnsavedRenderOptions<Node> = {\n render: (structure: UnsavedStructure, signal: AbortSignal) => Promise<Node | null | undefined>;\n shown: UnsavedRenderState<Node>;\n savedShape: string;\n onChange: (change: Partial<UnsavedRenderState<Node>>, isRender: boolean) => void;\n};\n\nexport interface UnsavedRender<Node> {\n tell(structure: ToldStructure): void;\n committed(shown: UnsavedRenderState<Node>, savedShape: string): void;\n dropUnsaved(): void;\n stop(): void;\n}\n\nexport const RENDER_TIMEOUT_MS = 10_000;\nexport const RETRY_AFTER_MS = 1000;\nexport const MOST_RETRIES_OF_A_STRUCTURE = 5;\nexport const COMMIT_WAIT_MS = 1000;\n\nexport const NOTHING_TOLD: UnsavedRenderState<never> = {\n editorShape: null,\n isAwaitingRender: false,\n settledCall: null,\n unsaved: null,\n};\n\nexport const heldSavedOf = <Node>(\n held: RenderOfShape<Node>,\n saved: RenderOfShape<Node>,\n editorShape: string | null\n): RenderOfShape<Node> => {\n const isEditorOnSaved = editorShape === null || editorShape === saved.shape;\n const isHeld = held.node === saved.node && held.shape === saved.shape;\n return isEditorOnSaved && !isHeld ? saved : held;\n};\n\nexport const inPlaceOfSaved = <Node>(\n { editorShape, isAwaitingRender, unsaved }: UnsavedRenderState<Node>,\n saved: RenderOfShape<Node>,\n heldSaved: RenderOfShape<Node>\n): Node => {\n if (saved.shape === editorShape) return saved.node;\n if (unsaved?.shape === editorShape) return unsaved.node;\n if (isAwaitingRender && heldSaved.shape === editorShape) return heldSaved.node;\n return unsaved && unsaved.shape !== saved.shape ? unsaved.node : saved.node;\n};\n\ntype Call = { abort: AbortController; isAbandoned: boolean };\n\nconst abandon = (call: Call) => {\n call.isAbandoned = true;\n call.abort.abort();\n};\n\nexport function createUnsavedRender<Node>({\n onChange,\n render,\n savedShape,\n shown,\n}: UnsavedRenderOptions<Node>): UnsavedRender<Node> {\n let committed = { savedShape, shown };\n let waiting: UnsavedStructure | null = null;\n let unsettled: Call | null = null;\n let isStopped = false;\n let retryTimer: ReturnType<typeof setTimeout> | undefined;\n let retryAfterMs = RETRY_AFTER_MS;\n let retriesLeft = MOST_RETRIES_OF_A_STRUCTURE;\n let awaitedCommit: { continueWithNextCall: () => void; settledCall: object } | null = null;\n\n const change = (next: Partial<UnsavedRenderState<Node>>, isRender = false) =>\n onChange(next, isRender);\n\n const showsEditorShape = () =>\n committed.shown.editorShape === committed.savedShape ||\n committed.shown.editorShape === committed.shown.unsaved?.shape;\n\n const showAfterCommit = (next: Partial<UnsavedRenderState<Node>>) =>\n new Promise<void>((resolve) => {\n const settledCall = {};\n awaitedCommit = { continueWithNextCall: resolve, settledCall };\n setTimeout(resolve, COMMIT_WAIT_MS);\n change({ ...next, settledCall }, true);\n });\n\n const settle = (shape: string, node: Node | null, isAnotherWaiting: boolean) => {\n if (shape !== committed.shown.editorShape && showsEditorShape()) {\n change({ isAwaitingRender: isAnotherWaiting });\n return;\n }\n return showAfterCommit({\n isAwaitingRender: isAnotherWaiting,\n unsaved: node === null ? null : { node, shape },\n });\n };\n\n const renderedOrNothing = async (structure: UnsavedStructure, signal: AbortSignal) => {\n try {\n return (await render(structure, signal)) ?? null;\n } catch {\n return null;\n }\n };\n\n const resetRetries = () => {\n retryAfterMs = RETRY_AFTER_MS;\n retriesLeft = MOST_RETRIES_OF_A_STRUCTURE;\n };\n\n const isWanted = ({ shape }: UnsavedStructure) =>\n shape === committed.shown.editorShape && shape !== committed.savedShape;\n\n const retryLater = (structure: UnsavedStructure, startCall: () => Promise<void>) => {\n if (retriesLeft === 0) return;\n retriesLeft -= 1;\n retryTimer = setTimeout(() => {\n if (waiting || unsettled || isStopped || !isWanted(structure)) return;\n waiting = structure;\n void startCall();\n }, retryAfterMs);\n retryAfterMs *= 2;\n };\n\n const renderWaiting = async (): Promise<void> => {\n if (!waiting || isStopped) return;\n const structure = waiting;\n waiting = null;\n\n const call: Call = { abort: new AbortController(), isAbandoned: false };\n unsettled = call;\n const timer = setTimeout(() => {\n if (call.isAbandoned) return;\n abandon(call);\n void settle(structure.shape, null, waiting !== null);\n }, RENDER_TIMEOUT_MS);\n const node = await renderedOrNothing(structure, call.abort.signal);\n clearTimeout(timer);\n\n const isRendered = node !== null && !call.isAbandoned;\n if (!call.isAbandoned) await settle(structure.shape, node, waiting !== null);\n unsettled = null;\n if (!isRendered && !waiting) retryLater(structure, renderWaiting);\n await renderWaiting();\n };\n\n const cancel = () => {\n waiting = null;\n clearTimeout(retryTimer);\n if (unsettled) abandon(unsettled);\n };\n\n const request = (structure: UnsavedStructure) => {\n waiting = structure;\n clearTimeout(retryTimer);\n resetRetries();\n if (!unsettled) void renderWaiting();\n };\n\n return {\n committed(committedShown, committedSavedShape) {\n committed = { savedShape: committedSavedShape, shown: committedShown };\n if (!awaitedCommit || awaitedCommit.settledCall !== committedShown.settledCall) return;\n const { continueWithNextCall } = awaitedCommit;\n awaitedCommit = null;\n continueWithNextCall();\n },\n dropUnsaved: () => change({ unsaved: null }),\n stop() {\n isStopped = true;\n cancel();\n },\n tell({ locale, shape, state: editorState }) {\n if (editorState === null) cancel();\n else request({ locale, shape, state: editorState });\n change({\n editorShape: shape,\n isAwaitingRender: editorState !== null,\n ...(editorState === null && { unsaved: null }),\n });\n },\n };\n}\n"],"names":["RENDER_TIMEOUT_MS","RETRY_AFTER_MS","MOST_RETRIES_OF_A_STRUCTURE","COMMIT_WAIT_MS","NOTHING_TOLD","editorShape","isAwaitingRender","settledCall","unsaved","heldSavedOf","held","saved","isEditorOnSaved","shape","isHeld","node","inPlaceOfSaved","heldSaved","abandon","call","isAbandoned","abort","createUnsavedRender","onChange","render","savedShape","shown","committed","waiting","unsettled","isStopped","retryTimer","retryAfterMs","retriesLeft","awaitedCommit","change","next","isRender","showsEditorShape","showAfterCommit","Promise","resolve","continueWithNextCall","setTimeout","settle","isAnotherWaiting","renderedOrNothing","structure","signal","resetRetries","isWanted","retryLater","startCall","renderWaiting","AbortController","timer","clearTimeout","isRendered","cancel","request","committedShown","committedSavedShape","dropUnsaved","stop","tell","locale","state","editorState"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../../src/client/instantPreview/unsavedRender/unsavedRender.ts"],"sourcesContent":["import type { VeEditorState } from \"../../../shared/protocol.js\";\n\nexport type RenderOfShape<Node> = { node: Node; shape: string };\n\ntype ToldStructure = {\n locale?: string;\n shape: string;\n state: VeEditorState | null;\n};\n\nexport type UnsavedStructure = ToldStructure & { state: VeEditorState };\n\nexport type UnsavedRenderState<Node> = {\n editorShape: string | null;\n isAwaitingRender: boolean;\n settledCall: object | null;\n unsaved: RenderOfShape<Node> | null;\n};\n\nexport type RenderOnThePage<Node> = (\n structure: UnsavedStructure\n) => Node | null | PromiseLike<Node | null>;\n\nexport type UnsavedRenderOptions<Node> = {\n render: (structure: UnsavedStructure, signal: AbortSignal) => Promise<Node | null | undefined>;\n optimistic?: RenderOnThePage<Node>;\n shown: UnsavedRenderState<Node>;\n savedShape: string;\n onChange: (change: Partial<UnsavedRenderState<Node>>, isRender: boolean) => void;\n};\n\nexport interface UnsavedRender<Node> {\n tell(structure: ToldStructure): void;\n committed(shown: UnsavedRenderState<Node>, savedShape: string): void;\n renderOnThePageAgain(): void;\n dropUnsaved(): void;\n stop(): void;\n}\n\nexport const RENDER_TIMEOUT_MS = 10_000;\nexport const RETRY_AFTER_MS = 1000;\nexport const MOST_RETRIES_OF_A_STRUCTURE = 5;\nexport const COMMIT_WAIT_MS = 1000;\nexport const STRUCTURE_SETTLE_MS = 200;\nexport const SERVER_CHECK_PAUSE_MS = 350;\n\nexport const NOTHING_TOLD: UnsavedRenderState<never> = {\n editorShape: null,\n isAwaitingRender: false,\n settledCall: null,\n unsaved: null,\n};\n\nexport const heldSavedOf = <Node>(\n held: RenderOfShape<Node>,\n saved: RenderOfShape<Node>,\n editorShape: string | null\n): RenderOfShape<Node> => {\n const isEditorOnSaved = editorShape === null || editorShape === saved.shape;\n const isHeld = held.node === saved.node && held.shape === saved.shape;\n return isEditorOnSaved && !isHeld ? saved : held;\n};\n\nexport const inPlaceOfSaved = <Node>(\n { editorShape, isAwaitingRender, unsaved }: UnsavedRenderState<Node>,\n saved: RenderOfShape<Node>,\n heldSaved: RenderOfShape<Node>\n): Node => {\n if (saved.shape === editorShape) return saved.node;\n if (unsaved?.shape === editorShape) return unsaved.node;\n if (isAwaitingRender && heldSaved.shape === editorShape) return heldSaved.node;\n return unsaved && unsaved.shape !== saved.shape ? unsaved.node : saved.node;\n};\n\ntype Call = { abort: AbortController; isAbandoned: boolean };\n\nconst nodeOrNothing = async <Node>(rendering: PromiseLike<Node | null>): Promise<Node | null> => {\n try {\n return await rendering;\n } catch {\n return null;\n }\n};\n\nconst isPromiseLike = <Value>(value: unknown): value is PromiseLike<Value> =>\n typeof (value as PromiseLike<Value> | null)?.then === \"function\";\n\nconst abandon = (call: Call) => {\n call.isAbandoned = true;\n call.abort.abort();\n};\n\nexport function createUnsavedRender<Node>({\n onChange,\n optimistic,\n render,\n savedShape,\n shown,\n}: UnsavedRenderOptions<Node>): UnsavedRender<Node> {\n let committed = { savedShape, shown };\n let waiting: UnsavedStructure | null = null;\n let unsettled: Call | null = null;\n let isStopped = false;\n let retryTimer: ReturnType<typeof setTimeout> | undefined;\n let startTimer: ReturnType<typeof setTimeout> | undefined;\n let toldShape: string | null = null;\n let toldUnsaved: UnsavedStructure | null = null;\n let shownOnThePage: RenderOfShape<Node> | null = null;\n let retryAfterMs = RETRY_AFTER_MS;\n let retriesLeft = MOST_RETRIES_OF_A_STRUCTURE;\n let awaitedCommit: { continueWithNextCall: () => void; settledCall: object } | null = null;\n\n const change = (next: Partial<UnsavedRenderState<Node>>, isRender = false) =>\n onChange(next, isRender);\n\n const showsEditorShape = () =>\n committed.shown.editorShape === committed.savedShape ||\n committed.shown.editorShape === committed.shown.unsaved?.shape;\n\n const showAfterCommit = (next: Partial<UnsavedRenderState<Node>>) =>\n new Promise<void>((resolve) => {\n const settledCall = {};\n awaitedCommit = { continueWithNextCall: resolve, settledCall };\n setTimeout(resolve, COMMIT_WAIT_MS);\n change({ ...next, settledCall }, true);\n });\n\n const renderedOnThePageAs = (shape: string) =>\n shownOnThePage?.shape === shape ? shownOnThePage : null;\n\n const settle = (shape: string, node: Node | null, isAnotherWaiting: boolean) => {\n if (shape !== committed.shown.editorShape && showsEditorShape()) {\n change({ isAwaitingRender: isAnotherWaiting });\n return;\n }\n return showAfterCommit({\n isAwaitingRender: isAnotherWaiting,\n unsaved: node === null ? renderedOnThePageAs(shape) : { node, shape },\n });\n };\n\n const renderedOrNothing = async (structure: UnsavedStructure, signal: AbortSignal) => {\n try {\n return (await render(structure, signal)) ?? null;\n } catch {\n return null;\n }\n };\n\n const resetRetries = () => {\n retryAfterMs = RETRY_AFTER_MS;\n retriesLeft = MOST_RETRIES_OF_A_STRUCTURE;\n };\n\n const isWanted = ({ shape }: UnsavedStructure) =>\n shape === committed.shown.editorShape && shape !== committed.savedShape;\n\n const retryLater = (structure: UnsavedStructure, startCall: () => Promise<void>) => {\n if (retriesLeft === 0) return;\n retriesLeft -= 1;\n retryTimer = setTimeout(() => {\n if (waiting || unsettled || isStopped || !isWanted(structure)) return;\n waiting = structure;\n void startCall();\n }, retryAfterMs);\n retryAfterMs *= 2;\n };\n\n const renderWaiting = async (): Promise<void> => {\n if (!waiting || isStopped) return;\n const structure = waiting;\n waiting = null;\n\n const call: Call = { abort: new AbortController(), isAbandoned: false };\n unsettled = call;\n const timer = setTimeout(() => {\n if (call.isAbandoned) return;\n abandon(call);\n void settle(structure.shape, null, waiting !== null);\n }, RENDER_TIMEOUT_MS);\n const node = await renderedOrNothing(structure, call.abort.signal);\n clearTimeout(timer);\n\n const isRendered = node !== null && !call.isAbandoned;\n if (!call.isAbandoned) await settle(structure.shape, node, waiting !== null);\n unsettled = null;\n if (!isRendered && !waiting) retryLater(structure, renderWaiting);\n if (startTimer === undefined) await renderWaiting();\n };\n\n const cancel = () => {\n waiting = null;\n clearTimeout(retryTimer);\n clearTimeout(startTimer);\n startTimer = undefined;\n if (unsettled) abandon(unsettled);\n };\n\n const startAfter = (delayMs: number) => {\n startTimer = setTimeout(() => {\n startTimer = undefined;\n if (!unsettled) void renderWaiting();\n }, delayMs);\n };\n\n const wait = (structure: UnsavedStructure) => {\n waiting = structure;\n clearTimeout(retryTimer);\n resetRetries();\n };\n\n const request = (structure: UnsavedStructure) => {\n wait(structure);\n if (unsettled || startTimer !== undefined) return;\n startAfter(STRUCTURE_SETTLE_MS);\n };\n\n const checkAfterPause = (structure: UnsavedStructure) => {\n wait(structure);\n clearTimeout(startTimer);\n startAfter(SERVER_CHECK_PAUSE_MS);\n };\n\n const renderedOnThePage = (structure: UnsavedStructure) => {\n try {\n return optimistic?.(structure) ?? null;\n } catch {\n return null;\n }\n };\n\n const showWhenRendered = async (shape: string, rendering: PromiseLike<Node | null>) => {\n const node = await nodeOrNothing(rendering);\n if (node === null || isStopped || toldShape !== shape) return;\n shownOnThePage = { node, shape };\n change({ unsaved: shownOnThePage });\n };\n\n const isRenderedAs = (shape: string) =>\n shownOnThePage?.shape === shape || committed.shown.unsaved?.shape === shape;\n\n const tellUnsaved = (structure: UnsavedStructure) => {\n const { shape } = structure;\n toldUnsaved = structure;\n const rendered = renderedOnThePage(structure);\n if (rendered === null || isPromiseLike<Node | null>(rendered)) {\n request(structure);\n change({ editorShape: shape, isAwaitingRender: true });\n if (rendered !== null) void showWhenRendered(shape, rendered);\n return;\n }\n checkAfterPause(structure);\n shownOnThePage = { node: rendered, shape };\n change({ editorShape: shape, isAwaitingRender: true, unsaved: shownOnThePage });\n };\n\n return {\n committed(committedShown, committedSavedShape) {\n committed = { savedShape: committedSavedShape, shown: committedShown };\n if (!awaitedCommit || awaitedCommit.settledCall !== committedShown.settledCall) return;\n const { continueWithNextCall } = awaitedCommit;\n awaitedCommit = null;\n continueWithNextCall();\n },\n renderOnThePageAgain() {\n const structure = toldUnsaved;\n if (!structure || isStopped || isRenderedAs(structure.shape)) return;\n const rendered = renderedOnThePage(structure);\n if (rendered === null) return;\n if (isPromiseLike<Node | null>(rendered)) {\n void showWhenRendered(structure.shape, rendered);\n return;\n }\n shownOnThePage = { node: rendered, shape: structure.shape };\n change({ unsaved: shownOnThePage });\n },\n dropUnsaved() {\n shownOnThePage = null;\n change({ unsaved: null });\n },\n stop() {\n isStopped = true;\n cancel();\n },\n tell({ locale, shape, state: editorState }) {\n toldShape = shape;\n if (editorState !== null) {\n tellUnsaved({ locale, shape, state: editorState });\n return;\n }\n cancel();\n toldUnsaved = null;\n shownOnThePage = null;\n change({ editorShape: shape, isAwaitingRender: false, unsaved: null });\n },\n };\n}\n"],"names":["RENDER_TIMEOUT_MS","RETRY_AFTER_MS","MOST_RETRIES_OF_A_STRUCTURE","COMMIT_WAIT_MS","STRUCTURE_SETTLE_MS","SERVER_CHECK_PAUSE_MS","NOTHING_TOLD","editorShape","isAwaitingRender","settledCall","unsaved","heldSavedOf","held","saved","isEditorOnSaved","shape","isHeld","node","inPlaceOfSaved","heldSaved","nodeOrNothing","rendering","isPromiseLike","value","then","abandon","call","isAbandoned","abort","createUnsavedRender","onChange","optimistic","render","savedShape","shown","committed","waiting","unsettled","isStopped","retryTimer","startTimer","toldShape","toldUnsaved","shownOnThePage","retryAfterMs","retriesLeft","awaitedCommit","change","next","isRender","showsEditorShape","showAfterCommit","Promise","resolve","continueWithNextCall","setTimeout","renderedOnThePageAs","settle","isAnotherWaiting","renderedOrNothing","structure","signal","resetRetries","isWanted","retryLater","startCall","renderWaiting","AbortController","timer","clearTimeout","isRendered","undefined","cancel","startAfter","delayMs","wait","request","checkAfterPause","renderedOnThePage","showWhenRendered","isRenderedAs","tellUnsaved","rendered","committedShown","committedSavedShape","renderOnThePageAgain","dropUnsaved","stop","tell","locale","state","editorState"],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ import type { LiveRichTextField, LiveRichTextRequest } from "../../../shared/protocol.js";
2
+ export type SavedRichTextRequest = {
3
+ field: LiveRichTextField;
4
+ locale?: string;
5
+ };
6
+ export type Grants = {
7
+ current(): string | null;
8
+ };
9
+ export interface ValueSource {
10
+ canAsk(): boolean;
11
+ value(request: LiveRichTextRequest | SavedRichTextRequest, signal?: AbortSignal): Promise<unknown>;
12
+ html(request: LiveRichTextRequest, signal: AbortSignal): Promise<string | null>;
13
+ }
14
+ export declare function valueSourceOf({ grants, payloadApi, }: {
15
+ grants: Grants;
16
+ payloadApi: string;
17
+ }): ValueSource;
@@ -0,0 +1,38 @@
1
+ import { isPlainObject } from "../../../shared/plainObject.js";
2
+ import { VE_UNSAVED_RICH_TEXT_PATH } from "../../../shared/protocol.js";
3
+ const HTML_FORMAT = "html";
4
+ const JSON_FORMAT = "json";
5
+ export function valueSourceOf({ grants, payloadApi }) {
6
+ const answerOf = async (format, request, signal)=>{
7
+ const grant = grants.current();
8
+ if (!grant) return null;
9
+ const response = await fetch(`${payloadApi}${VE_UNSAVED_RICH_TEXT_PATH}`, {
10
+ body: JSON.stringify({
11
+ format,
12
+ grant,
13
+ request
14
+ }),
15
+ headers: {
16
+ "Content-Type": "text/plain"
17
+ },
18
+ method: "POST",
19
+ signal
20
+ });
21
+ if (!response.ok) return null;
22
+ const answer = await response.json();
23
+ return isPlainObject(answer) ? answer : null;
24
+ };
25
+ return {
26
+ canAsk: ()=>grants.current() !== null,
27
+ async html (request, signal) {
28
+ const answer = await answerOf(HTML_FORMAT, request, signal);
29
+ return typeof answer?.html === "string" ? answer.html : null;
30
+ },
31
+ async value (request, signal) {
32
+ const answer = await answerOf(JSON_FORMAT, request, signal);
33
+ return answer?.value ?? null;
34
+ }
35
+ };
36
+ }
37
+
38
+ //# sourceMappingURL=valueSource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../../src/client/instantPreview/unsavedRender/valueSource.ts"],"sourcesContent":["import type { LiveRichTextField, LiveRichTextRequest } from \"../../../shared/protocol.js\";\n\nimport { isPlainObject } from \"../../../shared/plainObject.js\";\nimport { VE_UNSAVED_RICH_TEXT_PATH } from \"../../../shared/protocol.js\";\n\nexport type SavedRichTextRequest = { field: LiveRichTextField; locale?: string };\n\nexport type Grants = { current(): string | null };\n\nexport interface ValueSource {\n canAsk(): boolean;\n value(\n request: LiveRichTextRequest | SavedRichTextRequest,\n signal?: AbortSignal\n ): Promise<unknown>;\n html(request: LiveRichTextRequest, signal: AbortSignal): Promise<string | null>;\n}\n\nconst HTML_FORMAT = \"html\";\nconst JSON_FORMAT = \"json\";\n\ntype Format = typeof HTML_FORMAT | typeof JSON_FORMAT;\n\nexport function valueSourceOf({\n grants,\n payloadApi,\n}: {\n grants: Grants;\n payloadApi: string;\n}): ValueSource {\n const answerOf = async (\n format: Format,\n request: LiveRichTextRequest | SavedRichTextRequest,\n signal: AbortSignal | undefined\n ) => {\n const grant = grants.current();\n if (!grant) return null;\n\n const response = await fetch(`${payloadApi}${VE_UNSAVED_RICH_TEXT_PATH}`, {\n body: JSON.stringify({ format, grant, request }),\n headers: { \"Content-Type\": \"text/plain\" },\n method: \"POST\",\n signal,\n });\n if (!response.ok) return null;\n const answer: unknown = await response.json();\n return isPlainObject(answer) ? answer : null;\n };\n\n return {\n canAsk: () => grants.current() !== null,\n async html(request, signal) {\n const answer = await answerOf(HTML_FORMAT, request, signal);\n return typeof answer?.html === \"string\" ? answer.html : null;\n },\n async value(request, signal) {\n const answer = await answerOf(JSON_FORMAT, request, signal);\n return answer?.value ?? null;\n },\n };\n}\n"],"names":["isPlainObject","VE_UNSAVED_RICH_TEXT_PATH","HTML_FORMAT","JSON_FORMAT","valueSourceOf","grants","payloadApi","answerOf","format","request","signal","grant","current","response","fetch","body","JSON","stringify","headers","method","ok","answer","json","canAsk","html","value"],"mappings":"AAEA,SAASA,aAAa,QAAQ,iCAAiC;AAC/D,SAASC,yBAAyB,QAAQ,8BAA8B;AAexE,MAAMC,cAAc;AACpB,MAAMC,cAAc;AAIpB,OAAO,SAASC,cAAc,EAC5BC,MAAM,EACNC,UAAU,EAIX;IACC,MAAMC,WAAW,OACfC,QACAC,SACAC;QAEA,MAAMC,QAAQN,OAAOO,OAAO;QAC5B,IAAI,CAACD,OAAO,OAAO;QAEnB,MAAME,WAAW,MAAMC,MAAM,CAAC,EAAER,WAAW,EAAEL,0BAA0B,CAAC,EAAE;YACxEc,MAAMC,KAAKC,SAAS,CAAC;gBAAET;gBAAQG;gBAAOF;YAAQ;YAC9CS,SAAS;gBAAE,gBAAgB;YAAa;YACxCC,QAAQ;YACRT;QACF;QACA,IAAI,CAACG,SAASO,EAAE,EAAE,OAAO;QACzB,MAAMC,SAAkB,MAAMR,SAASS,IAAI;QAC3C,OAAOtB,cAAcqB,UAAUA,SAAS;IAC1C;IAEA,OAAO;QACLE,QAAQ,IAAMlB,OAAOO,OAAO,OAAO;QACnC,MAAMY,MAAKf,OAAO,EAAEC,MAAM;YACxB,MAAMW,SAAS,MAAMd,SAASL,aAAaO,SAASC;YACpD,OAAO,OAAOW,QAAQG,SAAS,WAAWH,OAAOG,IAAI,GAAG;QAC1D;QACA,MAAMC,OAAMhB,OAAO,EAAEC,MAAM;YACzB,MAAMW,SAAS,MAAMd,SAASJ,aAAaM,SAASC;YACpD,OAAOW,QAAQI,SAAS;QAC1B;IACF;AACF"}
@@ -1,9 +1,8 @@
1
- export declare const STEGA_PREFILTER: RegExp;
2
1
  export declare const DATA_VE_TARGET_ATTR = "data-ve-target";
2
+ export declare const DATA_VE_HOVERING_ATTR = "data-ve-hovering";
3
3
  export declare const DATA_VE_FOR_ATTR = "data-ve-for";
4
4
  export declare const LABEL_CLASS = "ve-edit-label";
5
5
  export declare const isOverlayLabel: (node: Node) => boolean;
6
6
  export declare const OUTLINE_STYLE = "1px solid #34d399";
7
- export declare const STEGA_ATTRS: Set<string>;
8
7
  export declare const LABEL_STYLES: Partial<CSSStyleDeclaration>;
9
8
  export declare const PAGE_SHOWN_EVENT = "pageshow";
@@ -1,17 +1,11 @@
1
- export const STEGA_PREFILTER = /[\u200B-\u202F\uFEFF]/;
2
1
  export const DATA_VE_TARGET_ATTR = "data-ve-target";
2
+ export const DATA_VE_HOVERING_ATTR = "data-ve-hovering";
3
3
  export const DATA_VE_FOR_ATTR = "data-ve-for";
4
4
  export const LABEL_CLASS = "ve-edit-label";
5
5
  export const isOverlayLabel = (node)=>node instanceof Element && node.classList.contains(LABEL_CLASS);
6
6
  const OUTLINE_COLOR = "#34d399";
7
7
  const LABEL_TEXT_COLOR = "#022c22";
8
8
  export const OUTLINE_STYLE = `1px solid ${OUTLINE_COLOR}`;
9
- export const STEGA_ATTRS = new Set([
10
- "alt",
11
- "title",
12
- "aria-label",
13
- "placeholder"
14
- ]);
15
9
  export const LABEL_STYLES = {
16
10
  position: "absolute",
17
11
  top: "0",
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/client/overlay/constants.ts"],"sourcesContent":["export const STEGA_PREFILTER = /[\\u200B-\\u202F\\uFEFF]/;\n\nexport const DATA_VE_TARGET_ATTR = \"data-ve-target\";\nexport const DATA_VE_FOR_ATTR = \"data-ve-for\";\nexport const LABEL_CLASS = \"ve-edit-label\";\n\nexport const isOverlayLabel = (node: Node): boolean =>\n node instanceof Element && node.classList.contains(LABEL_CLASS);\n\nconst OUTLINE_COLOR = \"#34d399\";\nconst LABEL_TEXT_COLOR = \"#022c22\";\nexport const OUTLINE_STYLE = `1px solid ${OUTLINE_COLOR}`;\n\nexport const STEGA_ATTRS = new Set([\"alt\", \"title\", \"aria-label\", \"placeholder\"]);\n\nexport const LABEL_STYLES: Partial<CSSStyleDeclaration> = {\n position: \"absolute\",\n top: \"0\",\n right: \"0\",\n transform: \"translateY(-100%)\",\n background: OUTLINE_COLOR,\n color: LABEL_TEXT_COLOR,\n padding: \"5px 11px\",\n fontSize: \"13px\",\n fontFamily: \"system-ui, -apple-system, sans-serif\",\n fontWeight: \"600\",\n lineHeight: \"1\",\n letterSpacing: \"0.025em\",\n textTransform: \"uppercase\",\n textDecoration: \"none\",\n border: \"0\",\n borderRadius: \"0\",\n cursor: \"pointer\",\n pointerEvents: \"auto\",\n zIndex: \"9999\",\n whiteSpace: \"nowrap\",\n fontStyle: \"normal\",\n fontVariant: \"normal\",\n};\n\nexport const PAGE_SHOWN_EVENT = \"pageshow\";\n"],"names":["STEGA_PREFILTER","DATA_VE_TARGET_ATTR","DATA_VE_FOR_ATTR","LABEL_CLASS","isOverlayLabel","node","Element","classList","contains","OUTLINE_COLOR","LABEL_TEXT_COLOR","OUTLINE_STYLE","STEGA_ATTRS","Set","LABEL_STYLES","position","top","right","transform","background","color","padding","fontSize","fontFamily","fontWeight","lineHeight","letterSpacing","textTransform","textDecoration","border","borderRadius","cursor","pointerEvents","zIndex","whiteSpace","fontStyle","fontVariant","PAGE_SHOWN_EVENT"],"mappings":"AAAA,OAAO,MAAMA,kBAAkB,wBAAwB;AAEvD,OAAO,MAAMC,sBAAsB,iBAAiB;AACpD,OAAO,MAAMC,mBAAmB,cAAc;AAC9C,OAAO,MAAMC,cAAc,gBAAgB;AAE3C,OAAO,MAAMC,iBAAiB,CAACC,OAC7BA,gBAAgBC,WAAWD,KAAKE,SAAS,CAACC,QAAQ,CAACL,aAAa;AAElE,MAAMM,gBAAgB;AACtB,MAAMC,mBAAmB;AACzB,OAAO,MAAMC,gBAAgB,CAAC,UAAU,EAAEF,cAAc,CAAC,CAAC;AAE1D,OAAO,MAAMG,cAAc,IAAIC,IAAI;IAAC;IAAO;IAAS;IAAc;CAAc,EAAE;AAElF,OAAO,MAAMC,eAA6C;IACxDC,UAAU;IACVC,KAAK;IACLC,OAAO;IACPC,WAAW;IACXC,YAAYV;IACZW,OAAOV;IACPW,SAAS;IACTC,UAAU;IACVC,YAAY;IACZC,YAAY;IACZC,YAAY;IACZC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,QAAQ;IACRC,cAAc;IACdC,QAAQ;IACRC,eAAe;IACfC,QAAQ;IACRC,YAAY;IACZC,WAAW;IACXC,aAAa;AACf,EAAE;AAEF,OAAO,MAAMC,mBAAmB,WAAW"}
1
+ {"version":3,"sources":["../../../src/client/overlay/constants.ts"],"sourcesContent":["export const DATA_VE_TARGET_ATTR = \"data-ve-target\";\nexport const DATA_VE_HOVERING_ATTR = \"data-ve-hovering\";\nexport const DATA_VE_FOR_ATTR = \"data-ve-for\";\nexport const LABEL_CLASS = \"ve-edit-label\";\n\nexport const isOverlayLabel = (node: Node): boolean =>\n node instanceof Element && node.classList.contains(LABEL_CLASS);\n\nconst OUTLINE_COLOR = \"#34d399\";\nconst LABEL_TEXT_COLOR = \"#022c22\";\nexport const OUTLINE_STYLE = `1px solid ${OUTLINE_COLOR}`;\n\nexport const LABEL_STYLES: Partial<CSSStyleDeclaration> = {\n position: \"absolute\",\n top: \"0\",\n right: \"0\",\n transform: \"translateY(-100%)\",\n background: OUTLINE_COLOR,\n color: LABEL_TEXT_COLOR,\n padding: \"5px 11px\",\n fontSize: \"13px\",\n fontFamily: \"system-ui, -apple-system, sans-serif\",\n fontWeight: \"600\",\n lineHeight: \"1\",\n letterSpacing: \"0.025em\",\n textTransform: \"uppercase\",\n textDecoration: \"none\",\n border: \"0\",\n borderRadius: \"0\",\n cursor: \"pointer\",\n pointerEvents: \"auto\",\n zIndex: \"9999\",\n whiteSpace: \"nowrap\",\n fontStyle: \"normal\",\n fontVariant: \"normal\",\n};\n\nexport const PAGE_SHOWN_EVENT = \"pageshow\";\n"],"names":["DATA_VE_TARGET_ATTR","DATA_VE_HOVERING_ATTR","DATA_VE_FOR_ATTR","LABEL_CLASS","isOverlayLabel","node","Element","classList","contains","OUTLINE_COLOR","LABEL_TEXT_COLOR","OUTLINE_STYLE","LABEL_STYLES","position","top","right","transform","background","color","padding","fontSize","fontFamily","fontWeight","lineHeight","letterSpacing","textTransform","textDecoration","border","borderRadius","cursor","pointerEvents","zIndex","whiteSpace","fontStyle","fontVariant","PAGE_SHOWN_EVENT"],"mappings":"AAAA,OAAO,MAAMA,sBAAsB,iBAAiB;AACpD,OAAO,MAAMC,wBAAwB,mBAAmB;AACxD,OAAO,MAAMC,mBAAmB,cAAc;AAC9C,OAAO,MAAMC,cAAc,gBAAgB;AAE3C,OAAO,MAAMC,iBAAiB,CAACC,OAC7BA,gBAAgBC,WAAWD,KAAKE,SAAS,CAACC,QAAQ,CAACL,aAAa;AAElE,MAAMM,gBAAgB;AACtB,MAAMC,mBAAmB;AACzB,OAAO,MAAMC,gBAAgB,CAAC,UAAU,EAAEF,cAAc,CAAC,CAAC;AAE1D,OAAO,MAAMG,eAA6C;IACxDC,UAAU;IACVC,KAAK;IACLC,OAAO;IACPC,WAAW;IACXC,YAAYR;IACZS,OAAOR;IACPS,SAAS;IACTC,UAAU;IACVC,YAAY;IACZC,YAAY;IACZC,YAAY;IACZC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,QAAQ;IACRC,cAAc;IACdC,QAAQ;IACRC,eAAe;IACfC,QAAQ;IACRC,YAAY;IACZC,WAAW;IACXC,aAAa;AACf,EAAE;AAEF,OAAO,MAAMC,mBAAmB,WAAW"}
@@ -6,6 +6,7 @@ export type RichTextShape = {
6
6
  export type FieldMatch = VeIdentity & {
7
7
  textNode: Text;
8
8
  richText?: RichTextShape;
9
+ holder?: Element;
9
10
  };
10
11
  export type FieldListener = {
11
12
  onFields(root: Element, matches: readonly FieldMatch[]): void;
@@ -15,6 +16,7 @@ export type FieldListener = {
15
16
  export interface FieldTracker {
16
17
  subscribe(listener: FieldListener): () => void;
17
18
  showText(node: Text, text: string): void;
19
+ showTextInHolder(match: FieldMatch, text: string): boolean;
18
20
  dispose(): void;
19
21
  }
20
22
  export declare function createFieldTracker(main: HTMLElement): FieldTracker;