ariadne_view_components 0.0.34-arm64-darwin → 0.0.35-arm64-darwin

data/app/components/ariadne/dropdown_component.rb

@@ -36,15 +36,15 @@ module Ariadne
 
     # @example Default
     #   <%= render(Ariadne::DropdownComponent.new) do |c| %>
-    #     <% c.button do %>
+    #     <% c.with_button do %>
     #       Dropdown
     #     <% end %>
     #
-    #     <% c.menu do |menu| %>
-    #      <% menu.header { "Header" } %>
-    #       <% menu.item { "Item 1" } %>
-    #       <% menu.item { "Item 2" } %>
-    #       <% menu.item { "Item 3" } %>
+    #     <% c.with_menu do |menu| %>
+    #      <% menu.with_header { "Header" } %>
+    #       <% menu.with_item { "Item 1" } %>
+    #       <% menu.with_item { "Item 2" } %>
+    #       <% menu.with_item { "Item 3" } %>
     #     <% end %>
     #   <% end %>
     #
@@ -54,95 +54,95 @@ module Ariadne
     #     Dividers can be used to separate a group of items. They don't have any content.
     #   @code
     #     <%= render(Ariadne::DropdownComponent.new) do |c| %>
-    #       <% c.button do %>
+    #       <% c.with_button do %>
     #         Dropdown
     #       <% end %>
     #
-    #     <% c.menu do |menu| %>
-    #       <% menu.header { "Header" } %>
-    #       <%= menu.item { "Item 1" } %>
-    #       <%= menu.item { "Item 2" } %>
-    #       <%= menu.item(divider: true) %>
-    #       <%= menu.item { "Item 3" } %>
-    #       <%= menu.item { "Item 4" } %>
-    #       <%= menu.item(divider: true) %>
-    #       <%= menu.item { "Item 5" } %>
-    #       <%= menu.item { "Item 6" } %>
+    #     <% c.with_menu do |menu| %>
+    #       <% menu.with_header { "Header" } %>
+    #       <%= menu.with_item { "Item 1" } %>
+    #       <%= menu.with_item { "Item 2" } %>
+    #       <%= menu.with_item(divider: true) %>
+    #       <%= menu.with_item { "Item 3" } %>
+    #       <%= menu.with_item { "Item 4" } %>
+    #       <%= menu.with_item(divider: true) %>
+    #       <%= menu.with_item { "Item 5" } %>
+    #       <%= menu.with_item { "Item 6" } %>
     #     <% end %>
     #    <% end %>
     #
     # @example With direction
     #   <%= render(Ariadne::DropdownComponent.new) do |c| %>
-    #     <% c.button do %>
+    #     <% c.with_button do %>
     #       Dropdown
     #     <% end %>
     #
-    #     <% c.menu(direction: :s) do |menu| %>
+    #     <% c.with_menu(direction: :s) do |menu| %>
     #       <% menu.header { "Header" } %>
-    #       <%= menu.item { "Item 1" } %>
-    #       <%= menu.item { "Item 2" } %>
-    #       <%= menu.item { "Item 3" } %>
-    #       <%= menu.item { "Item 4" } %>
+    #       <%= menu.with_item { "Item 1" } %>
+    #       <%= menu.with_item { "Item 2" } %>
+    #       <%= menu.with_item { "Item 3" } %>
+    #       <%= menu.with_item { "Item 4" } %>
     #     <% end %>
     #   <% end %>
     #
     # @example With caret
     #   <%= render(Ariadne::DropdownComponent.new(with_caret: true)) do |c| %>
-    #     <% c.button do %>
+    #     <% c.with_button do %>
     #       Dropdown
     #     <% end %>
     #
-    #     <% c.menu do |menu| %>
-    #       <% menu.header { "Header" } %>
-    #       <%= menu.item { "Item 1" } %>
-    #       <%= menu.item { "Item 2" } %>
-    #       <%= menu.item { "Item 3" } %>
-    #       <%= menu.item { "Item 4" } %>
+    #     <% c.with_menu do |menu| %>
+    #       <% menu.with_header { "Header" } %>
+    #       <%= menu.with_item { "Item 1" } %>
+    #       <%= menu.with_item { "Item 2" } %>
+    #       <%= menu.with_item { "Item 3" } %>
+    #       <%= menu.with_item { "Item 4" } %>
     #     <% end %>
     #   <% end %>
     #
     # @example Customizing the button
     #   <%= render(Ariadne::DropdownComponent.new) do |c| %>
-    #     <% c.button(scheme: :info, size: :sm) do %>
+    #     <% c.with_button(scheme: :info, size: :sm) do %>
     #       Dropdown
     #     <% end %>
     #
-    #     <% c.menu do |menu| %>
-    #       <% menu.header { "Header" } %>
-    #       <%= menu.item { "Item 1" } %>
-    #       <%= menu.item { "Item 2" } %>
-    #       <%= menu.item { "Item 3" } %>
-    #       <%= menu.item { "Item 4" } %>
+    #     <% c.with_menu do |menu| %>
+    #       <% menu.with_header { "Header" } %>
+    #       <%= menu.with_item { "Item 1" } %>
+    #       <%= menu.with_item { "Item 2" } %>
+    #       <%= menu.with_item { "Item 3" } %>
+    #       <%= menu.with_item { "Item 4" } %>
     #    <% end %>
     #   <% end %>
     #
     # @example Menu as list
     #   <%= render(Ariadne::DropdownComponent.new) do |c| %>
-    #     <% c.button do %>
+    #     <% c.with_button do %>
     #       Dropdown
     #     <% end %>
     #
-    #     <% c.menu(as: :list) do |menu| %>
-    #       <% menu.header { "Header" } %>
-    #       <% menu.item { "Item 1" } %>
-    #       <% menu.item { "Item 2" } %>
-    #       <% menu.item(divider: true) %>
-    #       <% menu.item { "Item 3" } %>
-    #       <% menu.item { "Item 4" } %>
+    #     <% c.with_menu(as: :list) do |menu| %>
+    #       <% menu.with_header { "Header" } %>
+    #       <% menu.with_item { "Item 1" } %>
+    #       <% menu.with_item { "Item 2" } %>
+    #       <% menu.with_item(divider: true) %>
+    #       <% menu.with_item { "Item 3" } %>
+    #       <% menu.with_item { "Item 4" } %>
     #     <% end %>
     #   <% end %>
     #
     # @example Customizing menu items
     #   <%= render(Ariadne::DropdownComponent.new) do |c| %>
-    #     <% c.button do %>
+    #     <% c.with_button do %>
     #       Dropdown
     #     <% end %>
     #
-    #     <% c.menu do |menu| %>
-    #       <% menu.header { "Header" } %>
-    #       <% menu.item(tag: :button) { "Item 1" } %>
-    #       <% menu.item(classes: "ariadne-text-red-500") { "Item 2" } %>
-    #       <% menu.item { "Item 3" } %>
+    #     <% c.with_menu do |menu| %>
+    #       <% menu.with_header { "Header" } %>
+    #       <% menu.with_item(tag: :button) { "Item 1" } %>
+    #       <% menu.with_item(classes: "ariadne-text-red-500") { "Item 2" } %>
+    #       <% menu.with_item { "Item 3" } %>
     #     <% end %>
     #   <% end %>
     #
@@ -152,7 +152,7 @@ module Ariadne
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(overlay: :default, with_caret: false, classes: "", attributes: {})
       @tag = check_incoming_tag(DEFAULT_TAG, tag)
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )

data/app/components/ariadne/flash_component.rb

@@ -63,9 +63,9 @@ module Ariadne
     renders_one :action, lambda { |tag: :div, classes: "", attributes: {}|
       tag = check_incoming_tag(:div, tag)
 
-      actual_classes = class_names(classes)
+      actual_classes = merge_class_names(classes)
 
-      Ariadne::BaseComponent.new(tag: tag, classes: actual_classes, attributes: attributes)
+      render(Ariadne::BaseComponent.new(tag: tag, classes: actual_classes, attributes: attributes))
     }
 
     # @example Schemes
@@ -79,13 +79,13 @@ module Ariadne
     #
     # @example Icon
     #   <%= render(Ariadne::FlashComponent.new) do |component| %>
-    #     <% component.icon(icon: :"user-group", variant: HeroiconsHelper::Icon::VARIANT_OUTLINE) %>
+    #     <% component.with_icon(icon: :"user-group", variant: HeroiconsHelper::Icon::VARIANT_OUTLINE) %>
     #     Look at this icon.
     #   <% end %>
     #
     # @example With actions
     #   <%= render(Ariadne::FlashComponent.new) do |component| %>
-    #     <% component.action do %>
+    #     <% component.with_action do %>
     #       <%= render(Ariadne::ButtonComponent.new(size: :sm)) { "Take action" } %>
     #     <% end %>
     #     This is a flash message with actions!
@@ -104,7 +104,7 @@ module Ariadne
 
       @scheme = fetch_or_raise(VALID_CONTENT_SCHEMES, scheme)
 
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         CONTENT_SCHEME_CLASS_MAPPINGS[@scheme],
         classes,

data/app/components/ariadne/flex_component/flex_component.html.erb

@@ -0,0 +1,5 @@
+<%= render Ariadne::BaseComponent.new(tag: @tag, classes: @classes, attributes: @attributes) do |component| %>
+  <% items.each do |item| %>
+    <%= item %>
+  <% end %>
+<% end %>

data/app/components/ariadne/flex_component.rb

@@ -10,6 +10,13 @@ module Ariadne
 
     VALID_TYPES = [:row, :column, :row_reverse, :column_reverse].freeze
 
+    # The sub-items(s) to render
+    renders_many :items, lambda { |static_content = nil, &block|
+      next static_content if static_content.present?
+
+      view_context.capture { block&.call }
+    }
+
     # @example Default
     #
     #   <%= render(Ariadne::FlexComponent.new(type: :column)) { "Example" } %>
@@ -33,7 +40,7 @@ module Ariadne
         "ariadne-flex-col-reverse"
       end
 
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
         flex_class,
@@ -42,8 +49,8 @@ module Ariadne
       @attributes = attributes
     end
 
-    def call
-      render(Ariadne::BaseComponent.new(tag: @tag, classes: @classes, attributes: @attributes)) { content }
+    def render?
+      items?
     end
   end
 end

data/app/components/ariadne/footer_component.rb

@@ -7,12 +7,12 @@ module Ariadne
 
     # @example Default
     #
-    #   <%= render(Ariadne::FooterComponent.new) %>
+    #   <%= render(Ariadne::FooterComponent.new) { "Footer." } %>
     #
     # @param classes [String] <%= link_to_classes_docs %>
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(classes: "", attributes: {})
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )

data/app/components/ariadne/grid_component.rb

@@ -17,7 +17,7 @@ module Ariadne
     # @param classes [String] <%= link_to_classes_docs %>
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(classes: "", attributes: {})
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )
@@ -34,7 +34,7 @@ module Ariadne
       DEFAULT_ENTRY_CLASSES = "ariadne-group ariadne-flex-1 ariadne-flex ariadne-flex-col ariadne-p-8 hover:ariadne-text-gray-500"
       renders_one :entry, lambda { |classes: "", attributes: {}, &block|
         view_context.capture do
-          actual_classes = class_names(DEFAULT_ENTRY_CLASSES, classes)
+          actual_classes = merge_class_names(DEFAULT_ENTRY_CLASSES, classes)
           render(Ariadne::BaseComponent.new(tag: :div, classes: actual_classes, attributes: attributes)) { block&.call }
         end
       }
@@ -42,7 +42,7 @@ module Ariadne
       DEFAULT_ACTION_LINK_CLASSES = "ariadne-relative ariadne--mr-px ariadne-w-0 ariadne-flex-1 ariadne-inline-flex ariadne-items-center ariadne-justify-center ariadne-py-4 ariadne-text-sm ariadne-font-medium ariadne-border ariadne-border-transparent"
       DEFAULT_ACTION_LINK_COLORS = "ariadne-h-full hover:ariadne-text-gray-500"
       renders_many :actions, lambda { |href:, icon:, label:, size: Ariadne::HeroiconComponent::SIZE_DEFAULT, variant: HeroiconsHelper::Icon::VARIANT_SOLID, classes: "", attributes: {}, text_classes: ""|
-        actual_classes = class_names(DEFAULT_ACTION_LINK_CLASSES, DEFAULT_ACTION_LINK_COLORS, classes)
+        actual_classes = merge_class_names(DEFAULT_ACTION_LINK_CLASSES, DEFAULT_ACTION_LINK_COLORS, classes)
         render(Ariadne::LinkComponent.new(href: href, classes: actual_classes, attributes: attributes)) do
           render(Ariadne::HeroiconComponent.new(icon: icon, size: size, variant: variant, text_classes: text_classes)) { label }
         end
@@ -55,13 +55,9 @@ module Ariadne
       attr_reader :classes, :attributes
 
       def initialize(classes: "", attributes: {})
-        @classes = class_names(DEFAULT_ITEM_CLASSES, classes)
+        @classes = merge_class_names(DEFAULT_ITEM_CLASSES, classes)
         @attributes = attributes
       end
-
-      def call
-        render(Ariadne::BaseComponent.new(tag: :div, classes: @classes, attributes: @attributes))
-      end
     end
   end
 end

data/app/components/ariadne/header_component.rb

@@ -23,10 +23,10 @@ module Ariadne
       @text = text
 
       if src.blank?
-        actual_classes = class_names(DEFAULT_TEXT_LOGO_CLASSES, classes)
+        actual_classes = merge_class_names(DEFAULT_TEXT_LOGO_CLASSES, classes)
         Ariadne::Text.new(tag: :span, classes: actual_classes, attributes: attributes)
       else
-        actual_classes = class_names(DEFAULT_IMAGE_LOGO_CLASSES, classes)
+        actual_classes = merge_class_names(DEFAULT_IMAGE_LOGO_CLASSES, classes)
         actual_attributes = { width: 40, height: 40 }.merge(attributes)
         @image_logo = Ariadne::ImageComponent.new(src: src, alt: alt, classes: actual_classes, attributes: actual_attributes)
       end
@@ -40,7 +40,7 @@ module Ariadne
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     DEFAULT_NAV_LINK_CLASSES = "ariadne-inline-block ariadne-rounded-lg ariadne-py-1 ariadne-px-2 ariadne-text-sm text-slate-700 hover:bg-slate-100 hover:text-slate-900"
     renders_many :navigation_links, lambda { |tag: Ariadne::LinkComponent::DEFAULT_TAG, href:, classes: "", attributes: {}|
-      actual_classes = class_names(DEFAULT_NAV_LINK_CLASSES, classes)
+      actual_classes = merge_class_names(DEFAULT_NAV_LINK_CLASSES, classes)
       Ariadne::LinkComponent.new(tag: tag, href: href, classes: actual_classes, attributes: attributes)
     }
 
@@ -51,7 +51,7 @@ module Ariadne
     # @param classes [String] <%= link_to_classes_docs %>
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     renders_many :action_links, lambda { |tag: Ariadne::LinkComponent::DEFAULT_TAG, href:, classes: "", attributes: {}|
-      actual_classes = class_names(DEFAULT_NAV_LINK_CLASSES, classes)
+      actual_classes = merge_class_names(DEFAULT_NAV_LINK_CLASSES, classes)
       Ariadne::LinkComponent.new(tag: tag, href: href, classes: actual_classes, attributes: attributes)
     }
 
@@ -63,13 +63,13 @@ module Ariadne
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     DEFAULT_SIGNUP_LINK_CLASSES = "group ariadne-inline-flex ariadne-items-center ariadne-justify-center ariadne-rounded-full ariadne-py-2 ariadne-px-4 ariadne-text-sm ariadne-font-semibold focus:ariadne-outline-none focus-visible:ariadne-outline-2 focus-visible:outline-offset-2"
     renders_one :signup_link, lambda { |tag: Ariadne::LinkComponent::DEFAULT_TAG, href:, classes: "", attributes: {}|
-      actual_classes = class_names(DEFAULT_SIGNUP_LINK_CLASSES, classes)
+      actual_classes = merge_class_names(DEFAULT_SIGNUP_LINK_CLASSES, classes)
       Ariadne::LinkComponent.new(tag: tag, href: href, classes: actual_classes, attributes: attributes)
     }
 
     DEFAULT_PROFILE_LINK_CLASSES = "group ariadne-inline-flex ariadne-items-center ariadne-justify-center ariadne-rounded-full ariadne-py-2 ariadne-px-4 ariadne-text-sm ariadne-font-semibold focus:ariadne-outline-none focus-visible:ariadne-outline-2 focus-visible:outline-offset-2"
     renders_one :profile_link, lambda { |tag: Ariadne::LinkComponent::DEFAULT_TAG, href:, classes: "", attributes: {}|
-      actual_classes = class_names(DEFAULT_PROFILE_LINK_CLASSES, classes)
+      actual_classes = merge_class_names(DEFAULT_PROFILE_LINK_CLASSES, classes)
       Ariadne::LinkComponent.new(tag: tag, href: href, classes: actual_classes, attributes: attributes)
     }
 
@@ -84,7 +84,7 @@ module Ariadne
     # @param classes [String] <%= link_to_classes_docs %>
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(classes: "", attributes: {})
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )

data/app/components/ariadne/heading_component.rb

@@ -39,7 +39,7 @@ module Ariadne
       @tag = fetch_or_raise(TAG_OPTIONS, tag)
       @attributes = attributes
 
-      @classes = class_names(*TAG_TO_CLASSES[tag], classes)
+      @classes = merge_class_names(*TAG_TO_CLASSES[tag], classes)
     end
 
     def call

data/app/components/ariadne/heroicon_component.rb

@@ -145,13 +145,13 @@ module Ariadne
       }
 
       @icon = heroicon(icon, variant: variant, **attributes)
-      @classes = class_names(
+      @classes = merge_class_names(
         @icon.attributes[:class],
         classes,
       )
       @attributes.merge!(@icon.attributes.except(:class, :"aria-hidden"))
 
-      @text_classes = class_names(DEFAULT_TEXT_CLASSES, text_classes)
+      @text_classes = merge_class_names(DEFAULT_TEXT_CLASSES, text_classes)
       @text_attributes = text_attributes
     end
 

data/app/components/ariadne/inline_flex_component.rb

@@ -28,7 +28,7 @@ module Ariadne
     DEFAULT_TEXT_CLOSED_CLASSES = "ariadne-text-state-closed"
     DEFAULT_TEXT_CLASSES = "ariadne-pl-2 ariadne-text-sm ariadne-font-medium"
     renders_one :icon, lambda { |tag: :svg, icon:, variant:, size: Ariadne::HeroiconComponent::SIZE_DEFAULT, classes: "", attributes: {}, text_classes: "", text_attributes: {}|
-      actual_text_classes = class_names(DEFAULT_TEXT_CLASSES, text_classes)
+      actual_text_classes = merge_class_names(DEFAULT_TEXT_CLASSES, text_classes)
       Ariadne::HeroiconComponent.new(tag: tag, icon: icon, variant: variant, size: size, classes: classes, attributes: attributes, text_classes: actual_text_classes, text_attributes: text_attributes) { content }
     }
 
@@ -38,7 +38,7 @@ module Ariadne
 
     DEFAULT_LABEL_CLASSES = "ariadne-pl-2 ariadne-text-sm ariadne-font-medium"
     renders_one :text, lambda { |classes: "", attributes: {}|
-      actual_classes = class_names(DEFAULT_LABEL_CLASSES, classes)
+      actual_classes = merge_class_names(DEFAULT_LABEL_CLASSES, classes)
       Ariadne::BaseComponent.new(tag: :span, classes: actual_classes, attributes: attributes) { content }
     }
 
@@ -47,17 +47,17 @@ module Ariadne
     # @example Default
     #
     #   <%= render(Ariadne::InlineFlexComponent.new) do |c| %>
-    #      <% c.item { Ariadne::InlineFlexComponent::STATE_OPEN_SVG.html_safe } %>
+    #      <% c.with_item { Ariadne::InlineFlexComponent::STATE_OPEN_SVG.html_safe } %>
     #   <% end %>
     #
     #   # TODO: STATE_CLOSED_SVG colors didn't show until it was listed in an example
     #   <%= render(Ariadne::InlineFlexComponent.new) do |c| %>
-    #      <% c.item { Ariadne::InlineFlexComponent::STATE_CLOSED_SVG.html_safe } %>
+    #      <% c.with_item { Ariadne::InlineFlexComponent::STATE_CLOSED_SVG.html_safe } %>
     #   <% end %>
     #
     #   <%= render(Ariadne::InlineFlexComponent.new) do |c| %>
-    #      <% c.icon(icon: :check, size: :sm, variant: HeroiconsHelper::Icon::VARIANT_SOLID) %>
-    #      <% c.text { "Closed" } %>
+    #      <% c.with_icon(icon: :check, size: :sm, variant: HeroiconsHelper::Icon::VARIANT_SOLID) %>
+    #      <% c.with_text { "Closed" } %>
     #   <% end %>
     #
     # @param tag [Symbol, String] The rendered tag name
@@ -65,7 +65,7 @@ module Ariadne
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(tag: DEFAULT_TAG, classes: "", attributes: {})
       @tag = check_incoming_tag(DEFAULT_TAG, tag)
-      @classes = class_names(DEFAULT_CLASSES, classes)
+      @classes = merge_class_names(DEFAULT_CLASSES, classes)
       @attributes = attributes
     end
   end

data/app/components/ariadne/link_component.rb

@@ -35,7 +35,7 @@ module Ariadne
     #     Use tooltips sparingly and as a last resort. Consult the <%= link_to_component(Ariadne::TooltipComponent) %> documentation for more information.
     #   @code
     #     <%= render(Ariadne::LinkComponent.new(href: "#", attributes: { id: "link-with-tooltip" })) do |c| %>
-    #       <% c.tooltip(text: "Tooltip text") %>
+    #       <% c.with_tooltip(text: "Tooltip text") %>
     #       Link
     #     <% end %>
     #
@@ -44,7 +44,7 @@ module Ariadne
     # @param actionable [Boolean] If true, adds additional classes to the link to make it more aware.
     # @param classes [String] <%= link_to_classes_docs %>
     # @param attributes [Hash] <%= link_to_attributes_docs %>
-    def initialize(tag: DEFAULT_TAG, href:,  actionable: false, classes: "", attributes: {})
+    def initialize(tag: DEFAULT_TAG, href:, actionable: false, classes: "", attributes: {})
       @tag = check_incoming_tag(DEFAULT_TAG, tag)
 
       @attributes = attributes
@@ -52,7 +52,7 @@ module Ariadne
 
       @id = @attributes[:id]
 
-      @classes = class_names(DEFAULT_CLASSES, classes)
+      @classes = merge_class_names(DEFAULT_CLASSES, classes)
       @classes << DEFAULT_ACTIONABLE_CLASSES if actionable
     end
 

data/app/components/ariadne/list_component.rb

@@ -12,7 +12,7 @@ module Ariadne
     #   <% numbers = [1, 2, 3] %>
     #   <%= render(Ariadne::ListComponent.new) do |list| %>
     #     <% numbers.each do |number| %>
-    #       <%= list.item do |item|  %>
+    #       <%= list.with_item do |item|  %>
     #         <%= number %>
     #       <% end %>
     #     <% end %>
@@ -23,10 +23,14 @@ module Ariadne
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(classes: "", attributes: {})
       @tag = DEFAULT_TAG
-      @classes = class_names(DEFAULT_UL_CLASSES, classes)
+      @classes = merge_class_names(DEFAULT_UL_CLASSES, classes)
       @attributes = attributes
     end
 
+    def render?
+      items?
+    end
+
     # This component is part of `ListComponent` and should not be
     # used as a standalone component.
     class ListItem < Ariadne::Component
@@ -36,7 +40,7 @@ module Ariadne
 
       def initialize(link: {}, classes: "", attributes: {})
         @link = link
-        @classes = class_names(DEFAULT_ITEM_CLASSES, classes)
+        @classes = merge_class_names(DEFAULT_ITEM_CLASSES, classes)
         @attributes = attributes
       end
 
@@ -51,7 +55,9 @@ module Ariadne
       def call
         render(Ariadne::BaseComponent.new(tag: :li, classes: @classes, attributes: @attributes)) do
           if linked?
-            render(Ariadne::LinkComponent.new(href: @link[:href], classes: @link[:classes], attributes: @link[:attributes])) do
+            classes = @link[:classes] || ""
+            attributes = @link[:attributes] || {}
+            render(Ariadne::LinkComponent.new(href: @link[:href], classes: classes, attributes: attributes)) do
               content
             end
           else

data/app/components/ariadne/narrow_container_component.rb

@@ -19,7 +19,7 @@ module Ariadne
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(classes: "", attributes: {})
       @tag = :div
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )

data/app/components/ariadne/panel_bar_component.rb

@@ -21,7 +21,7 @@ module Ariadne
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(classes: "", attributes: {})
       @tag = DEFAULT_TAG
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )
@@ -58,9 +58,9 @@ module Ariadne
       def initialize(link: {}, classes: "", attributes: {})
         @link = link
         if @link.present?
-          @link["classes"] = class_names(DEFAULT_WRAPPER_CLASSES, @link["classes"])
+          @link["classes"] = merge_class_names(DEFAULT_WRAPPER_CLASSES, @link["classes"])
         end
-        @classes = class_names(DEFAULT_ITEM_CLASSES, classes)
+        @classes = merge_class_names(DEFAULT_ITEM_CLASSES, classes)
         @attributes = attributes
       end
 

data/app/components/ariadne/pill_component.rb

@@ -28,7 +28,7 @@ module Ariadne
       @attributes["style"] = "background-color: rgba(#{@red}, #{@green}, #{@blue}, #{@alpha});"
       @text_color = contrast_of(@red, @green, @blue)
 
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
         @text_color,

data/app/components/ariadne/rich_text_area_component/rich-text-area-component.ts

@@ -25,12 +25,12 @@ export default class RichTextArea extends Controller {
         editorProps: {
           attributes: {
             class:
-              'ariadne-h-28 ariadne-max-h-48 ariadne-p-2 ariadne-rounded-lg ariadne-overflow-y-auto focus:ariadne-outline-none'
-          }
+              'ariadne-h-28 ariadne-max-h-48 ariadne-p-2 ariadne-rounded-lg ariadne-overflow-y-auto focus:ariadne-outline-none',
+          },
         },
         parseOptions: {
-          preserveWhitespace: true
-        }
+          preserveWhitespace: true,
+        },
       })
 
       const tiptapValueContainer = editorElement.previousElementSibling

data/app/components/ariadne/rich_text_area_component.rb

@@ -23,7 +23,7 @@ module Ariadne
       @sr_label = sr_label
       @has_form = has_form
 
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )

data/app/components/ariadne/slideover_component.rb

@@ -16,7 +16,7 @@ module Ariadne
 
     DEFAULT_BUTTON_CLASSES = "ariadne-inline-flex ariadne-items-center ariadne-shadow-sm ariadne-px-4 ariadne-py-1.5 ariadne-pb-2 ariadne-text-sm ariadne-leading-5 ariadne-font-medium ariadne-rounded-full " + Ariadne::ButtonComponent::SCHEME_CLASS_MAPPINGS[:default]
     renders_one :open_button, lambda { |selected: false, classes: "", attributes: {}|
-      actual_classes = class_names(DEFAULT_BUTTON_CLASSES, classes, selected ? "" : BASE_HIDDEN_CLASS)
+      actual_classes = merge_class_names(DEFAULT_BUTTON_CLASSES, classes, selected ? "" : BASE_HIDDEN_CLASS)
 
       attributes[:id] ||= "btnOpen"
       attributes[:"data-slideover-component-target"] ||= "slidePanel"
@@ -27,7 +27,7 @@ module Ariadne
     }
 
     renders_one :close_button, lambda { |selected: false, classes: "", attributes: {}|
-      actual_classes = class_names(DEFAULT_BUTTON_CLASSES, classes, selected ? "" : BASE_HIDDEN_CLASS)
+      actual_classes = merge_class_names(DEFAULT_BUTTON_CLASSES, classes, selected ? "" : BASE_HIDDEN_CLASS)
 
       attributes[:id] ||= "btnClose"
       attributes[:"data-slideover-component-target"] ||= "slidePanel"
@@ -49,7 +49,7 @@ module Ariadne
     # @param attributes [Hash] <%= link_to_attributes_docs %>
     def initialize(tag: DEFAULT_TAG, direction:, open_text: "Open", close_text: "Close", classes: "", attributes: {})
       @tag = check_incoming_tag(DEFAULT_TAG, tag)
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )

data/app/components/ariadne/tab_component.rb

@@ -63,7 +63,7 @@ module Ariadne
       @href = href
       @selected = selected
 
-      @classes = class_names(
+      @classes = merge_class_names(
         DEFAULT_CLASSES,
         classes,
       )

data/app/components/ariadne/tab_container_component/tab-container-component.ts

@@ -5,7 +5,7 @@ const DEFAULT_SELECTED_CLASSES: string[] = ['ariadne-border-slate-500', 'ariadne
 const DEFAULT_UNSELECTED_CLASSES: string[] = [
   'ariadne-text-gray-500',
   'hover:ariadne-text-gray-700',
-  'hover:ariadne-border-gray-300'
+  'hover:ariadne-border-gray-300',
 ]
 
 for (const tabContainer of document.getElementsByTagName('tab-container')) {