Revert "Modal form change proposal (#416)"

This reverts commit 3c21419.
daisyui · Sep 15, 2023 · 6f43241 · 6f43241
1 parent 3c21419
commit 6f43241
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/src/Modal/Modal.stories.tsx b/src/Modal/Modal.stories.tsx
@@ -23,9 +23,7 @@ export const Default: Story<ModalProps> = (args) => {
           Press ESC key or click the button below to close
         </Modal.Body>
         <Modal.Actions>
-          <form method="dialog">
-            <Button>Close</Button>
-          </form>
+          <Button>Close</Button>
         </Modal.Actions>
       </Modal>
     </div>
@@ -60,16 +58,14 @@ export const CloseButton: Story<ModalProps> = (args) => {
     <div className="font-sans">
       <Button onClick={handleShow}>Open Modal</Button>
       <Modal {...args} ref={ref}>
-        <form method="dialog">
-          <Button
-            size="sm"
-            color="ghost"
-            shape="circle"
-            className="absolute right-2 top-2"
-          >
-            x
-          </Button>
-        </form>
+        <Button
+          size="sm"
+          color="ghost"
+          shape="circle"
+          className="absolute right-2 top-2"
+        >
+          x
+        </Button>
         <Modal.Header className="font-bold">Hello!</Modal.Header>
         <Modal.Body>Press ESC key or click on X button to close</Modal.Body>
       </Modal>
@@ -91,9 +87,7 @@ export const CustomWidth: Story<ModalProps> = (args) => {
           Press ESC key or click the button below to close
         </Modal.Body>
         <Modal.Actions>
-          <form method="dialog">
-            <Button>Close</Button>
-          </form>
+          <Button>Close</Button>
         </Modal.Actions>
       </Modal>
     </div>
@@ -113,9 +107,7 @@ export const UseDialogHook: Story<ModalProps> = (args) => {
         <Modal.Header className="font-bold">Hello!</Modal.Header>
         <Modal.Body>This modal works with useDialog hook!</Modal.Body>
         <Modal.Actions>
-          <form method="dialog">
-            <Button>Close</Button>
-          </form>
+          <Button>Close</Button>
         </Modal.Actions>
       </Dialog>
     </div>

diff --git a/src/Modal/Modal.tsx b/src/Modal/Modal.tsx
@@ -42,9 +42,9 @@ const Modal = forwardRef<HTMLDialogElement, ModalProps>(
         className={containerClasses}
         ref={ref}
       >
-        <div data-theme={dataTheme} className={bodyClasses}>
+        <form method="dialog" data-theme={dataTheme} className={bodyClasses}>
           {children}
-        </div>
+        </form>
         {backdrop && (
           <form method="dialog" className="modal-backdrop">
             <button>close</button>