Merge pull request #85 from PhlexUI/cirdes/remove-attribute-merger

Using mix instead of attribute merger
ruby-ui · Aug 21, 2024 · 7fba0df · 7fba0df
2 parents de4c84f + faec591
commit 7fba0df
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 133 deletions.
diff --git a/lib/phlex_ui/attribute_merger.rb b/lib/phlex_ui/attribute_merger.rb
diff --git a/lib/phlex_ui/base.rb b/lib/phlex_ui/base.rb
@@ -7,7 +7,7 @@ class Base < Phlex::HTML
     attr_reader :attrs
 
     def initialize(**user_attrs)
-      @attrs = PhlexUI::AttributeMerger.new(default_attrs, user_attrs).call
+      @attrs = mix(default_attrs, user_attrs)
       @attrs[:class] = ::TailwindMerge::Merger.new.merge(@attrs[:class]) if @attrs[:class]
     end
 

diff --git a/lib/rbui/attribute_merger.rb b/lib/rbui/attribute_merger.rb
diff --git a/lib/rbui/base.rb b/lib/rbui/base.rb
@@ -7,7 +7,7 @@ class Base < Phlex::HTML
     attr_reader :attrs
 
     def initialize(**user_attrs)
-      @attrs = AttributeMerger.new(default_attrs, user_attrs).call
+      @attrs = mix(default_attrs, user_attrs)
       @attrs[:class] = ::TailwindMerge::Merger.new.merge(@attrs[:class]) if @attrs[:class]
     end
 

diff --git a/lib/rbui/theme_toggle/theme_toggle.rb b/lib/rbui/theme_toggle/theme_toggle.rb
@@ -7,12 +7,12 @@ def view_template(&)
     end
 
     def light_mode(**user_attrs, &)
-      light_attrs = AttributeMerger.new(default_light_attrs, user_attrs).call
+      light_attrs = mix(default_light_attrs, user_attrs)
       div(**light_attrs, &)
     end
 
     def dark_mode(**user_attrs, &)
-      dark_attrs = AttributeMerger.new(default_dark_attrs, user_attrs).call
+      dark_attrs = mix(default_dark_attrs, user_attrs)
       div(**dark_attrs, &)
     end