Update <Form> to use <.form>

surface-ui · Sep 6, 2021 · 5d6aadb · 5d6aadb
1 parent fe76fb1
commit 5d6aadb
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 24 deletions.
diff --git a/lib/surface/components/form.ex b/lib/surface/components/form.ex
@@ -92,12 +92,19 @@ defmodule Surface.Components.Form do
 
     assigns = assign(assigns, opts: opts)
 
+    # ~F"""
+    # {form = form_for(@for, @action, @opts)}
+    #   <Context put={__MODULE__, form: form}>
+    #     <#slot :args={form: form} />
+    #   </Context>
+    # <#Raw></form></#Raw>
+    # """
     ~F"""
-    {form = form_for(@for, @action, @opts)}
+    <.form :let={form} for={@for} action={@action} {...@opts}>
       <Context put={__MODULE__, form: form}>
         <#slot :args={form: form} />
       </Context>
-    <#Raw></form></#Raw>
+    </.form>
     """
   end
 end
diff --git a/test/surface/components/form/checkbox_test.exs b/test/surface/components/form/checkbox_test.exs
@@ -41,8 +41,8 @@ defmodule Surface.Components.Form.CheckboxTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
            <input name="user[admin]" type="hidden" value="false">\
            <input id="user_admin" name="user[admin]" type="checkbox" value="true">
            </form>

diff --git a/test/surface/components/form/file_input_test.exs b/test/surface/components/form/file_input_test.exs
@@ -41,8 +41,8 @@ defmodule Surface.Components.Form.FileInputTest do
       end
 
     assert html =~ """
-           <form action="#" enctype="multipart/form-data" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post" enctype="multipart/form-data">
+               <input name="_csrf_token" type="hidden" value="test">
              <input id="user_picture" name="user[picture]" type="file">
            </form>
            """

diff --git a/test/surface/components/form/hidden_inputs_test.exs b/test/surface/components/form/hidden_inputs_test.exs
@@ -18,8 +18,8 @@ defmodule Surface.Components.Form.HiddenInputsTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
            </form>
            """
   end
@@ -37,8 +37,8 @@ defmodule Surface.Components.Form.HiddenInputsTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
            </form>
            """
   end

diff --git a/test/surface/components/form/inputs_test.exs b/test/surface/components/form/inputs_test.exs
@@ -42,8 +42,8 @@ defmodule Surface.Components.Form.InputsTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
              <input id="parent_children_name" name="parent[children][name]" type="text">
              <input id="parent_children_email" name="parent[children][email]" type="text">
            </form>
@@ -65,8 +65,8 @@ defmodule Surface.Components.Form.InputsTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
                <div>index: <span>0</span></div>
                <div>index: <span>1</span></div>
            </form>
@@ -87,8 +87,8 @@ defmodule Surface.Components.Form.InputsTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
              <input id="parent_children_name" name="parent[children][name]" type="text">
              <input id="parent_children_email" name="parent[children][email]" type="text">
            </form>
@@ -109,8 +109,8 @@ defmodule Surface.Components.Form.InputsTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
              <input id="parent_children_name" name="custom_name[name]" type="text">
              <input id="parent_children_email" name="custom_name[email]" type="text">
            </form>

diff --git a/test/surface/components/form_test.exs b/test/surface/components/form_test.exs
@@ -41,8 +41,8 @@ defmodule Surface.Components.FormTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
            </form>
            """
   end
@@ -58,8 +58,8 @@ defmodule Surface.Components.FormTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
              <input id="user_name" name="user[name]" type="text">
            </form>
            """
@@ -76,8 +76,8 @@ defmodule Surface.Components.FormTest do
       end
 
     assert html =~ """
-           <form action="#" method="post">\
-           <input name="_csrf_token" type="hidden" value="test">
+           <form action="#" method="post">
+               <input name="_csrf_token" type="hidden" value="test">
              <input id="user_name" name="user[name]" type="text">
            </form>
            """