@overmap-ai/forms 1.0.12-fix-dropdown-error.2 → 1.0.12-fix-form-problem.0

package/dist/forms.js

@@ -2007,25 +2007,24 @@ const FieldBuilder = memo(function FieldBuilder2(props) {
   const handleCancel = useCallback(() => {
     setFieldType(void 0);
     setFormIsDirty(false);
+    console.log("handlecancelran");
   }, []);
-  const handleCloseDialog = useCallback(
-    (force) => {
-      if (force || !formIsDirty) {
-        setFieldType(void 0);
-        setIsOpen(false);
-      } else {
-        openConfirmDiscardChangesDialog({
-          onDiscard: () => {
-            setFieldType(void 0);
-            setIsOpen(false);
-          }
-        });
-      }
-    },
-    [formIsDirty, openConfirmDiscardChangesDialog, setIsOpen]
-  );
+  const handleCloseDialog = useCallback(() => {
+    console.log("handlecloseran");
+    if (!formIsDirty) {
+      setFieldType(void 0);
+      setIsOpen(false);
+    } else {
+      openConfirmDiscardChangesDialog({
+        onDiscard: () => {
+          setFieldType(void 0);
+          setIsOpen(false);
+        }
+      });
+    }
+  }, [formIsDirty, openConfirmDiscardChangesDialog, setIsOpen]);
   const handleCreateField = useCallback(
-    (form, closeDialog) => {
+    (form) => {
       const { label } = form;
       if (!type)
         throw new Error("Field type must be selected before creating a field.");
@@ -2050,31 +2049,26 @@ const FieldBuilder = memo(function FieldBuilder2(props) {
       }
       setFieldValue(parentPath, newFields).then();
       setIsOpen(false);
-      console.log(closeDialog);
     },
     [type, values, parentPath, editing, setFieldValue, setIsOpen, index]
   );
   const handleDirtyChange = useCallback((dirty) => setFormIsDirty(dirty), []);
-  const dialogContent = useCallback(
-    (closeDialog) => {
-      console.log(showChooseField, type, editing, initial);
-      if (showChooseField) {
-        return /* @__PURE__ */ jsx(ChooseFieldToAdd, { setFieldType });
+  const dialogContent = useCallback(() => {
+    if (showChooseField) {
+      return /* @__PURE__ */ jsx(ChooseFieldToAdd, { setFieldType });
+    }
+    return /* @__PURE__ */ jsx(
+      FieldOptionsForm,
+      {
+        conditionalSourceFields,
+        handleCancel,
+        handleCreateField,
+        fieldType: type,
+        defaultField: initial,
+        handleDirtyChange
       }
-      return /* @__PURE__ */ jsx(
-        FieldOptionsForm,
-        {
-          conditionalSourceFields,
-          handleCancel,
-          handleCreateField: (form) => handleCreateField(form, closeDialog),
-          fieldType: type,
-          defaultField: initial,
-          handleDirtyChange
-        }
-      );
-    },
-    [conditionalSourceFields, handleCancel, handleCreateField, handleDirtyChange, initial, showChooseField, type]
-  );
+    );
+  }, [conditionalSourceFields, handleCancel, handleCreateField, handleDirtyChange, initial, showChooseField, type]);
   return /* @__PURE__ */ jsx(
     Dialog,
     {
@@ -2092,15 +2086,17 @@ const forMobile = (mobile, display) => ({
 });
 const FieldActions = memo(function FieldActions2(props) {
   const { remove: remove2, dragHandleProps, editProps, insertAfterProps, duplicateProps } = props;
-  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
+  const [isDuplicateDialogOpen, setIsDuplicateDialogOpen] = useState(false);
+  const [isAddDialogOpen, setIsAddDialogOpen] = useState(false);
   const actions = useMemo(
     () => [
       {
         SelectedContent: FieldBuilder,
-        selectedContentProps: { ...editProps, isOpen: isDialogOpen, setIsOpen: setIsDialogOpen },
+        selectedContentProps: { ...editProps, isOpen: isEditDialogOpen, setIsOpen: setIsEditDialogOpen },
         Icon: Pencil1Icon,
         text: "Edit",
-        buttonProps: { onClick: () => setIsDialogOpen(true) }
+        buttonProps: { onClick: () => setIsEditDialogOpen(true) }
       },
       {
         Icon: TrashIcon,
@@ -2111,17 +2107,21 @@ const FieldActions = memo(function FieldActions2(props) {
       },
       {
         SelectedContent: FieldBuilder,
-        selectedContentProps: { ...duplicateProps, isOpen: isDialogOpen, setIsOpen: setIsDialogOpen },
+        selectedContentProps: {
+          ...duplicateProps,
+          isOpen: isDuplicateDialogOpen,
+          setIsOpen: setIsDuplicateDialogOpen
+        },
         Icon: CopyIcon,
         text: "Duplicate",
-        buttonProps: { onClick: () => setIsDialogOpen(true) }
+        buttonProps: { onClick: () => setIsDuplicateDialogOpen(true) }
       },
       {
         SelectedContent: FieldBuilder,
-        selectedContentProps: { ...insertAfterProps, isOpen: isDialogOpen, setIsOpen: setIsDialogOpen },
+        selectedContentProps: { ...insertAfterProps, isOpen: isAddDialogOpen, setIsOpen: setIsAddDialogOpen },
         Icon: PlusIcon,
         text: "Add after",
-        buttonProps: { onClick: () => setIsDialogOpen(true) }
+        buttonProps: { onClick: () => setIsAddDialogOpen(true) }
       },
       {
         // Wrapping icon in a div so that the asChild turns the button into a div
@@ -2133,7 +2133,16 @@ const FieldActions = memo(function FieldActions2(props) {
         buttonProps: { ...dragHandleProps, asChild: true }
       }
     ],
-    [dragHandleProps, duplicateProps, editProps, insertAfterProps, isDialogOpen, remove2]
+    [
+      dragHandleProps,
+      duplicateProps,
+      editProps,
+      insertAfterProps,
+      isAddDialogOpen,
+      isDuplicateDialogOpen,
+      isEditDialogOpen,
+      remove2
+    ]
   );
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Flex, { gap: "4", display: forMobile(false, "flex"), children: actions.map((Action) => {