@pantheon-systems/puck-css 0.11.1 → 0.13.0

package/dist/merge/components/conflict-notifications/useConflictNotifications.js

@@ -1,20 +1,8 @@
-/**
- * useConflictNotifications Hook
- *
- * Hook for managing real-time conflict notifications.
- * Listens to WebSocket events for collaboration conflicts.
- */
 import { useState, useCallback, useEffect, useRef } from 'react';
 import { usePresenceContext } from '../../../core/PresenceContext.js';
-/**
- * Generate a unique notification ID.
- */
 function generateNotificationId() {
     return `conflict-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
 }
-/**
- * Get a human-readable message for a conflict event.
- */
 function getConflictMessage(event) {
     if (event.type === 'conflict') {
         switch (event.conflictType) {
@@ -40,9 +28,6 @@ function getConflictMessage(event) {
     }
     return 'A collaboration event occurred';
 }
-/**
- * Convert a WebSocket event to a ConflictNotification.
- */
 function eventToNotification(event) {
     let type;
     if (event.type === 'conflict') {
@@ -67,39 +52,12 @@ function eventToNotification(event) {
         timestamp: new Date().toISOString(),
     };
 }
-/**
- * Hook for managing real-time conflict notifications.
- *
- * Subscribes to the PresenceContext for WebSocket events and
- * maintains a list of active conflict notifications.
- *
- * @example
- * ```tsx
- * function ConflictPanel() {
- *   const { notifications, dismiss, dismissAll } = useConflictNotifications();
- *
- *   return (
- *     <div>
- *       {notifications.map((n) => (
- *         <ConflictNotificationToast
- *           key={n.id}
- *           notification={n}
- *           onDismiss={() => dismiss(n.id)}
- *         />
- *       ))}
- *     </div>
- *   );
- * }
- * ```
- */
 export function useConflictNotifications(options = {}) {
     const { autoDismissCheckpoints = false, autoDismissMs = 5000 } = options;
     const [notifications, setNotifications] = useState([]);
     const timersRef = useRef(new Map());
     const context = usePresenceContext();
-    // Dismiss a notification by ID
     const dismiss = useCallback((id) => {
-        // Clear any auto-dismiss timer
         const timer = timersRef.current.get(id);
         if (timer) {
             clearTimeout(timer);
@@ -107,16 +65,13 @@ export function useConflictNotifications(options = {}) {
         }
         setNotifications((prev) => prev.filter((n) => n.id !== id));
     }, []);
-    // Dismiss all notifications
     const dismissAll = useCallback(() => {
         timersRef.current.forEach((timer) => clearTimeout(timer));
         timersRef.current.clear();
         setNotifications([]);
     }, []);
-    // Handle incoming events
     const handleEvent = useCallback((event) => {
         const conflictEvent = event;
-        // Only handle conflict-related events
         if (conflictEvent.type !== 'conflict' &&
             conflictEvent.type !== 'agent_checkpoint' &&
             conflictEvent.type !== 'agent_kicked') {
@@ -124,7 +79,6 @@ export function useConflictNotifications(options = {}) {
         }
         const notification = eventToNotification(conflictEvent);
         setNotifications((prev) => [...prev, notification]);
-        // Set up auto-dismiss for checkpoint notifications
         if (autoDismissCheckpoints && notification.type === 'agent_checkpoint') {
             const timer = setTimeout(() => {
                 dismiss(notification.id);
@@ -132,12 +86,10 @@ export function useConflictNotifications(options = {}) {
             timersRef.current.set(notification.id, timer);
         }
     }, [autoDismissCheckpoints, autoDismissMs, dismiss]);
-    // Subscribe to presence events
     useEffect(() => {
         const unsubscribe = context.subscribe(handleEvent);
         return () => {
             unsubscribe();
-            // Clear all timers on unmount
             timersRef.current.forEach((timer) => clearTimeout(timer));
             timersRef.current.clear();
         };

package/dist/merge/components/conflict-notifications/useConflictNotifications.js.map

@@ -1 +1 @@
-{"version":3,"file":"useConflictNotifications.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-notifications/useConflictNotifications.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useConflictNotifications.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-notifications/useConflictNotifications.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AA8DtE,SAAS,sBAAsB;IAC7B,OAAO,YAAY,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;AAC5E,CAAC;AAKD,SAAS,kBAAkB,CAAC,KAAoB;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9B,QAAQ,KAAK,CAAC,YAAY,EAAE,CAAC;YAC3B,KAAK,eAAe;gBAClB,OAAO,KAAK,CAAC,SAAS;oBACpB,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,mCAAmC;oBACvD,CAAC,CAAC,2CAA2C,CAAC;YAClD,KAAK,gBAAgB;gBACnB,OAAO,0CAA0C,CAAC;YACpD;gBACE,OAAO,yBAAyB,CAAC;QACrC,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC,SAAS;YACpB,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,iDAAiD;YACrE,CAAC,CAAC,yDAAyD,CAAC;IAChE,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC,SAAS;YACpB,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,6CAA6C;YACjE,CAAC,CAAC,kDAAkD,CAAC;IACzD,CAAC;IAED,OAAO,gCAAgC,CAAC;AAC1C,CAAC;AAKD,SAAS,mBAAmB,CAAC,KAAoB;IAC/C,IAAI,IAA8B,CAAC;IAEnC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9B,IAAI,GAAG,KAAK,CAAC,YAAY,IAAI,gBAAgB,CAAC;IAChD,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAC7C,IAAI,GAAG,kBAAkB,CAAC;IAC5B,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QACzC,IAAI,GAAG,cAAc,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,gBAAgB,CAAC;IAC1B,CAAC;IAED,OAAO;QACL,EAAE,EAAE,sBAAsB,EAAE;QAC5B,IAAI;QACJ,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,kBAAkB,EAAE,KAAK,CAAC,OAAO;QACjC,OAAO,EAAE,kBAAkB,CAAC,KAAK,CAAC;QAClC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACpC,CAAC;AACJ,CAAC;AA2BD,MAAM,UAAU,wBAAwB,CACtC,UAA2C,EAAE;IAE7C,MAAM,EAAE,sBAAsB,GAAG,KAAK,EAAE,aAAa,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEzE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAyB,EAAE,CAAC,CAAC;IAC/E,MAAM,SAAS,GAAG,MAAM,CAA8B,IAAI,GAAG,EAAE,CAAC,CAAC;IACjE,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IAGrC,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,EAAU,EAAE,EAAE;QAEzC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,KAAK,EAAE,CAAC;YACV,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC;QAED,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC,EAAE,EAAE,CAAC,CAAC;IAGP,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;QAClC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1D,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC1B,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACvB,CAAC,EAAE,EAAE,CAAC,CAAC;IAGP,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,KAAc,EAAE,EAAE;QACjB,MAAM,aAAa,GAAG,KAAsB,CAAC;QAG7C,IACE,aAAa,CAAC,IAAI,KAAK,UAAU;YACjC,aAAa,CAAC,IAAI,KAAK,kBAAkB;YACzC,aAAa,CAAC,IAAI,KAAK,cAAc,EACrC,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;QAExD,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QAGpD,IAAI,sBAAsB,IAAI,YAAY,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACvE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC,EAAE,aAAa,CAAC,CAAC;YAClB,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,EACD,CAAC,sBAAsB,EAAE,aAAa,EAAE,OAAO,CAAC,CACjD,CAAC;IAGF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAEnD,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;YAEd,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1D,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IAE3B,OAAO;QACL,aAAa;QACb,OAAO;QACP,UAAU;KACX,CAAC;AACJ,CAAC"}

package/dist/merge/components/conflict-resolution/ComponentConflictGroup.js

@@ -1,8 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const baseClass = 'component-conflict-group';
-// =============================================================================
-// Inline Style Constants
-// =============================================================================
 const containerStyle = {
     marginBottom: '16px',
 };
@@ -60,13 +57,6 @@ const valueStyle = {
     fontFamily: 'monospace',
     fontSize: '12px',
 };
-// =============================================================================
-// Helpers
-// =============================================================================
-/**
- * Formats a value for display. Objects and arrays are JSON-stringified;
- * primitives are converted to string directly.
- */
 function formatValue(value) {
     if (value === undefined)
         return 'undefined';
@@ -76,32 +66,6 @@ function formatValue(value) {
         return JSON.stringify(value);
     return String(value);
 }
-// =============================================================================
-// Component
-// =============================================================================
-/**
- * Renders a group of conflicting fields for a single Puck component.
- *
- * Shows the component type as a header, a conflict count badge, and
- * for each field: the prop name, source/target values, and radio
- * buttons to choose which side to keep.
- *
- * @param props - {@link ComponentConflictGroupProps}
- * @returns A React element displaying the conflict group with resolution controls.
- *
- * @example
- * ```tsx
- * <ComponentConflictGroup
- *   componentType="Heading"
- *   componentId="h1"
- *   fields={conflictingFields}
- *   sourceBranchName="feature"
- *   targetBranchName="main"
- *   resolutions={resolutions}
- *   onResolutionChange={handleChange}
- * />
- * ```
- */
 export function ComponentConflictGroup({ componentType, componentId, fields, sourceBranchName, targetBranchName, resolutions, onResolutionChange, }) {
     const conflictCount = fields.filter((f) => f.classification === 'conflicting').length;
     return (_jsxs("div", { className: baseClass, style: containerStyle, children: [_jsxs("div", { className: `${baseClass}__header`, style: headerStyle, children: [_jsx("h3", { className: `${baseClass}__title`, style: titleStyle, children: componentType }), _jsxs("span", { className: `${baseClass}__conflict-count`, style: conflictCountStyle, children: [conflictCount, " ", conflictCount === 1 ? 'conflict' : 'conflicts'] })] }), _jsx("div", { className: `${baseClass}__fields`, style: fieldsContainerStyle, children: fields.map((field) => {

package/dist/merge/components/conflict-resolution/ComponentConflictGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"ComponentConflictGroup.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-resolution/ComponentConflictGroup.tsx"],"names":[],"mappings":";AAqCA,MAAM,SAAS,GAAG,0BAA0B,CAAC;AAE7C,gFAAgF;AAChF,yBAAyB;AACzB,gFAAgF;AAEhF,MAAM,cAAc,GAAwB;IAC1C,YAAY,EAAE,MAAM;CACrB,CAAC;AAEF,MAAM,WAAW,GAAwB;IACvC,OAAO,EAAE,MAAM;IACf,UAAU,EAAE,QAAQ;IACpB,GAAG,EAAE,KAAK;IACV,YAAY,EAAE,KAAK;CACpB,CAAC;AAEF,MAAM,UAAU,GAAwB;IACtC,QAAQ,EAAE,MAAM;IAChB,UAAU,EAAE,GAAG;IACf,MAAM,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,kBAAkB,GAAwB;IAC9C,QAAQ,EAAE,MAAM;IAChB,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,MAAM;IACpB,UAAU,EAAE,SAAS;IACrB,KAAK,EAAE,SAAS;CACjB,CAAC;AAEF,MAAM,oBAAoB,GAAwB;IAChD,OAAO,EAAE,MAAM;IACf,aAAa,EAAE,QAAQ;IACvB,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,aAAa,GAAwB;IACzC,OAAO,EAAE,UAAU;IACnB,MAAM,EAAE,mBAAmB;IAC3B,YAAY,EAAE,KAAK;CACpB,CAAC;AAEF,MAAM,cAAc,GAAwB;IAC1C,UAAU,EAAE,GAAG;IACf,QAAQ,EAAE,MAAM;IAChB,YAAY,EAAE,KAAK;CACpB,CAAC;AAEF,MAAM,gBAAgB,GAAwB;IAC5C,OAAO,EAAE,MAAM;IACf,aAAa,EAAE,QAAQ;IACvB,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,gBAAgB,GAAwB;IAC5C,OAAO,EAAE,MAAM;IACf,UAAU,EAAE,QAAQ;IACpB,GAAG,EAAE,KAAK;IACV,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,SAAS;CAClB,CAAC;AAEF,MAAM,eAAe,GAAwB;IAC3C,UAAU,EAAE,GAAG;IACf,KAAK,EAAE,SAAS;CACjB,CAAC;AAEF,MAAM,UAAU,GAAwB;IACtC,KAAK,EAAE,SAAS;IAChB,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,MAAM;CACjB,CAAC;AAEF,gFAAgF;AAChF,UAAU;AACV,gFAAgF;AAEhF;;;GAGG;AACH,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAC5C,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,gFAAgF;AAChF,YAAY;AACZ,gFAAgF;AAEhF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,sBAAsB,CAAC,EACrC,aAAa,EACb,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,kBAAkB,GACU;IAC5B,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,aAAa,CAC1C,CAAC,MAAM,CAAC;IAET,OAAO,CACL,eAAK,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,aAE9C,eAAK,SAAS,EAAE,GAAG,SAAS,UAAU,EAAE,KAAK,EAAE,WAAW,aACxD,aAAI,SAAS,EAAE,GAAG,SAAS,SAAS,EAAE,KAAK,EAAE,UAAU,YAAG,aAAa,GAAM,EAC7E,gBAAM,SAAS,EAAE,GAAG,SAAS,kBAAkB,EAAE,KAAK,EAAE,kBAAkB,aACvE,aAAa,OAAG,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,IAC1D,IACH,EAGN,cAAK,SAAS,EAAE,GAAG,SAAS,UAAU,EAAE,KAAK,EAAE,oBAAoB,YAChE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;oBACpB,MAAM,SAAS,GAAG,GAAG,WAAW,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAErD,OAAO,CACL,eAA0B,SAAS,EAAE,GAAG,SAAS,SAAS,EAAE,KAAK,EAAE,aAAa,aAC9E,cAAK,SAAS,EAAE,GAAG,SAAS,cAAc,EAAE,KAAK,EAAE,cAAc,YAC9D,KAAK,CAAC,QAAQ,GACX,EAEN,eAAK,SAAS,EAAE,GAAG,SAAS,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,aAEnE,iBAAO,SAAS,EAAE,GAAG,SAAS,UAAU,EAAE,KAAK,EAAE,gBAAgB,aAC/D,gBACE,IAAI,EAAC,OAAO,EACZ,IAAI,EAAE,SAAS,EACf,KAAK,EAAC,QAAQ,EACd,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,QAAQ,EACjD,QAAQ,EAAE,GAAG,EAAE,CACb,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAE3D,EACF,gBAAM,SAAS,EAAE,GAAG,SAAS,eAAe,EAAE,KAAK,EAAE,eAAe,aACjE,gBAAgB,SACZ,EAAC,GAAG,EACX,eAAM,SAAS,EAAE,GAAG,SAAS,SAAS,EAAE,KAAK,EAAE,UAAU,YACtD,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,GAC1B,IACD,EAGR,iBAAO,SAAS,EAAE,GAAG,SAAS,UAAU,EAAE,KAAK,EAAE,gBAAgB,aAC/D,gBACE,IAAI,EAAC,OAAO,EACZ,IAAI,EAAE,SAAS,EACf,KAAK,EAAC,QAAQ,EACd,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,QAAQ,EACjD,QAAQ,EAAE,GAAG,EAAE,CACb,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAE3D,EACF,gBAAM,SAAS,EAAE,GAAG,SAAS,eAAe,EAAE,KAAK,EAAE,eAAe,aACjE,gBAAgB,SACZ,EAAC,GAAG,EACX,eAAM,SAAS,EAAE,GAAG,SAAS,SAAS,EAAE,KAAK,EAAE,UAAU,YACtD,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,GAC1B,IACD,IACJ,KA3CE,KAAK,CAAC,QAAQ,CA4ClB,CACP,CAAC;gBACJ,CAAC,CAAC,GACE,IACF,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ComponentConflictGroup.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-resolution/ComponentConflictGroup.tsx"],"names":[],"mappings":"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"}

package/dist/merge/components/conflict-resolution/PuckFieldResolutionPanel.js

@@ -1,69 +1,29 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * PuckFieldResolutionPanel Component
- *
- * Main panel for Puck-aware field-level conflict resolution. Groups
- * conflicts by component, separates auto-merged fields from conflicting
- * fields, and provides radio-button resolution for each conflict.
- */
 import { useState, useMemo, useCallback } from 'react';
 import { classifyPuckFields, groupFieldsByComponent, buildMergedSnapshot, } from '../../utils/puckFieldClassifier.js';
 import { ComponentConflictGroup } from './ComponentConflictGroup.js';
 const baseClass = 'puck-field-resolution-panel';
-/**
- * Builds a unique key for a field resolution entry.
- */
 function fieldKey(componentId, propName) {
     return `${componentId}:${propName}`;
 }
-/**
- * Main panel for Puck-aware field-level conflict resolution.
- *
- * Classifies all field changes between source and target, separates
- * auto-merged fields from true conflicts, and renders radio-button
- * resolution UI grouped by component.
- *
- * @param props - {@link PuckFieldResolutionPanelProps}
- * @returns A React element containing the resolution UI with auto-merge summary,
- *          conflict groups, and an apply button.
- *
- * @example
- * ```tsx
- * <PuckFieldResolutionPanel
- *   sourceSnapshot={sourceBranchData}
- *   targetSnapshot={targetBranchData}
- *   baseSnapshot={commonAncestor}
- *   sourceBranchName="feature-branch"
- *   targetBranchName="main"
- *   onResolve={(merged) => saveMerged(merged)}
- * />
- * ```
- */
 export function PuckFieldResolutionPanel({ sourceSnapshot, targetSnapshot, baseSnapshot, sourceBranchName, targetBranchName, onResolve, }) {
-    // Classify all fields
     const allFields = useMemo(() => classifyPuckFields(sourceSnapshot, targetSnapshot, baseSnapshot), [sourceSnapshot, targetSnapshot, baseSnapshot]);
-    // Separate auto-merged from conflicting
     const autoMergedFields = useMemo(() => allFields.filter((f) => f.classification === 'source-only' ||
         f.classification === 'target-only'), [allFields]);
     const conflictingFields = useMemo(() => allFields.filter((f) => f.classification === 'conflicting'), [allFields]);
-    // Group conflicting fields by component
     const conflictGroups = useMemo(() => groupFieldsByComponent(conflictingFields), [conflictingFields]);
-    // Resolution state
     const [resolutions, setResolutions] = useState({});
-    // Check if all conflicts are resolved
     const allResolved = useMemo(() => {
         if (conflictingFields.length === 0)
             return true;
         return conflictingFields.every((f) => resolutions[fieldKey(f.componentId, f.propName)] !== undefined);
     }, [conflictingFields, resolutions]);
-    // Handle resolution change
     const handleResolutionChange = useCallback((componentId, propName, choice) => {
         setResolutions((prev) => ({
             ...prev,
             [fieldKey(componentId, propName)]: choice,
         }));
     }, []);
-    // Handle apply
     const handleApply = useCallback(() => {
         const merged = buildMergedSnapshot(sourceSnapshot, targetSnapshot, allFields, resolutions);
         onResolve(merged);

package/dist/merge/components/conflict-resolution/PuckFieldResolutionPanel.js.map

@@ -1 +1 @@
-{"version":3,"file":"PuckFieldResolutionPanel.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-resolution/PuckFieldResolutionPanel.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PuckFieldResolutionPanel.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-resolution/PuckFieldResolutionPanel.tsx"],"names":[],"mappings":"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"}

package/dist/merge/components/conflict-resolution/RenderedResolutionPreview.js

@@ -1,8 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const baseClass = 'rendered-resolution-preview';
-/**
- * Formats a value for display in the preview.
- */
 function formatPreviewValue(value) {
     if (value === undefined)
         return 'undefined';
@@ -12,24 +9,6 @@ function formatPreviewValue(value) {
         return JSON.stringify(value, null, 2);
     return String(value);
 }
-/**
- * Preview component that shows a summary of the merged PuckData.
- *
- * Currently renders a key-value summary of all components and their
- * props. Can be extended later to render a full Puck preview when
- * a Puck config is available.
- *
- * @param props - {@link RenderedResolutionPreviewProps}
- * @returns A React element displaying root props, content components, and zones.
- *
- * @example
- * ```tsx
- * <RenderedResolutionPreview
- *   mergedData={mergedSnapshot}
- *   config={puckConfig}
- * />
- * ```
- */
 export function RenderedResolutionPreview({ mergedData, config: _config, }) {
     return (_jsxs("div", { className: baseClass, children: [_jsx("h3", { className: `${baseClass}__title`, children: "Merged Preview" }), mergedData.root?.props &&
                 Object.keys(mergedData.root.props).length > 0 && (_jsxs("div", { className: `${baseClass}__root`, children: [_jsx("h4", { className: `${baseClass}__section-title`, children: "Page Settings" }), _jsx("dl", { className: `${baseClass}__prop-list`, children: Object.entries(mergedData.root.props).map(([key, value]) => (_jsxs("div", { className: `${baseClass}__prop`, children: [_jsx("dt", { className: `${baseClass}__prop-name`, children: key }), _jsx("dd", { className: `${baseClass}__prop-value`, children: formatPreviewValue(value) })] }, key))) })] })), mergedData.content.length > 0 && (_jsxs("div", { className: `${baseClass}__content`, children: [_jsx("h4", { className: `${baseClass}__section-title`, children: "Components" }), mergedData.content.map((component) => (_jsxs("div", { className: `${baseClass}__component`, children: [_jsx("h5", { className: `${baseClass}__component-type`, children: component.type }), _jsx("dl", { className: `${baseClass}__prop-list`, children: Object.entries(component.props)

package/dist/merge/components/conflict-resolution/RenderedResolutionPreview.js.map

@@ -1 +1 @@
-{"version":3,"file":"RenderedResolutionPreview.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-resolution/RenderedResolutionPreview.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"RenderedResolutionPreview.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-resolution/RenderedResolutionPreview.tsx"],"names":[],"mappings":"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"}

package/dist/merge/components/conflict-resolution/index.js

@@ -1,8 +1,3 @@
-/**
- * Conflict Resolution Components
- *
- * Puck-aware field-level conflict resolution UI components.
- */
 export { PuckFieldResolutionPanel } from './PuckFieldResolutionPanel.js';
 export { ComponentConflictGroup } from './ComponentConflictGroup.js';
 export { RenderedResolutionPreview } from './RenderedResolutionPreview.js';

package/dist/merge/components/conflict-resolution/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-resolution/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/merge/components/conflict-resolution/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC"}

package/dist/merge/components/merge-resolution/CherryPickVisualPanel.js

@@ -1,18 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * CherryPickVisualPanel Component
- *
- * Two-column layout for cherry-pick with visual comparison and live merged preview.
- * The left column shows two rendered Puck pages (Draft and Live) with
- * ComponentClickOverlay on each, plus prop-level controls below.
- * The right column shows a live-updating merged preview.
- *
- * Does NOT use MergePreviewRenderer (see PLAN.md Decision 3).
- * Instead renders two separate <Render> instances directly, each with its own
- * ComponentClickOverlay for unambiguous panel-level click handling.
- *
- * All visual styling uses inline React styles.
- */
 import { useRef, useMemo } from 'react';
 import { Render } from '@puckeditor/core';
 import { createDiffMap, createHighlightedConfig } from '../../../versioning/utils/highlightConfig.js';
@@ -21,9 +7,6 @@ import { groupFieldsByComponent } from '../../utils/puckFieldClassifier.js';
 import { ScaledContent } from '../../../editor/components/merge-preview/ScaledContent.js';
 import { ComponentConflictGroup } from '../conflict-resolution/ComponentConflictGroup.js';
 import { ComponentClickOverlay } from './ComponentClickOverlay.js';
-// =============================================================================
-// Inline Style Constants
-// =============================================================================
 const containerStyle = {
     display: 'flex',
     gap: '16px',
@@ -112,19 +95,10 @@ const autoMergedStyle = {
     color: '#666',
     marginBottom: '12px',
 };
-// =============================================================================
-// Helpers
-// =============================================================================
-/**
- * Derives per-component selection state from cherry-pick selections.
- * For a component, if ALL conflicting props are resolved to 'source',
- * returns 'source'. If all 'target', returns 'target'. Otherwise 'none'.
- */
 function deriveComponentSelections(document) {
     const result = {};
     if (!document.classifiedFields)
         return result;
-    // Group conflicting fields by component
     const componentConflicts = new Map();
     for (const field of document.classifiedFields) {
         if (field.classification === 'conflicting') {
@@ -150,39 +124,21 @@ function deriveComponentSelections(document) {
     }
     return result;
 }
-// =============================================================================
-// Component
-// =============================================================================
-/**
- * Visual cherry-pick panel with two-column layout.
- *
- * @param props - {@link CherryPickVisualPanelProps}
- * @returns A React element with visual comparison and merged preview.
- */
 export function CherryPickVisualPanel({ document: doc, config, diffs, sourceBranchName, targetBranchName, onCherryPickSelection, onAcceptAllComponentProps, }) {
     const sourceContainerRef = useRef(null);
     const targetContainerRef = useRef(null);
-    // Create highlighted configs for diff visualization.
-    // Each panel gets a namespaced diffMap so the highlighted-config wrapper
-    // can look up diff types by the namespaced props.id it receives.
     const diffMap = useMemo(() => createDiffMap(diffs), [diffs]);
     const sourceDiffMap = useMemo(() => new Map([...diffMap].map(([k, v]) => [`s_${k}`, v])), [diffMap]);
     const targetDiffMap = useMemo(() => new Map([...diffMap].map(([k, v]) => [`t_${k}`, v])), [diffMap]);
     const sourceHighlightedConfig = useMemo(() => createHighlightedConfig(config, sourceDiffMap, 'after'), [config, sourceDiffMap]);
     const targetHighlightedConfig = useMemo(() => createHighlightedConfig(config, targetDiffMap, 'before'), [config, targetDiffMap]);
-    // Derive per-component selection state for overlay indicators
     const componentSelections = useMemo(() => deriveComponentSelections(doc), [doc]);
-    // Namespaced selection maps for ComponentClickOverlay — the overlay reads
-    // data-component-id from the DOM, which now carries the panel namespace prefix.
     const sourceSelections = useMemo(() => Object.fromEntries(Object.entries(componentSelections).map(([k, v]) => [`s_${k}`, v])), [componentSelections]);
     const targetSelections = useMemo(() => Object.fromEntries(Object.entries(componentSelections).map(([k, v]) => [`t_${k}`, v])), [componentSelections]);
-    // Strip the panel namespace prefix before forwarding to business logic.
     const stripNs = (id) => id.replace(/^[a-z]_/, '');
-    // Group classified fields by component for prop-level controls
     const componentGroups = doc.classifiedFields
         ? groupFieldsByComponent(doc.classifiedFields)
         : [];
-    // Count auto-merged (non-conflicting) fields
     const autoMergedCount = doc.classifiedFields
         ? doc.classifiedFields.filter((f) => f.classification !== 'conflicting').length
         : 0;

package/dist/merge/components/merge-resolution/CherryPickVisualPanel.js.map

@@ -1 +1 @@
-{"version":3,"file":"CherryPickVisualPanel.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/CherryPickVisualPanel.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CherryPickVisualPanel.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/CherryPickVisualPanel.tsx"],"names":[],"mappings":";AAeA,OAAc,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAI1C,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACtG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,2DAA2D,CAAC;AAC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAmCnE,MAAM,cAAc,GAAwB;IAC1C,OAAO,EAAE,MAAM;IACf,GAAG,EAAE,MAAM;IACX,SAAS,EAAE,MAAM;CAClB,CAAC;AAEF,MAAM,eAAe,GAAwB;IAC3C,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,CAAC;CACZ,CAAC;AAEF,MAAM,gBAAgB,GAAwB;IAC5C,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,CAAC;CACZ,CAAC;AAEF,MAAM,kBAAkB,GAAwB;IAC9C,OAAO,EAAE,MAAM;IACf,GAAG,EAAE,MAAM;IACX,YAAY,EAAE,MAAM;CACrB,CAAC;AAEF,MAAM,gBAAgB,GAAwB;IAC5C,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,CAAC;IACX,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,mBAAmB;IAC3B,YAAY,EAAE,KAAK;IACnB,QAAQ,EAAE,QAAQ;CACnB,CAAC;AAEF,MAAM,eAAe,GAAwB;IAC3C,OAAO,EAAE,UAAU;IACnB,UAAU,EAAE,GAAG;IACf,QAAQ,EAAE,MAAM;IAChB,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,mBAAmB;CAClC,CAAC;AAEF,MAAM,iBAAiB,GAAwB;IAC7C,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,MAAM,wBAAwB,GAAwB;IACpD,OAAO,EAAE,UAAU;IACnB,UAAU,EAAE,GAAG;IACf,QAAQ,EAAE,MAAM;IAChB,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,mBAAmB;IACjC,KAAK,EAAE,SAAS;IAChB,YAAY,EAAE,aAAa;CAC5B,CAAC;AAEF,MAAM,2BAA2B,GAAwB;IACvD,MAAM,EAAE,mBAAmB;IAC3B,YAAY,EAAE,KAAK;IACnB,QAAQ,EAAE,QAAQ;CACnB,CAAC;AAEF,MAAM,yBAAyB,GAAwB;IACrD,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,MAAM,WAAW,GAAwB;IACvC,OAAO,EAAE,WAAW;IACpB,SAAS,EAAE,QAAQ;IACnB,KAAK,EAAE,MAAM;IACb,SAAS,EAAE,QAAQ;CACpB,CAAC;AAEF,MAAM,oBAAoB,GAAwB;IAChD,SAAS,EAAE,MAAM;CAClB,CAAC;AAEF,MAAM,mBAAmB,GAAwB;IAC/C,YAAY,EAAE,MAAM;IACpB,MAAM,EAAE,mBAAmB;IAC3B,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,MAAM,qBAAqB,GAAwB;IACjD,OAAO,EAAE,MAAM;IACf,GAAG,EAAE,KAAK;IACV,YAAY,EAAE,KAAK;CACpB,CAAC;AAEF,MAAM,iBAAiB,GAAwB;IAC7C,OAAO,EAAE,UAAU;IACnB,YAAY,EAAE,KAAK;IACnB,WAAW,EAAE,KAAK;IAClB,WAAW,EAAE,OAAO;IACpB,WAAW,EAAE,MAAM;IACnB,UAAU,EAAE,OAAO;IACnB,MAAM,EAAE,SAAS;IACjB,QAAQ,EAAE,MAAM;CACjB,CAAC;AAEF,MAAM,eAAe,GAAwB;IAC3C,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,MAAM;CACrB,CAAC;AAWF,SAAS,yBAAyB,CAChC,QAA4B;IAE5B,MAAM,MAAM,GAAiD,EAAE,CAAC;IAEhE,IAAI,CAAC,QAAQ,CAAC,gBAAgB;QAAE,OAAO,MAAM,CAAC;IAG9C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAoB,CAAC;IACvD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAC9C,IAAI,KAAK,CAAC,cAAc,KAAK,aAAa,EAAE,CAAC;YAC3C,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YACjE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC9B,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,kBAAkB,EAAE,CAAC;QAC1D,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAC9B,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,oBAAoB,CAAC,GAAG,WAAW,IAAI,QAAQ,EAAE,CAAC,CAC1E,CAAC;QAEF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;QAC/B,CAAC;aAAM,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC;QACjC,CAAC;aAAM,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAYD,MAAM,UAAU,qBAAqB,CAAC,EACpC,QAAQ,EAAE,GAAG,EACb,MAAM,EACN,KAAK,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACrB,yBAAyB,GACE;IAC3B,MAAM,kBAAkB,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACxD,MAAM,kBAAkB,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAKxD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAC1D,CAAC,OAAO,CAAC,CACV,CAAC;IACF,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAC1D,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,MAAM,uBAAuB,GAAG,OAAO,CACrC,GAAG,EAAE,CAAC,uBAAuB,CAAC,MAAiC,EAAE,aAAa,EAAE,OAAO,CAAC,EACxF,CAAC,MAAM,EAAE,aAAa,CAAC,CACxB,CAAC;IAEF,MAAM,uBAAuB,GAAG,OAAO,CACrC,GAAG,EAAE,CAAC,uBAAuB,CAAC,MAAiC,EAAE,aAAa,EAAE,QAAQ,CAAC,EACzF,CAAC,MAAM,EAAE,aAAa,CAAC,CACxB,CAAC;IAGF,MAAM,mBAAmB,GAAG,OAAO,CACjC,GAAG,EAAE,CAAC,yBAAyB,CAAC,GAAG,CAAC,EACpC,CAAC,GAAG,CAAC,CACN,CAAC;IAIF,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAC5F,CAAC,mBAAmB,CAAC,CACtB,CAAC;IACF,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAC5F,CAAC,mBAAmB,CAAC,CACtB,CAAC;IAGF,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAG1D,MAAM,eAAe,GAAG,GAAG,CAAC,gBAAgB;QAC1C,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAGP,MAAM,eAAe,GAAG,GAAG,CAAC,gBAAgB;QAC1C,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,aAAa,CAAC,CAAC,MAAM;QAC/E,CAAC,CAAC,CAAC,CAAC;IAEN,MAAM,UAAU,GAAG,OAAO,CACxB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAA0B,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAC3F,CAAC,GAAG,CAAC,cAAc,CAAC,CACrB,CAAC;IACF,MAAM,UAAU,GAAG,OAAO,CACxB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAA0B,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAC3F,CAAC,GAAG,CAAC,cAAc,CAAC,CACrB,CAAC;IACF,MAAM,UAAU,GAAG,OAAO,CACxB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAA0B,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAC3F,CAAC,GAAG,CAAC,cAAc,CAAC,CACrB,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAC,0BAA0B,EAAC,KAAK,EAAE,cAAc,aAE7D,eAAK,SAAS,EAAC,gCAAgC,EAAC,KAAK,EAAE,eAAe,aAEnE,UAAU,IAAI,UAAU,IAAI,CAC3B,eAAK,SAAS,EAAC,sCAAsC,EAAC,KAAK,EAAE,kBAAkB,aAE7E,eAAK,SAAS,EAAC,wCAAwC,EAAC,KAAK,EAAE,gBAAgB,aAC7E,cAAK,SAAS,EAAC,uCAAuC,EAAC,KAAK,EAAE,eAAe,YAC1E,gBAAgB,GACb,EACN,cACE,SAAS,EAAC,yCAAyC,EACnD,KAAK,EAAE,iBAAiB,EACxB,GAAG,EAAE,kBAAkB,YAEvB,KAAC,aAAa,cACZ,KAAC,MAAM,IACL,MAAM,EAAE,uBAAiE,EACzE,IAAI,EAAE,UAA6D,GACnE,GACY,GACZ,EACN,KAAC,qBAAqB,IACpB,YAAY,EAAE,kBAAkB,EAChC,UAAU,EAAE,gBAAgB,EAC5B,gBAAgB,EAAE,CAAC,WAAW,EAAE,EAAE,CAChC,yBAAyB,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,EAE3E,WAAW,EAAE,IAAI,EACjB,WAAW,EAAE,gBAAgB,GAC7B,IACE,EAGN,eAAK,SAAS,EAAC,wCAAwC,EAAC,KAAK,EAAE,gBAAgB,aAC7E,cAAK,SAAS,EAAC,uCAAuC,EAAC,KAAK,EAAE,eAAe,YAC1E,gBAAgB,GACb,EACN,cACE,SAAS,EAAC,yCAAyC,EACnD,KAAK,EAAE,iBAAiB,EACxB,GAAG,EAAE,kBAAkB,YAEvB,KAAC,aAAa,cACZ,KAAC,MAAM,IACL,MAAM,EAAE,uBAAiE,EACzE,IAAI,EAAE,UAA6D,GACnE,GACY,GACZ,EACN,KAAC,qBAAqB,IACpB,YAAY,EAAE,kBAAkB,EAChC,UAAU,EAAE,gBAAgB,EAC5B,gBAAgB,EAAE,CAAC,WAAW,EAAE,EAAE,CAChC,yBAAyB,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,EAE3E,WAAW,EAAE,IAAI,EACjB,WAAW,EAAE,gBAAgB,GAC7B,IACE,IACF,CACP,EAGA,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,CAC7B,eAAK,SAAS,EAAC,qCAAqC,EAAC,KAAK,EAAE,oBAAoB,aAC7E,eAAe,GAAG,CAAC,IAAI,CACtB,aAAG,SAAS,EAAC,uCAAuC,EAAC,KAAK,EAAE,eAAe,aACxE,eAAe,OAAG,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,oBAC3D,CACL,EAEA,eAAe,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAC9B,eAEE,SAAS,EAAC,2CAA2C,EACrD,KAAK,EAAE,mBAAmB,aAE1B,eACE,SAAS,EAAC,6CAA6C,EACvD,KAAK,EAAE,qBAAqB,aAE5B,iBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,yCAAyC,EACnD,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,GAAG,EAAE,CACZ,yBAAyB,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,sCAIjE,EACT,iBACE,IAAI,EAAC,QAAQ,EACb,SAAS,EAAC,yCAAyC,EACnD,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,GAAG,EAAE,CACZ,yBAAyB,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,qCAIjE,IACL,EACN,KAAC,sBAAsB,IACrB,aAAa,EAAE,KAAK,CAAC,aAAa,EAClC,WAAW,EAAE,KAAK,CAAC,WAAW,EAC9B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,gBAAgB,EAAE,gBAAgB,EAClC,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EACT,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;6CACrC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC;6CACtD,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CACzD,EAEH,kBAAkB,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CACpD,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,GAEtE,KA7CG,KAAK,CAAC,WAAW,CA8ClB,CACP,CAAC,IACE,CACP,IACG,EAGN,cAAK,SAAS,EAAC,iCAAiC,EAAC,KAAK,EAAE,gBAAgB,YACtE,eACE,SAAS,EAAC,0CAA0C,EACpD,KAAK,EAAE,2BAA2B,aAElC,cACE,SAAS,EAAC,yCAAyC,EACnD,KAAK,EAAE,wBAAwB,+BAG3B,EACN,cACE,SAAS,EAAC,0CAA0C,EACpD,KAAK,EAAE,yBAAyB,YAE/B,UAAU,CAAC,CAAC,CAAC,CACZ,KAAC,aAAa,cACZ,KAAC,MAAM,IACL,MAAM,EAAE,MAAgD,EACxD,IAAI,EAAE,UAA6D,GACnE,GACY,CACjB,CAAC,CAAC,CAAC,CACF,YACE,SAAS,EAAC,yCAAyC,EACnD,KAAK,EAAE,WAAW,0DAGhB,CACL,GACG,IACF,GACF,IACF,CACP,CAAC;AACJ,CAAC"}

package/dist/merge/components/merge-resolution/ComponentClickOverlay.js

@@ -1,17 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * ComponentClickOverlay Component
- *
- * Transparent overlay that positions click targets over rendered Puck
- * components. Used by CherryPickVisualPanel to enable component-level
- * selection without modifying Puck configs.
- *
- * All visual styling uses inline React styles.
- */
 import { useState, useEffect, useCallback } from 'react';
-// =============================================================================
-// Inline Style Constants
-// =============================================================================
 const overlayContainerStyle = {
     position: 'absolute',
     top: 0,
@@ -38,16 +26,6 @@ const selectionIndicatorColors = {
     source: '#22c55e',
     target: '#3b82f6',
 };
-// =============================================================================
-// Component
-// =============================================================================
-/**
- * Renders absolutely-positioned click targets over each component that has
- * a `data-component-id` attribute in the container.
- *
- * @param props - {@link ComponentClickOverlayProps}
- * @returns A React element with overlay click targets, or null if no components found.
- */
 export function ComponentClickOverlay({ containerRef, selections, onComponentClick, interactive, branchLabel, }) {
     const [positions, setPositions] = useState([]);
     const updatePositions = useCallback(() => {
@@ -83,12 +61,10 @@ export function ComponentClickOverlay({ containerRef, selections, onComponentCli
         const container = containerRef.current;
         if (!container)
             return;
-        // Use ResizeObserver to track position changes
         const observer = new ResizeObserver(() => {
             updatePositions();
         });
         observer.observe(container);
-        // Also listen for window resize
         const handleResize = () => updatePositions();
         window.addEventListener('resize', handleResize);
         return () => {

package/dist/merge/components/merge-resolution/ComponentClickOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"ComponentClickOverlay.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/ComponentClickOverlay.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ComponentClickOverlay.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/ComponentClickOverlay.tsx"],"names":[],"mappings":"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"}

package/dist/merge/components/merge-resolution/DocumentResolutionDetail.d.ts.map

@@ -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"}
+{"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"}