fixed layout resolving issue when using turbo-rails gem

matestack · Apr 29, 2022 · 315322a · 315322a
1 parent 0ff8d01
commit 315322a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/matestack/ui/core/helper.rb b/lib/matestack/ui/core/helper.rb
@@ -36,7 +36,10 @@ def render(*args)
             if controller_layout == false
               root_layout = layout ? layout.layout : false
             else
-              if controller_layout.nil?
+              # when using the turbo-rails gem, controller_layout is a Proc
+              # https://github.com/hotwired/turbo-rails/blob/v1.0.1/app/controllers/turbo/frames/frame_request.rb#L16
+              # and not nil or a string indicating which layout to be used like before
+              if controller_layout.nil? || controller_layout.is_a?(Proc)
                 root_layout = "application"
               else
                 root_layout = controller_layout