okonomi_ui_kit 0.1.7 → 0.1.9

data/app/helpers/okonomi_ui_kit/components/page.rb

@@ -35,7 +35,7 @@ module OkonomiUiKit
       def render_content
         @template.safe_join(@content_parts)
       end
-      
+
       def to_s
         render_content
       end
@@ -62,7 +62,7 @@ module OkonomiUiKit
       end
 
       def breadcrumbs(&block)
-        @breadcrumbs_content = @template.breadcrumbs(&block)
+        @breadcrumbs_content = @template.ui.breadcrumbs(&block)
       end
 
       def row(&block)
@@ -163,7 +163,7 @@ module OkonomiUiKit
         if block_given?
           # Capture the content first to see if attributes were used
           content = capture { yield(self) }
-          
+
           @body_content = if @attributes.any?
             # If attributes were added, wrap them in dl
             tag.div do
@@ -192,10 +192,10 @@ module OkonomiUiKit
         attribute_html = tag.div(class: "py-6 sm:grid sm:grid-cols-3 sm:gap-4") do
           dt_content = tag.dt(label, class: "text-sm font-medium text-gray-900")
           dd_content = tag.dd(content, class: "mt-1 text-sm/6 text-gray-700 sm:col-span-2 sm:mt-0")
-          
+
           dt_content + dd_content
         end
-        
+
         @attributes << attribute_html
       end
 
@@ -213,7 +213,7 @@ module OkonomiUiKit
 
       def build_header
         return nil unless @title_content || @subtitle_content || @actions_content
-        
+
         tag.div(class: "py-6") do
           if @actions_content
             tag.div(class: "flex w-full justify-between items-start") do
@@ -223,7 +223,7 @@ module OkonomiUiKit
                 content_parts << @subtitle_content if @subtitle_content
                 @template.safe_join(content_parts.compact)
               end
-              
+
               title_section + @actions_content
             end
           else
@@ -244,4 +244,4 @@ module OkonomiUiKit
       end
     end
   end
-end
+end

data/app/helpers/okonomi_ui_kit/components/table.rb

@@ -4,8 +4,8 @@ module OkonomiUiKit
       def render(options = {}, &block)
         options = options.with_indifferent_access
         variant = (options.delete(:variant) || :default).to_sym
-        
-        builder = TableBuilder.new(view, theme, self, variant)
+
+        builder = TableBuilder.new(view, self, variant)
         view.render(template_path, builder: builder, options: options, &block)
       end
 
@@ -48,9 +48,8 @@ module OkonomiUiKit
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::CaptureHelper
 
-      def initialize(template, theme, style_provider, variant = :default)
+      def initialize(template, style_provider, variant = :default)
         @template = template
-        @theme = theme
         @style_provider = style_provider
         @variant = variant
         @current_row_cells = []
@@ -127,8 +126,8 @@ module OkonomiUiKit
           capture(&block)
         else
           tag.div(class: style(:empty_state, :wrapper)) do
-            icon_content = if @template.respond_to?(:svg_icon)
-              @template.svg_icon(icon, class: style(:empty_state, :icon))
+            icon_content = if @template.respond_to?(:ui)
+              @template.ui.icon(icon, class: style(:empty_state, :icon))
             else
               tag.div(class: style(:empty_state, :icon))
             end
@@ -157,7 +156,7 @@ module OkonomiUiKit
 
       def render_th(cell, is_first, is_last)
         align_class = style(:alignment, cell[:align]) || style(:alignment, :left)
-        
+
         position_class = if is_first
           style(:th, :first)
         elsif is_last
@@ -171,7 +170,7 @@ module OkonomiUiKit
           position_class,
           align_class,
           cell[:options][:class]
-        ].compact.join(' ')
+        ].compact.join(" ")
 
         options = cell[:options].except(:class)
         tag.th(cell[:content], scope: cell[:scope], class: classes, **options)
@@ -179,7 +178,7 @@ module OkonomiUiKit
 
       def render_td(cell, is_first, is_last)
         align_class = style(:alignment, cell[:align]) || style(:alignment, :left)
-        
+
         position_class = if is_first
           style(:td, :first)
         elsif is_last
@@ -193,7 +192,7 @@ module OkonomiUiKit
           position_class,
           align_class,
           cell[:options][:class]
-        ].compact.join(' ')
+        ].compact.join(" ")
 
         options = cell[:options].except(:class)
         tag.td(cell[:content], class: classes, **options)

data/app/helpers/okonomi_ui_kit/components/typography.rb

@@ -2,14 +2,14 @@ module OkonomiUiKit
   module Components
     class Typography < OkonomiUiKit::Component
       TYPOGRAPHY_COMPONENTS = {
-        body1: 'p',
-        body2: 'p',
-        h1: 'h1',
-        h2: 'h2',
-        h3: 'h3',
-        h4: 'h4',
-        h5: 'h5',
-        h6: 'h6',
+        body1: "p",
+        body2: "p",
+        h1: "h1",
+        h2: "h2",
+        h3: "h3",
+        h4: "h4",
+        h5: "h5",
+        h6: "h6"
       }.freeze
 
       def render(text = nil, options = {}, &block)
@@ -17,15 +17,15 @@ module OkonomiUiKit
         options ||= {}
         options = options.with_indifferent_access
 
-        variant = (options.delete(:variant) || 'body1').to_sym
-        component = (TYPOGRAPHY_COMPONENTS[variant] || 'span').to_s
-        color = (options.delete(:color) || 'default').to_sym
+        variant = (options.delete(:variant) || "body1").to_sym
+        component = (TYPOGRAPHY_COMPONENTS[variant] || "span").to_s
+        color = (options.delete(:color) || "default").to_sym
 
         classes = [
-          style(:variants, variant) || '',
-          style(:colors, color) || '',
-          options.delete(:class) || ''
-        ].reject(&:blank?).join(' ')
+          style(:variants, variant) || "",
+          style(:colors, color) || "",
+          options.delete(:class) || ""
+        ].reject(&:blank?).join(" ")
 
         view.render(
           template_path,
@@ -65,4 +65,4 @@ module OkonomiUiKit
       end
     end
   end
-end
+end

data/app/helpers/okonomi_ui_kit/components.rb

@@ -0,0 +1,4 @@
+module OkonomiUiKit
+  module Components
+  end
+end

data/app/helpers/okonomi_ui_kit/config.rb

@@ -6,11 +6,15 @@ module OkonomiUiKit
       raise ArgumentError, "Styles must be a Hash" unless styles.is_a?(Hash)
 
       styles_registry[theme] ||= {}
-      styles_registry[theme] = styles_registry[theme].deep_merge(styles)
+      styles_registry[theme] = deep_merge({}, styles_registry[theme], styles)
     end
 
     def self.styles_registry
       @styles_registry ||= {}
     end
+
+    def self.deep_merge(*hashes)
+      OkonomiUiKit::TWMerge.deep_merge_all(*hashes)
+    end
   end
 end

data/app/helpers/okonomi_ui_kit/configs.rb

@@ -0,0 +1,4 @@
+module OkonomiUiKit
+  module Configs
+  end
+end

data/app/helpers/okonomi_ui_kit/form_builder.rb

@@ -7,202 +7,111 @@ module OkonomiUiKit
     end
 
     def field_set(options = {}, &block)
-      @template.render('okonomi/forms/tailwind/field_set', options:, form: self, &block)
+      ui.forms.field_set(self, options, &block)
     end
 
     def field(field_id = nil, options = {}, &block)
-      @template.render('okonomi/forms/tailwind/field', field_id:, options:, form: self, &block)
+      ui.forms.field(self, field_id, options, &block)
     end
 
     def upload_field(method, options = {})
-      @template.render('okonomi/forms/tailwind/upload_field', method:, options:, form: self)
+      ui.forms.upload_field(self, method, options)
     end
 
     def text_field(method, options = {})
-      css = input_field_classes(method, :text, options)
-      super(method, { autocomplete: "off" }.merge(options).merge(class: css))
+      super(*resolve_arguments(:text_field, method, options))
     end
 
     def email_field(method, options = {})
-      css = input_field_classes(method, :email, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:email_field, method, options))
     end
 
     def url_field(method, options = {})
-      css = input_field_classes(method, :url, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:url_field, method, options))
+    end
+
+    def resolve_arguments(component_name, *args)
+      component = ui.forms.resolve_component(component_name)
+
+      if component.nil?
+        args
+      else
+        component.render_arguments(object, *args)
+      end
     end
 
     def password_field(method, options = {})
-      css = input_field_classes(method, :password, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:password_field, method, options))
     end
 
     def number_field(method, options = {})
-      css = input_field_classes(method, :number, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:number_field, method, options))
     end
 
     def telephone_field(method, options = {})
-      css = input_field_classes(method, :telephone_field, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:telephone_field, method, options))
     end
 
     def search_field(method, options = {})
-      css = input_field_classes(method, :search, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:search_field, method, options))
     end
 
     def date_field(method, options = {})
-      css = input_field_classes(method, :date, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:date_field, method, options))
     end
 
     def datetime_local_field(method, options = {})
-      css = input_field_classes(method, :datetime_local, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:datetime_local_field, method, options))
     end
 
     def time_field(method, options = {})
-      css = input_field_classes(method, :time, options)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:time_field, method, options))
     end
 
     def text_area(method, options = {})
-      css = input_field_classes(method, :textarea, options, include_disabled: false)
-      super(method, options.merge(class: css))
+      super(*resolve_arguments(:text_area, method, options))
     end
 
     def select(method, choices = nil, options = {}, html_options = {}, &block)
-      css = [
-        ui.get_theme.dig(:components, :select, :root),
-        when_errors(
-          method,
-          ui.get_theme.dig(:components, :select, :error),
-          ui.get_theme.dig(:components, :select, :valid)
-        ),
-        html_options[:class]
-      ].compact.join(' ').split(' ').uniq
-
-      select_html = super(method, choices, options, html_options.merge(class: css), &block)
-      icon_html = @template.svg_icon(
-        ui.get_theme.dig(:components, :select, :icon, :file),
-        class: ui.get_theme.dig(:components, :select, :icon, :class)
-      )
-
-      @template.content_tag(:div, class: ui.get_theme.dig(:components, :select, :wrapper)) do
-        @template.concat(select_html)
-        @template.concat(icon_html)
-      end
+      ui.forms.select(self, method, choices, options, html_options, &block)
     end
 
     def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
-      css = [
-        ui.get_theme.dig(:components, :select, :root),
-        when_errors(
-          method,
-          ui.get_theme.dig(:components, :select, :error),
-          ui.get_theme.dig(:components, :select, :valid)
-        ),
-        html_options[:class]
-      ].compact.join(' ').split(' ').uniq
-
-      select_html = super(method, collection, value_method, text_method, options, html_options.merge(class: css))
-      icon_html = @template.svg_icon(
-        ui.get_theme.dig(:components, :select, :icon, :file),
-        class: ui.get_theme.dig(:components, :select, :icon, :class)
-      )
-
-      @template.content_tag(:div, class: ui.get_theme.dig(:components, :select, :wrapper)) do
-        @template.concat(select_html)
-        @template.concat(icon_html)
-      end
+      ui.forms.collection_select(self, method, collection, value_method, text_method, options, html_options)
     end
 
     def multi_select(method, **options)
-      @template.render(
-        partial: 'okonomi/forms/tailwind/multi_select',
-        locals: {
-          form: self,
-          method: method,
-          options: options
-        }
-      )
+      ui.forms.multi_select(self, method, options)
     end
 
     def label(method, text = nil, options = {}, &block)
-      base_classes = ui.get_theme.dig(:components, :label, :root)
-      super(method, text, merge_class(options, base_classes), &block)
+      ui.forms.label(self, method, text, options, &block)
     end
 
     def submit(value = nil, options = {})
-      variant = options.delete(:variant) || 'contained'
-      color = options.delete(:color) || 'primary'
+      value, options = nil, value if value.is_a?(Hash)
+      value ||= submit_default_value
 
-      base_classes = ui.button_class(variant:, color:)
-      super(value, merge_class(options, base_classes))
+      options ||= {}
+      options[:type] = "submit"
+      options[:variant] ||= "contained"
+      options[:color] ||= "primary"
+
+      ui.button_tag(value, options)
     end
 
     def check_box_with_label(method, options = {}, checked_value = true, unchecked_value = false)
-      @template.content_tag(:div, class: ui.get_theme.dig(:components, :checkbox, :wrapper)) do
-        @template.concat check_box(
-                           method,
-                           {
-                             class: ui.get_theme.dig(:components, :checkbox, :input, :root)
-                           }.merge(options || {}),
-                           checked_value,
-                           unchecked_value
-                         )
-        @template.concat @template.render('okonomi/forms/tailwind/checkbox_label', method:, options:, form: self)
-      end
+      ui.forms.check_box_with_label(self, method, options, checked_value, unchecked_value)
     end
 
     def show_if(field:, equals:, &block)
-      field_id = "#{object_name}_#{field}"
-      @template.tag.div(
-        class: "hidden",
-        data: {
-          controller: "form-field-visibility",
-          "form-field-visibility-field-id-value": field_id,
-          "form-field-visibility-equals-value": equals
-        },
-        &block
-      )
+      ui.forms.show_if(self, field: field, equals: equals, &block)
     end
 
     private
 
-    def input_field_classes(method, type, options, include_disabled: true)
-      css_classes = [
-        ui.get_theme.dig(:components, :input, :types, type, :root) || ui.get_theme.dig(:components, :input, :types, :text, :root),
-        when_errors(
-          method,
-          ui.get_theme.dig(:components, :input, :types, type, :error) || ui.get_theme.dig(:components, :input, :types, :text, :error),
-          ui.get_theme.dig(:components, :input, :types, type, :valid) || ui.get_theme.dig(:components, :input, :types, :text, :valid)
-        ),
-        options[:class]
-      ]
-
-      if include_disabled
-        css_classes << (
-          ui.get_theme.dig(:components, :input, :types, type, :disabled) || ui.get_theme.dig(:components, :input, :types, :text, :disabled)
-        )
-      end
-
-      css_classes.compact.join(' ').split(' ').uniq
-    end
-
-    def when_errors(method, value, default_value = nil)
-      key = method.to_s.gsub('_id', '').to_sym
-      if object.errors.include?(key) || object.errors.include?(method)
-        value
-      else
-        default_value
-      end
-    end
-
     def merge_class(options, new_class)
-      options[:class] = [options[:class], new_class].compact.join(" ")
+      options[:class] = OkonomiUiKit::TWMerge.merge(options[:class] || "", new_class)
       options
     end
   end

data/app/helpers/okonomi_ui_kit/form_component.rb

@@ -0,0 +1,7 @@
+module OkonomiUiKit
+  class FormComponent < Component
+    def self.namespace
+      OkonomiUiKit::Components::Forms
+    end
+  end
+end

data/app/helpers/okonomi_ui_kit/svg_icons.rb

@@ -13,16 +13,16 @@ module OkonomiUiKit
 
   def self.file_path(name)
     # First check in the host application
-    host_path = Rails.root.join('app', 'assets', 'images', "#{name}.svg")
+    host_path = Rails.root.join("app", "assets", "images", "#{name}.svg")
     return host_path if File.exist?(host_path)
-    
+
     # Fall back to the engine's icons
-    engine_path = OkonomiUiKit::Engine.root.join('app', 'assets', 'images', "#{name}.svg")
+    engine_path = OkonomiUiKit::Engine.root.join("app", "assets", "images", "#{name}.svg")
     return engine_path if File.exist?(engine_path)
-    
+
     nil
   end
-  
+
   # Deprecated, kept for backwards compatibility
   def self.file_name(name)
     file_path(name)

data/app/helpers/okonomi_ui_kit/t_w_merge.rb

@@ -0,0 +1,114 @@
+module OkonomiUiKit
+  class TWMerge
+    # ---- Public API -----------------------------------------------------------
+
+    # Merge two Tailwind class strings with conflict resolution.
+    def self.merge(a, b)
+      tokens = "#{a} #{b}".split(/\s+/).reject(&:empty?)
+      result = []
+      index_by_key = {}
+
+      tokens.each do |tok|
+        variants, base = split_variants(tok)
+        group = conflict_group_for(base)
+        key = [ variants, group || "literal:#{base}" ]
+
+        if index_by_key.key?(key)
+          pos = index_by_key[key]
+          result[pos] = tok
+        else
+          index_by_key[key] = result.length
+          result << tok
+        end
+      end
+
+      result.join(" ")
+    end
+
+    def self.merge_all(*args)
+      args.compact.reduce do |merged, arg|
+        merge(merged, arg)
+      end
+    end
+
+    # Deep-merge two hashes; when both values are strings, merge as Tailwind classes.
+    # For other types, the right-hand value wins unless it is nil.
+    def self.deep_merge(a, b)
+      if a.is_a?(Hash) && b.is_a?(Hash)
+        (a.keys | b.keys).each_with_object({}) do |k, h|
+          h[k] = deep_merge(a[k], b[k])
+        end
+      elsif a.is_a?(String) && b.is_a?(String)
+        merge(a, b)
+      else
+        b.nil? ? a : b
+      end
+    end
+
+    def self.deep_merge_all(*hashes)
+      hashes.reduce({}) do |result, hash|
+        if hash.is_a?(Hash)
+          deep_merge(result, hash)
+        else
+          raise ArgumentError, "All arguments must be Hashes"
+        end
+      end
+    end
+
+    # ---- Implementation details ----------------------------------------------
+
+    # Conflict groups (minimal, extensible). More specific patterns first.
+    CONFLICT_RULES = [
+      # Typography
+      [ /^text-(?:xs|sm|base|lg|xl|\d+xl|\[\S+\])$/, :text_size ],
+      [ /^text-(?:inherit|current|transparent|black|white|[a-z]+-\d{2,3}|[a-z]+-950|\[.+\])$/, :text_color ],
+      [ /^font-(?:thin|extralight|light|normal|medium|semibold|bold|extrabold|black)$/, :font_weight ],
+      [ /^leading-(?:none|tight|snug|normal|relaxed|loose|\d+|\[.+\])$/, :line_height ],
+      [ /^tracking-(?:tighter|tight|normal|wide|widest|\[.+\])$/, :letter_spacing ],
+
+      # Display & position
+      [ /^(?:hidden|block|inline|inline-block|flex|inline-flex|grid|inline-grid|table|inline-table|flow-root)$/, :display ],
+      [ /^(?:static|fixed|absolute|relative|sticky)$/, :position ],
+
+      # Flexbox
+      [ /^flex-(?:row|col|row-reverse|col-reverse)$/, :flex_direction ],
+      [ /^flex-(?:wrap|nowrap|wrap-reverse)$/, :flex_wrap ],
+      [ /^items-(?:start|end|center|baseline|stretch)$/, :align_items ],
+      [ /^justify-(?:start|end|center|between|around|evenly)$/, :justify_content ],
+
+      # Borders
+      [ /^(?:border|border-(?:\d+|\[\S+\]))$/, :border_width_overall ],
+      [ /^border-[trblxy](?:-\d+|\[\S+\])?$/, :border_width_side ],
+      [ /^border-(?:solid|dashed|dotted|double|none)$/, :border_style ],
+      [ /^border-(?:inherit|current|transparent|black|white|[a-z]+-\d{2,3}|[a-z]+-950|\[.+\])$/, :border_color ],
+
+      # Radius
+      [ /^rounded(?:-(?:none|sm|md|lg|xl|2xl|3xl|full|\[.+\]))?$/, :rounded_overall ],
+      [ /^rounded-(?:t|r|b|l|tl|tr|br|bl)-(?:none|sm|md|lg|xl|2xl|3xl|full|\[.+\])$/, :rounded_corner ],
+
+      # Background
+      [ /^bg-(?:inherit|current|transparent|black|white|[a-z]+-\d{2,3}|[a-z]+-950|\[.+\])$/, :bg_color ],
+
+      # Overflow & opacity
+      [ /^overflow-(?:auto|hidden|visible|scroll|clip)$/, :overflow ],
+      [ /^overflow-[xy]-(?:auto|hidden|visible|scroll|clip)$/, :overflow_axis ],
+      [ /^opacity-(?:\d{1,3}|\[.+\])$/, :opacity ]
+    ].freeze
+
+    class << self
+      private
+
+      # "sm:hover:text-lg" -> ["sm:hover", "text-lg"]
+      def split_variants(token)
+        parts = token.split(":")
+        return [ "", token ] if parts.size == 1
+        [ parts[0..-2].join(":"), parts[-1] ]
+      end
+
+      def conflict_group_for(base)
+        rule = CONFLICT_RULES.find { |(rx, _)| base.match?(rx) }
+        rule ? rule[1] : nil
+      end
+    end
+  end
+end