@pantheon-systems/puck-css 0.12.0 → 0.14.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 (559) hide show
  1. package/README.md +1 -1
  2. package/dist/agent/components/AgentActionButton.js +0 -13
  3. package/dist/agent/components/AgentActionButton.js.map +1 -1
  4. package/dist/agent/components/AgentActionModal.js +0 -13
  5. package/dist/agent/components/AgentActionModal.js.map +1 -1
  6. package/dist/agent/components/AgentStatusPanel.js +0 -10
  7. package/dist/agent/components/AgentStatusPanel.js.map +1 -1
  8. package/dist/agent/components/index.js +0 -5
  9. package/dist/agent/components/index.js.map +1 -1
  10. package/dist/agent/useAgentEdit.js +0 -12
  11. package/dist/agent/useAgentEdit.js.map +1 -1
  12. package/dist/agent/useAgentTrigger.js +0 -29
  13. package/dist/agent/useAgentTrigger.js.map +1 -1
  14. package/dist/auth/P1AuthProvider.d.ts +9 -2
  15. package/dist/auth/P1AuthProvider.d.ts.map +1 -1
  16. package/dist/auth/P1AuthProvider.js +21 -44
  17. package/dist/auth/P1AuthProvider.js.map +1 -1
  18. package/dist/auth/P1LoginPage.js +0 -18
  19. package/dist/auth/P1LoginPage.js.map +1 -1
  20. package/dist/auth/index.d.ts +2 -0
  21. package/dist/auth/index.d.ts.map +1 -1
  22. package/dist/auth/index.js +1 -9
  23. package/dist/auth/index.js.map +1 -1
  24. package/dist/auth/logout.d.ts +23 -0
  25. package/dist/auth/logout.d.ts.map +1 -0
  26. package/dist/auth/logout.js +14 -0
  27. package/dist/auth/logout.js.map +1 -0
  28. package/dist/auth/storage-keys.d.ts +5 -0
  29. package/dist/auth/storage-keys.d.ts.map +1 -0
  30. package/dist/auth/storage-keys.js +3 -0
  31. package/dist/auth/storage-keys.js.map +1 -0
  32. package/dist/collaboration/components/AgentActivityBanner.js +0 -15
  33. package/dist/collaboration/components/AgentActivityBanner.js.map +1 -1
  34. package/dist/collaboration/components/CollaboratorAvatars.js +0 -17
  35. package/dist/collaboration/components/CollaboratorAvatars.js.map +1 -1
  36. package/dist/collaboration/components/FocusRegionHighlight.js +0 -9
  37. package/dist/collaboration/components/FocusRegionHighlight.js.map +1 -1
  38. package/dist/collaboration/components/PresenceIndicator.js +0 -9
  39. package/dist/collaboration/components/PresenceIndicator.js.map +1 -1
  40. package/dist/collaboration/useBranchPresence.js +0 -36
  41. package/dist/collaboration/useBranchPresence.js.map +1 -1
  42. package/dist/collaboration/useFocusRegionReporting.js +0 -75
  43. package/dist/collaboration/useFocusRegionReporting.js.map +1 -1
  44. package/dist/collaboration/usePresence.js +0 -37
  45. package/dist/collaboration/usePresence.js.map +1 -1
  46. package/dist/collaboration/useSitePresence.js +0 -36
  47. package/dist/collaboration/useSitePresence.js.map +1 -1
  48. package/dist/collaboration/utils/avatarColor.js +0 -3
  49. package/dist/collaboration/utils/avatarColor.js.map +1 -1
  50. package/dist/collaboration/utils/focusHighlightConfig.js +0 -61
  51. package/dist/collaboration/utils/focusHighlightConfig.js.map +1 -1
  52. package/dist/collaboration/utils/focusRegionMap.js +1 -80
  53. package/dist/collaboration/utils/focusRegionMap.js.map +1 -1
  54. package/dist/collaboration/utils/initials.js +0 -14
  55. package/dist/collaboration/utils/initials.js.map +1 -1
  56. package/dist/collaboration/utils/presenceIdentity.js +0 -26
  57. package/dist/collaboration/utils/presenceIdentity.js.map +1 -1
  58. package/dist/core/FocusHighlightContext.js +0 -31
  59. package/dist/core/FocusHighlightContext.js.map +1 -1
  60. package/dist/core/NotificationContext.js +2 -67
  61. package/dist/core/NotificationContext.js.map +1 -1
  62. package/dist/core/P1PuckContext.js +0 -31
  63. package/dist/core/P1PuckContext.js.map +1 -1
  64. package/dist/core/PresenceContext.js +0 -18
  65. package/dist/core/PresenceContext.js.map +1 -1
  66. package/dist/core/config.js +0 -11
  67. package/dist/core/config.js.map +1 -1
  68. package/dist/core/featureConfig.js +0 -32
  69. package/dist/core/featureConfig.js.map +1 -1
  70. package/dist/core/index.d.ts +1 -1
  71. package/dist/core/index.d.ts.map +1 -1
  72. package/dist/core/plugin-types.d.ts +9 -0
  73. package/dist/core/plugin-types.d.ts.map +1 -1
  74. package/dist/core/types.d.ts +7 -1
  75. package/dist/core/types.d.ts.map +1 -1
  76. package/dist/core/types.js +0 -3
  77. package/dist/core/types.js.map +1 -1
  78. package/dist/core/utils/debounce.js +0 -18
  79. package/dist/core/utils/debounce.js.map +1 -1
  80. package/dist/core/utils/requestError.js +0 -5
  81. package/dist/core/utils/requestError.js.map +1 -1
  82. package/dist/core/utils/retry.js +0 -31
  83. package/dist/core/utils/retry.js.map +1 -1
  84. package/dist/core/utils/throttle.js +0 -24
  85. package/dist/core/utils/throttle.js.map +1 -1
  86. package/dist/data/cross-reference-resolve.js +0 -6
  87. package/dist/data/cross-reference-resolve.js.map +1 -1
  88. package/dist/data/cross-reference.js +0 -15
  89. package/dist/data/cross-reference.js.map +1 -1
  90. package/dist/data/css-queries/css-query-registry.d.ts +2 -2
  91. package/dist/data/css-queries/css-query-registry.js +1 -1
  92. package/dist/data/css-queries/css-query-registry.js.map +1 -1
  93. package/dist/data/dal/index.js +0 -21
  94. package/dist/data/dal/index.js.map +1 -1
  95. package/dist/data/dal/init.js +0 -40
  96. package/dist/data/dal/init.js.map +1 -1
  97. package/dist/data/dal/p1-store.d.ts.map +1 -1
  98. package/dist/data/dal/p1-store.js +11 -41
  99. package/dist/data/dal/p1-store.js.map +1 -1
  100. package/dist/data/data-list-block/builtin-components/cards.d.ts +1 -0
  101. package/dist/data/data-list-block/builtin-components/cards.d.ts.map +1 -1
  102. package/dist/data/data-list-block/builtin-components/cards.js +16 -16
  103. package/dist/data/data-list-block/builtin-components/cards.js.map +1 -1
  104. package/dist/data/data-list-block/builtin-components/listing.d.ts +1 -0
  105. package/dist/data/data-list-block/builtin-components/listing.d.ts.map +1 -1
  106. package/dist/data/data-list-block/builtin-components/listing.js +4 -3
  107. package/dist/data/data-list-block/builtin-components/listing.js.map +1 -1
  108. package/dist/data/data-list-block/builtin-components/rows.d.ts +1 -0
  109. package/dist/data/data-list-block/builtin-components/rows.d.ts.map +1 -1
  110. package/dist/data/data-list-block/builtin-components/rows.js +3 -3
  111. package/dist/data/data-list-block/builtin-components/rows.js.map +1 -1
  112. package/dist/data/data-list-block/create-data-list-block.d.ts +1 -0
  113. package/dist/data/data-list-block/create-data-list-block.d.ts.map +1 -1
  114. package/dist/data/data-list-block/create-data-list-block.js +7 -11
  115. package/dist/data/data-list-block/create-data-list-block.js.map +1 -1
  116. package/dist/data/data-list-block/data-list.css +314 -0
  117. package/dist/data/data-list-block/utils.js +0 -1
  118. package/dist/data/data-list-block/utils.js.map +1 -1
  119. package/dist/data/fields/pds-field-helpers.js +1 -4
  120. package/dist/data/fields/pds-field-helpers.js.map +1 -1
  121. package/dist/data/fields/visible-when.js +0 -5
  122. package/dist/data/fields/visible-when.js.map +1 -1
  123. package/dist/data/fields.d.ts.map +1 -1
  124. package/dist/data/fields.js +7 -14
  125. package/dist/data/fields.js.map +1 -1
  126. package/dist/data/get-page.js +0 -1
  127. package/dist/data/get-page.js.map +1 -1
  128. package/dist/data/page-editor-meta.js +0 -7
  129. package/dist/data/page-editor-meta.js.map +1 -1
  130. package/dist/data/page-store.js +0 -32
  131. package/dist/data/page-store.js.map +1 -1
  132. package/dist/data/page-structure.js +0 -3
  133. package/dist/data/page-structure.js.map +1 -1
  134. package/dist/data/paths.d.ts +6 -0
  135. package/dist/data/paths.d.ts.map +1 -1
  136. package/dist/data/paths.js +3 -16
  137. package/dist/data/paths.js.map +1 -1
  138. package/dist/data/query-provider.d.ts +14 -0
  139. package/dist/data/query-provider.d.ts.map +1 -1
  140. package/dist/data/query-provider.js +20 -9
  141. package/dist/data/query-provider.js.map +1 -1
  142. package/dist/data/remote-datasources/fetch-http-json.js +0 -5
  143. package/dist/data/remote-datasources/fetch-http-json.js.map +1 -1
  144. package/dist/data/remote-datasources/loader.js +0 -21
  145. package/dist/data/remote-datasources/loader.js.map +1 -1
  146. package/dist/data/remote-datasources/remote-datasource-registry.js +0 -4
  147. package/dist/data/remote-datasources/remote-datasource-registry.js.map +1 -1
  148. package/dist/data/resolve-data-templates.js +0 -24
  149. package/dist/data/resolve-data-templates.js.map +1 -1
  150. package/dist/data/route-templates.js +0 -29
  151. package/dist/data/route-templates.js.map +1 -1
  152. package/dist/data/semantic-ops.js +0 -11
  153. package/dist/data/semantic-ops.js.map +1 -1
  154. package/dist/data/styles.js +0 -2
  155. package/dist/data/styles.js.map +1 -1
  156. package/dist/data/template-autocomplete.js +0 -8
  157. package/dist/data/template-autocomplete.js.map +1 -1
  158. package/dist/data/utils.d.ts +16 -0
  159. package/dist/data/utils.d.ts.map +1 -1
  160. package/dist/data/utils.js +21 -1
  161. package/dist/data/utils.js.map +1 -1
  162. package/dist/editor/P1App.d.ts.map +1 -1
  163. package/dist/editor/P1App.js +6 -45
  164. package/dist/editor/P1App.js.map +1 -1
  165. package/dist/editor/P1PuckProvider.d.ts +1 -1
  166. package/dist/editor/P1PuckProvider.d.ts.map +1 -1
  167. package/dist/editor/P1PuckProvider.js +54 -561
  168. package/dist/editor/P1PuckProvider.js.map +1 -1
  169. package/dist/editor/aiPanelStore.js +0 -7
  170. package/dist/editor/aiPanelStore.js.map +1 -1
  171. package/dist/editor/components/BranchSelector.js +0 -21
  172. package/dist/editor/components/BranchSelector.js.map +1 -1
  173. package/dist/editor/components/CollapsibleSectionHeader.js +1 -4
  174. package/dist/editor/components/CollapsibleSectionHeader.js.map +1 -1
  175. package/dist/editor/components/DraggableRow.js +0 -1
  176. package/dist/editor/components/DraggableRow.js.map +1 -1
  177. package/dist/editor/components/EditorReloadOverlay.d.ts +16 -0
  178. package/dist/editor/components/EditorReloadOverlay.d.ts.map +1 -0
  179. package/dist/editor/components/EditorReloadOverlay.js +13 -0
  180. package/dist/editor/components/EditorReloadOverlay.js.map +1 -0
  181. package/dist/editor/components/NotificationContainer.js +0 -20
  182. package/dist/editor/components/NotificationContainer.js.map +1 -1
  183. package/dist/editor/components/OutlinePanel.js +1 -12
  184. package/dist/editor/components/OutlinePanel.js.map +1 -1
  185. package/dist/editor/components/P1InspectorFields.d.ts.map +1 -1
  186. package/dist/editor/components/P1InspectorFields.js +12 -14
  187. package/dist/editor/components/P1InspectorFields.js.map +1 -1
  188. package/dist/editor/components/P1TemplateFields.js +6 -12
  189. package/dist/editor/components/P1TemplateFields.js.map +1 -1
  190. package/dist/editor/components/PanelHeader.d.ts.map +1 -1
  191. package/dist/editor/components/PanelHeader.js +3 -2
  192. package/dist/editor/components/PanelHeader.js.map +1 -1
  193. package/dist/editor/components/PublishButton.js +0 -21
  194. package/dist/editor/components/PublishButton.js.map +1 -1
  195. package/dist/editor/components/PuckDataCapture.js +0 -14
  196. package/dist/editor/components/PuckDataCapture.js.map +1 -1
  197. package/dist/editor/components/PuckDataSynchronizer.js +0 -67
  198. package/dist/editor/components/PuckDataSynchronizer.js.map +1 -1
  199. package/dist/editor/components/PuckSelectionTracker.js +0 -62
  200. package/dist/editor/components/PuckSelectionTracker.js.map +1 -1
  201. package/dist/editor/components/SaveIndicator.js +0 -41
  202. package/dist/editor/components/SaveIndicator.js.map +1 -1
  203. package/dist/editor/components/Toast.js +1 -32
  204. package/dist/editor/components/Toast.js.map +1 -1
  205. package/dist/editor/components/VersionBannerOverride.d.ts +7 -1
  206. package/dist/editor/components/VersionBannerOverride.d.ts.map +1 -1
  207. package/dist/editor/components/VersionBannerOverride.js +17 -24
  208. package/dist/editor/components/VersionBannerOverride.js.map +1 -1
  209. package/dist/editor/components/collapsibleSectionContext.js +0 -10
  210. package/dist/editor/components/collapsibleSectionContext.js.map +1 -1
  211. package/dist/editor/components/componentIconName.js +0 -23
  212. package/dist/editor/components/componentIconName.js.map +1 -1
  213. package/dist/editor/components/connectable.js +0 -5
  214. package/dist/editor/components/connectable.js.map +1 -1
  215. package/dist/editor/components/merge-preview/MergePreviewRenderer.js +2 -74
  216. package/dist/editor/components/merge-preview/MergePreviewRenderer.js.map +1 -1
  217. package/dist/editor/components/merge-preview/ScaledContent.js +0 -6
  218. package/dist/editor/components/merge-preview/ScaledContent.js.map +1 -1
  219. package/dist/editor/components/merge-preview/index.js +0 -5
  220. package/dist/editor/components/merge-preview/index.js.map +1 -1
  221. package/dist/editor/components/outlineTree.js +0 -31
  222. package/dist/editor/components/outlineTree.js.map +1 -1
  223. package/dist/editor/components/useDragReorder.js +0 -1
  224. package/dist/editor/components/useDragReorder.js.map +1 -1
  225. package/dist/editor/composePlugins.d.ts +9 -3
  226. package/dist/editor/composePlugins.d.ts.map +1 -1
  227. package/dist/editor/composePlugins.js +3 -8
  228. package/dist/editor/composePlugins.js.map +1 -1
  229. package/dist/editor/defaultPlugins.d.ts +1 -1
  230. package/dist/editor/defaultPlugins.d.ts.map +1 -1
  231. package/dist/editor/defaultPlugins.js +3 -1
  232. package/dist/editor/defaultPlugins.js.map +1 -1
  233. package/dist/editor/freshFieldTypes.d.ts +12 -0
  234. package/dist/editor/freshFieldTypes.d.ts.map +1 -0
  235. package/dist/editor/freshFieldTypes.js +11 -0
  236. package/dist/editor/freshFieldTypes.js.map +1 -0
  237. package/dist/editor/logout-store.d.ts +13 -0
  238. package/dist/editor/logout-store.d.ts.map +1 -0
  239. package/dist/editor/logout-store.js +23 -0
  240. package/dist/editor/logout-store.js.map +1 -0
  241. package/dist/editor/plugin/P1Plugin.d.ts +16 -3
  242. package/dist/editor/plugin/P1Plugin.d.ts.map +1 -1
  243. package/dist/editor/plugin/P1Plugin.js +21 -171
  244. package/dist/editor/plugin/P1Plugin.js.map +1 -1
  245. package/dist/editor/plugin/context-sync-key.js +0 -19
  246. package/dist/editor/plugin/context-sync-key.js.map +1 -1
  247. package/dist/editor/plugin/createP1Overrides.js +1 -49
  248. package/dist/editor/plugin/createP1Overrides.js.map +1 -1
  249. package/dist/editor/plugin/document-sync-plugin.js +0 -50
  250. package/dist/editor/plugin/document-sync-plugin.js.map +1 -1
  251. package/dist/editor/plugin/fieldGuidance.js +0 -5
  252. package/dist/editor/plugin/fieldGuidance.js.map +1 -1
  253. package/dist/editor/plugin/index.js +0 -6
  254. package/dist/editor/plugin/index.js.map +1 -1
  255. package/dist/editor/plugin/selectHeaderCollaborators.js +0 -8
  256. package/dist/editor/plugin/selectHeaderCollaborators.js.map +1 -1
  257. package/dist/editor/presets.js +2 -2
  258. package/dist/editor/stablePluginDeps.d.ts +9 -0
  259. package/dist/editor/stablePluginDeps.d.ts.map +1 -0
  260. package/dist/editor/stablePluginDeps.js +15 -0
  261. package/dist/editor/stablePluginDeps.js.map +1 -0
  262. package/dist/editor/thumbnails/LiveThumbnail.js +1 -49
  263. package/dist/editor/thumbnails/LiveThumbnail.js.map +1 -1
  264. package/dist/editor/thumbnails/ThumbnailCard.js +0 -25
  265. package/dist/editor/thumbnails/ThumbnailCard.js.map +1 -1
  266. package/dist/editor/thumbnails/buildLiveThumbnailDrawer.js +0 -21
  267. package/dist/editor/thumbnails/buildLiveThumbnailDrawer.js.map +1 -1
  268. package/dist/editor/thumbnails/humanizeComponentName.js +0 -17
  269. package/dist/editor/thumbnails/humanizeComponentName.js.map +1 -1
  270. package/dist/editor/thumbnails/resolveLiveThumbnailDrawer.js +0 -11
  271. package/dist/editor/thumbnails/resolveLiveThumbnailDrawer.js.map +1 -1
  272. package/dist/editor/thumbnails/thumbnailCache.js +0 -38
  273. package/dist/editor/thumbnails/thumbnailCache.js.map +1 -1
  274. package/dist/editor/useAutoSave.js +0 -32
  275. package/dist/editor/useAutoSave.js.map +1 -1
  276. package/dist/editor/useBranches.js +0 -30
  277. package/dist/editor/useBranches.js.map +1 -1
  278. package/dist/editor/useComponentRegistry.d.ts +1 -1
  279. package/dist/editor/useComponentRegistry.js +0 -28
  280. package/dist/editor/useComponentRegistry.js.map +1 -1
  281. package/dist/editor/useDocuments.js +0 -51
  282. package/dist/editor/useDocuments.js.map +1 -1
  283. package/dist/editor/useMergePreview.js +8 -12
  284. package/dist/editor/useMergePreview.js.map +1 -1
  285. package/dist/editor/useP1Editor.d.ts +35 -7
  286. package/dist/editor/useP1Editor.d.ts.map +1 -1
  287. package/dist/editor/useP1Editor.js +146 -243
  288. package/dist/editor/useP1Editor.js.map +1 -1
  289. package/dist/editor/useP1Overrides.js +15 -50
  290. package/dist/editor/useP1Overrides.js.map +1 -1
  291. package/dist/editor/useP1Plugin.d.ts +10 -4
  292. package/dist/editor/useP1Plugin.d.ts.map +1 -1
  293. package/dist/editor/useP1Plugin.js +34 -56
  294. package/dist/editor/useP1Plugin.js.map +1 -1
  295. package/dist/editor/useRealtime.d.ts +15 -3
  296. package/dist/editor/useRealtime.d.ts.map +1 -1
  297. package/dist/editor/useRealtime.js +12 -91
  298. package/dist/editor/useRealtime.js.map +1 -1
  299. package/dist/editor/useResponsivePanels.js +2 -35
  300. package/dist/editor/useResponsivePanels.js.map +1 -1
  301. package/dist/editor/useSidebarScrollPreservation.js +0 -14
  302. package/dist/editor/useSidebarScrollPreservation.js.map +1 -1
  303. package/dist/editor/utils/buildThumbnailOverride.js +0 -9
  304. package/dist/editor/utils/buildThumbnailOverride.js.map +1 -1
  305. package/dist/editor/utils/componentRegistry.d.ts +6 -11
  306. package/dist/editor/utils/componentRegistry.d.ts.map +1 -1
  307. package/dist/editor/utils/componentRegistry.js +1 -71
  308. package/dist/editor/utils/componentRegistry.js.map +1 -1
  309. package/dist/editor/utils/createStablePluginArray.js +0 -27
  310. package/dist/editor/utils/createStablePluginArray.js.map +1 -1
  311. package/dist/editor/utils/path.js +0 -6
  312. package/dist/editor/utils/path.js.map +1 -1
  313. package/dist/editor/utils/puckYjsBinding.d.ts +1 -1
  314. package/dist/editor/utils/puckYjsBinding.js +0 -99
  315. package/dist/editor/utils/puckYjsBinding.js.map +1 -1
  316. package/dist/editor/utils/restoreDocumentVersion.js +0 -12
  317. package/dist/editor/utils/restoreDocumentVersion.js.map +1 -1
  318. package/dist/editor/utils/sanitizeRichtextDefaults.js +0 -26
  319. package/dist/editor/utils/sanitizeRichtextDefaults.js.map +1 -1
  320. package/dist/editor/utils/snapshotToPuckData.js +0 -8
  321. package/dist/editor/utils/snapshotToPuckData.js.map +1 -1
  322. package/dist/editor/utils/syncComponentRegistry.d.ts +2 -2
  323. package/dist/editor/utils/syncComponentRegistry.js +1 -76
  324. package/dist/editor/utils/syncComponentRegistry.js.map +1 -1
  325. package/dist/editor/utils/syncComponentRegistryWriteOnly.d.ts +7 -7
  326. package/dist/editor/utils/syncComponentRegistryWriteOnly.js +0 -22
  327. package/dist/editor/utils/syncComponentRegistryWriteOnly.js.map +1 -1
  328. package/dist/editor/utils/templatePath.js +0 -5
  329. package/dist/editor/utils/templatePath.js.map +1 -1
  330. package/dist/features/content-type-templates/editor/useTemplatePermissions.js +0 -3
  331. package/dist/features/content-type-templates/editor/useTemplatePermissions.js.map +1 -1
  332. package/dist/features/content-type-templates/hooks/useTemplateList.js +0 -30
  333. package/dist/features/content-type-templates/hooks/useTemplateList.js.map +1 -1
  334. package/dist/features/content-type-templates/index.js +0 -8
  335. package/dist/features/content-type-templates/index.js.map +1 -1
  336. package/dist/features/content-type-templates/permissions/createPuckPermissions.js +1 -43
  337. package/dist/features/content-type-templates/permissions/createPuckPermissions.js.map +1 -1
  338. package/dist/features/content-type-templates/permissions/role-permissions.d.ts +8 -0
  339. package/dist/features/content-type-templates/permissions/role-permissions.d.ts.map +1 -1
  340. package/dist/features/content-type-templates/permissions/role-permissions.js +3 -29
  341. package/dist/features/content-type-templates/permissions/role-permissions.js.map +1 -1
  342. package/dist/features/content-type-templates/permissions/useContentRole.js +0 -24
  343. package/dist/features/content-type-templates/permissions/useContentRole.js.map +1 -1
  344. package/dist/features/content-type-templates/permissions/useResolveContentRole.d.ts +5 -5
  345. package/dist/features/content-type-templates/permissions/useResolveContentRole.js +2 -22
  346. package/dist/features/content-type-templates/permissions/useResolveContentRole.js.map +1 -1
  347. package/dist/features/content-type-templates/stores/index.js +0 -5
  348. package/dist/features/content-type-templates/stores/index.js.map +1 -1
  349. package/dist/features/content-type-templates/stores/template-store-api.js +0 -14
  350. package/dist/features/content-type-templates/stores/template-store-api.js.map +1 -1
  351. package/dist/features/content-type-templates/stores/template-store.d.ts +1 -1
  352. package/dist/features/content-type-templates/stores/template-store.js +0 -12
  353. package/dist/features/content-type-templates/stores/template-store.js.map +1 -1
  354. package/dist/features/content-type-templates/types.js +0 -5
  355. package/dist/features/content-type-templates/types.js.map +1 -1
  356. package/dist/features/content-type-templates/ui/ActionBarPinButton.js +12 -21
  357. package/dist/features/content-type-templates/ui/ActionBarPinButton.js.map +1 -1
  358. package/dist/features/content-type-templates/ui/TemplateDetailsPanel.js +0 -23
  359. package/dist/features/content-type-templates/ui/TemplateDetailsPanel.js.map +1 -1
  360. package/dist/features/content-type-templates/ui/TemplateSelector.js +0 -19
  361. package/dist/features/content-type-templates/ui/TemplateSelector.js.map +1 -1
  362. package/dist/features/content-type-templates/validation/structural-validation.js +0 -40
  363. package/dist/features/content-type-templates/validation/structural-validation.js.map +1 -1
  364. package/dist/features/localization/authority.d.ts +26 -0
  365. package/dist/features/localization/authority.d.ts.map +1 -0
  366. package/dist/features/localization/authority.js +17 -0
  367. package/dist/features/localization/authority.js.map +1 -0
  368. package/dist/features/localization/index.d.ts +11 -0
  369. package/dist/features/localization/index.d.ts.map +1 -0
  370. package/dist/features/localization/index.js +7 -0
  371. package/dist/features/localization/index.js.map +1 -0
  372. package/dist/features/localization/prop-target.d.ts +26 -0
  373. package/dist/features/localization/prop-target.d.ts.map +1 -0
  374. package/dist/features/localization/prop-target.js +15 -0
  375. package/dist/features/localization/prop-target.js.map +1 -0
  376. package/dist/features/localization/puck-overrides.d.ts +12 -0
  377. package/dist/features/localization/puck-overrides.d.ts.map +1 -0
  378. package/dist/features/localization/puck-overrides.js +12 -0
  379. package/dist/features/localization/puck-overrides.js.map +1 -0
  380. package/dist/features/localization/relation.d.ts +14 -0
  381. package/dist/features/localization/relation.d.ts.map +1 -0
  382. package/dist/features/localization/relation.js +7 -0
  383. package/dist/features/localization/relation.js.map +1 -0
  384. package/dist/features/localization/translatable.d.ts +24 -0
  385. package/dist/features/localization/translatable.d.ts.map +1 -0
  386. package/dist/features/localization/translatable.js +30 -0
  387. package/dist/features/localization/translatable.js.map +1 -0
  388. package/dist/features/localization/types.d.ts +17 -0
  389. package/dist/features/localization/types.d.ts.map +1 -0
  390. package/dist/features/localization/types.js +2 -0
  391. package/dist/features/localization/types.js.map +1 -0
  392. package/dist/features/localization/ui/AuthorityFieldControl.d.ts +32 -0
  393. package/dist/features/localization/ui/AuthorityFieldControl.d.ts.map +1 -0
  394. package/dist/features/localization/ui/AuthorityFieldControl.js +36 -0
  395. package/dist/features/localization/ui/AuthorityFieldControl.js.map +1 -0
  396. package/dist/features/localization/ui/TranslatabilityToggle.d.ts +17 -0
  397. package/dist/features/localization/ui/TranslatabilityToggle.d.ts.map +1 -0
  398. package/dist/features/localization/ui/TranslatabilityToggle.js +16 -0
  399. package/dist/features/localization/ui/TranslatabilityToggle.js.map +1 -0
  400. package/dist/features/localization/useLocalizationData.d.ts +37 -0
  401. package/dist/features/localization/useLocalizationData.d.ts.map +1 -0
  402. package/dist/features/localization/useLocalizationData.js +88 -0
  403. package/dist/features/localization/useLocalizationData.js.map +1 -0
  404. package/dist/index.d.ts +6 -4
  405. package/dist/index.d.ts.map +1 -1
  406. package/dist/index.js +2 -43
  407. package/dist/index.js.map +1 -1
  408. package/dist/merge/components/conflict-notifications/ConflictNotificationToast.js +0 -19
  409. package/dist/merge/components/conflict-notifications/ConflictNotificationToast.js.map +1 -1
  410. package/dist/merge/components/conflict-notifications/index.js +0 -5
  411. package/dist/merge/components/conflict-notifications/index.js.map +1 -1
  412. package/dist/merge/components/conflict-notifications/useConflictNotifications.js +0 -48
  413. package/dist/merge/components/conflict-notifications/useConflictNotifications.js.map +1 -1
  414. package/dist/merge/components/conflict-resolution/ComponentConflictGroup.js +0 -36
  415. package/dist/merge/components/conflict-resolution/ComponentConflictGroup.js.map +1 -1
  416. package/dist/merge/components/conflict-resolution/PuckFieldResolutionPanel.js +0 -40
  417. package/dist/merge/components/conflict-resolution/PuckFieldResolutionPanel.js.map +1 -1
  418. package/dist/merge/components/conflict-resolution/RenderedResolutionPreview.js +0 -21
  419. package/dist/merge/components/conflict-resolution/RenderedResolutionPreview.js.map +1 -1
  420. package/dist/merge/components/conflict-resolution/index.js +0 -5
  421. package/dist/merge/components/conflict-resolution/index.js.map +1 -1
  422. package/dist/merge/components/merge-resolution/CherryPickVisualPanel.js +0 -44
  423. package/dist/merge/components/merge-resolution/CherryPickVisualPanel.js.map +1 -1
  424. package/dist/merge/components/merge-resolution/ComponentClickOverlay.js +0 -24
  425. package/dist/merge/components/merge-resolution/ComponentClickOverlay.js.map +1 -1
  426. package/dist/merge/components/merge-resolution/DocumentResolutionDetail.d.ts.map +1 -1
  427. package/dist/merge/components/merge-resolution/DocumentResolutionDetail.js +6 -31
  428. package/dist/merge/components/merge-resolution/DocumentResolutionDetail.js.map +1 -1
  429. package/dist/merge/components/merge-resolution/index.js +0 -3
  430. package/dist/merge/components/merge-resolution/index.js.map +1 -1
  431. package/dist/merge/useMergeResolution.d.ts +1 -1
  432. package/dist/merge/useMergeResolution.d.ts.map +1 -1
  433. package/dist/merge/useMergeResolution.js +6 -75
  434. package/dist/merge/useMergeResolution.js.map +1 -1
  435. package/dist/merge/utils/namespacePuckData.d.ts.map +1 -1
  436. package/dist/merge/utils/namespacePuckData.js +8 -8
  437. package/dist/merge/utils/namespacePuckData.js.map +1 -1
  438. package/dist/merge/utils/puckFieldClassifier.js +0 -183
  439. package/dist/merge/utils/puckFieldClassifier.js.map +1 -1
  440. package/dist/p1/editor/connect/connect-preview-config.js +0 -5
  441. package/dist/p1/editor/connect/connect-preview-config.js.map +1 -1
  442. package/dist/p1/editor/connect/field-connect-plugin.js +0 -6
  443. package/dist/p1/editor/connect/field-connect-plugin.js.map +1 -1
  444. package/dist/p1/editor/editor-preview-resolve.js +0 -13
  445. package/dist/p1/editor/editor-preview-resolve.js.map +1 -1
  446. package/dist/p1/editor/hooks/api-hooks.js +0 -7
  447. package/dist/p1/editor/hooks/api-hooks.js.map +1 -1
  448. package/dist/p1/editor/hooks/useLiveEditorContext.d.ts.map +1 -1
  449. package/dist/p1/editor/hooks/useLiveEditorContext.js +2 -13
  450. package/dist/p1/editor/hooks/useLiveEditorContext.js.map +1 -1
  451. package/dist/p1/editor/hooks/useLiveRemoteDatasources.js +0 -22
  452. package/dist/p1/editor/hooks/useLiveRemoteDatasources.js.map +1 -1
  453. package/dist/p1/editor/hooks/useP1Plugins.js +0 -5
  454. package/dist/p1/editor/hooks/useP1Plugins.js.map +1 -1
  455. package/dist/p1/editor/remote-datasources/remote-datasource-explorer-plugin.js +0 -7
  456. package/dist/p1/editor/remote-datasources/remote-datasource-explorer-plugin.js.map +1 -1
  457. package/dist/p1/editor/template-autocomplete-layer.js +0 -4
  458. package/dist/p1/editor/template-autocomplete-layer.js.map +1 -1
  459. package/dist/pds/components/AgentChip.js +0 -3
  460. package/dist/pds/components/AgentChip.js.map +1 -1
  461. package/dist/pds/components/CreatePageModal.js +1 -97
  462. package/dist/pds/components/CreatePageModal.js.map +1 -1
  463. package/dist/pds/components/LoadingMessage.d.ts.map +1 -1
  464. package/dist/pds/components/LoadingMessage.js +2 -1
  465. package/dist/pds/components/LoadingMessage.js.map +1 -1
  466. package/dist/pds/components/LoadingMessage.module.css +2 -21
  467. package/dist/pds/components/LoadingOverlay.d.ts +17 -0
  468. package/dist/pds/components/LoadingOverlay.d.ts.map +1 -0
  469. package/dist/pds/components/LoadingOverlay.js +7 -0
  470. package/dist/pds/components/LoadingOverlay.js.map +1 -0
  471. package/dist/pds/components/LoadingOverlay.module.css +28 -0
  472. package/dist/pds/components/P1EditorHeader.d.ts +9 -2
  473. package/dist/pds/components/P1EditorHeader.d.ts.map +1 -1
  474. package/dist/pds/components/P1EditorHeader.js +6 -26
  475. package/dist/pds/components/P1EditorHeader.js.map +1 -1
  476. package/dist/pds/components/P1EditorHeader.module.css +26 -0
  477. package/dist/pds/components/PageNavigator.js +0 -16
  478. package/dist/pds/components/PageNavigator.js.map +1 -1
  479. package/dist/pds/components/PageNotFound.d.ts +27 -0
  480. package/dist/pds/components/PageNotFound.d.ts.map +1 -0
  481. package/dist/pds/components/PageNotFound.js +24 -0
  482. package/dist/pds/components/PageNotFound.js.map +1 -0
  483. package/dist/pds/components/PageNotFound.module.css +51 -0
  484. package/dist/pds/components/PresenceStack.js +0 -9
  485. package/dist/pds/components/PresenceStack.js.map +1 -1
  486. package/dist/pds/components/PublishControl.js +0 -6
  487. package/dist/pds/components/PublishControl.js.map +1 -1
  488. package/dist/pds/components/WorkstreamSwitcher.js +1 -25
  489. package/dist/pds/components/WorkstreamSwitcher.js.map +1 -1
  490. package/dist/pds/index.d.ts +4 -0
  491. package/dist/pds/index.d.ts.map +1 -1
  492. package/dist/pds/index.js +2 -29
  493. package/dist/pds/index.js.map +1 -1
  494. package/dist/pds/theme/pds-core-content.js +0 -5
  495. package/dist/pds/theme/pds-core-content.js.map +1 -1
  496. package/dist/pds/utils/deriveDocState.js +0 -1
  497. package/dist/pds/utils/deriveDocState.js.map +1 -1
  498. package/dist/pds/utils/deriveLiveDocState.js +0 -13
  499. package/dist/pds/utils/deriveLiveDocState.js.map +1 -1
  500. package/dist/registry-sync.js +0 -4
  501. package/dist/registry-sync.js.map +1 -1
  502. package/dist/server.js +0 -7
  503. package/dist/server.js.map +1 -1
  504. package/dist/versioning/components/ReadOnlyFieldsGuard.js +0 -3
  505. package/dist/versioning/components/ReadOnlyFieldsGuard.js.map +1 -1
  506. package/dist/versioning/components/VersionBannerActions.js +0 -1
  507. package/dist/versioning/components/VersionBannerActions.js.map +1 -1
  508. package/dist/versioning/components/version-compare/BranchDiffHeader.js +0 -7
  509. package/dist/versioning/components/version-compare/BranchDiffHeader.js.map +1 -1
  510. package/dist/versioning/components/version-compare/BranchMergeCompare.js +0 -19
  511. package/dist/versioning/components/version-compare/BranchMergeCompare.js.map +1 -1
  512. package/dist/versioning/components/version-compare/ComponentNode.js +0 -8
  513. package/dist/versioning/components/version-compare/ComponentNode.js.map +1 -1
  514. package/dist/versioning/components/version-compare/ComponentTree.js +0 -10
  515. package/dist/versioning/components/version-compare/ComponentTree.js.map +1 -1
  516. package/dist/versioning/components/version-compare/DiffHeader.js +0 -3
  517. package/dist/versioning/components/version-compare/DiffHeader.js.map +1 -1
  518. package/dist/versioning/components/version-compare/DocumentDiffList.js +0 -14
  519. package/dist/versioning/components/version-compare/DocumentDiffList.js.map +1 -1
  520. package/dist/versioning/components/version-compare/PropDiffPanel.js +0 -7
  521. package/dist/versioning/components/version-compare/PropDiffPanel.js.map +1 -1
  522. package/dist/versioning/components/version-compare/PropDiffRow.js +0 -3
  523. package/dist/versioning/components/version-compare/PropDiffRow.js.map +1 -1
  524. package/dist/versioning/components/version-compare/PropValueDisplay.js +0 -22
  525. package/dist/versioning/components/version-compare/PropValueDisplay.js.map +1 -1
  526. package/dist/versioning/components/version-compare/VersionComparePage.js +0 -13
  527. package/dist/versioning/components/version-compare/VersionComparePage.js.map +1 -1
  528. package/dist/versioning/components/version-compare/VisualBranchCompare.js +0 -17
  529. package/dist/versioning/components/version-compare/VisualBranchCompare.js.map +1 -1
  530. package/dist/versioning/components/version-compare/VisualVersionCompare.js +0 -23
  531. package/dist/versioning/components/version-compare/VisualVersionCompare.js.map +1 -1
  532. package/dist/versioning/components/version-compare/index.js +0 -5
  533. package/dist/versioning/components/version-compare/index.js.map +1 -1
  534. package/dist/versioning/components/version-history/AgentCheckpointBadge.js +0 -14
  535. package/dist/versioning/components/version-history/AgentCheckpointBadge.js.map +1 -1
  536. package/dist/versioning/components/version-history/VersionItem.js +0 -7
  537. package/dist/versioning/components/version-history/VersionItem.js.map +1 -1
  538. package/dist/versioning/components/version-history/index.js +0 -5
  539. package/dist/versioning/components/version-history/index.js.map +1 -1
  540. package/dist/versioning/useCheckpoints.js +0 -28
  541. package/dist/versioning/useCheckpoints.js.map +1 -1
  542. package/dist/versioning/useVersions.js +0 -31
  543. package/dist/versioning/useVersions.js.map +1 -1
  544. package/dist/versioning/utils/branchDiff.js +0 -93
  545. package/dist/versioning/utils/branchDiff.js.map +1 -1
  546. package/dist/versioning/utils/diff.js +0 -79
  547. package/dist/versioning/utils/diff.js.map +1 -1
  548. package/dist/versioning/utils/formatVersionDate.js +0 -12
  549. package/dist/versioning/utils/formatVersionDate.js.map +1 -1
  550. package/dist/versioning/utils/highlightConfig.js +0 -42
  551. package/dist/versioning/utils/highlightConfig.js.map +1 -1
  552. package/dist/versioning/utils/versionKind.js +0 -10
  553. package/dist/versioning/utils/versionKind.js.map +1 -1
  554. package/package.json +7 -7
  555. package/src/data/data-list-block/data-list.css +314 -0
  556. package/src/pds/theme/PuckEditorTheme.css +5 -5
  557. package/src/styles.css +1 -1
  558. package/src/pds/theme/PuckEditorTheme.test.ts +0 -195
  559. package/src/pds/theme/pds-core-content.ts +0 -8
@@ -1,17 +1,5 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
- /**
3
- * ComponentClickOverlay Component
4
- *
5
- * Transparent overlay that positions click targets over rendered Puck
6
- * components. Used by CherryPickVisualPanel to enable component-level
7
- * selection without modifying Puck configs.
8
- *
9
- * All visual styling uses inline React styles.
10
- */
11
2
  import { useState, useEffect, useCallback } from 'react';
12
- // =============================================================================
13
- // Inline Style Constants
14
- // =============================================================================
15
3
  const overlayContainerStyle = {
16
4
  position: 'absolute',
17
5
  top: 0,
@@ -38,16 +26,6 @@ const selectionIndicatorColors = {
38
26
  source: '#22c55e',
39
27
  target: '#3b82f6',
40
28
  };
41
- // =============================================================================
42
- // Component
43
- // =============================================================================
44
- /**
45
- * Renders absolutely-positioned click targets over each component that has
46
- * a `data-component-id` attribute in the container.
47
- *
48
- * @param props - {@link ComponentClickOverlayProps}
49
- * @returns A React element with overlay click targets, or null if no components found.
50
- */
51
29
  export function ComponentClickOverlay({ containerRef, selections, onComponentClick, interactive, branchLabel, }) {
52
30
  const [positions, setPositions] = useState([]);
53
31
  const updatePositions = useCallback(() => {
@@ -83,12 +61,10 @@ export function ComponentClickOverlay({ containerRef, selections, onComponentCli
83
61
  const container = containerRef.current;
84
62
  if (!container)
85
63
  return;
86
- // Use ResizeObserver to track position changes
87
64
  const observer = new ResizeObserver(() => {
88
65
  updatePositions();
89
66
  });
90
67
  observer.observe(container);
91
- // Also listen for window resize
92
68
  const handleResize = () => updatePositions();
93
69
  window.addEventListener('resize', handleResize);
94
70
  return () => {
@@ -1 +1 @@
1
- {"version":3,"file":"ComponentClickOverlay.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/ComponentClickOverlay.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ComponentClickOverlay.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/ComponentClickOverlay.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"DocumentResolutionDetail.d.ts","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/DocumentResolutionDetail.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAmD,MAAM,OAAO,CAAC;AAIxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAClG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAQxE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAClF,qBAAqB,EAAE,CACrB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,QAAQ,GAAG,QAAQ,KACxB,IAAI,CAAC;IACV,yBAAyB,EAAE,CACzB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,QAAQ,GAAG,QAAQ,KACxB,IAAI,CAAC;IACV,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2CAA2C;IAC3C,KAAK,CAAC,EAAE,yBAAyB,EAAE,CAAC;CACrC;AA0KD,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EAAE,GAAG,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,yBAAyB,EACzB,MAAM,EACN,KAAU,GACX,EAAE,6BAA6B,GAAG,KAAK,CAAC,YAAY,CA6SpD"}
1
+ {"version":3,"file":"DocumentResolutionDetail.d.ts","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/DocumentResolutionDetail.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAmD,MAAM,OAAO,CAAC;AAIxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAClG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAQxE,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAClF,qBAAqB,EAAE,CACrB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,QAAQ,GAAG,QAAQ,KACxB,IAAI,CAAC;IACV,yBAAyB,EAAE,CACzB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,QAAQ,GAAG,QAAQ,KACxB,IAAI,CAAC;IACV,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2CAA2C;IAC3C,KAAK,CAAC,EAAE,yBAAyB,EAAE,CAAC;CACrC;AA0KD,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EAAE,GAAG,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,yBAAyB,EACzB,MAAM,EACN,KAAU,GACX,EAAE,6BAA6B,GAAG,KAAK,CAAC,YAAY,CAkTpD"}
@@ -1,13 +1,4 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
2
- /**
3
- * DocumentResolutionDetail Component
4
- *
5
- * Expanded view for a single document showing strategy options,
6
- * visual comparison via MergePreviewRenderer, cherry-pick visual panel,
7
- * and delete-type conflict messages.
8
- *
9
- * All visual styling uses inline React styles.
10
- */
11
2
  import { useEffect, useState, useRef, useCallback } from 'react';
12
3
  import { InlineMessage } from '@pantheon-systems/pds-toolkit-react';
13
4
  import { Render } from '@puckeditor/core';
@@ -17,9 +8,6 @@ import { ViewModeSelector } from '../../../editor/components/merge-preview/ViewM
17
8
  import { CherryPickVisualPanel } from './CherryPickVisualPanel.js';
18
9
  import { ResolutionStrategyPicker } from './ResolutionStrategyPicker.js';
19
10
  const baseClass = 'document-resolution-detail';
20
- // =============================================================================
21
- // Inline Style Constants
22
- // =============================================================================
23
11
  const detailHeaderStyle = {
24
12
  display: 'flex',
25
13
  alignItems: 'center',
@@ -65,9 +53,6 @@ const noContentStyle = {
65
53
  color: '#999',
66
54
  fontStyle: 'italic',
67
55
  };
68
- // =============================================================================
69
- // Private Helper Components
70
- // =============================================================================
71
56
  function getDeleteMessage(conflictType) {
72
57
  if (conflictType === 'deleted-in-source') {
73
58
  return 'This document was deleted in Draft.';
@@ -77,11 +62,6 @@ function getDeleteMessage(conflictType) {
77
62
  }
78
63
  return null;
79
64
  }
80
- /**
81
- * StrategyEmphasisWrapper: wraps MergePreviewRenderer and applies visual
82
- * emphasis for accept-draft and accept-live strategies.
83
- * Uses DOM queries to position dimming overlays on the non-selected panel.
84
- */
85
65
  function StrategyEmphasisWrapper({ strategy, children, }) {
86
66
  const wrapperRef = useRef(null);
87
67
  const [panelRects, setPanelRects] = useState([]);
@@ -104,9 +84,6 @@ function StrategyEmphasisWrapper({ strategy, children, }) {
104
84
  window.addEventListener('resize', updatePanelRects);
105
85
  return () => window.removeEventListener('resize', updatePanelRects);
106
86
  }, [updatePanelRects]);
107
- // Panel 0 = source (Draft), Panel 1 = target (Live)
108
- // accept-draft: highlight panel 0 (Draft), dim panel 1 (Live)
109
- // accept-live: highlight panel 1 (Live), dim panel 0 (Draft)
110
87
  const highlightIndex = strategy === 'accept-draft' ? 0 : 1;
111
88
  const dimIndex = strategy === 'accept-draft' ? 1 : 0;
112
89
  return (_jsxs("div", { ref: wrapperRef, className: "strategy-emphasis-wrapper", style: { position: 'relative' }, children: [children, panelRects[dimIndex] && (_jsx("div", { className: "strategy-emphasis-wrapper__dim-overlay", "data-testid": "strategy-dim-overlay", style: {
@@ -130,9 +107,6 @@ function StrategyEmphasisWrapper({ strategy, children, }) {
130
107
  boxSizing: 'border-box',
131
108
  } }))] }));
132
109
  }
133
- // =============================================================================
134
- // Main Component
135
- // =============================================================================
136
110
  export function DocumentResolutionDetail({ document: doc, sourceBranchName, targetBranchName, onSetStrategy, onCherryPickSelection, onAcceptAllComponentProps, config, diffs = [], }) {
137
111
  const hasConfig = config != null;
138
112
  const [viewMode, setViewMode] = useState('side-by-side');
@@ -150,10 +124,11 @@ export function DocumentResolutionDetail({ document: doc, sourceBranchName, targ
150
124
  const isNewOnDraft = doc.changeType === 'new-on-draft';
151
125
  const isDeletedOnDraft = doc.changeType === 'deleted-on-draft';
152
126
  const deleteMessage = isConflicting ? getDeleteMessage(doc.conflictType) : null;
153
- const hasBothSnapshots = !!doc.sourceSnapshot && !!doc.targetSnapshot;
154
- const hasSourceOnly = !!doc.sourceSnapshot && !doc.targetSnapshot;
155
- const hasNeitherSnapshot = !doc.sourceSnapshot && !doc.targetSnapshot;
156
- // Show ViewModeSelector for comparisons (conflicts and non-conflicting changes with both snapshots)
127
+ const hasPuckContent = (s) => !!s && typeof s === 'object' && Array.isArray(s.content);
128
+ const hasBothSnapshots = hasPuckContent(doc.sourceSnapshot) && hasPuckContent(doc.targetSnapshot);
129
+ const hasSourceOnly = hasPuckContent(doc.sourceSnapshot) && !hasPuckContent(doc.targetSnapshot);
130
+ const hasTargetOnly = !hasPuckContent(doc.sourceSnapshot) && hasPuckContent(doc.targetSnapshot);
131
+ const hasNeitherSnapshot = !hasPuckContent(doc.sourceSnapshot) && !hasPuckContent(doc.targetSnapshot);
157
132
  const showViewModeSelector = hasBothSnapshots && (isConflicting || isDraftChanged);
158
133
  return (_jsxs("div", { className: baseClass, "data-testid": "merge-resolution-detail", style: { padding: 0 }, children: [_jsxs("div", { className: `${baseClass}__header`, style: detailHeaderStyle, children: [_jsx("h3", { className: `${baseClass}__path`, style: {
159
134
  fontSize: '18px',
@@ -162,6 +137,6 @@ export function DocumentResolutionDetail({ document: doc, sourceBranchName, targ
162
137
  color: '#333',
163
138
  flex: '1 1 auto',
164
139
  }, children: doc.documentPath }), showViewModeSelector && (_jsx(ViewModeSelector, { viewMode: viewMode, onViewModeChange: setViewMode }))] }), (isConflicting || isDeletedOnMain) && (_jsxs(_Fragment, { children: [_jsx(ResolutionStrategyPicker, { currentStrategy: doc.strategy, conflictType: doc.conflictType, onSelect: (strategy) => onSetStrategy(doc.documentId, strategy) }), deleteMessage && (_jsx(InlineMessage, { type: "warning", title: deleteMessage })), doc.strategy === 'accept-draft' && hasBothSnapshots && (_jsx(InlineMessage, { type: "success", title: "Draft version will be kept." })), doc.strategy === 'accept-live' && hasBothSnapshots && (_jsx(InlineMessage, { type: "info", title: "Live version will be kept." })), doc.strategy === 'unresolved' && hasBothSnapshots && (_jsx(InlineMessage, { type: "warning", title: "Select a resolution strategy above." })), (doc.strategy === 'accept-draft' || doc.strategy === 'accept-live') && hasBothSnapshots && hasConfig && (_jsx(StrategyEmphasisWrapper, { strategy: doc.strategy, children: _jsx(MergePreviewRenderer, { sourceData: doc.sourceSnapshot, targetData: doc.targetSnapshot, diffs: diffs, config: config, viewMode: viewMode, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName }) })), doc.strategy === 'unresolved' && hasBothSnapshots && hasConfig && (_jsx(MergePreviewRenderer, { sourceData: doc.sourceSnapshot, targetData: doc.targetSnapshot, diffs: diffs, config: config, viewMode: viewMode, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName })), doc.strategy === 'cherry-pick' && hasBothSnapshots && hasConfig && (_jsx(CherryPickVisualPanel, { document: doc, config: config, diffs: diffs, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName, onCherryPickSelection: onCherryPickSelection, onAcceptAllComponentProps: onAcceptAllComponentProps })), doc.strategy === 'cherry-pick' && !hasConfig && doc.classifiedFields && (_jsx("div", { className: `${baseClass}__cherry-pick-fallback`, style: { marginTop: '16px' }, children: _jsx("p", { style: { fontSize: '13px', color: '#666', marginBottom: '12px' }, children: doc.classifiedFields.filter((f) => f.classification !== 'conflicting').length > 0 &&
165
- `${doc.classifiedFields.filter((f) => f.classification !== 'conflicting').length} fields auto-merged` }) })), !doc.sourceSnapshot && doc.targetSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: targetBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) }), _jsx("div", { className: `${baseClass}__overlay-message`, style: overlayMessageStyle, children: "Deleted in Draft" })] })), hasSourceOnly && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: sourceBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) }), _jsx("div", { className: `${baseClass}__overlay-message`, style: overlayMessageStyle, children: "New document" })] })), hasNeitherSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "No content available" }))] })), isDraftChanged && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "info", title: "Changed on Draft. No conflict to resolve." }), hasBothSnapshots && hasConfig && (_jsx(MergePreviewRenderer, { sourceData: doc.sourceSnapshot, targetData: doc.targetSnapshot, diffs: diffs, config: config, viewMode: viewMode, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName })), hasSourceOnly && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: sourceBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) })] })), !hasBothSnapshots && !hasSourceOnly && !doc.targetSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Document preview not available" })), !hasBothSnapshots && !hasSourceOnly && doc.targetSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: targetBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) })] }))] })), isNewOnDraft && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "success", title: "New document created on Draft." }), doc.sourceSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsxs("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: [sourceBranchName, " (new)"] }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) })] })), !doc.sourceSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Document preview not available" }))] })), isDeletedOnDraft && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "warning", title: "Deleted on Draft. This document will be removed from Live." }), doc.targetSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsxs("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: [targetBranchName, " (will be deleted)"] }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) })] })), !doc.targetSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Published version preview not available" }))] }))] }));
140
+ `${doc.classifiedFields.filter((f) => f.classification !== 'conflicting').length} fields auto-merged` }) })), hasTargetOnly && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: targetBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) }), _jsx("div", { className: `${baseClass}__overlay-message`, style: overlayMessageStyle, children: "Deleted in Draft" })] })), hasSourceOnly && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: sourceBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) }), _jsx("div", { className: `${baseClass}__overlay-message`, style: overlayMessageStyle, children: "New document" })] })), hasNeitherSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "No content available" }))] })), isDraftChanged && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "info", title: "Changed on Draft. No conflict to resolve." }), hasBothSnapshots && hasConfig && (_jsx(MergePreviewRenderer, { sourceData: doc.sourceSnapshot, targetData: doc.targetSnapshot, diffs: diffs, config: config, viewMode: viewMode, sourceBranchName: sourceBranchName, targetBranchName: targetBranchName })), hasSourceOnly && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: sourceBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) })] })), !hasBothSnapshots && !hasSourceOnly && !doc.targetSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Document preview not available" })), !hasBothSnapshots && !hasSourceOnly && doc.targetSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsx("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: targetBranchName }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) })] }))] })), isNewOnDraft && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "success", title: "New document created on Draft." }), doc.sourceSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsxs("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: [sourceBranchName, " (new)"] }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.sourceSnapshot }) }) })] })), !doc.sourceSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Document preview not available" }))] })), isDeletedOnDraft && (_jsxs(_Fragment, { children: [_jsx(InlineMessage, { type: "warning", title: "Deleted on Draft. This document will be removed from Live." }), doc.targetSnapshot && hasConfig && (_jsxs("div", { className: `${baseClass}__single-panel`, style: singlePanelContainerStyle, children: [_jsxs("div", { className: `${baseClass}__single-panel-label`, style: singlePanelLabelStyle, children: [targetBranchName, " (will be deleted)"] }), _jsx("div", { className: `${baseClass}__single-panel-content`, style: singlePanelContentStyle, children: _jsx(ScaledContent, { children: _jsx(Render, { config: config, data: doc.targetSnapshot }) }) })] })), !doc.targetSnapshot && (_jsx("div", { className: `${baseClass}__no-content`, style: noContentStyle, children: "Published version preview not available" }))] }))] }));
166
141
  }
167
142
  //# sourceMappingURL=DocumentResolutionDetail.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"DocumentResolutionDetail.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/DocumentResolutionDetail.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DocumentResolutionDetail.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/DocumentResolutionDetail.tsx"],"names":[],"mappings":"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"}
@@ -1,6 +1,3 @@
1
- /**
2
- * Merge Resolution Components - Barrel Export
3
- */
4
1
  export { MergeReviewPage } from './MergeReviewPage.js';
5
2
  export { MergeResolutionPage } from './MergeResolutionPage.js';
6
3
  export { DocumentResolutionList } from './DocumentResolutionList.js';
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC"}
@@ -3,7 +3,7 @@
3
3
  *
4
4
  * Central state machine for multi-document merge conflict resolution.
5
5
  * Manages document list, per-document strategy selection, cherry-pick
6
- * state, CRDT preview fetching, navigation, and merge execution.
6
+ * state, preview fetching, navigation, and merge execution.
7
7
  */
8
8
  import type { P1Client, PuckData, DocumentConflictType, MergeRequest } from '@pantheon-systems/css-client';
9
9
  import type { PuckFieldClassification } from './utils/puckFieldClassifier.js';
@@ -1 +1 @@
1
- {"version":3,"file":"useMergeResolution.d.ts","sourceRoot":"","sources":["../../src/merge/useMergeResolution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useMergeResolution.d.ts","sourceRoot":"","sources":["../../src/merge/useMergeResolution.ts"],"names":[],"mappings":"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"}
@@ -1,21 +1,8 @@
1
- /**
2
- * useMergeResolution Hook
3
- *
4
- * Central state machine for multi-document merge conflict resolution.
5
- * Manages document list, per-document strategy selection, cherry-pick
6
- * state, CRDT preview fetching, navigation, and merge execution.
7
- */
8
1
  import { useState, useCallback, useMemo } from 'react';
9
2
  import { classifyPuckFields, buildMergedSnapshot, } from './utils/puckFieldClassifier.js';
10
- // =============================================================================
11
- // Helper: determine if a conflict type allows cherry-pick / CRDT
12
- // =============================================================================
13
3
  function isDeleteConflict(conflictType) {
14
4
  return conflictType === 'deleted-in-source' || conflictType === 'deleted-in-target';
15
5
  }
16
- // =============================================================================
17
- // Hook Implementation
18
- // =============================================================================
19
6
  export function useMergeResolution(options) {
20
7
  const { client, siteId, sourceBranchId, targetBranchId } = options;
21
8
  const [documents, setDocuments] = useState([]);
@@ -28,30 +15,21 @@ export function useMergeResolution(options) {
28
15
  const [mergeRequest, setMergeRequest] = useState(null);
29
16
  const [mergeRequestCreating, setMergeRequestCreating] = useState(false);
30
17
  const [mergeRequestError, setMergeRequestError] = useState(null);
31
- // Derived state
32
18
  const currentDocument = useMemo(() => documents[currentIndex] ?? null, [documents, currentIndex]);
33
19
  const totalCount = documents.length;
34
20
  const resolvedCount = useMemo(() => documents.filter((d) => d.strategy !== 'unresolved').length, [documents]);
35
21
  const unresolvedCount = useMemo(() => documents.filter((d) => d.strategy === 'unresolved').length, [documents]);
36
22
  const allResolved = useMemo(() => documents.length > 0 && unresolvedCount === 0, [documents.length, unresolvedCount]);
37
- // =========================================================================
38
- // Load preview
39
- // =========================================================================
40
23
  const loadPreview = useCallback(async () => {
41
24
  setPreviewLoading(true);
42
25
  setPreviewError(null);
43
26
  try {
44
27
  const preview = await client.merge.preview(siteId, sourceBranchId, targetBranchId, { includeContent: true, excludePathPrefixes: ['_registry/'] });
45
- // Build conflict set for quick lookup
46
28
  const conflictDocIds = new Set(preview.conflicts.documentConflicts.map((c) => c.documentId));
47
29
  const conflictMap = new Map(preview.conflicts.documentConflicts.map((c) => [c.documentId, c]));
48
- // Build source and target change sets
49
30
  const sourceChangeMap = new Map(preview.sourceChanges.map((c) => [c.documentId, c]));
50
31
  const targetChangeMap = new Map(preview.targetChanges.map((c) => [c.documentId, c]));
51
- // Build diff map for quick lookup
52
32
  const diffMap = new Map((preview.documentDiffs ?? []).map((d) => [d.documentId, d]));
53
- // Collect document IDs from conflicts and source (Draft) changes only.
54
- // Target-only changes are already on Live and are not part of the merge.
55
33
  const allDocIds = new Set();
56
34
  for (const c of preview.conflicts.documentConflicts) {
57
35
  allDocIds.add(c.documentId);
@@ -59,23 +37,14 @@ export function useMergeResolution(options) {
59
37
  for (const sc of preview.sourceChanges) {
60
38
  allDocIds.add(sc.documentId);
61
39
  }
62
- // Fetch snapshots for non-conflicting documents in parallel
63
40
  const snapshotFetches = new Map();
64
41
  for (const docId of allDocIds) {
65
- // Skip fetching only when the conflict diff already has both snapshots.
66
- // When a snapshot is missing from the diff (backend may return null for
67
- // targetSnapshot even for both-modified conflicts), fall through so we
68
- // can fetch it via getLatest as a fallback.
69
42
  if (conflictDocIds.has(docId) && diffMap.has(docId)) {
70
43
  const d = diffMap.get(docId);
71
44
  if (d?.sourceSnapshot && d.targetSnapshot) {
72
45
  continue;
73
46
  }
74
47
  }
75
- // For non-conflicting docs (and conflicting docs with incomplete diff
76
- // snapshots), fetch snapshots via versions API.
77
- // Always try both branches — a doc may exist on the other branch
78
- // via COW inheritance even if it wasn't changed there.
79
48
  snapshotFetches.set(docId, (async () => {
80
49
  const results = await Promise.allSettled([
81
50
  client.versions.getLatest(siteId, sourceBranchId, docId),
@@ -93,7 +62,6 @@ export function useMergeResolution(options) {
93
62
  };
94
63
  })());
95
64
  }
96
- // Wait for all snapshot fetches
97
65
  const fetchedSnapshots = new Map();
98
66
  for (const [docId, fetchPromise] of snapshotFetches) {
99
67
  try {
@@ -103,7 +71,6 @@ export function useMergeResolution(options) {
103
71
  fetchedSnapshots.set(docId, { source: null, target: null });
104
72
  }
105
73
  }
106
- // Build document resolutions for all documents
107
74
  const docs = [];
108
75
  for (const docId of allDocIds) {
109
76
  const conflict = conflictMap.get(docId);
@@ -111,13 +78,11 @@ export function useMergeResolution(options) {
111
78
  const inSource = sourceChangeMap.has(docId);
112
79
  const inTarget = targetChangeMap.has(docId);
113
80
  const isConflicting = conflictDocIds.has(docId);
114
- // Determine change path info
115
81
  const docPath = conflict?.documentPath
116
82
  ?? diff?.documentPath
117
83
  ?? sourceChangeMap.get(docId)?.documentPath
118
84
  ?? targetChangeMap.get(docId)?.documentPath
119
85
  ?? docId;
120
- // Determine changeType, strategy, and conflictType
121
86
  let changeType;
122
87
  let strategy;
123
88
  let conflictType;
@@ -135,39 +100,29 @@ export function useMergeResolution(options) {
135
100
  const sourceChange = sourceChangeMap.get(docId);
136
101
  const snapshots = fetchedSnapshots.get(docId);
137
102
  if (sourceChange?.isDeleted) {
138
- // State 5: Document deleted on Draft
139
103
  changeType = 'deleted-on-draft';
140
- strategy = 'accept-draft'; // Will delete on merge
104
+ strategy = 'accept-draft';
141
105
  }
142
106
  else if (snapshots?.target === null) {
143
- // State 1: New document on Draft, doesn't exist on Live
144
107
  changeType = 'new-on-draft';
145
108
  strategy = 'accept-draft';
146
109
  }
147
110
  else {
148
- // State 3: Document changed on Draft, Live version is older
149
111
  changeType = 'draft-changed';
150
112
  strategy = 'accept-draft';
151
113
  }
152
- conflictType = 'both-modified'; // Not actually a conflict
114
+ conflictType = 'both-modified';
153
115
  }
154
116
  else {
155
- // In both sourceChanges and targetChanges but not in conflicts
156
- // (shouldn't normally happen, but handle gracefully as a source change)
157
117
  changeType = 'draft-changed';
158
118
  strategy = 'accept-draft';
159
119
  conflictType = 'both-modified';
160
120
  }
161
- // Get snapshots
162
121
  let sourceSnapshot = null;
163
122
  let targetSnapshot = null;
164
123
  if (isConflicting && diff) {
165
- // Use snapshots from documentDiffs for conflicting docs
166
124
  sourceSnapshot = diff.sourceSnapshot ?? null;
167
125
  targetSnapshot = diff.targetSnapshot ?? null;
168
- // Fall back to separately-fetched snapshots when the conflict diff is
169
- // missing one (backend may return null targetSnapshot even for
170
- // both-modified conflicts when the version isn't directly accessible).
171
126
  const fetched = fetchedSnapshots.get(docId);
172
127
  if (fetched) {
173
128
  if (!sourceSnapshot)
@@ -177,24 +132,18 @@ export function useMergeResolution(options) {
177
132
  }
178
133
  }
179
134
  else {
180
- // Use fetched snapshots for non-conflicting docs
181
135
  const snapshots = fetchedSnapshots.get(docId);
182
136
  if (snapshots) {
183
137
  sourceSnapshot = snapshots.source;
184
138
  targetSnapshot = snapshots.target;
185
139
  }
186
140
  }
187
- // Skip conflicts where source and target content is identical —
188
- // no user action needed, the merge can proceed with either version.
189
141
  if (isConflicting &&
190
142
  sourceSnapshot &&
191
143
  targetSnapshot &&
192
144
  JSON.stringify(sourceSnapshot) === JSON.stringify(targetSnapshot)) {
193
145
  continue;
194
146
  }
195
- // Skip internal component registry documents — these are managed
196
- // automatically by useComponentRegistry and must not appear in
197
- // the merge resolution UI.
198
147
  if (docPath.startsWith('_registry/')) {
199
148
  continue;
200
149
  }
@@ -211,7 +160,6 @@ export function useMergeResolution(options) {
211
160
  classifiedFields: null,
212
161
  });
213
162
  }
214
- // Sort: conflicting first, then deleted-on-main, new, changed, deleted-on-draft
215
163
  const changeTypeOrder = {
216
164
  conflicting: 0,
217
165
  'deleted-on-main': 1,
@@ -231,9 +179,6 @@ export function useMergeResolution(options) {
231
179
  setPreviewLoading(false);
232
180
  }
233
181
  }, [client, siteId, sourceBranchId, targetBranchId]);
234
- // =========================================================================
235
- // Navigation
236
- // =========================================================================
237
182
  const goToDocument = useCallback((index) => {
238
183
  if (index >= 0 && index < documents.length) {
239
184
  setCurrentIndex(index);
@@ -248,7 +193,6 @@ export function useMergeResolution(options) {
248
193
  const goToNextUnresolved = useCallback(() => {
249
194
  if (documents.length === 0)
250
195
  return;
251
- // Search from currentIndex+1, wrapping around
252
196
  for (let i = 1; i <= documents.length; i++) {
253
197
  const idx = (currentIndex + i) % documents.length;
254
198
  if (documents[idx]?.strategy === 'unresolved') {
@@ -256,22 +200,16 @@ export function useMergeResolution(options) {
256
200
  return;
257
201
  }
258
202
  }
259
- // No unresolved documents found — stay put
260
203
  }, [documents, currentIndex]);
261
- // =========================================================================
262
- // Strategy selection
263
- // =========================================================================
264
204
  const setStrategy = useCallback((documentId, strategy) => {
265
205
  setDocuments((prev) => prev.map((doc) => {
266
206
  if (doc.documentId !== documentId)
267
207
  return doc;
268
- // Disallow cherry-pick for delete conflicts
269
208
  if (isDeleteConflict(doc.conflictType) &&
270
209
  strategy === 'cherry-pick') {
271
210
  return doc;
272
211
  }
273
212
  const updates = { strategy };
274
- // When switching to cherry-pick, populate classifiedFields
275
213
  if (strategy === 'cherry-pick' &&
276
214
  doc.sourceSnapshot &&
277
215
  doc.targetSnapshot) {
@@ -286,9 +224,6 @@ export function useMergeResolution(options) {
286
224
  const setRemainingStrategy = useCallback((strategy) => {
287
225
  setDocuments((prev) => prev.map((doc) => doc.strategy === 'unresolved' ? { ...doc, strategy } : doc));
288
226
  }, []);
289
- // =========================================================================
290
- // Cherry-pick
291
- // =========================================================================
292
227
  const setCherryPickSelection = useCallback((documentId, componentId, propName, choice) => {
293
228
  setDocuments((prev) => prev.map((doc) => {
294
229
  if (doc.documentId !== documentId)
@@ -298,7 +233,6 @@ export function useMergeResolution(options) {
298
233
  ...doc.cherryPickSelections,
299
234
  [key]: choice,
300
235
  };
301
- // Recompute merged snapshot
302
236
  let mergedSnapshot = null;
303
237
  if (doc.sourceSnapshot && doc.targetSnapshot && doc.classifiedFields) {
304
238
  mergedSnapshot = buildMergedSnapshot(doc.sourceSnapshot, doc.targetSnapshot, doc.classifiedFields, newSelections);
@@ -334,9 +268,6 @@ export function useMergeResolution(options) {
334
268
  };
335
269
  }));
336
270
  }, []);
337
- // =========================================================================
338
- // Merge request lifecycle
339
- // =========================================================================
340
271
  const createMergeRequest = useCallback(async (title) => {
341
272
  setMergeRequestCreating(true);
342
273
  setMergeRequestError(null);
@@ -367,9 +298,6 @@ export function useMergeResolution(options) {
367
298
  setMergeRequestError(err instanceof Error ? err.message : 'Failed to approve merge request');
368
299
  }
369
300
  }, [client, siteId, mergeRequest]);
370
- // =========================================================================
371
- // Merge execution (via merge request)
372
- // =========================================================================
373
301
  const executeMerge = useCallback(async (_message) => {
374
302
  if (!mergeRequest) {
375
303
  setMergeError('No merge request created. Create and approve a merge request first.');
@@ -399,7 +327,10 @@ export function useMergeResolution(options) {
399
327
  throw new Error(`Cannot execute merge: document "${doc.documentPath}" (${doc.documentId}) is still unresolved`);
400
328
  }
401
329
  });
402
- await client.merge.executeRequest(siteId, mergeRequest.id, { resolutions });
330
+ const result = await client.merge.executeRequest(siteId, mergeRequest.id, { resolutions });
331
+ if (result.jobId !== undefined && result.success !== true) {
332
+ await client.merge.waitForJob(siteId, result.jobId);
333
+ }
403
334
  setMergeSuccess(true);
404
335
  setMergeRequest((prev) => prev ? { ...prev, status: 'merged' } : null);
405
336
  }
@@ -1 +1 @@
1
- {"version":3,"file":"useMergeResolution.js","sourceRoot":"","sources":["../../src/merge/useMergeResolution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useMergeResolution.js","sourceRoot":"","sources":["../../src/merge/useMergeResolution.ts"],"names":[],"mappings":"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"}