daisyui 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 618724b24d6d8e24b2af9f8c3ec73c54e2585780f7f08f95e7b95a695003f884
-  data.tar.gz: bf4a1d586b782bf36402fee0854198004977d3be75a9e814181933ceb4451275
+  metadata.gz: 0dfd69755019e48481d090083a5165c37b04d50af7d76b145a2f76dae4ebb594
+  data.tar.gz: c4b804a2a61d7018f6db355629b9d90525dfe89508b63a236829d7dcd72e25a6
 SHA512:
-  metadata.gz: d0679796916b581e19c7d519f006cf63f2cef7304148339f84c59129e03244ef7da2c10b0060e1ec232bb272cba04067cf181b3eb9fd58e50e1ed2df1a88ea3d
-  data.tar.gz: b8b705ab2250dfeda5953ae36f9e9a45fdeee9f5200aba740f683c64b5e5a3501e8c21a6c85dba6e500ec9fd33c02d47aff78bbefda7383b4906b71b2fc5d8d9
+  metadata.gz: 976568cac60b3cb8ce9ce4d1270630660dd60507447c6e4304336f7c58296204a84acbc4ccc41dc628f17b77180cf5b75a6889d28ce7a3f424aba064a0914183
+  data.tar.gz: b7c07d86fe55bc2722e6730dcd021197d8f98b13e54d0560736bc7e97d57f38bd1bd6da028ee7fc99f5ddb1c5077093094bf2c67205e04a7697e7bcad3f02f0c

data/lib/daisy_ui/alert.rb

@@ -4,16 +4,10 @@ module DaisyUI
   class Alert < Base
     self.component_class = :alert
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, role: :alert, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:alert-info"
       # "@sm:alert-info"

data/lib/daisy_ui/avatar.rb

@@ -4,16 +4,10 @@ module DaisyUI
   class Avatar < Base
     self.component_class = :avatar
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:online"
       # "@sm:online"

data/lib/daisy_ui/avatar_group.rb

@@ -4,16 +4,12 @@ module DaisyUI
   class AvatarGroup < Base
     self.component_class = "avatar-group"
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def avatar(*, **, &)
-      render DaisyUI::Avatar.new(*, **, &)
+    def avatar(...)
+      render DaisyUI::Avatar.new(...)
     end
   end
 end

data/lib/daisy_ui/badge.rb

@@ -12,8 +12,6 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    private
-
     register_modifiers(
       # "sm:badge-neutral"
       # "@sm:badge-neutral"

data/lib/daisy_ui/base.rb

@@ -1,7 +1,41 @@
 # frozen_string_literal: true
 
 module DaisyUI
+  # Base class for all DaisyUI components.
+  #
+  # ## Architecture Overview
+  #
+  # Components accept three types of arguments:
+  # 1. **Modifiers** - Positional symbol arguments that map to DaisyUI CSS classes
+  #    Example: Dropdown.new(:top, :hover) → "dropdown-top dropdown-hover"
+  #
+  # 2. **Options** - Keyword arguments for the component (as:, id:)
+  #    Example: Dropdown.new(as: :div, id: "my-dropdown")
+  #
+  # 3. **Attributes** - Additional keyword arguments for HTML attributes (data:, aria:, class:)
+  #    Example: Dropdown.new(data: {controller: "dropdown"}, class: "my-custom-class")
+  #
+  # ## Key Methods
+  #
+  # - `classes` - Builds the final CSS class string by combining base class,
+  #   modifiers, responsive classes, and user-provided classes. DESTRUCTIVELY
+  #   removes :class from options.
+  #
+  # - `attributes` - Returns the hash of HTML attributes to splat into the element.
+  #   By default includes all remaining options (after :class was removed) plus :id.
+  #   Override in subclasses if different behavior is needed.
+  #
+  # ## Typical Usage Pattern
+  #
+  # In a component's view_template:
+  #   def view_template(&)
+  #     div(class: classes, **attributes, &)
+  #   end
+  #
+  # This renders: <div class="[generated classes]" id="..." data-...="..." ...>
+  #
   class Base < Phlex::HTML
+    BOOLS = [true, false].freeze
     # Shared color modifiers used across multiple components
     # Maps color names to their DaisyUI background/text class combinations
     COLOR_MODIFIERS = {
@@ -105,9 +139,9 @@ module DaisyUI
         super
         subclass.modifiers = (modifiers || {}).dup
         # Inherit component_class if it was explicitly set
-        if instance_variable_defined?(:@component_class)
-          subclass.component_class = @component_class
-        end
+        return unless instance_variable_defined?(:@component_class)
+
+        subclass.component_class = @component_class
       end
 
       def register_modifiers(mods)
@@ -122,7 +156,10 @@ module DaisyUI
       @modifiers = modifiers + boolean_modifiers
       @as = as
       @id = id
+      # Store all keyword arguments (class, data, aria, etc.)
+      # This will be processed by `classes` and `attributes` methods
       @options = options
+      super()
     end
 
     private
@@ -130,6 +167,15 @@ module DaisyUI
     attr_reader :modifiers, :options, :as, :id
 
     # Main extension points - override these in your project!
+
+    # Builds the final CSS class string from:
+    # 1. Component base class (e.g., "dropdown")
+    # 2. Modifier classes (e.g., "dropdown-top")
+    # 3. Responsive classes (e.g., "sm:dropdown-hover")
+    # 4. User-provided classes via `class:` option
+    #
+    # Note: This method DESTRUCTIVELY removes :class from options
+    # so it won't appear again in attributes
     def classes
       merge_classes(
         base_class,
@@ -139,8 +185,15 @@ module DaisyUI
       )
     end
 
+    # Returns the hash of HTML attributes to splat into the element.
+    # By default, includes all options (except :class which was removed by `classes`)
+    # and adds :id if provided.
+    #
+    # Override this method in subclasses if you need different behavior.
+    # For example, Drawer overrides this to exclude :id because it uses
+    # id internally for toggle/overlay elements.
     def attributes
-      merge_attributes(**options)
+      options.dup.merge(id: id).compact
     end
 
     # Simple defaults - easy to override
@@ -149,16 +202,10 @@ module DaisyUI
       result.empty? ? nil : result
     end
 
-    def merge_attributes(**attrs)
-      attrs
-    end
-
     # Core functionality
     def base_class
       # If responsive option includes `true`, base class should only appear with responsive prefix
-      if options[:responsive]&.values&.any? { |mods| Array(mods).include?(true) }
-        return nil
-      end
+      return nil if options[:responsive]&.values&.any? { |mods| Array(mods).include?(true) }
 
       apply_prefix(self.class.component_class&.to_s)
     end
@@ -206,9 +253,7 @@ module DaisyUI
       boolean_mods = []
 
       modifier_keys.each do |key|
-        if options.key?(key) && (options[key] == true || options[key] == false)
-          boolean_mods << key if options.delete(key) == true
-        end
+        boolean_mods << key if options.key?(key) && BOOLS.include?(options[key]) && (options.delete(key) == true)
       end
 
       boolean_mods

data/lib/daisy_ui/breadcrumbs.rb

@@ -4,21 +4,17 @@ module DaisyUI
   class Breadcrumbs < Base
     self.component_class = :breadcrumbs
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes) do
         ul(&)
       end
     end
 
-    def crumb(**opts, &)
-      li(class: component_classes(options: opts), **opts, &)
+    def crumb(**options, &)
+      li(class: component_classes(options: options), **options, &)
     end
-    alias_method :breadcrumb, :crumb
-    alias_method :item, :crumb
+    alias breadcrumb crumb
+    alias item crumb
 
     register_modifiers({})
   end

data/lib/daisy_ui/calendar.rb

@@ -28,8 +28,8 @@ module DaisyUI
 
     attr_reader :type
 
-    def render_cally(&block)
-      calendar_date(class: classes, **attributes, &block)
+    def render_cally(&)
+      calendar_date(class: classes, **attributes, &)
     end
 
     def render_pikaday

data/lib/daisy_ui/card.rb

@@ -12,16 +12,16 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def body(**opts, &)
-      div(class: component_classes("card-body", options: opts), **opts, &)
+    def body(**options, &)
+      div(class: component_classes("card-body", options:), **options, &)
     end
 
-    def title(**opts, &)
-      header(class: component_classes("card-title", options: opts), **opts, &)
+    def title(**options, &)
+      header(class: component_classes("card-title", options:), **options, &)
     end
 
-    def actions(**opts, &)
-      footer(class: component_classes("card-actions", options: opts), **opts, &)
+    def actions(**options, &)
+      footer(class: component_classes("card-actions", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/carousel.rb

@@ -5,16 +5,12 @@ module DaisyUI
   class Carousel < Base
     self.component_class = :carousel
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def item(**opts, &)
-      div(class: component_classes("carousel-item", options: opts), **opts, &)
+    def item(**options, &)
+      div(class: component_classes("carousel-item", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/chat.rb

@@ -5,28 +5,24 @@ module DaisyUI
   class Chat < Base
     self.component_class = :chat
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def image(**opts, &)
-      div(class: component_classes("chat-image", options: opts), **opts, &)
+    def image(**options, &)
+      div(class: component_classes("chat-image", options:), **options, &)
     end
 
-    def header(**opts, &)
-      div(class: component_classes("chat-header", options: opts), **opts, &)
+    def header(**options, &)
+      div(class: component_classes("chat-header", options:), **options, &)
     end
 
-    def bubble(**opts, &)
-      div(class: component_classes("chat-bubble", options: opts), **opts, &)
+    def bubble(**options, &)
+      div(class: component_classes("chat-bubble", options:), **options, &)
     end
 
-    def footer(**opts, &)
-      div(class: component_classes("chat-footer", options: opts), **opts, &)
+    def footer(**options, &)
+      div(class: component_classes("chat-footer", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/collapse.rb

@@ -3,20 +3,18 @@
 module DaisyUI
   # @component html class="collapse"
   class Collapse < Base
-    def initialize(*, as: :div, **)
-      super
-    end
+    self.component_class = :collapse
 
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def title(**opts, &)
-      div(class: component_classes("collapse-title", options: opts), **opts, &)
+    def title(**options, &)
+      div(class: component_classes("collapse-title", options:), **options, &)
     end
 
-    def content(**opts, &)
-      div(class: component_classes("collapse-content", options: opts), **opts, &)
+    def content(**options, &)
+      div(class: component_classes("collapse-content", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/collapsible_sub_menu.rb

@@ -18,12 +18,10 @@ module DaisyUI
       details_attrs[:open] = true if modifiers.include?(:open) || options.delete(:open) == true
 
       details(**details_attrs) do
-        if @title
-          summary do
-            render @title
-          end
-        else
-          raise ArgumentError, "A collapsible submenu requires a title"
+        raise ArgumentError, "A collapsible submenu requires a title" unless @title
+
+        summary do
+          render @title
         end
 
         if @items.any?
@@ -37,18 +35,14 @@ module DaisyUI
     end
 
     def title(&block)
-      if @title
-        raise ArgumentError, "A collapsible submenu can only have one title"
-      else
-        @title = block
-      end
-    end
+      raise ArgumentError, "A collapsible submenu can only have one title" if @title
 
-    def item(*, **, &)
-      @items << MenuItem.new(*, **, &)
+      @title = block
     end
 
-    private
+    def item(...)
+      @items << MenuItem.new(...)
+    end
 
     register_modifiers(COLOR_MODIFIERS)
   end

data/lib/daisy_ui/configurable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DaisyUI
   module Configurable
     def configure

data/lib/daisy_ui/diff.rb

@@ -13,16 +13,16 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def item_1(**opts, &)
-      div(class: component_classes("diff-item-1", options: opts), **opts, &)
+    def item_1(**options, &)
+      div(class: component_classes("diff-item-1", options:), **options, &)
     end
 
-    def item_2(**opts, &)
-      div(class: component_classes("diff-item-2", options: opts), **opts, &)
+    def item_2(**options, &)
+      div(class: component_classes("diff-item-2", options:), **options, &)
     end
 
-    def resizer(**opts, &)
-      div(class: component_classes("diff-resizer", options: opts), **opts, &)
+    def resizer(**options, &)
+      div(class: component_classes("diff-resizer", options:), **options, &)
     end
   end
 end

data/lib/daisy_ui/divider.rb

@@ -5,10 +5,6 @@ module DaisyUI
   class Divider < Base
     self.component_class = :divider
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end

data/lib/daisy_ui/dock.rb

@@ -5,16 +5,12 @@ module DaisyUI
   class Dock < Base
     self.component_class = :dock
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def label(**opts, &)
-      span(class: component_classes("dock-label", options: opts), **opts, &)
+    def label(**options, &)
+      span(class: component_classes("dock-label", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/drawer.rb

@@ -13,21 +13,21 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def toggle(**opts, &)
-      toggle_classes = component_classes("drawer-toggle", options: opts)
-      input(id:, type: :checkbox, class: toggle_classes, **opts, &)
+    def toggle(**options, &)
+      toggle_classes = component_classes("drawer-toggle", options:)
+      input(id:, type: :checkbox, class: toggle_classes, **options, &)
     end
 
     def content(as: :div, **options, &)
-      public_send(as, class: component_classes("drawer-content", options: options), **options, &)
+      public_send(as, class: component_classes("drawer-content", options:), **options, &)
     end
 
     def side(as: :div, **options, &)
-      public_send(as, class: component_classes("drawer-side", options: options), **options, &)
+      public_send(as, class: component_classes("drawer-side", options:), **options, &)
     end
 
     def overlay(**options, &)
-      overlay_classes = component_classes("drawer-overlay", options: options)
+      overlay_classes = component_classes("drawer-overlay", options:)
       label(for: id, class: overlay_classes, **options, &)
     end
 
@@ -37,6 +37,14 @@ module DaisyUI
 
     private
 
+    # Override Base#attributes to exclude :id from the main drawer element.
+    # The Drawer component requires an :id parameter, but it's used internally
+    # to wire up the toggle checkbox, overlay, and button elements - NOT for
+    # the main drawer container.
+    def attributes
+      options
+    end
+
     register_modifiers(
         # "sm:drawer-end"
         # "@sm:drawer-end"

data/lib/daisy_ui/dropdown.rb

@@ -4,12 +4,12 @@ module DaisyUI
   class Dropdown < Base
     self.component_class = :dropdown
 
-    def initialize(*, as: :div, **)
+    def initialize(*modifiers, as: :div, id: nil, **options)
       super
     end
 
     def view_template(&)
-      if modifiers.include?(:tap_to_close)
+      if tap_to_close?
         details(class: classes, **attributes, &)
       else
         public_send(as, class: classes, **attributes, &)
@@ -17,34 +17,36 @@ module DaisyUI
     end
 
     def button(*, **, &)
-      if modifiers.include?(:tap_to_close)
+      if tap_to_close?
         render Button.new(*, as: :summary, **, &)
       else
         render Button.new(*, as: :div, role: :button, tabindex: 0, **, &)
       end
     end
 
-    def content(*, as: :div, **opts, &)
-      content_classes = component_classes("dropdown-content", options: opts)
+    def content(*, as: :div, **options, &)
+      content_classes = component_classes("dropdown-content", options:)
 
-      if modifiers.include?(:tap_to_close)
-        render_as(*, as:, class: content_classes, **opts, &)
+      if tap_to_close?
+        render_as(*, as:, class: content_classes, **options, &)
       else
-        render_as(*, as:, tabindex: 0, class: content_classes, **opts, &)
+        render_as(*, as:, tabindex: 0, class: content_classes, **options, &)
       end
     end
 
-    def menu(*, **opts, &)
-      menu_classes = component_classes("dropdown-content", options: opts)
+    def menu(*, **options, &)
+      menu_classes = component_classes("dropdown-content", options:)
 
-      if modifiers.include?(:tap_to_close)
-        render Menu.new(*, class: menu_classes, **opts, &)
+      if tap_to_close?
+        render Menu.new(*, class: menu_classes, **options, &)
       else
-        render Menu.new(*, tabindex: 0, class: menu_classes, **opts, &)
+        render Menu.new(*, tabindex: 0, class: menu_classes, **options, &)
       end
     end
 
-    private
+    def tap_to_close?
+      modifiers.include?(:tap_to_close)
+    end
 
     register_modifiers(
         # "sm:dropdown-end"

data/lib/daisy_ui/fab.rb

@@ -5,20 +5,16 @@ module DaisyUI
   class Fab < Base
     self.component_class = :fab
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def close(**opts, &)
-      div(class: component_classes("fab-close", options: opts), **opts, &)
+    def close(**options, &)
+      div(class: component_classes("fab-close", options:), **options, &)
     end
 
-    def main_action(**opts, &)
-      div(class: component_classes("fab-main-action", options: opts), **opts, &)
+    def main_action(**options, &)
+      div(class: component_classes("fab-main-action", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/fieldset.rb

@@ -13,8 +13,8 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def legend(**opts, &)
-      super(class: component_classes("fieldset-legend", options: opts), **opts, &)
+    def legend(**options, &)
+      super(class: component_classes("fieldset-legend", options:), **options, &)
     end
   end
 end

data/lib/daisy_ui/filter.rb

@@ -5,17 +5,13 @@ module DaisyUI
   class Filter < Base
     self.component_class = :filter
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end
 
-    def reset(**opts, &)
-      reset_classes = component_classes("filter-reset", options: opts)
-      input(type: :radio, class: reset_classes, **opts, &)
+    def reset(**options, &)
+      reset_classes = component_classes("filter-reset", options:)
+      input(type: :radio, class: reset_classes, **options, &)
     end
   end
 end

data/lib/daisy_ui/footer.rb

@@ -13,8 +13,8 @@ module DaisyUI
       public_send(as, class: classes, **attributes, &)
     end
 
-    def title(**opts, &)
-      div(class: component_classes("footer-title", options: opts), **opts, &)
+    def title(**options, &)
+      div(class: component_classes("footer-title", options:), **options, &)
     end
 
     register_modifiers(

data/lib/daisy_ui/form_control.rb

@@ -4,10 +4,6 @@ module DaisyUI
   class FormControl < Base
     self.component_class = "form-control"
 
-    def initialize(*, as: :div, **)
-      super
-    end
-
     def view_template(&)
       public_send(as, class: classes, **attributes, &)
     end