panda-cms 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e27fb8ea71f2ea75ce8b82dc1a572e9fc6c55ee7d0e1df48b3af93228881bc0e
-  data.tar.gz: a58147bb5374e6bfdc70aed581c9b98048b0e3937a4037c2daae7e5b6c70ae57
+  metadata.gz: a11a8249369ac564953d025d4887020ced356b6357a5d8c823580c27e39394cb
+  data.tar.gz: 04d6f8dab1ae48f77414ea10b515739f36a54c0f37b79e82f7d9282305af03a1
 SHA512:
-  metadata.gz: e6494d67893174959b47efe2276c1fe1ae27606cc268e62d1bf77566bcbf95c37cc935f2a62c0bdc0db24f62b42d2ca44cc36c8a9a2a328bee634d5e079374c1
-  data.tar.gz: 2d263e8ca147f3c0bc9061f5f9c7149d4705a7b16fbc1d02a7072a71884292574677a588b9dc9dbbae30d90da6e2495f6b43f319fe674b98da2076fe97a64cc7
+  metadata.gz: eb71f7f01ba585e142738e5d28510c5a0508b69843aab7c5b60fbf5cbaa7bb89419a916df923d0282cd2311a61614d836002635e67b9d6dfadd4bd6dba4e3f81
+  data.tar.gz: a795545501c2633b3e911b93ccd5c302adbb7d9c9f5a0ab6c363196ae4e0d18089a2b99cc3ada4b66e44902c8a5828212251b331e1b8b4d4762dfafef74dfe0f

data/README.md

@@ -12,7 +12,7 @@ Better websites, on Rails.
 🐼 is grown from our work at [Otaina](https://www.otaina.co.uk), a small group of freelancers. We needed something that could handle websites large and small – but where we could expand it too. We sent our first websites live in March 2024.
 
 ![Gem Version](https://img.shields.io/gem/v/panda-cms) ![Build Status](https://img.shields.io/github/actions/workflow/status/tastybamboo/panda-cms/ci.yml)
-![GitHub Last Commit](https://img.shields.io/github/last-commit/tasty-bamboo/panda-cms) [![Ruby Code Style](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/standardrb/standard)
+![GitHub Last Commit](https://img.shields.io/github/last-commit/tastybamboo/panda-cms) [![Ruby Code Style](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/standardrb/standard)
 
 ## Usage
 
@@ -44,8 +44,8 @@ For initial setup, run:
 
 ```shell
 bundle install
-rails generate panda-cms:install
-rails panda-cms:install:migrations
+rails generate panda_cms:install
+rails panda_cms:install:migrations
 rails db:seed
 ```
 
@@ -57,7 +57,7 @@ If you don't want to use GitHub to login (or are at a URL other than http://loca
 
 This is a non-exhuastive list (there will be many more):
 
-* To date, this has only been tested with Rails 7.1 and 7.2.
+* To date, this has only been tested with Rails 7.1, 7.2 and 8.0
 * There may be conflicts if you're not using Tailwind CSS on the frontend. Please report this.
 
 ## Contributing
@@ -66,8 +66,43 @@ We welcome contributions.
 
 See our [Contributing Guidelines](https://docs.pandacms.io/developers/contributing/)
 
+### Testing
+
+Panda CMS uses RSpec for testing.
+
+#### Using Fixtures
+
+We encourage using fixtures for tests instead of factories for consistent test data:
+
+1. Create fixture files in `spec/fixtures` named after the model's table (e.g., `panda_cms_pages.yml`)
+2. Define records with unique names and their attributes
+3. Use helper methods to create test templates with mocked file validation
+
+Example fixture format:
+
+```yaml
+# spec/fixtures/panda_cms_pages.yml
+home_page:
+  title: "Home"
+  path: "/"
+  panda_cms_template_id: <%= ActiveRecord::FixtureSet.identify(:page_template) %>
+  status: "active"
+  created_at: <%= Time.current %>
+  updated_at: <%= Time.current %>
+```
+
+Example test using fixtures:
+
+```ruby
+# Access fixture using table name and record name
+page = panda_cms_pages(:home_page)
+expect(page.title).to eq("Home")
+```
+
+When testing models with file validations or complex callbacks, use the helper methods in `spec/models/panda/cms/page_spec.rb` as a reference.
+
 ## License
 
 The gem is available as open source under the terms of the [BSD-3-Clause License](https://opensource.org/licenses/bsd-3-clause).
 
-Copyright © 2024, Panda Software Limited.
+Copyright © 2024 - 2025, Otaina Limited.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 
 APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)

data/app/assets/builds/panda.cms.css

@@ -1182,10 +1182,6 @@ a.block-link:after {
   pointer-events: none;
 }
 
-.pointer-events-auto {
-  pointer-events: auto;
-}
-
 .visible {
   visibility: visible;
 }
@@ -1250,8 +1246,8 @@ a.block-link:after {
   z-index: 10;
 }
 
-.z-50 {
-  z-index: 50;
+.z-\[9999\] {
+  z-index: 9999;
 }
 
 .col-span-3 {

data/app/assets/tailwind/application.css

@@ -0,0 +1,178 @@
+@import "tailwindcss";
+
+@config "tailwind.config.js";
+
+@theme {
+  --color-white: var(--color-white);
+  --color-black: var(--color-black);
+  --color-light: var(--color-light);
+  --color-mid: var(--color-mid);
+  --color-dark: var(--color-dark);
+  --color-highlight: var(--color-highlight);
+  --color-active: var(--color-active);
+  --color-inactive: var(--color-active);
+  --color-warning: var(--color-warning);
+  --color-error: var(--color-error);
+}
+
+@plugin "tailwindcss/typography";
+@plugin "tailwindcss/forms";
+
+@layer base {
+  html[data-theme="default"] {
+    --color-white: 249 249 249; /* #F9F9F9 */
+    --color-black: 26 22 29; /* #1A161D */
+
+    --color-light: 238 206 230; /* #EECEE6 */
+    --color-mid: 141 94 183; /* #8D5EB7 */
+    --color-dark: 33 29 73; /* #211D49 */
+
+    --color-highlight: 208 64 20; /* #D04014 */
+
+    --color-active: 0 135 85; /* #008755 */
+    --color-warning: 250 207 142; /* #FACF8E */
+    --color-inactive: 216 247 245; /* #d6e4f7 */
+    --color-error: 245 129 129; /* #F58181 */
+  }
+
+  html[data-theme="sky"] {
+    --color-white: 249 249 249; /* #F9F9F9 */
+    --color-black: 26 22 29; /* #1A161D */
+    --color-light: 204 238 242; /* #CCEEF2 */
+    --color-mid: 42 102 159; /* #2A669F */
+    --color-dark: 20 32 74; /* #14204A */
+    --color-highlight: 208 64 20; /* #D04014 */
+
+    --color-active: 69 154 89; /* #459A59 - darker green with better contrast */
+    --color-warning: 244 190 102; /* #F4BE66 */
+    --color-inactive: 216 247 245; /* #d6e4f7 */
+    --color-error: 208 64 20; /* #D04014 */
+  }
+
+  a.block-link:after {
+    position: absolute;
+    content: "";
+    inset: 0;
+  }
+}
+
+/* Default editor styles */
+@layer components {
+  .codex-editor__redactor .ce-block .ce-block__content {
+    @apply text-base font-normal font-sans text-dark leading-[1.6] space-y-[1.6rem];
+
+    h1.ce-header {
+      @apply text-3xl md:text-4xl font-semibold font-sans leading-[1.2];
+    }
+
+    h2.ce-header {
+      @apply text-2xl font-medium font-sans leading-[1.3] mb-4 mt-8;
+    }
+
+    h3.ce-header {
+      @apply text-xl font-normal font-sans leading-[1.3] mb-4 mt-6;
+    }
+
+    p,
+    li {
+      @apply leading-[1.6] tracking-wide max-w-[85ch];
+
+      a {
+        @apply text-[#1A9597] underline underline-offset-2 hover:text-[#158486] focus:outline-2 focus:outline-offset-2 focus:outline-[#1A9597];
+      }
+
+      strong,
+      b {
+        @apply font-semibold;
+      }
+    }
+
+    p {
+      @apply mb-4;
+    }
+
+    .cdx-quote {
+      @apply bg-[#eef0f3] border-l-inactive border-l-8 p-6 mb-4;
+
+      .cdx-quote__caption {
+        @apply block ml-6 mt-2 text-sm text-dark;
+      }
+
+      .cdx-quote__text {
+        quotes: "\201C" "\201D" "\2018" "\2019";
+        @apply pl-6;
+
+        &:before {
+          @apply -ml-8 mr-2 text-dark text-6xl leading-4 align-text-bottom font-serif;
+          content: open-quote;
+        }
+
+        p {
+          @apply inline italic text-lg;
+        }
+      }
+    }
+
+    .cdx-list {
+      @apply mb-4 pl-6;
+
+      &--ordered {
+        @apply list-decimal;
+      }
+
+      &--unordered {
+        @apply list-disc;
+      }
+
+      .cdx-list {
+        @apply mt-2 mb-0;
+      }
+
+      .cdx-list__item {
+        @apply mb-2 pl-2;
+      }
+    }
+
+    .cdx-nested-list {
+      @apply mb-4 pl-6;
+
+      &--ordered {
+        @apply list-decimal;
+      }
+
+      &--unordered {
+        @apply list-disc;
+      }
+
+      .cdx-nested-list {
+        @apply mt-2 mb-0;
+      }
+
+      .cdx-nested-list__item {
+        @apply mb-2 pl-2;
+      }
+    }
+
+    .cdx-table {
+      @apply w-full border-collapse border-2 border-dark my-6;
+
+      &__head {
+        @apply font-semibold border-dark border-r-2 p-3 bg-light;
+      }
+
+      &__row {
+        @apply border-dark border-b-2;
+      }
+
+      &__cell {
+        @apply border-dark border-r-2 p-3;
+      }
+    }
+
+    .cdx-embed {
+      iframe {
+        @apply w-full border-none;
+      }
+    }
+  }
+}

data/app/assets/tailwind/tailwind.config.js

@@ -0,0 +1,15 @@
+module.exports = {
+  content: {
+    relative: true,
+    files: [
+      "../../public/*.html",
+      "../../app/views/**/*.html.erb",
+      "../../app/builders/panda/cms/**/*.rb",
+      "../../app/components/panda/cms/**/*.html.erb",
+      "../../app/components/panda/cms/**/*.rb",
+      "../../app/helpers/panda/cms/**/*.rb",
+      "../../app/javascript/panda/cms/**/*.js",
+      "../../vendor/javascript/**/*.js",
+    ],
+  },
+};

data/app/builders/panda/cms/form_builder.rb

@@ -1,4 +1,4 @@
-require "ostruct"
+# frozen_string_literal: true
 
 module Panda
   module CMS
@@ -6,7 +6,7 @@ module Panda
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::FormTagHelper
 
-      def label(attribute, text = nil, options = {}, &block)
+      def label(attribute, text = nil, options = {})
         super(attribute, text, options.reverse_merge(class: label_styles))
       end
 
@@ -15,50 +15,53 @@ module Panda
           content_tag :div, class: container_styles do
             label(attribute) + meta_text(options) +
               content_tag(:div, class: "flex flex-grow") do
-                content_tag(:span, class: "inline-flex items-center px-3 text-base border border-r-none rounded-s-md whitespace-nowrap break-keep") { options.dig(:data, :prefix) } +
-                  super(attribute, options.reverse_merge(class: input_styles_prefix + " input-prefix rounded-l-none border-l-none"))
-              end
+                content_tag(:span,
+                  class: "inline-flex items-center px-3 text-base border border-r-none rounded-s-md whitespace-nowrap break-keep") do
+                  options.dig(:data, :prefix)
+                end +
+                  super(attribute, options.reverse_merge(class: "#{input_styles_prefix} input-prefix rounded-l-none border-l-none"))
+              end + error_message(attribute)
           end
         else
           content_tag :div, class: container_styles do
-            label(attribute) + meta_text(options) + super(attribute, options.reverse_merge(class: input_styles))
+            label(attribute) + meta_text(options) + super(attribute, options.reverse_merge(class: input_styles)) + error_message(attribute)
           end
         end
       end
 
       def email_field(method, options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles))
+          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles)) + error_message(method)
         end
       end
 
       def datetime_field(method, options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles))
+          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles)) + error_message(method)
         end
       end
 
       def text_area(method, options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles))
+          label(method) + meta_text(options) + super(method, options.reverse_merge(class: input_styles)) + error_message(method)
         end
       end
 
       def password_field(attribute, options = {})
         content_tag :div, class: container_styles do
-          label(attribute) + meta_text(options) + super(attribute, options.reverse_merge(class: input_styles))
+          label(attribute) + meta_text(options) + super(attribute, options.reverse_merge(class: input_styles)) + error_message(attribute)
         end
       end
 
-      def select(method, choices = nil, options = {}, html_options = {}, &block)
+      def select(method, choices = nil, options = {}, html_options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, choices, options, html_options.reverse_merge(class: select_styles)) + select_svg
+          label(method) + meta_text(options) + super(method, choices, options, html_options.reverse_merge(class: select_styles)) + select_svg + error_message(method)
         end
       end
 
       def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
         content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, collection, value_method, text_method, options, html_options.reverse_merge(class: input_styles))
+          label(method) + meta_text(options) + super(method, collection, value_method, text_method, options, html_options.reverse_merge(class: input_styles)) + error_message(method)
         end
       end
 
@@ -147,30 +150,9 @@ module Panda
         end
       end
 
-      def rich_text_area(method, options = {})
-        content_tag :div, class: container_styles do
-          label(method) + meta_text(options) + super(method, options.reverse_merge(class: textarea_styles))
-        end
-      end
-
-      def rich_text_field(method, options = {})
-        wrap_field(method, options) do
-          if defined?(ActionText)
-            # For test environment
-            if Rails.env.test?
-              # Just render a textarea for testing
-              text_area(method, options.reverse_merge(class: textarea_styles))
-            else
-              rich_text_area(method, options.reverse_merge(class: textarea_styles))
-            end
-          else
-            text_area(method, options.reverse_merge(class: textarea_styles))
-          end
-        end
-      end
-
       def meta_text(options)
         return unless options[:meta]
+
         @template.content_tag(:p, options[:meta], class: "block text-black/60 text-sm mb-2")
       end
 
@@ -197,7 +179,8 @@ module Panda
       end
 
       def select_svg
-        @template.content_tag(:svg, class: "pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-gray-400", aria_hidden: true) do
+        @template.content_tag(:svg,
+          class: "pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 text-gray-400", aria_hidden: true) do
           @template.content_tag(:path, d: "M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z")
         end
       end
@@ -229,6 +212,14 @@ module Panda
       def field_wrapper_styles
         "mt-1"
       end
+
+      def error_message(attribute)
+        return unless object.respond_to?(:errors) && object.errors[attribute]&.any?
+
+        content_tag(:p, class: "mt-2 text-sm text-red-600") do
+          object.errors[attribute].join(", ")
+        end
+      end
     end
   end
 end

data/app/components/panda/cms/admin/flash_message_component.html.erb

@@ -1,4 +1,4 @@
-<div class="fixed top-2 right-2 z-50 p-2 space-y-4 w-full max-w-sm pointer-events-none sm:items-end"
+<div class="fixed top-2 right-2 z-[9999] p-2 space-y-4 w-full max-w-sm sm:items-end"
      data-controller="alert"
      <% if @temporary %> data-alert-dismiss-after-value="3000"<% end %>
      data-transition-enter="ease-in-out duration-500"
@@ -7,7 +7,7 @@
      data-transition-leave="ease-in-out duration-500"
      data-transition-leave-from="translate-x-0 opacity-100"
      data-transition-leave-to="translate-x-full opacity-0">
-  <div class="overflow-hidden w-full max-w-sm bg-white rounded-lg ring-1 ring-black ring-opacity-5 shadow-lg pointer-events-auto">
+  <div class="overflow-hidden w-full max-w-sm bg-white rounded-lg ring-1 ring-black ring-opacity-5 shadow-lg">
     <div class="p-4">
       <div class="flex items-start">
         <div class="flex-shrink-0">

data/app/components/panda/cms/admin/heading_component.rb

@@ -29,13 +29,14 @@ module Panda
           output = output.html_safe
           base_heading_styles = "flex pt-1 text-black mb-5 -mt-1"
 
-          if level == 1
+          case level
+          when 1
             content_tag(:h1, output, class: [base_heading_styles, "text-2xl font-medium", @additional_styles])
-          elsif level == 2
+          when 2
             content_tag(:h2, output, class: [base_heading_styles, "text-xl font-medium", @additional_styles])
-          elsif level == 3
+          when 3
             content_tag(:h3, output, class: [base_heading_styles, "text-xl", "font-light", @additional_styles])
-          elsif level == :panel
+          when :panel
             content_tag(:h3, output, class: ["text-base font-medium p-4 text-white"])
           end
         end

data/app/components/panda/cms/admin/panel_component.rb

@@ -4,9 +4,9 @@ module Panda
   module CMS
     module Admin
       class PanelComponent < ViewComponent::Base
-        renders_one :heading, ->(text:, icon: "", level: :panel, additional_styles: "") do
+        renders_one :heading, lambda { |text:, icon: "", level: :panel, additional_styles: ""|
           Panda::CMS::Admin::HeadingComponent.new(text: text, icon: icon, level: level, additional_styles: additional_styles)
-        end
+        }
       end
     end
   end

data/app/components/panda/cms/admin/statistics_component.rb

@@ -4,8 +4,7 @@ module Panda
   module CMS
     module Admin
       class StatisticsComponent < ViewComponent::Base
-        attr_reader :metric
-        attr_reader :value
+        attr_reader :metric, :value
 
         def initialize(metric:, value:)
           @metric = metric

data/app/components/panda/cms/admin/user_activity_component.html.erb

@@ -1,5 +1,7 @@
-<% if user.is_a?(Panda::CMS::User) %>
+<% if user.is_a?(Panda::CMS::User) && time %>
   <%= render Panda::CMS::Admin::UserDisplayComponent.new(user: user, metadata: "#{time_ago_in_words(time)} ago") %>
+<% elsif user.is_a?(Panda::CMS::User) %>
+  <%= render Panda::CMS::Admin::UserDisplayComponent.new(user: user, metadata: "Not published") %>
 <% elsif time %>
   <div class="text-black/60"><%= time_ago_in_words(time) %> ago</div>
 <% end %>

data/app/components/panda/cms/admin/user_activity_component.rb

@@ -4,28 +4,15 @@ module Panda
   module CMS
     module Admin
       class UserActivityComponent < ViewComponent::Base
-        attr_accessor :model
-        attr_accessor :time
-        attr_accessor :user
+        attr_accessor :model, :time, :user
 
-        # @param whodunnit_to [ActiveRecord::Base] Model instance to which the user activity is related
-        def initialize(whodunnit_to: nil, at: nil, user: nil)
-          if whodunnit_to
-            @model = whodunnit_to
-            whodunnit_id = @model.versions&.last&.whodunnit
-            if whodunnit_id
-              @user = User.find(whodunnit_id)
-              @time = @model.updated_at
-            end
-          elsif user.is_a?(::Panda::CMS::User) && at.is_a?(::ActiveSupport::TimeWithZone)
-            @user = user
-            @time = at
-          end
-
-          if !@time
-            @user = nil
-            @time = nil
-          end
+        # @param model [ActiveRecord::Base] Model instance to which the user activity is related
+        # @param at [ActiveSupport::TimeWithZone] Time of the activity
+        # @param user [Panda::CMS::User] User who performed the activity
+        def initialize(model: nil, at: nil, user: nil)
+          @model = model
+          @user = user if user.is_a?(::Panda::CMS::User)
+          @time = at if at.is_a?(::ActiveSupport::TimeWithZone)
         end
       end
     end

data/app/components/panda/cms/code_component.rb

@@ -17,15 +17,19 @@ module Panda
         @options[:id] ||= "code-#{key.to_s.dasherize}"
         @editable = editable
 
-        raise BlockError.new("Key 'code' is not allowed for CodeComponent") if key == :code
+        raise BlockError, "Key 'code' is not allowed for CodeComponent" if key == :code
       end
 
       def call
         # TODO: For the non-editable version, grab this from a cache or similar?
-        block = Panda::CMS::Block.find_by(kind: KIND, key: @key, panda_cms_template_id: Current.page.panda_cms_template_id)
+        block = Panda::CMS::Block.find_by(kind: KIND, key: @key,
+          panda_cms_template_id: Current.page.panda_cms_template_id)
 
         if block.nil?
-          raise Panda::CMS::MissingBlockError.new("Block with key #{@key} not found for page #{Current.page.title}") unless Rails.env.production?
+          unless Rails.env.production?
+            raise Panda::CMS::MissingBlockError, "Block with key #{@key} not found for page #{Current.page.title}"
+          end
+
           return false
         end
 
@@ -58,7 +62,7 @@ module Panda
 
       def is_embedded?
         # TODO: Check security on this - embed_id should match something?
-        request.params.dig(:embed_id).present?
+        request.params[:embed_id].present?
       end
     end
   end

data/app/components/panda/cms/menu_component.rb

@@ -23,24 +23,25 @@ module Panda
 
         @menu_items = @menu_items.order(:lft).map do |menu_item|
           if is_active?(menu_item)
-            menu_item.define_singleton_method(:css_classes) { styles[:default] + " " + styles[:active] }
+            menu_item.define_singleton_method(:css_classes) { "#{styles[:default]} #{styles[:active]}" }
           else
-            menu_item.define_singleton_method(:css_classes) { styles[:default] + " " + styles[:inactive] }
+            menu_item.define_singleton_method(:css_classes) { "#{styles[:default]} #{styles[:inactive]}" }
           end
 
           menu_item
         end
 
         # TODO: Surely don't need this but Current.page isn't working in the component
-        if @render_page_menu
-          @current_page = Panda::CMS::Page.find_by(path: @current_path)
-          @page_menu_styles = page_menu_styles
-        end
+        return unless @render_page_menu
+
+        @current_page = Panda::CMS::Page.find_by(path: @current_path)
+        @page_menu_styles = page_menu_styles
       end
 
       def is_active?(menu_item)
         return true if @current_path == "/" && active_link?(menu_item.page.path, match: :exact)
         return true if menu_item.page.path != "/" && active_link?(menu_item.page.path, match: :starts_with)
+
         false
       end
 

data/app/components/panda/cms/page_menu_component.rb

@@ -3,31 +3,29 @@
 module Panda
   module CMS
     class PageMenuComponent < ViewComponent::Base
-      attr_accessor :page
-      attr_accessor :menu_item
-      attr_accessor :styles
+      attr_accessor :page, :menu_item, :styles
 
       def initialize(page:, start_depth:, styles: {}, show_heading: true)
         @page = page
 
-        unless @page.nil?
-          start_page = if @page.depth == start_depth
-            @page
-          else
-            @page.ancestors.find { |anc| anc.depth == start_depth }
-          end
+        return if @page.nil?
 
-          menu = start_page&.page_menu
-          return if menu.nil?
+        start_page = if @page.depth == start_depth
+          @page
+        else
+          @page.ancestors.find { |anc| anc.depth == start_depth }
+        end
 
-          @menu_item = menu.menu_items.order(:lft)&.first
+        menu = start_page&.page_menu
+        return if menu.nil?
 
-          @show_heading = show_heading
+        @menu_item = menu.menu_items.order(:lft)&.first
 
-          # Set some default styles for sanity
-          @styles = styles
-          @styles[:indent_with] ||= "pl-2"
-        end
+        @show_heading = show_heading
+
+        # Set some default styles for sanity
+        @styles = styles
+        @styles[:indent_with] ||= "pl-2"
       end
 
       def render?