@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,50 @@
1
+ "use client";
2
+ import { useDocumentEvents, useLocale } from "@payloadcms/ui";
3
+ import { useContext, useEffect, useRef } from "react";
4
+ import { VE_DOCUMENT_SAVED_TYPE } from "../shared/protocol.js";
5
+ import { collectionDocumentOf } from "../shared/veDocument.js";
6
+ import { usePreviewWindow } from "./instantPreview/usePreviewWindow.js";
7
+ import { PreviewPagesContext } from "./previewPages.js";
8
+ const savedDocumentOf = ({ entitySlug, id })=>id === undefined || id === null ? {
9
+ collectionSlug: entitySlug,
10
+ kind: "global"
11
+ } : collectionDocumentOf(entitySlug, id);
12
+ const savedMessageOf = (saved, locale)=>({
13
+ ...savedDocumentOf(saved),
14
+ ...locale && {
15
+ locale
16
+ },
17
+ type: VE_DOCUMENT_SAVED_TYPE
18
+ });
19
+ export function PreviewPageBridge() {
20
+ const { getWindow, origin, post } = usePreviewWindow();
21
+ const { mostRecentUpdate } = useDocumentEvents();
22
+ const { code: locale } = useLocale();
23
+ const announcePreviewPage = useContext(PreviewPagesContext);
24
+ const reportedUpdate = useRef(mostRecentUpdate);
25
+ useEffect(()=>{
26
+ if (!origin) return;
27
+ return announcePreviewPage({
28
+ getWindow,
29
+ origin
30
+ });
31
+ }, [
32
+ announcePreviewPage,
33
+ getWindow,
34
+ origin
35
+ ]);
36
+ useEffect(()=>{
37
+ if (mostRecentUpdate === reportedUpdate.current) return;
38
+ reportedUpdate.current = mostRecentUpdate;
39
+ if (mostRecentUpdate) post([
40
+ savedMessageOf(mostRecentUpdate, locale)
41
+ ]);
42
+ }, [
43
+ locale,
44
+ mostRecentUpdate,
45
+ post
46
+ ]);
47
+ return null;
48
+ }
49
+
50
+ //# sourceMappingURL=PreviewPageBridge.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/admin/PreviewPageBridge.tsx"],"sourcesContent":["\"use client\";\n\nimport type { DocumentEvent } from \"payload\";\n\nimport { useDocumentEvents, useLocale } from \"@payloadcms/ui\";\nimport { useContext, useEffect, useRef } from \"react\";\n\nimport type { VeDocument, VeDocumentSavedMessage } from \"../shared/protocol.js\";\n\nimport { VE_DOCUMENT_SAVED_TYPE } from \"../shared/protocol.js\";\nimport { collectionDocumentOf } from \"../shared/veDocument.js\";\nimport { usePreviewWindow } from \"./instantPreview/usePreviewWindow.js\";\nimport { PreviewPagesContext } from \"./previewPages.js\";\n\nconst savedDocumentOf = ({ entitySlug, id }: DocumentEvent): VeDocument =>\n id === undefined || id === null\n ? { collectionSlug: entitySlug, kind: \"global\" }\n : collectionDocumentOf(entitySlug, id);\n\nconst savedMessageOf = (\n saved: DocumentEvent,\n locale: string | undefined\n): VeDocumentSavedMessage => ({\n ...savedDocumentOf(saved),\n ...(locale && { locale }),\n type: VE_DOCUMENT_SAVED_TYPE,\n});\n\nexport function PreviewPageBridge() {\n const { getWindow, origin, post } = usePreviewWindow();\n const { mostRecentUpdate } = useDocumentEvents();\n const { code: locale } = useLocale();\n const announcePreviewPage = useContext(PreviewPagesContext);\n const reportedUpdate = useRef(mostRecentUpdate);\n\n useEffect(() => {\n if (!origin) return;\n return announcePreviewPage({ getWindow, origin });\n }, [announcePreviewPage, getWindow, origin]);\n\n useEffect(() => {\n if (mostRecentUpdate === reportedUpdate.current) return;\n reportedUpdate.current = mostRecentUpdate;\n if (mostRecentUpdate) post([savedMessageOf(mostRecentUpdate, locale)]);\n }, [locale, mostRecentUpdate, post]);\n\n return null;\n}\n"],"names":["useDocumentEvents","useLocale","useContext","useEffect","useRef","VE_DOCUMENT_SAVED_TYPE","collectionDocumentOf","usePreviewWindow","PreviewPagesContext","savedDocumentOf","entitySlug","id","undefined","collectionSlug","kind","savedMessageOf","saved","locale","type","PreviewPageBridge","getWindow","origin","post","mostRecentUpdate","code","announcePreviewPage","reportedUpdate","current"],"mappings":"AAAA;AAIA,SAASA,iBAAiB,EAAEC,SAAS,QAAQ,iBAAiB;AAC9D,SAASC,UAAU,EAAEC,SAAS,EAAEC,MAAM,QAAQ,QAAQ;AAItD,SAASC,sBAAsB,QAAQ,wBAAwB;AAC/D,SAASC,oBAAoB,QAAQ,0BAA0B;AAC/D,SAASC,gBAAgB,QAAQ,uCAAuC;AACxE,SAASC,mBAAmB,QAAQ,oBAAoB;AAExD,MAAMC,kBAAkB,CAAC,EAAEC,UAAU,EAAEC,EAAE,EAAiB,GACxDA,OAAOC,aAAaD,OAAO,OACvB;QAAEE,gBAAgBH;QAAYI,MAAM;IAAS,IAC7CR,qBAAqBI,YAAYC;AAEvC,MAAMI,iBAAiB,CACrBC,OACAC,SAC4B,CAAA;QAC5B,GAAGR,gBAAgBO,MAAM;QACzB,GAAIC,UAAU;YAAEA;QAAO,CAAC;QACxBC,MAAMb;IACR,CAAA;AAEA,OAAO,SAASc;IACd,MAAM,EAAEC,SAAS,EAAEC,MAAM,EAAEC,IAAI,EAAE,GAAGf;IACpC,MAAM,EAAEgB,gBAAgB,EAAE,GAAGvB;IAC7B,MAAM,EAAEwB,MAAMP,MAAM,EAAE,GAAGhB;IACzB,MAAMwB,sBAAsBvB,WAAWM;IACvC,MAAMkB,iBAAiBtB,OAAOmB;IAE9BpB,UAAU;QACR,IAAI,CAACkB,QAAQ;QACb,OAAOI,oBAAoB;YAAEL;YAAWC;QAAO;IACjD,GAAG;QAACI;QAAqBL;QAAWC;KAAO;IAE3ClB,UAAU;QACR,IAAIoB,qBAAqBG,eAAeC,OAAO,EAAE;QACjDD,eAAeC,OAAO,GAAGJ;QACzB,IAAIA,kBAAkBD,KAAK;YAACP,eAAeQ,kBAAkBN;SAAQ;IACvE,GAAG;QAACA;QAAQM;QAAkBD;KAAK;IAEnC,OAAO;AACT"}
@@ -2,19 +2,24 @@
2
2
  import { jsx as _jsx } from "react/jsx-runtime";
3
3
  import { useConfig } from "@payloadcms/ui";
4
4
  import { useCallback, useEffect, useState } from "react";
5
- import { defaultBuildAdminEditUrl } from "../shared/buildAdminEditUrl.js";
5
+ import { adminBaseOf, defaultBuildAdminEditUrl } from "../shared/buildAdminEditUrl.js";
6
6
  import { VE_FOCUS_PARAM, VE_MESSAGE_TYPE } from "../shared/protocol.js";
7
7
  import { expandAndFocus } from "./expandAndFocus.js";
8
- import { currentFormPathOf, OpenFormsContext } from "./openField/openForms.js";
8
+ import { openDocumentOf } from "./openField/openDocument.js";
9
+ import { createOpenForms, currentFormPathOf, OpenFormsContext } from "./openField/openForms.js";
9
10
  import { parseFieldPath } from "./parseFieldPath.js";
11
+ import { isFromAdminOrPreviewPage, PreviewPagesContext } from "./previewPages.js";
10
12
  import { resolveContainerChain } from "./resolveContainerChain.js";
11
13
  const escapeRegex = (value)=>value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
12
- const isSameOrigin = (eventOrigin)=>{
13
- if (typeof window === "undefined") return false;
14
- return eventOrigin === window.location.origin;
14
+ const decoded = (segment)=>{
15
+ try {
16
+ return decodeURIComponent(segment);
17
+ } catch {
18
+ return segment;
19
+ }
15
20
  };
16
21
  const makeLocators = (adminBasePath)=>{
17
- const base = escapeRegex(adminBasePath);
22
+ const base = escapeRegex(adminBaseOf(adminBasePath));
18
23
  const collectionRe = new RegExp(`^${base}/collections/([^/]+)/([^/?#]+)`);
19
24
  const globalRe = new RegExp(`^${base}/globals/([^/?#]+)`);
20
25
  const currentCollectionLocation = ()=>{
@@ -23,13 +28,13 @@ const makeLocators = (adminBasePath)=>{
23
28
  const [, slug, id] = match;
24
29
  if (!slug || !id) return null;
25
30
  return {
26
- slug,
27
- id
31
+ id: decoded(id),
32
+ slug: decoded(slug)
28
33
  };
29
34
  };
30
35
  const currentGlobalSlug = ()=>{
31
36
  const match = window.location.pathname.match(globalRe);
32
- return match?.[1] ?? null;
37
+ return match?.[1] ? decoded(match[1]) : null;
33
38
  };
34
39
  const navigateAndFocus = (message)=>{
35
40
  const url = defaultBuildAdminEditUrl({
@@ -65,19 +70,42 @@ const focusFieldPath = async (path, kind, slug, getFields)=>{
65
70
  const resolved = chainResult ?? fallbackResolution(path);
66
71
  await expandAndFocus(resolved.chain, resolved.fieldId);
67
72
  };
73
+ const forgetFocusParam = ()=>{
74
+ const url = new URL(window.location.href);
75
+ if (!url.searchParams.has(VE_FOCUS_PARAM)) return;
76
+ url.searchParams.delete(VE_FOCUS_PARAM);
77
+ window.history.replaceState(null, "", url.toString());
78
+ };
79
+ const focusFieldOnceFormIsOpen = async (openForms, document, path, getFields)=>{
80
+ try {
81
+ await openForms.whenOpen(document);
82
+ await focusFieldPath(path, document.kind, document.collectionSlug, getFields);
83
+ } finally{
84
+ forgetFocusParam();
85
+ }
86
+ };
68
87
  export function VisualEditingBridgeProvider({ adminBasePath = "/admin", children }) {
69
88
  const { getEntityConfig } = useConfig();
70
- const [openForms] = useState(()=>new Set());
71
- const announceOpenForm = useCallback((form)=>{
72
- openForms.add(form);
89
+ const [openForms] = useState(createOpenForms);
90
+ const [previewPages] = useState(()=>new Set());
91
+ const [linkedFocus] = useState(()=>({
92
+ started: false
93
+ }));
94
+ const announcePreviewPage = useCallback((page)=>{
95
+ previewPages.add(page);
73
96
  return ()=>{
74
- openForms.delete(form);
97
+ previewPages.delete(page);
75
98
  };
76
99
  }, [
77
- openForms
100
+ previewPages
78
101
  ]);
79
102
  useEffect(()=>{
80
103
  const { currentCollectionLocation, currentGlobalSlug, navigateAndFocus } = makeLocators(adminBasePath);
104
+ const documentOfLocation = ()=>openDocumentOf({
105
+ collectionSlug: currentCollectionLocation()?.slug,
106
+ globalSlug: currentGlobalSlug() ?? undefined,
107
+ id: currentCollectionLocation()?.id
108
+ });
81
109
  const getFields = (kind, slug)=>{
82
110
  try {
83
111
  const entity = kind === "collection" ? getEntityConfig({
@@ -90,23 +118,15 @@ export function VisualEditingBridgeProvider({ adminBasePath = "/admin", children
90
118
  return null;
91
119
  }
92
120
  };
93
- const url = new URL(window.location.href);
94
- const focusPath = url.searchParams.get(VE_FOCUS_PARAM);
95
- if (focusPath) {
96
- url.searchParams.delete(VE_FOCUS_PARAM);
97
- window.history.replaceState(null, "", url.toString());
98
- const collection = currentCollectionLocation();
99
- const globalSlug = currentGlobalSlug();
100
- setTimeout(()=>{
101
- if (collection) {
102
- void focusFieldPath(focusPath, "collection", collection.slug, getFields);
103
- } else if (globalSlug) {
104
- void focusFieldPath(focusPath, "global", globalSlug, getFields);
105
- }
106
- }, 500);
121
+ const focusPath = new URL(window.location.href).searchParams.get(VE_FOCUS_PARAM);
122
+ const linked = documentOfLocation();
123
+ if (focusPath && !linked) forgetFocusParam();
124
+ if (focusPath && linked && !linkedFocus.started) {
125
+ linkedFocus.started = true;
126
+ void focusFieldOnceFormIsOpen(openForms, linked, focusPath, getFields);
107
127
  }
108
128
  const handle = (event)=>{
109
- if (!isSameOrigin(event.origin)) return;
129
+ if (!isFromAdminOrPreviewPage(event, window.location.origin, previewPages)) return;
110
130
  const data = event.data;
111
131
  if (!data || data.type !== VE_MESSAGE_TYPE) return;
112
132
  if (data.kind === "collection") {
@@ -117,7 +137,7 @@ export function VisualEditingBridgeProvider({ adminBasePath = "/admin", children
117
137
  navigateAndFocus(data);
118
138
  return;
119
139
  }
120
- void focusFieldPath(currentFormPathOf(data, openForms), "collection", data.collectionSlug, getFields);
140
+ void focusFieldPath(currentFormPathOf(data, openForms.forms), "collection", data.collectionSlug, getFields);
121
141
  return;
122
142
  }
123
143
  if (data.kind === "global") {
@@ -126,7 +146,7 @@ export function VisualEditingBridgeProvider({ adminBasePath = "/admin", children
126
146
  navigateAndFocus(data);
127
147
  return;
128
148
  }
129
- void focusFieldPath(currentFormPathOf(data, openForms), "global", data.collectionSlug, getFields);
149
+ void focusFieldPath(currentFormPathOf(data, openForms.forms), "global", data.collectionSlug, getFields);
130
150
  }
131
151
  };
132
152
  window.addEventListener("message", handle);
@@ -134,11 +154,16 @@ export function VisualEditingBridgeProvider({ adminBasePath = "/admin", children
134
154
  }, [
135
155
  getEntityConfig,
136
156
  adminBasePath,
137
- openForms
157
+ openForms,
158
+ previewPages,
159
+ linkedFocus
138
160
  ]);
139
- return /*#__PURE__*/ _jsx(OpenFormsContext.Provider, {
140
- value: announceOpenForm,
141
- children: children
161
+ return /*#__PURE__*/ _jsx(PreviewPagesContext.Provider, {
162
+ value: announcePreviewPage,
163
+ children: /*#__PURE__*/ _jsx(OpenFormsContext.Provider, {
164
+ value: openForms.announce,
165
+ children: children
166
+ })
142
167
  });
143
168
  }
144
169
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/admin/VisualEditingBridgeProvider.tsx"],"sourcesContent":["\"use client\";\n\nimport { useConfig } from \"@payloadcms/ui\";\nimport { useCallback, useEffect, useState } from \"react\";\n\nimport { defaultBuildAdminEditUrl } from \"../shared/buildAdminEditUrl.js\";\nimport { VE_FOCUS_PARAM, VE_MESSAGE_TYPE } from \"../shared/protocol.js\";\nimport type { DocKind } from \"../shared/protocol.js\";\nimport type { VeOpenFieldMessage } from \"../shared/protocol.js\";\nimport { expandAndFocus } from \"./expandAndFocus.js\";\nimport { currentFormPathOf, OpenFormsContext } from \"./openField/openForms.js\";\nimport type { AnnounceOpenForm, OpenForm } from \"./openField/openForms.js\";\nimport { parseFieldPath } from \"./parseFieldPath.js\";\nimport { resolveContainerChain } from \"./resolveContainerChain.js\";\nimport type { ContainerInstruction, ResolverField } from \"./resolveContainerChain.js\";\n\nconst escapeRegex = (value: string): string => value.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\");\n\nconst isSameOrigin = (eventOrigin: string): boolean => {\n if (typeof window === \"undefined\") return false;\n return eventOrigin === window.location.origin;\n};\n\nconst makeLocators = (adminBasePath: string) => {\n const base = escapeRegex(adminBasePath);\n const collectionRe = new RegExp(`^${base}/collections/([^/]+)/([^/?#]+)`);\n const globalRe = new RegExp(`^${base}/globals/([^/?#]+)`);\n\n const currentCollectionLocation = (): { slug: string; id: string } | null => {\n const match = window.location.pathname.match(collectionRe);\n if (!match) return null;\n const [, slug, id] = match;\n if (!slug || !id) return null;\n return { slug, id };\n };\n\n const currentGlobalSlug = (): string | null => {\n const match = window.location.pathname.match(globalRe);\n return match?.[1] ?? null;\n };\n\n const navigateAndFocus = (message: VeOpenFieldMessage): void => {\n const url = defaultBuildAdminEditUrl({\n adminBasePath,\n collectionSlug: message.collectionSlug,\n docId: message.docId,\n kind: message.kind,\n locale: message.locale,\n path: message.path,\n });\n const opened = window.open(url, \"_blank\");\n if (!opened) window.location.assign(url);\n };\n\n return { currentCollectionLocation, currentGlobalSlug, navigateAndFocus };\n};\n\nconst fallbackResolution = (\n path: string\n): { chain: ContainerInstruction[]; fieldId: string | null } => {\n const { rowIds, fieldId } = parseFieldPath(path);\n return {\n chain: rowIds.map((rowContainerId) => ({ kind: \"row\", rowContainerId }) as const),\n fieldId,\n };\n};\n\ntype EntityFieldsLookup = (kind: DocKind, slug: string) => ResolverField[] | null;\n\nconst focusFieldPath = async (\n path: string,\n kind: DocKind,\n slug: string,\n getFields: EntityFieldsLookup\n): Promise<void> => {\n const fields = getFields(kind, slug);\n const chainResult = fields !== null ? resolveContainerChain(path, fields) : null;\n const resolved = chainResult ?? fallbackResolution(path);\n await expandAndFocus(resolved.chain, resolved.fieldId);\n};\n\nexport function VisualEditingBridgeProvider({\n adminBasePath = \"/admin\",\n children,\n}: {\n adminBasePath?: string;\n children: React.ReactNode;\n}) {\n const { getEntityConfig } = useConfig();\n const [openForms] = useState(() => new Set<OpenForm>());\n\n const announceOpenForm = useCallback<AnnounceOpenForm>(\n (form) => {\n openForms.add(form);\n return () => {\n openForms.delete(form);\n };\n },\n [openForms]\n );\n\n useEffect(() => {\n const { currentCollectionLocation, currentGlobalSlug, navigateAndFocus } =\n makeLocators(adminBasePath);\n\n const getFields: EntityFieldsLookup = (kind, slug) => {\n try {\n const entity =\n kind === \"collection\"\n ? getEntityConfig({ collectionSlug: slug })\n : getEntityConfig({ globalSlug: slug });\n return (entity?.fields ?? null) as ResolverField[] | null;\n } catch {\n return null;\n }\n };\n\n const url = new URL(window.location.href);\n const focusPath = url.searchParams.get(VE_FOCUS_PARAM);\n if (focusPath) {\n url.searchParams.delete(VE_FOCUS_PARAM);\n window.history.replaceState(null, \"\", url.toString());\n const collection = currentCollectionLocation();\n const globalSlug = currentGlobalSlug();\n setTimeout(() => {\n if (collection) {\n void focusFieldPath(focusPath, \"collection\", collection.slug, getFields);\n } else if (globalSlug) {\n void focusFieldPath(focusPath, \"global\", globalSlug, getFields);\n }\n }, 500);\n }\n\n const handle = (event: MessageEvent) => {\n if (!isSameOrigin(event.origin)) return;\n const data = event.data as VeOpenFieldMessage | undefined;\n if (!data || data.type !== VE_MESSAGE_TYPE) return;\n\n if (data.kind === \"collection\") {\n const current = currentCollectionLocation();\n const wrongCollection = current?.slug !== data.collectionSlug;\n const wrongDoc = data.docId !== undefined && current?.id !== data.docId;\n if (!current || wrongCollection || wrongDoc) {\n navigateAndFocus(data);\n return;\n }\n void focusFieldPath(\n currentFormPathOf(data, openForms),\n \"collection\",\n data.collectionSlug,\n getFields\n );\n return;\n }\n\n if (data.kind === \"global\") {\n const slug = currentGlobalSlug();\n if (slug !== data.collectionSlug) {\n navigateAndFocus(data);\n return;\n }\n void focusFieldPath(\n currentFormPathOf(data, openForms),\n \"global\",\n data.collectionSlug,\n getFields\n );\n }\n };\n\n window.addEventListener(\"message\", handle);\n return () => window.removeEventListener(\"message\", handle);\n }, [getEntityConfig, adminBasePath, openForms]);\n\n return <OpenFormsContext.Provider value={announceOpenForm}>{children}</OpenFormsContext.Provider>;\n}\n"],"names":["useConfig","useCallback","useEffect","useState","defaultBuildAdminEditUrl","VE_FOCUS_PARAM","VE_MESSAGE_TYPE","expandAndFocus","currentFormPathOf","OpenFormsContext","parseFieldPath","resolveContainerChain","escapeRegex","value","replace","isSameOrigin","eventOrigin","window","location","origin","makeLocators","adminBasePath","base","collectionRe","RegExp","globalRe","currentCollectionLocation","match","pathname","slug","id","currentGlobalSlug","navigateAndFocus","message","url","collectionSlug","docId","kind","locale","path","opened","open","assign","fallbackResolution","rowIds","fieldId","chain","map","rowContainerId","focusFieldPath","getFields","fields","chainResult","resolved","VisualEditingBridgeProvider","children","getEntityConfig","openForms","Set","announceOpenForm","form","add","delete","entity","globalSlug","URL","href","focusPath","searchParams","get","history","replaceState","toString","collection","setTimeout","handle","event","data","type","current","wrongCollection","wrongDoc","undefined","addEventListener","removeEventListener","Provider"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/admin/VisualEditingBridgeProvider.tsx"],"sourcesContent":["\"use client\";\n\nimport { useConfig } from \"@payloadcms/ui\";\nimport { useCallback, useEffect, useState } from \"react\";\n\nimport type { VeDocument } from \"../shared/protocol.js\";\n\nimport { adminBaseOf, defaultBuildAdminEditUrl } from \"../shared/buildAdminEditUrl.js\";\nimport { VE_FOCUS_PARAM, VE_MESSAGE_TYPE } from \"../shared/protocol.js\";\nimport type { DocKind } from \"../shared/protocol.js\";\nimport type { VeOpenFieldMessage } from \"../shared/protocol.js\";\nimport { expandAndFocus } from \"./expandAndFocus.js\";\nimport { openDocumentOf } from \"./openField/openDocument.js\";\nimport { createOpenForms, currentFormPathOf, OpenFormsContext } from \"./openField/openForms.js\";\nimport type { OpenForms } from \"./openField/openForms.js\";\nimport { parseFieldPath } from \"./parseFieldPath.js\";\nimport { isFromAdminOrPreviewPage, PreviewPagesContext } from \"./previewPages.js\";\nimport type { AnnouncePreviewPage, PreviewPage } from \"./previewPages.js\";\nimport { resolveContainerChain } from \"./resolveContainerChain.js\";\nimport type { ContainerInstruction, ResolverField } from \"./resolveContainerChain.js\";\n\nconst escapeRegex = (value: string): string => value.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\");\n\nconst decoded = (segment: string): string => {\n try {\n return decodeURIComponent(segment);\n } catch {\n return segment;\n }\n};\n\nconst makeLocators = (adminBasePath: string) => {\n const base = escapeRegex(adminBaseOf(adminBasePath));\n const collectionRe = new RegExp(`^${base}/collections/([^/]+)/([^/?#]+)`);\n const globalRe = new RegExp(`^${base}/globals/([^/?#]+)`);\n\n const currentCollectionLocation = (): { slug: string; id: string } | null => {\n const match = window.location.pathname.match(collectionRe);\n if (!match) return null;\n const [, slug, id] = match;\n if (!slug || !id) return null;\n return { id: decoded(id), slug: decoded(slug) };\n };\n\n const currentGlobalSlug = (): string | null => {\n const match = window.location.pathname.match(globalRe);\n return match?.[1] ? decoded(match[1]) : null;\n };\n\n const navigateAndFocus = (message: VeOpenFieldMessage): void => {\n const url = defaultBuildAdminEditUrl({\n adminBasePath,\n collectionSlug: message.collectionSlug,\n docId: message.docId,\n kind: message.kind,\n locale: message.locale,\n path: message.path,\n });\n const opened = window.open(url, \"_blank\");\n if (!opened) window.location.assign(url);\n };\n\n return { currentCollectionLocation, currentGlobalSlug, navigateAndFocus };\n};\n\nconst fallbackResolution = (\n path: string\n): { chain: ContainerInstruction[]; fieldId: string | null } => {\n const { rowIds, fieldId } = parseFieldPath(path);\n return {\n chain: rowIds.map((rowContainerId) => ({ kind: \"row\", rowContainerId }) as const),\n fieldId,\n };\n};\n\ntype EntityFieldsLookup = (kind: DocKind, slug: string) => ResolverField[] | null;\n\nconst focusFieldPath = async (\n path: string,\n kind: DocKind,\n slug: string,\n getFields: EntityFieldsLookup\n): Promise<void> => {\n const fields = getFields(kind, slug);\n const chainResult = fields !== null ? resolveContainerChain(path, fields) : null;\n const resolved = chainResult ?? fallbackResolution(path);\n await expandAndFocus(resolved.chain, resolved.fieldId);\n};\n\nconst forgetFocusParam = (): void => {\n const url = new URL(window.location.href);\n if (!url.searchParams.has(VE_FOCUS_PARAM)) return;\n url.searchParams.delete(VE_FOCUS_PARAM);\n window.history.replaceState(null, \"\", url.toString());\n};\n\nconst focusFieldOnceFormIsOpen = async (\n openForms: OpenForms,\n document: VeDocument,\n path: string,\n getFields: EntityFieldsLookup\n): Promise<void> => {\n try {\n await openForms.whenOpen(document);\n await focusFieldPath(path, document.kind, document.collectionSlug, getFields);\n } finally {\n forgetFocusParam();\n }\n};\n\nexport function VisualEditingBridgeProvider({\n adminBasePath = \"/admin\",\n children,\n}: {\n adminBasePath?: string;\n children: React.ReactNode;\n}) {\n const { getEntityConfig } = useConfig();\n const [openForms] = useState(createOpenForms);\n const [previewPages] = useState(() => new Set<PreviewPage>());\n const [linkedFocus] = useState(() => ({ started: false }));\n\n const announcePreviewPage = useCallback<AnnouncePreviewPage>(\n (page) => {\n previewPages.add(page);\n return () => {\n previewPages.delete(page);\n };\n },\n [previewPages]\n );\n\n useEffect(() => {\n const { currentCollectionLocation, currentGlobalSlug, navigateAndFocus } =\n makeLocators(adminBasePath);\n\n const documentOfLocation = (): VeDocument | null =>\n openDocumentOf({\n collectionSlug: currentCollectionLocation()?.slug,\n globalSlug: currentGlobalSlug() ?? undefined,\n id: currentCollectionLocation()?.id,\n });\n\n const getFields: EntityFieldsLookup = (kind, slug) => {\n try {\n const entity =\n kind === \"collection\"\n ? getEntityConfig({ collectionSlug: slug })\n : getEntityConfig({ globalSlug: slug });\n return (entity?.fields ?? null) as ResolverField[] | null;\n } catch {\n return null;\n }\n };\n\n const focusPath = new URL(window.location.href).searchParams.get(VE_FOCUS_PARAM);\n const linked = documentOfLocation();\n if (focusPath && !linked) forgetFocusParam();\n if (focusPath && linked && !linkedFocus.started) {\n linkedFocus.started = true;\n void focusFieldOnceFormIsOpen(openForms, linked, focusPath, getFields);\n }\n\n const handle = (event: MessageEvent) => {\n if (!isFromAdminOrPreviewPage(event, window.location.origin, previewPages)) return;\n const data = event.data as VeOpenFieldMessage | undefined;\n if (!data || data.type !== VE_MESSAGE_TYPE) return;\n\n if (data.kind === \"collection\") {\n const current = currentCollectionLocation();\n const wrongCollection = current?.slug !== data.collectionSlug;\n const wrongDoc = data.docId !== undefined && current?.id !== data.docId;\n if (!current || wrongCollection || wrongDoc) {\n navigateAndFocus(data);\n return;\n }\n void focusFieldPath(\n currentFormPathOf(data, openForms.forms),\n \"collection\",\n data.collectionSlug,\n getFields\n );\n return;\n }\n\n if (data.kind === \"global\") {\n const slug = currentGlobalSlug();\n if (slug !== data.collectionSlug) {\n navigateAndFocus(data);\n return;\n }\n void focusFieldPath(\n currentFormPathOf(data, openForms.forms),\n \"global\",\n data.collectionSlug,\n getFields\n );\n }\n };\n\n window.addEventListener(\"message\", handle);\n return () => window.removeEventListener(\"message\", handle);\n }, [getEntityConfig, adminBasePath, openForms, previewPages, linkedFocus]);\n\n return (\n <PreviewPagesContext.Provider value={announcePreviewPage}>\n <OpenFormsContext.Provider value={openForms.announce}>{children}</OpenFormsContext.Provider>\n </PreviewPagesContext.Provider>\n );\n}\n"],"names":["useConfig","useCallback","useEffect","useState","adminBaseOf","defaultBuildAdminEditUrl","VE_FOCUS_PARAM","VE_MESSAGE_TYPE","expandAndFocus","openDocumentOf","createOpenForms","currentFormPathOf","OpenFormsContext","parseFieldPath","isFromAdminOrPreviewPage","PreviewPagesContext","resolveContainerChain","escapeRegex","value","replace","decoded","segment","decodeURIComponent","makeLocators","adminBasePath","base","collectionRe","RegExp","globalRe","currentCollectionLocation","match","window","location","pathname","slug","id","currentGlobalSlug","navigateAndFocus","message","url","collectionSlug","docId","kind","locale","path","opened","open","assign","fallbackResolution","rowIds","fieldId","chain","map","rowContainerId","focusFieldPath","getFields","fields","chainResult","resolved","forgetFocusParam","URL","href","searchParams","has","delete","history","replaceState","toString","focusFieldOnceFormIsOpen","openForms","document","whenOpen","VisualEditingBridgeProvider","children","getEntityConfig","previewPages","Set","linkedFocus","started","announcePreviewPage","page","add","documentOfLocation","globalSlug","undefined","entity","focusPath","get","linked","handle","event","origin","data","type","current","wrongCollection","wrongDoc","forms","addEventListener","removeEventListener","Provider","announce"],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import type { ContainerInstruction } from "./resolveContainerChain.js";
2
+ export declare const WALK_BUDGET_MS = 20000;
2
3
  export declare const findFieldElement: (fieldId: string) => HTMLElement | null;
3
4
  export declare const scrollNearestAncestorIntoView: (fieldId: string) => void;
4
5
  export declare const applyContainerChain: (chain: readonly ContainerInstruction[]) => Promise<boolean>;
@@ -1,11 +1,13 @@
1
1
  import { arrayFieldIdOfRow, FIELD_ID_PREFIX, FIELD_ID_SEPARATOR, fieldDomIdOf } from "./fieldDomId.js";
2
- const FOCUS_SELECTOR = '[data-lexical-editor="true"], input:not([type="hidden"]), textarea';
2
+ const RICH_TEXT_EDITOR_SELECTOR = '[data-lexical-editor="true"]';
3
+ const FOCUS_SELECTOR = `${RICH_TEXT_EDITOR_SELECTOR}, input:not([type="hidden"]), textarea`;
4
+ const RICH_TEXT_FIELD_SELECTOR = ".rich-text-lexical";
3
5
  const FIELD_WRAPPER_SELECTOR = ".field-type";
4
6
  const BLOCK_NAME_INPUT_SELECTOR = ".section-title__input";
5
7
  const FOCUSED_FIELD_FRAME_SELECTOR = ".section-title, .field-type";
6
8
  const SWEEP_STYLE_ID = "ve-sweep-styles";
7
- const POLL_INTERVAL_MS = 60;
8
- const STEP_BUDGET_MS = 1500;
9
+ const POLL_INTERVAL_MS = 20;
10
+ export const WALK_BUDGET_MS = 20_000;
9
11
  const POST_SCROLL_DELAY_MS = 500;
10
12
  const REVEAL_TOTAL_MS = 1800;
11
13
  const FOCUS_HSL = {
@@ -93,11 +95,12 @@ const ensureSweepStyles = ()=>{
93
95
  document.head.append(style);
94
96
  };
95
97
  const SWEEP_DECORATION_PAD = 24;
98
+ const DOCUMENT_HEADER_SELECTOR = ".doc-controls";
96
99
  const playSweep = (el)=>{
97
100
  ensureSweepStyles();
98
101
  const wrap = document.createElement("div");
99
102
  wrap.className = "ve-sweep-wrap";
100
- const docHeader = document.querySelector(".doc-controls");
103
+ const docHeader = document.querySelector(DOCUMENT_HEADER_SELECTOR);
101
104
  const ring = document.createElement("div");
102
105
  ring.className = "ve-sweep-ring";
103
106
  const corners = [
@@ -148,35 +151,83 @@ export const findFieldElement = (fieldId)=>{
148
151
  const wrapper = labelOf(fieldId)?.closest(FIELD_WRAPPER_SELECTOR);
149
152
  return wrapper ?? blockNameInputOf(fieldId);
150
153
  };
151
- export const scrollNearestAncestorIntoView = (fieldId)=>{
152
- if (!fieldId.startsWith(FIELD_ID_PREFIX)) return;
154
+ const nearestRenderedAncestorOf = (fieldId)=>{
155
+ if (!fieldId.startsWith(FIELD_ID_PREFIX)) return null;
153
156
  const segments = fieldId.slice(FIELD_ID_PREFIX.length).split(FIELD_ID_SEPARATOR);
154
157
  for(let i = segments.length; i > 0; i--){
155
158
  const ancestorId = `${FIELD_ID_PREFIX}${segments.slice(0, i).join(FIELD_ID_SEPARATOR)}`;
156
159
  // oxlint-disable-next-line unicorn/prefer-query-selector -- ids are not guaranteed to be valid CSS selectors
157
160
  const el = document.getElementById(ancestorId);
158
- if (el && typeof el.scrollIntoView === "function") {
159
- el.scrollIntoView({
160
- behavior: "auto",
161
- block: "center"
162
- });
163
- return;
164
- }
161
+ if (el) return el;
165
162
  }
163
+ return null;
166
164
  };
167
- const waitFor = (predicate, budgetMs)=>{
168
- return new Promise((resolve)=>{
169
- const deadline = Date.now() + budgetMs;
165
+ const scrollIntoViewAtOnce = (el)=>{
166
+ if (el && typeof el.scrollIntoView === "function") {
167
+ el.scrollIntoView({
168
+ behavior: "auto",
169
+ block: "center"
170
+ });
171
+ }
172
+ };
173
+ const isOutOfView = (el)=>{
174
+ const rect = el.getBoundingClientRect();
175
+ return rect.bottom <= 0 || rect.top >= window.innerHeight;
176
+ };
177
+ const isWhollyInView = (el)=>{
178
+ const rect = el.getBoundingClientRect();
179
+ const header = document.querySelector(DOCUMENT_HEADER_SELECTOR);
180
+ const top = header?.getBoundingClientRect().bottom ?? 0;
181
+ return rect.height > 0 && rect.top >= top && rect.bottom <= window.innerHeight;
182
+ };
183
+ export const scrollNearestAncestorIntoView = (fieldId)=>scrollIntoViewAtOnce(nearestRenderedAncestorOf(fieldId));
184
+ const nearestRenderedContainerOf = (fieldId, scope)=>{
185
+ const ancestor = nearestRenderedAncestorOf(fieldId);
186
+ if (!(scope instanceof HTMLElement)) return ancestor;
187
+ return !ancestor || ancestor.contains(scope) ? scope : ancestor;
188
+ };
189
+ let latestWalk = 0;
190
+ const startWalk = (budgetMs)=>{
191
+ latestWalk += 1;
192
+ const walk = latestWalk;
193
+ const deadline = Date.now() + budgetMs;
194
+ return {
195
+ isOver: ()=>walk !== latestWalk || Date.now() >= deadline
196
+ };
197
+ };
198
+ const waitFor = (predicate, walk)=>new Promise((resolve)=>{
170
199
  const tick = ()=>{
171
200
  if (predicate()) return resolve(true);
172
- if (Date.now() >= deadline) return resolve(false);
201
+ if (walk.isOver()) return resolve(false);
173
202
  setTimeout(tick, POLL_INTERVAL_MS);
174
203
  };
175
204
  tick();
176
205
  });
206
+ const waitForRendered = (find, fieldId, scope, walk)=>{
207
+ let scrolledTo = null;
208
+ const isRendered = ()=>{
209
+ if (find() !== null) return true;
210
+ const container = nearestRenderedContainerOf(fieldId, scope);
211
+ const isPushedOutOfView = container !== null && isOutOfView(container);
212
+ if (container !== scrolledTo || isPushedOutOfView) scrollIntoViewAtOnce(container);
213
+ scrolledTo = container;
214
+ return false;
215
+ };
216
+ return waitFor(isRendered, walk).then((rendered)=>rendered ? find() : null);
177
217
  };
218
+ const pause = (ms)=>new Promise((resolve)=>{
219
+ setTimeout(resolve, ms);
220
+ });
178
221
  const collapsibleDomId = (path)=>fieldDomIdOf(`collapsible-${path}`);
179
- const runInstruction = async (instruction, scope)=>{
222
+ const TOGGLE_SELECTOR = ".collapsible__toggle";
223
+ const COLLAPSED_TOGGLE_CLASS = "collapsible__toggle--collapsed";
224
+ const expand = async (container, walk)=>{
225
+ const toggle = container.querySelector(TOGGLE_SELECTOR);
226
+ if (!toggle?.classList.contains(COLLAPSED_TOGGLE_CLASS)) return true;
227
+ toggle.click();
228
+ return waitFor(()=>!toggle.classList.contains(COLLAPSED_TOGGLE_CLASS), walk);
229
+ };
230
+ const runInstruction = async (instruction, scope, walk)=>{
180
231
  switch(instruction.kind){
181
232
  case "tab":
182
233
  {
@@ -185,13 +236,13 @@ const runInstruction = async (instruction, scope)=>{
185
236
  return buttons[instruction.tabIndex] ?? null;
186
237
  };
187
238
  const isActive = ()=>getButton()?.classList.contains("tabs-field__tab-button--active") ?? false;
188
- const ready = await waitFor(()=>getButton() !== null, STEP_BUDGET_MS);
239
+ const ready = await waitFor(()=>getButton() !== null, walk);
189
240
  if (!ready) return {
190
241
  ok: false,
191
242
  nextScope: scope
192
243
  };
193
- if (!isActive()) getButton().click();
194
- const activated = await waitFor(isActive, STEP_BUDGET_MS);
244
+ if (!isActive()) getButton()?.click();
245
+ const activated = await waitFor(isActive, walk);
195
246
  return {
196
247
  ok: activated,
197
248
  nextScope: scope
@@ -201,114 +252,86 @@ const runInstruction = async (instruction, scope)=>{
201
252
  {
202
253
  const id = collapsibleDomId(instruction.path);
203
254
  // oxlint-disable-next-line unicorn/prefer-query-selector -- ids are not guaranteed to be valid CSS selectors
204
- const ready = await waitFor(()=>document.getElementById(id) !== null, STEP_BUDGET_MS);
205
- if (!ready) return {
255
+ const wrapper = await waitForRendered(()=>document.getElementById(id), id, scope, walk);
256
+ if (!wrapper) return {
206
257
  ok: false,
207
258
  nextScope: scope
208
259
  };
209
- // oxlint-disable-next-line unicorn/prefer-query-selector -- ids are not guaranteed to be valid CSS selectors
210
- const wrapper = document.getElementById(id);
211
- const toggle = wrapper.querySelector(".collapsible__toggle");
212
- if (!toggle) return {
213
- ok: true,
214
- nextScope: wrapper
215
- };
216
- if (toggle.classList.contains("collapsible__toggle--collapsed")) {
217
- toggle.click();
218
- const opened = await waitFor(()=>!toggle.classList.contains("collapsible__toggle--collapsed"), STEP_BUDGET_MS);
219
- return {
220
- ok: opened,
221
- nextScope: wrapper
222
- };
223
- }
224
260
  return {
225
- ok: true,
261
+ ok: await expand(wrapper, walk),
226
262
  nextScope: wrapper
227
263
  };
228
264
  }
229
265
  case "row":
230
266
  {
231
- scrollNearestAncestorIntoView(arrayFieldIdOfRow(instruction.rowContainerId));
232
- const ready = await waitFor(// oxlint-disable-next-line unicorn/prefer-query-selector -- ids are not guaranteed to be valid CSS selectors
233
- ()=>document.getElementById(instruction.rowContainerId) !== null, STEP_BUDGET_MS);
234
- if (!ready) return {
267
+ const row = await waitForRendered(// oxlint-disable-next-line unicorn/prefer-query-selector -- ids are not guaranteed to be valid CSS selectors
268
+ ()=>document.getElementById(instruction.rowContainerId), arrayFieldIdOfRow(instruction.rowContainerId), scope, walk);
269
+ if (!row) return {
235
270
  ok: false,
236
271
  nextScope: scope
237
272
  };
238
- // oxlint-disable-next-line unicorn/prefer-query-selector -- ids are not guaranteed to be valid CSS selectors
239
- const row = document.getElementById(instruction.rowContainerId);
240
- const toggle = row.querySelector(".collapsible__toggle");
241
- if (!toggle) return {
242
- ok: true,
243
- nextScope: row
244
- };
245
- if (toggle.classList.contains("collapsible__toggle--collapsed")) {
246
- toggle.click();
247
- const opened = await waitFor(()=>!toggle.classList.contains("collapsible__toggle--collapsed"), STEP_BUDGET_MS);
248
- return {
249
- ok: opened,
250
- nextScope: row
251
- };
252
- }
253
273
  return {
254
- ok: true,
274
+ ok: await expand(row, walk),
255
275
  nextScope: row
256
276
  };
257
277
  }
258
278
  }
259
279
  };
260
- export const applyContainerChain = async (chain)=>{
280
+ const walkContainerChain = async (chain, walk)=>{
261
281
  let scope = document;
262
282
  for (const instruction of chain){
263
- const result = await runInstruction(instruction, scope);
264
- if (!result.ok) return false;
283
+ const result = await runInstruction(instruction, scope, walk);
284
+ if (!result.ok) return {
285
+ ok: false,
286
+ scope
287
+ };
265
288
  scope = result.nextScope;
266
289
  }
267
- return true;
290
+ return {
291
+ ok: true,
292
+ scope
293
+ };
294
+ };
295
+ export const applyContainerChain = async (chain)=>{
296
+ const { ok } = await walkContainerChain(chain, startWalk(WALK_BUDGET_MS));
297
+ return ok;
298
+ };
299
+ const focusableOf = async (fieldEl, walk)=>{
300
+ if (fieldEl.matches(FOCUS_SELECTOR)) return fieldEl;
301
+ if (!fieldEl.matches(RICH_TEXT_FIELD_SELECTOR)) {
302
+ return fieldEl.querySelector(FOCUS_SELECTOR);
303
+ }
304
+ const editorOf = ()=>fieldEl.querySelector(RICH_TEXT_EDITOR_SELECTOR);
305
+ await waitFor(()=>editorOf() !== null, walk);
306
+ return editorOf();
268
307
  };
269
- const focusAndSweep = (fieldEl)=>{
270
- if (typeof fieldEl.scrollIntoView === "function") {
271
- fieldEl.scrollIntoView({
308
+ const scrollSmoothlyIntoView = (el)=>{
309
+ if (typeof el.scrollIntoView === "function") {
310
+ el.scrollIntoView({
272
311
  behavior: "smooth",
273
312
  block: "center"
274
313
  });
275
314
  }
276
- setTimeout(()=>{
277
- let sweepTarget = fieldEl;
278
- if (fieldEl.matches(FOCUS_SELECTOR)) {
279
- fieldEl.focus({
280
- preventScroll: true
281
- });
282
- const wrapper = fieldEl.closest(FOCUSED_FIELD_FRAME_SELECTOR);
283
- if (wrapper) sweepTarget = wrapper;
284
- } else {
285
- const focusable = fieldEl.querySelector(FOCUS_SELECTOR);
286
- focusable?.focus({
287
- preventScroll: true
288
- });
289
- }
290
- if (typeof fieldEl.scrollIntoView === "function") {
291
- const rect = fieldEl.getBoundingClientRect();
292
- const viewportHeight = window.innerHeight;
293
- const outOfView = rect.bottom <= 0 || rect.top >= viewportHeight;
294
- if (outOfView) {
295
- fieldEl.scrollIntoView({
296
- behavior: "smooth",
297
- block: "center"
298
- });
299
- }
300
- }
301
- playSweep(sweepTarget);
302
- }, POST_SCROLL_DELAY_MS);
315
+ };
316
+ const focusAndSweep = async (fieldEl, walk)=>{
317
+ if (!isWhollyInView(fieldEl)) {
318
+ scrollSmoothlyIntoView(fieldEl);
319
+ await pause(POST_SCROLL_DELAY_MS);
320
+ }
321
+ const focusable = await focusableOf(fieldEl, walk);
322
+ focusable?.focus({
323
+ preventScroll: true
324
+ });
325
+ if (isOutOfView(fieldEl)) scrollSmoothlyIntoView(fieldEl);
326
+ const frame = focusable === fieldEl ? fieldEl.closest(FOCUSED_FIELD_FRAME_SELECTOR) : null;
327
+ playSweep(frame ?? fieldEl);
303
328
  };
304
329
  export const expandAndFocus = async (chain, fieldId)=>{
305
- await applyContainerChain(chain);
330
+ const walk = startWalk(WALK_BUDGET_MS);
331
+ const { scope } = await walkContainerChain(chain, walk);
306
332
  if (!fieldId) return;
307
- scrollNearestAncestorIntoView(fieldId);
308
- const ready = await waitFor(()=>findFieldElement(fieldId) !== null, STEP_BUDGET_MS);
309
- if (!ready) return;
310
- const fieldEl = findFieldElement(fieldId);
311
- if (fieldEl) focusAndSweep(fieldEl);
333
+ const fieldEl = await waitForRendered(()=>findFieldElement(fieldId), fieldId, scope, walk);
334
+ if (fieldEl) await focusAndSweep(fieldEl, walk);
312
335
  };
313
336
 
314
337
  //# sourceMappingURL=expandAndFocus.js.map