df-ae-forms-package 1.0.98 → 1.1.1

package/dist/index.js

@@ -4334,20 +4334,57 @@ const DraggableGridComponent = ({ component, selectedComponent, mode, onComponen
                             e.currentTarget.style.backgroundColor = '#ef4444';
                         }, children: jsxRuntime.jsx(lucideReact.Trash2, { size: 12 }) })] }))] }));
 };
-const GridDropZone = ({ gridComponents, mode, onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, selectedComponent, renderFormComponent, gridId, formData = {}, formTemplateId, onThresholdActionCompletion, onThresholdIssueRaised, onNotesChange, onAttachmentChange, columnView = false, shouldShowComponent }) => {
+// Sub-component for the drop zone within the grid
+const GridDropZone = ({ gridComponents, mode, onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, selectedComponent, renderFormComponent, gridId, formData, formTemplateId, onThresholdActionCompletion, onThresholdIssueRaised, onNotesChange, onAttachmentChange, columnView, shouldShowComponent }) => {
     const { setNodeRef, isOver } = core.useDroppable({
         id: `grid-drop-zone-${gridId}`,
-        disabled: mode !== 'edit'
+        disabled: mode !== 'edit',
+        data: {
+            isGridDropZone: true,
+            gridId: gridId
+        }
+    });
+    // Sensors for drag and drop
+    const sensors = core.useSensors(core.useSensor(core.PointerSensor, {
+        activationConstraint: {
+            distance: 8,
+        },
+    }), core.useSensor(core.KeyboardSensor, {
+        coordinateGetter: sortable.sortableKeyboardCoordinates,
+    }));
+    const handleDragEnd = ((event) => {
+        const { active, over } = event;
+        if (over && active.id !== over.id) {
+            gridComponents.findIndex((item) => item.id === active.id);
+            gridComponents.findIndex((item) => item.id === over.id);
+        }
     });
-    return (jsxRuntime.jsx("div", { ref: setNodeRef, className: "grid-drop-zone", style: {
-            border: isOver ? '2px dashed #3b82f6' : '2px dashed #d1d5db',
+    return (jsxRuntime.jsx("div", { ref: setNodeRef, className: `grid-drop-zone ${gridComponents.length === 0 ? 'empty' : ''}`, style: {
+            border: isOver ? '2px dashed #3b82f6' : '1px dashed #d1d5db',
             borderRadius: '8px',
             padding: '16px',
-            backgroundColor: isOver ? 'var(--df-color-primary-light)' : 'var(--df-color-fb-container)',
-            minHeight: '120px',
-            transition: 'all 0.2s ease',
-            position: 'relative'
-        }, children: gridComponents.length > 0 ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(sortable.SortableContext, { items: gridComponents.map(c => c.id), strategy: sortable.horizontalListSortingStrategy, children: jsxRuntime.jsx("div", { style: {
+            backgroundColor: isOver ? 'var(--df-color-primary-light)' : '#f9fafb',
+            minHeight: '100px',
+            transition: 'all 0.2s ease'
+        }, children: gridComponents.length === 0 ? (jsxRuntime.jsxs("div", { style: {
+                textAlign: 'center',
+                color: 'var(--df-color-text-light)',
+                fontSize: '14px',
+                padding: '40px 20px',
+                display: 'flex',
+                flexDirection: 'column',
+                alignItems: 'center',
+                gap: '8px',
+                backgroundColor: 'var(--df-color-fb-container)',
+                border: '1px dashed var(--df-color-fb-border)',
+                borderRadius: '8px'
+            }, children: [jsxRuntime.jsx("div", { style: {
+                        fontWeight: '500',
+                        color: isOver ? 'var(--df-color-primary)' : 'var(--df-color-text-dark)'
+                    }, children: isOver ? 'Drop components here' : 'Empty DataGrid' }), jsxRuntime.jsx("div", { style: {
+                        fontSize: '12px',
+                        color: '#9ca3af'
+                    }, children: "Drag and drop components here to create your grid" })] })) : (jsxRuntime.jsxs(core.DndContext, { sensors: sensors, onDragEnd: handleDragEnd, children: [jsxRuntime.jsx(sortable.SortableContext, { items: gridComponents.map(c => c.id), strategy: columnView ? sortable.verticalListSortingStrategy : sortable.horizontalListSortingStrategy, children: jsxRuntime.jsx("div", { style: {
                             display: 'flex',
                             flexDirection: columnView ? 'column' : 'row',
                             flexWrap: 'nowrap',
@@ -4372,28 +4409,14 @@ const GridDropZone = ({ gridComponents, mode, onComponentSelect, onComponentDele
                         minHeight: '40px',
                         display: 'flex',
                         alignItems: 'center',
-                        justifyContent: 'center'
-                    }, children: isOver ? (jsxRuntime.jsx("span", { style: { color: '#3b82f6', fontWeight: '500' }, children: "Drop component here to add to grid" })) : (jsxRuntime.jsx("span", { children: "+ Drop more components here" })) })] })) : (jsxRuntime.jsxs("div", { style: {
-                textAlign: 'center',
-                color: 'var(--df-color-text-light)',
-                fontSize: '14px',
-                padding: '40px 20px',
-                display: 'flex',
-                flexDirection: 'column',
-                alignItems: 'center',
-                gap: '8px',
-                backgroundColor: 'var(--df-color-fb-container)',
-                border: '1px dashed var(--df-color-fb-border)',
-                borderRadius: '8px'
-            }, children: [jsxRuntime.jsx("div", { style: {
-                        fontWeight: '500',
-                        color: isOver ? 'var(--df-color-primary)' : 'var(--df-color-text-dark)'
-                    }, children: isOver ? 'Drop components here' : 'Empty DataGrid' }), jsxRuntime.jsx("div", { style: {
-                        fontSize: '12px',
-                        color: '#9ca3af'
-                    }, children: "Drag and drop components here to create your grid" })] })) }));
+                        justifyContent: 'center',
+                        marginTop: '12px'
+                    }, children: isOver ? (jsxRuntime.jsx("span", { style: { color: '#3b82f6', fontWeight: '500' }, children: "Drop component here to add to grid" })) : (jsxRuntime.jsx("span", { children: "+ Drop more components here" })) })] })) }));
 };
-const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode = 'preview', allowAddRemoveEntries = true, addAnotherText = 'Add Another', removeText = 'Remove', maxEntries = 10, minEntries = 1, displayAsGrid = true, onAddEntry, onRemoveEntry, formData: _formData = {}, formTemplateId, onThresholdActionCompletion, onThresholdIssueRaised, onNotesChange, onAttachmentChange, columnView = false, shouldShowComponent }) => {
+// Sub-component for displaying entries (TableView)
+const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode, allowAddRemoveEntries, addAnotherText, removeText, maxEntries, minEntries, displayAsGrid = true, onAddEntry, onRemoveEntry, formData, // Use current formData to render values
+formTemplateId, onThresholdActionCompletion, onThresholdIssueRaised, onNotesChange, onAttachmentChange, columnView, shouldShowComponent }) => {
+    const _formData = formData || {};
     const visibleTemplateComponents = React.useMemo(() => {
         if (!shouldShowComponent)
             return templateComponents;
@@ -4455,21 +4478,23 @@ const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode
                                     whiteSpace: 'nowrap',
                                     overflow: 'hidden',
                                     textOverflow: 'ellipsis'
-                                }, children: component.basic?.label || `Column ${index + 1}` }, `header-${component.id}`))) })), dataEntries.length > 0 ? (dataEntries.map((entry, entryIndex) => (jsxRuntime.jsxs("div", { className: "table-row", style: {
-                                display: 'grid',
-                                // Change grid columns to 1fr for column view
-                                gridTemplateColumns: columnView
-                                    ? '1fr'
-                                    : `repeat(${visibleTemplateComponents.length}, minmax(150px, 1fr))`,
+                                }, children: component.basic?.label || `Column ${index + 1}` }, `header-${component.id || index}`))) })), dataEntries.length > 0 ? (dataEntries.map((entry, entryIndex) => (jsxRuntime.jsxs("div", { className: "table-row", style: {
+                                // Use flex column for column view, grid for row view
+                                display: columnView ? 'flex' : 'grid',
+                                flexDirection: columnView ? 'column' : 'row',
+                                gridTemplateColumns: !columnView
+                                    ? `repeat(${visibleTemplateComponents.length}, minmax(150px, 1fr))`
+                                    : undefined,
                                 borderBottom: entryIndex < dataEntries.length - 1 ? '1px solid var(--df-color-fb-border)' : 'none',
                                 backgroundColor: entryIndex % 2 === 0 ? 'var(--df-color-fb-container)' : 'var(--df-color-fb-bg)',
                                 position: 'relative',
-                                minWidth: columnView ? '100%' : `${visibleTemplateComponents.length * 150}px`
+                                minWidth: columnView ? '100%' : `${visibleTemplateComponents.length * 150}px`,
+                                padding: columnView ? '16px' : '0'
                             }, children: [visibleTemplateComponents.map((templateComponent, componentIndex) => {
                                     let entryComponent = entry.components?.[componentIndex];
                                     if (!entryComponent) {
                                         // Use entry.id (which is unique) instead of entryIndex to prevent data collisions
-                                        const uniqueId = `${templateComponent.id}-${entry.id}-${componentIndex}`;
+                                        const uniqueId = `${templateComponent.id || 'comp'}-${entry.id}-${componentIndex}`;
                                         entryComponent = {
                                             ...templateComponent,
                                             id: uniqueId,
@@ -4482,7 +4507,7 @@ const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode
                                     else {
                                         entryComponent = {
                                             ...entryComponent,
-                                            id: entryComponent.id,
+                                            id: entryComponent.id || `${templateComponent.id || 'comp'}-${entry.id}-${componentIndex}`,
                                             basic: {
                                                 ...entryComponent.basic,
                                                 showLabel: columnView // Show label in column view
@@ -4490,21 +4515,24 @@ const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode
                                         };
                                     }
                                     return (jsxRuntime.jsx("div", { style: {
-                                            padding: '12px 16px',
+                                            padding: columnView ? '12px 0' : '12px 16px',
                                             borderRight: !columnView && componentIndex < visibleTemplateComponents.length - 1 ? '1px solid var(--df-color-fb-border)' : 'none',
                                             // Add bottom border for fields in column view except the last one
                                             borderBottom: columnView && componentIndex < visibleTemplateComponents.length - 1 ? '1px dashed var(--df-color-fb-border)' : 'none',
-                                            minHeight: '60px',
+                                            minHeight: columnView ? 'auto' : '60px',
                                             minWidth: columnView ? '100%' : '150px',
+                                            width: columnView ? '100%' : 'auto',
                                             display: 'flex',
-                                            alignItems: 'center',
-                                            overflow: 'hidden'
+                                            flexDirection: columnView ? 'column' : 'row',
+                                            alignItems: columnView ? 'stretch' : 'center',
+                                            overflow: 'hidden',
+                                            gap: columnView ? '8px' : '0'
                                         }, children: jsxRuntime.jsx("div", { style: {
                                                 width: '100%',
-                                                minWidth: '120px',
+                                                minWidth: columnView ? '100%' : '120px',
                                                 overflow: 'hidden'
                                             }, children: renderFormComponent(entryComponent, !columnView) }) }, `${entry.id}-${componentIndex}`));
-                                }), mode === 'test' && allowAddRemoveEntries && dataEntries.length > minEntries && (jsxRuntime.jsx("button", { onClick: () => onRemoveEntry?.(entryIndex), disabled: dataEntries.length <= minEntries, style: {
+                                }), mode === 'test' && allowAddRemoveEntries && dataEntries.length > minEntries && (jsxRuntime.jsx("button", { onClick: () => onRemoveEntry(entryIndex), disabled: dataEntries.length <= minEntries, style: {
                                         position: 'absolute',
                                         top: '8px',
                                         right: '8px',
@@ -4538,7 +4566,7 @@ const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode
                         position: 'sticky',
                         bottom: 0,
                         zIndex: 5
-                    }, children: jsxRuntime.jsxs("button", { onClick: onAddEntry, disabled: dataEntries.length >= maxEntries, style: {
+                    }, children: jsxRuntime.jsxs("button", { onClick: () => { console.log('[TableView] Add Entry button clicked (grid view)', 'entries:', dataEntries.length, 'max:', maxEntries); onAddEntry(); }, disabled: dataEntries.length >= maxEntries, style: {
                             padding: '8px 16px',
                             backgroundColor: dataEntries.length >= maxEntries ? '#f3f4f6' : '#10b981',
                             color: dataEntries.length >= maxEntries ? '#9ca3af' : '#ffffff',
@@ -4576,7 +4604,7 @@ const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode
                                     fontWeight: '600',
                                     color: 'var(--df-color-text-dark)',
                                     fontSize: '14px'
-                                }, children: ["Entry #", entryIndex + 1] }), mode === 'test' && allowAddRemoveEntries && dataEntries.length > 1 && (jsxRuntime.jsx("button", { onClick: () => onRemoveEntry?.(entryIndex), disabled: dataEntries.length <= minEntries, style: {
+                                }, children: ["Entry #", entryIndex + 1] }), mode === 'test' && allowAddRemoveEntries && dataEntries.length > 1 && (jsxRuntime.jsx("button", { onClick: () => onRemoveEntry(entryIndex), disabled: dataEntries.length <= minEntries, style: {
                                     padding: '4px 8px',
                                     backgroundColor: dataEntries.length <= minEntries ? '#f3f4f6' : '#ef4444',
                                     color: dataEntries.length <= minEntries ? '#9ca3af' : '#ffffff',
@@ -4592,40 +4620,39 @@ const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode
                                     height: '24px',
                                     justifyContent: 'center'
                                 }, title: removeText, children: jsxRuntime.jsx("span", { style: { fontSize: '14px' }, children: "\u00D7" }) }))] }), jsxRuntime.jsx("div", { style: {
-                            display: 'grid',
-                            gridTemplateColumns: columnView ? '1fr' : 'repeat(auto-fit, minmax(200px, 1fr))',
+                            display: columnView ? 'flex' : 'grid',
+                            flexDirection: columnView ? 'column' : 'row',
+                            gridTemplateColumns: !columnView ? 'repeat(auto-fit, minmax(200px, 1fr))' : undefined,
                             gap: '16px'
                         }, children: visibleTemplateComponents.map((templateComponent, componentIndex) => {
-                            // Find the corresponding component in this entry by index first, then by name+label
                             let entryComponent = entry.components?.[componentIndex];
-                            // If no component at this index, try to find by name+label
                             if (!entryComponent) {
                                 entryComponent = entry.components?.find((comp) => comp.name === templateComponent.name &&
                                     comp.basic?.label === templateComponent.basic?.label);
                             }
                             if (!entryComponent) {
-                                // Use entry.id (which is unique) instead of entryIndex
-                                const uniqueId = `${templateComponent.id}-${entry.id}-${componentIndex}`;
+                                const uniqueId = `${templateComponent.id || 'comp'}-${entry.id}-${componentIndex}`;
                                 entryComponent = {
                                     ...templateComponent,
                                     id: uniqueId,
                                     basic: {
                                         ...templateComponent.basic,
-                                        showLabel: false // Hide label in datagrid cells
+                                        showLabel: columnView // Show label in column view, hide in grid view
                                     }
                                 };
                             }
                             else {
-                                // Preserve the original ID to maintain form value connections
                                 entryComponent = {
                                     ...entryComponent,
-                                    id: entryComponent.id, // Keep the original ID
+                                    id: entryComponent.id || `${templateComponent.id || 'comp'}-${entry.id}-${componentIndex}`,
                                     basic: {
                                         ...entryComponent.basic,
-                                        showLabel: false // Hide label in datagrid cells
+                                        showLabel: columnView // Show label in column view, hide in grid view
                                     }
                                 };
                             }
+                            if (!entryComponent)
+                                return null;
                             return (jsxRuntime.jsxs("div", { style: {
                                     display: 'flex',
                                     flexDirection: 'column',
@@ -4661,7 +4688,7 @@ const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode
                     borderRadius: '8px',
                     display: 'flex',
                     justifyContent: 'center'
-                }, children: jsxRuntime.jsxs("button", { onClick: onAddEntry, disabled: dataEntries.length >= maxEntries, style: {
+                }, children: jsxRuntime.jsxs("button", { onClick: () => { console.log('[TableView] Add Entry button clicked (list view)', 'entries:', dataEntries.length, 'max:', maxEntries); onAddEntry(); }, disabled: dataEntries.length >= maxEntries, style: {
                         padding: '8px 16px',
                         backgroundColor: dataEntries.length >= maxEntries ? '#f3f4f6' : '#10b981',
                         color: dataEntries.length >= maxEntries ? '#9ca3af' : '#ffffff',
@@ -4674,14 +4701,21 @@ const TableView = ({ templateComponents, dataEntries, renderFormComponent, mode
                         alignItems: 'center',
                         gap: '8px',
                         transition: 'all 0.2s ease'
+                    }, onMouseEnter: (e) => {
+                        if (dataEntries.length < maxEntries) {
+                            e.currentTarget.style.backgroundColor = '#059669';
+                        }
+                    }, onMouseLeave: (e) => {
+                        e.currentTarget.style.backgroundColor = '#10b981';
                     }, children: [jsxRuntime.jsx("span", { children: "+" }), addAnotherText] }) }))] }));
 };
 const DfFormDataGrid = ({ id, properties, mode = 'edit', formData = {}, onValueChange, onSelect, isSelected = false, className = '', onDataGridSelect, onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, selectedComponent, renderFormComponent, onEntryAdd, onEntryRemove, formTemplateId, onThresholdActionCompletion, onThresholdIssueRaised, onNotesChange, onAttachmentChange, shouldShowComponent }) => {
     const [isCollapsed, setIsCollapsed] = React.useState(false);
     const hasInitialized = React.useRef(false);
     // Get all components in the grid and sanitize them to ensure no data leaks into templates
-    let gridComponents = (properties.templateComponents || []).map(comp => ({
+    let gridComponents = (properties.templateComponents || []).map((comp, index) => ({
         ...comp,
+        id: comp.id || `${id}-template-${index}`, // CRITICAL: Ensure template components have stable IDs
         basic: {
             ...comp.basic,
             // Use an empty string instead of undefined to satisfy component typing
@@ -4692,9 +4726,10 @@ const DfFormDataGrid = ({ id, properties, mode = 'edit', formData = {}, onValueC
     const dataEntries = properties.entries || [];
     // Fallback: If no template components but we have entries, extract template from first entry
     if (gridComponents.length === 0 && dataEntries.length > 0 && dataEntries[0].components) {
-        gridComponents = dataEntries[0].components.map((comp) => ({
+        gridComponents = dataEntries[0].components.map((comp, index) => ({
             ...comp,
-            id: comp.id?.replace(/-entry-\d+$/, '') || comp.id, // Remove entry suffix for template
+            // Remove entry suffix for template, use stable ID if missing
+            id: comp.id?.replace(/-entry-.*$/, '') || `${id}-template-${index}`,
             basic: {
                 ...comp.basic,
                 // Clear any data values while keeping types happy
@@ -4762,12 +4797,9 @@ const DfFormDataGrid = ({ id, properties, mode = 'edit', formData = {}, onValueC
                     // Check if entry is missing any template components or if existing components need updates
                     return gridComponents.some((templateComp, componentIndex) => {
                         const existingComponent = entry.components?.[componentIndex];
-                        if (!existingComponent) {
-                            return true; // Missing component at this index
+                        if (!existingComponent || !existingComponent.id) {
+                            return true; // Missing component or missing ID at this index
                         }
-                        // We don't check for ID matches here anymore
-                        // const expectedId = `${templateComp.id}-entry-${entry.index}-${componentIndex}`
-                        // const hasProperId = existingComponent.id === expectedId
                         // Check if existing component needs to be updated with new template properties
                         // Compare key properties that should be synced
                         const needsPropertyUpdate = JSON.stringify(existingComponent.basic?.options) !== JSON.stringify(templateComp.basic?.options) ||
@@ -4775,7 +4807,6 @@ const DfFormDataGrid = ({ id, properties, mode = 'edit', formData = {}, onValueC
                             existingComponent.basic?.defaultValue !== templateComp.basic?.defaultValue ||
                             existingComponent.basic?.label !== templateComp.basic?.label ||
                             existingComponent.validation?.required !== templateComp.validation?.required;
-                        // We do not check for ID mismatch anymore as we want to preserve unique IDs
                         return needsPropertyUpdate;
                     });
                 });
@@ -4796,7 +4827,8 @@ const DfFormDataGrid = ({ id, properties, mode = 'edit', formData = {}, onValueC
                                 // Update existing component with new template properties while ensuring unique ID and preserving form values
                                 const updatedComponent = {
                                     ...templateComp,
-                                    id: existingComponent.id, // Preserve existing ID !!
+                                    // Preserve existing ID or generate one if missing
+                                    id: existingComponent.id || `${templateComp.id}-${entry.id}-${componentIndex}`,
                                     basic: {
                                         ...templateComp.basic,
                                         showLabel: false, // Hide label in datagrid cells
@@ -4905,6 +4937,10 @@ const DfFormDataGrid = ({ id, properties, mode = 'edit', formData = {}, onValueC
         // In edit/preview modes, don't handle value changes as components are read-only
     }, [mode, onValueChange]);
     const handleAddEntry = React.useCallback(() => {
+        console.log('[DfFormDataGrid] handleAddEntry called');
+        console.log('[DfFormDataGrid] gridComponents:', gridComponents.length, gridComponents.map(c => c.id));
+        console.log('[DfFormDataGrid] current entries:', properties.entries?.length);
+        console.log('[DfFormDataGrid] onValueChange exists:', !!onValueChange);
         // Use timestamp and random string to ensure uniqueness even if entries are deleted
         const uniqueSuffix = `${Date.now()}-${Math.random().toString(36).substr(2, 5)}`;
         const newEntryId = `entry-${uniqueSuffix}`;
@@ -4926,13 +4962,19 @@ const DfFormDataGrid = ({ id, properties, mode = 'edit', formData = {}, onValueC
             }),
             styles: {}
         };
+        console.log('[DfFormDataGrid] newEntry created:', newEntry.id, 'with', newEntry.components.length, 'components');
         const updatedEntries = [...properties.entries, newEntry];
+        console.log('[DfFormDataGrid] updatedEntries count:', updatedEntries.length);
         if (onValueChange) {
+            console.log('[DfFormDataGrid] calling onValueChange with updated entries');
             onValueChange({
                 id,
                 value: { ...properties, entries: updatedEntries }
             });
         }
+        else {
+            console.log('[DfFormDataGrid] WARNING: onValueChange is not defined!');
+        }
         onEntryAdd?.();
     }, [properties, onValueChange, id, onEntryAdd, gridComponents]);
     const handleRemoveEntry = React.useCallback((entryIndex) => {
@@ -5029,7 +5071,7 @@ const DfFormDataGrid = ({ id, properties, mode = 'edit', formData = {}, onValueC
                 , { 
                     // Cast to FormComponentType[] to satisfy TableView typing; gridComponents
                     // are always child form components of the datagrid.
-                    templateComponents: gridComponents, dataEntries: dataEntries, renderFormComponent: renderFormComponent || renderComponent, mode: mode, allowAddRemoveEntries: properties.datagrid?.allowAddRemoveEntries ?? true, addAnotherText: properties.datagrid?.addAnotherText ?? 'Add Entry', removeText: properties.datagrid?.removeText ?? 'Remove', maxEntries: properties.datagrid?.maxEntries ?? 10, minEntries: properties.datagrid?.minEntries ?? 1, displayAsGrid: properties.datagrid?.displayAsGrid ?? true, onAddEntry: onEntryAdd ? onEntryAdd : handleAddEntry, onRemoveEntry: onEntryRemove ? onEntryRemove : handleRemoveEntry, formData: formData, formTemplateId: formTemplateId, onThresholdActionCompletion: onThresholdActionCompletion, onThresholdIssueRaised: onThresholdIssueRaised, onNotesChange: onNotesChange, onAttachmentChange: onAttachmentChange, columnView: properties.datagrid?.columnView, shouldShowComponent: shouldShowComponent })) }))] }));
+                    templateComponents: gridComponents, dataEntries: dataEntries, renderFormComponent: renderFormComponent || renderComponent, mode: mode, allowAddRemoveEntries: properties.datagrid?.allowAddRemoveEntries ?? true, addAnotherText: properties.datagrid?.addAnotherText ?? 'Add Entry', removeText: properties.datagrid?.removeText ?? 'Remove', maxEntries: properties.datagrid?.maxEntries ?? 10, minEntries: properties.datagrid?.minEntries ?? 1, displayAsGrid: properties.datagrid?.displayAsGrid ?? true, onAddEntry: handleAddEntry, onRemoveEntry: handleRemoveEntry, formData: formData, formTemplateId: formTemplateId, onThresholdActionCompletion: onThresholdActionCompletion, onThresholdIssueRaised: onThresholdIssueRaised, onNotesChange: onNotesChange, onAttachmentChange: onAttachmentChange, columnView: properties.datagrid?.columnView, shouldShowComponent: shouldShowComponent })) }))] }));
 };
 
 const DraggableChild = ({ child, selectedChild, mode, onChildSelect, onChildDelete, renderFormComponent, isOverlay = false, isChildrenEditMode = false, formData = {}, formTemplateId, onThresholdActionCompletion, onThresholdIssueRaised, onNotesChange, onAttachmentChange, workOrderNumber, assetNumber, user, onCreateIssue, onUpdateIssue }) => {
@@ -5420,7 +5462,7 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
             });
         };
         // Validate component IDs for uniqueness without mutating original props
-        const getValidatedComponents = (components) => {
+        const getValidatedComponents = (components, parentId) => {
             return components.map((component, index) => {
                 let validatedComponent = { ...component };
                 // Ensure component has an ID
@@ -5429,33 +5471,42 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                     const name = validatedComponent.name || 'component';
                     const label = validatedComponent.basic?.label || '';
                     const safeLabel = label.replace(/[^a-zA-Z0-9]/g, '').toLowerCase().substring(0, 10);
-                    // Generate a unique ID
-                    validatedComponent.id = `${name}-${safeLabel || 'gen'}-${Date.now()}-${Math.random().toString(36).substr(2, 6)}-${index}`;
+                    // Generate a stable unique ID if parentId is provided, otherwise fallback to semi-stable
+                    if (parentId) {
+                        validatedComponent.id = `${parentId}-${name}-${index}`;
+                    }
+                    else {
+                        // For root components, use label if available for stability
+                        const labelPart = safeLabel ? `-${safeLabel}` : '';
+                        validatedComponent.id = `${name}${labelPart}-${index}`;
+                    }
                     console.warn(`[DfFormPreview] Assigned missing ID: ${validatedComponent.id}`);
                 }
                 else {
                     // Check for duplicates
                     if (seenIds.has(validatedComponent.id)) {
                         console.error(`[DfFormPreview] Duplicate component ID detected: ${validatedComponent.id}`);
-                        // Generate a unique ID for duplicate
-                        validatedComponent.id = `${validatedComponent.id}-duplicate-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+                        // Generate a unique ID for duplicate - using index to keep it somewhat stable
+                        validatedComponent.id = `${validatedComponent.id}-dup-${index}`;
                         console.warn(`[DfFormPreview] Generated new unique ID: ${validatedComponent.id}`);
                     }
                 }
                 seenIds.add(validatedComponent.id);
                 // Recursively validate nested components
                 if (validatedComponent.children && Array.isArray(validatedComponent.children)) {
-                    validatedComponent.children = getValidatedComponents(validatedComponent.children);
+                    validatedComponent.children = getValidatedComponents(validatedComponent.children, validatedComponent.id);
                 }
                 if (validatedComponent.cells && Array.isArray(validatedComponent.cells)) {
-                    validatedComponent.cells = validatedComponent.cells.map((row) => {
+                    validatedComponent.cells = validatedComponent.cells.map((row, rowIndex) => {
                         const normalizedRow = normalizeTableRow(row);
                         if (normalizedRow.length > 0) {
-                            return normalizedRow.map((cell) => {
+                            return normalizedRow.map((cell, cellIndex) => {
                                 if (cell && cell.components && Array.isArray(cell.components)) {
+                                    // Stable ID for table cells: tableId-row-X-cell-Y
+                                    const cellContextId = `${validatedComponent.id}-row-${rowIndex}-cell-${cellIndex}`;
                                     return {
                                         ...cell,
-                                        components: getValidatedComponents(cell.components)
+                                        components: getValidatedComponents(cell.components, cellContextId)
                                     };
                                 }
                                 return cell;
@@ -5467,9 +5518,10 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                 if (validatedComponent.entries && Array.isArray(validatedComponent.entries)) {
                     validatedComponent.entries = validatedComponent.entries.map((entry) => {
                         if (entry && entry.components && Array.isArray(entry.components)) {
+                            // Stable ID for datagrid entries: datagridId-entryId or using entry.id
                             return {
                                 ...entry,
-                                components: getValidatedComponents(entry.components)
+                                components: getValidatedComponents(entry.components, entry.id || `${validatedComponent.id}-entry-${entry.index}`)
                             };
                         }
                         return entry;
@@ -6452,12 +6504,9 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                             onFormDataChange?.(updatedComponents);
                         } }) }));
             case 'datagrid':
-                // Align package datagrid wiring with main app behaviour:
-                // - Let DfFormDataGrid manage entry structure via onValueChange
-                // - Use the shared onFormValueChange handler for nested field values
-                // - Keep notes/attachments wiring as before
                 return (jsxRuntime.jsx(DfFormDataGrid, { ...commonProps, properties: component, formData: formValues, formTemplateId: formTemplateId, mode: commonProps.mode, onThresholdActionCompletion: handleThresholdActionCompletion, onThresholdIssueRaised: handleThresholdIssueRaised, onNotesChange: (componentId, notes) => {
                         handleComponentNotesChange(componentId, notes);
+                        // Handle notes change for datagrid entry components
                         const updatedComponents = localFormComponents.map(comp => {
                             if (comp.id === component.id && comp.entries) {
                                 const updatedEntries = comp.entries.map((entry) => {
@@ -6485,6 +6534,7 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                         onFormDataChange?.(updatedComponents);
                     }, onAttachmentChange: (componentId, attachments) => {
                         handleComponentAttachmentChange(componentId, attachments);
+                        // Handle attachment change for datagrid entry components
                         const updatedComponents = localFormComponents.map(comp => {
                             if (comp.id === component.id && comp.entries) {
                                 const updatedEntries = comp.entries.map((entry) => {
@@ -6510,7 +6560,116 @@ onComponentSelect, onComponentDelete, onComponentEdit, onComponentUpdate, select
                             return comp;
                         });
                         onFormDataChange?.(updatedComponents);
-                    }, onValueChange: onFormValueChange, renderFormComponent: (field) => {
+                    }, onValueChange: (change) => {
+                        console.log('[DfFormPreview] datagrid onValueChange received:', change.id, 'hasEntries:', change.value && typeof change.value === 'object' && 'entries' in change.value);
+                        // Handle datagrid value changes (entries updates)
+                        if (change.id === component.id && change.value && typeof change.value === 'object' && 'entries' in change.value) {
+                            console.log('[DfFormPreview] datagrid entries update - entries count:', change.value.entries?.length);
+                            // Update localFormComponents with new entries structure
+                            const updatedComponents = localFormComponents.map(comp => {
+                                if (comp.id === component.id) {
+                                    return {
+                                        ...comp,
+                                        ...change.value
+                                    };
+                                }
+                                return comp;
+                            });
+                            // CRITICAL: Update local state immediately so new entries render without Angular round-trip
+                            setLocalFormComponents(updatedComponents);
+                            onFormDataChange?.(updatedComponents);
+                            // Also update formValues for nested components
+                            if (change.value.entries && Array.isArray(change.value.entries)) {
+                                change.value.entries.forEach((entry) => {
+                                    if (entry.components && Array.isArray(entry.components)) {
+                                        entry.components.forEach((nestedComp) => {
+                                            const nestedValue = formValues[nestedComp.id];
+                                            if (nestedValue !== undefined) ;
+                                            else {
+                                                // Initialize with defaultValue if available
+                                                const defaultValue = nestedComp.basic?.defaultValue;
+                                                if (defaultValue !== undefined) {
+                                                    setFormValues(prev => ({
+                                                        ...prev,
+                                                        [nestedComp.id]: defaultValue
+                                                    }));
+                                                }
+                                            }
+                                        });
+                                    }
+                                });
+                            }
+                        }
+                        else {
+                            // For nested component value changes, use the regular handler
+                            onFormValueChange(change);
+                        }
+                    }, onEntryAdd: () => {
+                        // CRITICAL: Entry has already been added via onValueChange in DfFormDataGrid
+                        // Get the updated component from localFormComponents (which should have been updated by onValueChange)
+                        const currentComponent = localFormComponents.find(comp => comp.id === component.id);
+                        if (currentComponent && currentComponent.entries) {
+                            // Entry should already be in the component via onValueChange
+                            // Just ensure localFormComponents is in sync (no-op if already synced)
+                            const updatedComponents = localFormComponents.map(comp => {
+                                if (comp.id === component.id) {
+                                    // Ensure entries are properly structured
+                                    return {
+                                        ...comp,
+                                        entries: comp.entries || []
+                                    };
+                                }
+                                return comp;
+                            });
+                            onFormDataChange?.(updatedComponents);
+                        }
+                        else {
+                            // Fallback: If component doesn't have entries yet, try to get from formValues
+                            setTimeout(() => {
+                                const datagridValue = formValues[component.id];
+                                if (datagridValue && typeof datagridValue === 'object' && 'entries' in datagridValue) {
+                                    const updatedComponents = localFormComponents.map(comp => {
+                                        if (comp.id === component.id) {
+                                            return {
+                                                ...comp,
+                                                entries: datagridValue.entries
+                                            };
+                                        }
+                                        return comp;
+                                    });
+                                    onFormDataChange?.(updatedComponents);
+                                }
+                            }, 100);
+                        }
+                    }, onEntryRemove: (entryIndex) => {
+                        // Handle entry remove - update form components
+                        const updatedComponents = localFormComponents.map(comp => {
+                            if (comp.id === component.id && comp.entries) {
+                                const currentEntries = comp.entries || [];
+                                const updatedEntries = currentEntries
+                                    .filter((_, index) => index !== entryIndex)
+                                    .map((entry, index) => ({
+                                    ...entry,
+                                    index,
+                                    id: `entry-${comp.id}-${index}`,
+                                    components: entry.components?.map((comp, compIndex) => {
+                                        const templateComp = (comp.templateComponents || [])[compIndex];
+                                        return {
+                                            ...comp,
+                                            id: templateComp ? `${templateComp.id}-entry-${index}-${compIndex}` : comp.id
+                                        };
+                                    }) || []
+                                }));
+                                return {
+                                    ...comp,
+                                    entries: updatedEntries
+                                };
+                            }
+                            return comp;
+                        });
+                        onFormDataChange?.(updatedComponents);
+                    }, renderFormComponent: (field) => {
+                        // Ensure the nested component gets the proper form value
                         return renderFormComponent(field);
                     } }));
             case 'file':