fix: creating a new label when adding a new card resets all fields (#119)

* fix: creating a new label when adding a new card resets all fields

* fix: persist form data and modal stacking without breaking the animations

apps/web/src/components/CheckboxDropdown.tsx

@@ -86,8 +86,10 @@ export default function CheckboxDropdown({
             </label>
             {handleEdit && (
               <button
+                type="button"
                 className="invisible ml-auto group-hover:visible"
                 onClick={(event) => {
+                  event.preventDefault();
                   event.stopPropagation();
                   handleEdit(item.key);
                 }}
@@ -100,8 +102,12 @@ export default function CheckboxDropdown({
       ))}
       {handleCreate && (
         <button
+          type="button"
           className="flex w-full items-center rounded-[5px] p-2 px-2 text-[12px] text-dark-900 hover:bg-light-200 dark:hover:bg-dark-300"
-          onClick={() => handleCreate()}
+          onClick={(e) => {
+            e.preventDefault();
+            handleCreate();
+          }}
         >
           <HiMiniPlus size={20} className="pr-1.5" />
           {createNewItemLabel}

apps/web/src/components/Editor.tsx

@@ -15,6 +15,7 @@ import {
   ReactRenderer,
   useEditor,
 } from "@tiptap/react";
+import { useEffect } from "react";
 import StarterKit from "@tiptap/starter-kit";
 import Suggestion from "@tiptap/suggestion";
 import { forwardRef, useImperativeHandle, useRef, useState } from "react";
@@ -343,9 +344,19 @@ export default function Editor({
       editable: !readOnly,
       injectCSS: false,
     },
-    [content],
+    [], // creating the editor only once
   );
 
+  // this will sync external content changes without re-creating the editor instance
+  useEffect(() => {
+    if (!editor) return;
+    const currentHTML = editor.getHTML();
+    const safeContent = content ?? "";
+    if (safeContent !== currentHTML) {
+      editor.commands.setContent(safeContent, false);
+    }
+  }, [content, editor]);
+
   return (
     <div ref={containerRef}>
       <style jsx global>{`

apps/web/src/components/LabelForm.tsx

@@ -63,12 +63,16 @@ export function LabelForm({
       );
       try {
         refetch();
-        if (!isCreateAnotherEnabled) closeModal();
-        reset({
-          name: "",
-          colour: colours[(currentColourIndex + 1) % colours.length],
-          isCreateAnotherEnabled,
-        });
+        if (!isCreateAnotherEnabled) {
+          closeModal();
+        } else {
+          const newFormState = {
+            name: "",
+            colour: colours[(currentColourIndex + 1) % colours.length],
+            isCreateAnotherEnabled,
+          };
+          reset(newFormState);
+        }
       } catch (e) {
         console.log(e);
       }
@@ -79,10 +83,6 @@ export function LabelForm({
     onSuccess: () => {
       refetch();
       closeModal();
-      reset({
-        name: "",
-        colour: colours[0],
-      });
     },
   });
 

apps/web/src/components/modal.tsx

@@ -7,15 +7,19 @@ interface Props {
   children: React.ReactNode;
   modalSize?: "sm" | "md" | "lg";
   positionFromTop?: "sm" | "md" | "lg";
+  isVisible?: boolean;
 }
 
 const Modal: React.FC<Props> = ({
   children,
   modalSize = "sm",
   positionFromTop = "md",
+  isVisible,
 }) => {
   const { isOpen, closeModal } = useModal();
 
+  const shouldShow = isVisible !== undefined ? isVisible : isOpen;
+
   const modalSizeMap = {
     sm: "max-w-[400px]",
     md: "max-w-[550px]",
@@ -29,7 +33,7 @@ const Modal: React.FC<Props> = ({
   };
 
   return (
-    <Transition.Root show={isOpen} as={Fragment}>
+    <Transition.Root show={shouldShow} as={Fragment}>
       <Dialog as="div" className="relative z-10" onClose={closeModal}>
         <Transition.Child
           as={Fragment}