@enerjisaformlibrary/formbuilder-react 1.0.6 → 1.0.8

package/index.js

@@ -28501,7 +28501,7 @@ function JsonViewerModal({ isOpen, onClose, schema }) {
 }
 
 function FormBuilder({ initialForm, onSave, onChange, className = '', theme = 'light', showToolbar = true, showComponentLibrary = true, showPropertiesPanel = true, }) {
-    const { form, loadForm, addRowWithField } = useFormStore();
+    const { form, loadForm, addRowWithField, addField, addFieldToContainer, addFieldToContainerDirect } = useFormStore();
     const [activeId, setActiveId] = useState(null);
     const [activeType, setActiveType] = useState(null);
     const [jsonViewerOpen, setJsonViewerOpen] = useState(false);
@@ -28562,33 +28562,61 @@ function FormBuilder({ initialForm, onSave, onChange, className = '', theme = 'l
         }
         const activeData = active.data.current;
         const overData = over.data.current;
+        // Check for library item (using actual data structure from ComponentLibrary)
+        const isLibraryItem = activeData?.isLibraryItem;
+        const fieldType = activeData?.componentType || activeData?.type;
+        // Determine drop target type
+        const dropType = overData?.type;
+        const isCanvas = dropType === 'canvas';
+        const isColumn = dropType === 'column';
+        const isContainerDrop = dropType === 'container-drop';
+        const isContainerColumn = dropType === 'container-column';
         console.log('[FormBuilder] Checking conditions:', {
-            isNew: activeData?.isNew,
-            fieldType: activeData?.fieldType,
-            isCanvas: overData?.isCanvas,
-            columnId: overData?.columnId
+            isLibraryItem,
+            fieldType,
+            dropType,
+            isCanvas,
+            isColumn,
+            isContainerDrop,
+            isContainerColumn,
+            overData
         });
-        if (activeData?.isNew && activeData?.fieldType) {
-            const fieldType = activeData.fieldType;
-            if (overData?.isCanvas || overData?.columnId) {
-                console.log('[FormBuilder] Adding field:', fieldType);
-                addRowWithField({
-                    type: fieldType,
-                    props: {
-                        key: `field_${Date.now()}`,
-                        label: getDefaultLabel(fieldType),
-                        placeholder: '',
-                    },
-                    validation: {},
-                    customStyle: {},
-                });
-            }
-            else {
-                console.log('[FormBuilder] Drop target not canvas or column');
-            }
+        if (!isLibraryItem || !fieldType) {
+            console.log('[FormBuilder] Not a library item drag');
+            return;
+        }
+        const newField = {
+            type: fieldType,
+            props: {
+                key: `field_${Date.now()}`,
+                label: getDefaultLabel(fieldType),
+                placeholder: '',
+            },
+            validation: {},
+            customStyle: {},
+        };
+        if (isContainerColumn && overData?.rowId && overData?.columnId && overData?.containerFieldId && overData?.containerRowId && overData?.containerColumnId) {
+            // Drop into a specific container column
+            console.log('[FormBuilder] Adding field to container column:', fieldType);
+            addFieldToContainer(overData.rowId, overData.columnId, overData.containerFieldId, overData.containerRowId, overData.containerColumnId, newField);
+        }
+        else if (isContainerDrop && overData?.rowId && overData?.columnId && overData?.containerFieldId) {
+            // Drop into container directly (adds to first row)
+            console.log('[FormBuilder] Adding field to container direct:', fieldType);
+            addFieldToContainerDirect(overData.rowId, overData.columnId, overData.containerFieldId, newField);
+        }
+        else if (isColumn && overData?.rowId && overData?.columnId) {
+            // Drop into an existing column
+            console.log('[FormBuilder] Adding field to existing column:', fieldType);
+            addField(overData.rowId, overData.columnId, newField);
+        }
+        else if (isCanvas) {
+            // Drop into canvas - create new row
+            console.log('[FormBuilder] Adding field as new row:', fieldType);
+            addRowWithField(newField);
         }
         else {
-            console.log('[FormBuilder] Not a new field drag');
+            console.log('[FormBuilder] Unknown drop target');
         }
     };
     return (jsx(TooltipProvider, { children: jsxs("div", { className: `formbuilder-container ${theme} ${className}`, children: [jsxs(DndContext, { sensors: sensors, collisionDetection: closestCenter, onDragStart: handleDragStart, onDragOver: handleDragOver, onDragEnd: handleDragEnd, children: [jsxs("div", { className: "flex flex-col h-full", children: [showToolbar && (jsx(Toolbar, { onOpenJsonViewer: () => setJsonViewerOpen(true) })), jsxs("div", { className: "flex flex-1 overflow-hidden", children: [showComponentLibrary && (jsx(ComponentLibrary, {})), jsx("div", { className: "flex-1 overflow-auto", children: jsx(FormCanvas, {}) }), showPropertiesPanel && (jsx(PropertiesPanel, {}))] })] }), jsx(DragOverlay, { children: activeId && activeType && (jsx(DragOverlayContent, { type: activeType })) })] }), jsx(JsonViewerModal, { isOpen: jsonViewerOpen, onClose: () => setJsonViewerOpen(false), schema: form })] }) }));