Add ability to disable default form wrapper (#522)

TrestleAdmin · Nov 13, 2024 · bcd5124 · bcd5124
1 parent dc8e987
commit bcd5124
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/app/views/trestle/resource/edit.html.erb b/app/views/trestle/resource/edit.html.erb
@@ -15,6 +15,6 @@
 
 <%= resource_turbo_frame(instance) do %>
   <%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>
-    <%= render partial: "form", layout: modal_request? ? "modal" : "layout" %>
+    <%= render partial: "form", layout: modal_request? ? "modal" : "layout", locals: { wrapper: admin.form.wrapper? } %>
   <% end %>
 <% end %>
diff --git a/app/views/trestle/resource/new.html.erb b/app/views/trestle/resource/new.html.erb
@@ -14,6 +14,6 @@
 
 <%= resource_turbo_frame(instance) do %>
   <%= trestle_form_for instance, url: admin.path(:create), method: :post do |f| %>
-    <%= render partial: "form", layout: modal_request? ? "modal" : "layout" %>
+    <%= render partial: "form", layout: modal_request? ? "modal" : "layout", locals: { wrapper: admin.form.wrapper? } %>
   <% end %>
 <% end %>
diff --git a/app/views/trestle/resource/show.html.erb b/app/views/trestle/resource/show.html.erb
@@ -15,6 +15,6 @@
 
 <%= resource_turbo_frame(instance) do %>
   <%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>
-    <%= render partial: "form", layout: modal_request? ? "modal" : "layout" %>
+    <%= render partial: "form", layout: modal_request? ? "modal" : "layout", locals: { wrapper: admin.form.wrapper? } %>
   <% end %>
 <% end %>
diff --git a/lib/trestle/form.rb b/lib/trestle/form.rb
@@ -26,6 +26,10 @@ def modal?
       options[:modal]
     end
 
+    def wrapper?
+      options.fetch(:wrapper, true)
+    end
+
     def dialog?
       Trestle.deprecator.warn("`Trestle::Form#dialog?` is deprecated. Please use `modal?` instead.")
       options[:modal]

diff --git a/spec/trestle/form_spec.rb b/spec/trestle/form_spec.rb
@@ -21,4 +21,13 @@
 
     it { is_expected.to be_modal }
   end
+
+  context "without options[:wrapper]" do
+    it { is_expected.to be_wrapper }
+  end
+
+  context "with options[:wrapper] = false" do
+    subject(:form) { Trestle::Form.new(wrapper: false) }
+    it { is_expected.not_to be_wrapper }
+  end
 end