From 6f43241e82023d2d18ca9446294df9e4158688a4 Mon Sep 17 00:00:00 2001
From: Benji <64439681+benjitrosch@users.noreply.github.com>
Date: Fri, 15 Sep 2023 14:42:41 -0400
Subject: [PATCH] Revert "Modal form change  proposal (#416)"

This reverts commit 3c21419637ae152fc347c398021399cb1f3f882d.
---
 src/Modal/Modal.stories.tsx | 30 +++++++++++-------------------
 src/Modal/Modal.tsx         |  4 ++--
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Modal/Modal.stories.tsx b/src/Modal/Modal.stories.tsx
index 60c86699..c6577e80 100644
--- 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
index a2a9bdcc..8e2dfc10 100644
--- 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>