sdr_view_components 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961d9463dcd2c8acb582e5e97f18c31fff4aa9ec1520456351f6e7aaef232a7e
-  data.tar.gz: 6f75438e29d6c7571cdbd54aef23966323fcc85a31b757e777489f4babd5a59c
+  metadata.gz: 6ed77ab15d611e21337871d3d410b784454ec8e1a356fe91050b2250d7bc7d14
+  data.tar.gz: 10f9d789b3ca10d8b1bef44adf1dbb61639267115340f6d113d08d2d70d54002
 SHA512:
-  metadata.gz: 8de70284a279feae9500bdeb0dabef38e67a8f0433b67d2dfeccbc34f72b78c7703061a3e3fb7ad234148d6d2c0f9738953e01554bed19bfc5f69ce6b13264ce
-  data.tar.gz: 8be397da249a2e0871f80f78e9ae3ee65d237c5437ee3e79dc20b4db9548403bd7802f0f1b397a4d350793f8c688c4e6b08099439098c44b9874ffe924462743
+  metadata.gz: 05475af8c2288f5f14ccfc0590fdb86374f530df207cf3fd82aa877d2377dbc91af5fde8742db8a74b16f6ef3dd1135a03450ec0a0bc083d0e4d4de404656844
+  data.tar.gz: fe4975a4869e202997e972c67999d66f9e729e7edc0e26f68ab83aaa7b6690579b6e0fa06a263f083c42f0fad2e81c1fead6d527235079dedb6fae7ff7c6e0b8

data/app/components/sdr_view_components/elements/navigation/nav_item_component.rb

@@ -5,7 +5,7 @@ module SdrViewComponents
     module Navigation
       # Component for navigation item link.
       class NavItemComponent < BaseComponent
-        def initialize(text:, path:, data: {})
+        def initialize(text:, path: nil, data: {})
           @text = text
           @path = path
           @data = data
@@ -16,7 +16,11 @@ module SdrViewComponents
 
         def call
           tag.li class: 'nav-item' do
-            link_to text, path, class: 'nav-link', data:
+            if path.present?
+              link_to text, path, class: 'nav-link', data:
+            else
+              tag.span text, class: 'nav-link'
+            end
           end
         end
       end

data/app/components/sdr_view_components/elements/toast_component.html.erb

@@ -11,7 +11,9 @@
       ></div>
       <div>
         <div class="fw-semibold"><%= title %> </div>
-        <div><%= text %></div>
+        <% if text.present? %>
+          <div><%= text %></div>
+        <% end %>
       </div>
       <div class="me-2 m-auto">
         <% if close_text.present? %>

data/app/components/sdr_view_components/elements/toast_component.rb

@@ -4,7 +4,7 @@ module SdrViewComponents
   module Elements
     # Component for rendering a toast element.
     class ToastComponent < BaseComponent
-      def initialize(title:, text:, close_text: nil, variant: :black)
+      def initialize(title:, text: nil, close_text: nil, variant: :black)
         @title = title
         @text = text
         @close_text = close_text

data/app/components/sdr_view_components/forms/basic_checkbox_component.rb

@@ -3,18 +3,13 @@
 module SdrViewComponents
   module Forms
     # Component for form checkbox field
-    class BasicCheckboxComponent < BaseComponent
-      def initialize(form:, field_name:, **args)
-        @form = form
-        @field_name = field_name
-        @args = args
-        super()
+    class BasicCheckboxComponent < BasicComponent
+      def call
+        form.check_box field_name, class: classes, **args
       end
 
-      attr_reader :args, :form, :field_name
-
-      def call
-        form.check_box field_name, **args
+      def classes
+        merge_classes('form-check-input', @classes)
       end
     end
   end

data/app/components/sdr_view_components/forms/basic_component.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module SdrViewComponents
+  module Forms
+    # Base component for basic components.
+    class BasicComponent < BaseComponent
+      # Subclasses may override this if additional args, e.g., value, are needed.
+      def initialize(form:, field_name:, classes: [], **args)
+        @form = form
+        @field_name = field_name
+        @args = args
+        @classes = classes
+        super()
+      end
+
+      attr_reader :args, :form, :field_name
+
+      def call
+        raise NotImplementedError, 'Subclasses must implement the call method'
+      end
+
+      # Subclasses can override this to provide default classes, e.g., form-check-input
+      def classes
+        merge_classes(@classes)
+      end
+    end
+  end
+end

data/app/components/sdr_view_components/forms/basic_file_component.rb

@@ -3,18 +3,9 @@
 module SdrViewComponents
   module Forms
     # Component for form file field
-    class BasicFileComponent < BaseComponent
-      def initialize(form:, field_name:, **args)
-        @form = form
-        @field_name = field_name
-        @args = args
-        super()
-      end
-
-      attr_reader :args, :form, :field_name
-
+    class BasicFileComponent < BasicComponent
       def call
-        form.file_field field_name, **args
+        form.file_field field_name, class: classes, **args
       end
     end
   end

data/app/components/sdr_view_components/forms/basic_radio_button_component.rb

@@ -3,19 +3,20 @@
 module SdrViewComponents
   module Forms
     # Component for form radio button field
-    class BasicRadioButtonComponent < BaseComponent
-      def initialize(form:, field_name:, value:, **args)
-        @form = form
-        @field_name = field_name
+    class BasicRadioButtonComponent < BasicComponent
+      def initialize(form:, field_name:, value:, classes: [], **args)
         @value = value
-        @args = args
-        super()
+        super(form:, field_name:, classes:, **args)
       end
 
-      attr_reader :args, :form, :field_name, :value
+      attr_reader :value
 
       def call
-        form.radio_button field_name, value, **args
+        form.radio_button field_name, value, class: classes, **args
+      end
+
+      def classes
+        merge_classes('form-check-input', @classes)
       end
     end
   end

data/app/components/sdr_view_components/forms/basic_text_area_component.rb

@@ -3,18 +3,13 @@
 module SdrViewComponents
   module Forms
     # Component for form text area field
-    class BasicTextAreaComponent < BaseComponent
-      def initialize(form:, field_name:, **args)
-        @form = form
-        @field_name = field_name
-        @args = args
-        super()
+    class BasicTextAreaComponent < BasicComponent
+      def call
+        form.text_area field_name, class: classes, **args
       end
 
-      attr_reader :args, :form, :field_name
-
-      def call
-        form.text_area field_name, **args
+      def classes
+        merge_classes('form-control', @classes)
       end
     end
   end

data/app/components/sdr_view_components/forms/basic_text_field_component.rb

@@ -3,18 +3,13 @@
 module SdrViewComponents
   module Forms
     # Component for form text field
-    class BasicTextFieldComponent < BaseComponent
-      def initialize(form:, field_name:, **args)
-        @form = form
-        @field_name = field_name
-        @args = args
-        super()
+    class BasicTextFieldComponent < BasicComponent
+      def call
+        form.text_field field_name, class: classes, **args
       end
 
-      attr_reader :args, :form, :field_name
-
-      def call
-        form.text_field field_name, **args
+      def classes
+        merge_classes('form-control', @classes)
       end
     end
   end

data/app/components/sdr_view_components/forms/checkbox_component.rb

@@ -5,9 +5,8 @@ module SdrViewComponents
     # Component for form checkbox field
     class CheckboxComponent < FieldComponent
       def initialize(**args)
-        args[:container_class] = merge_classes('form-check', args[:container_class])
-        args[:input_class] = merge_classes('form-check-input', args[:input_class])
-        args[:label_default_class] = merge_classes('form-check-label', args[:input_class])
+        args[:container_classes] = merge_classes('form-check', args[:container_classes])
+        args[:label_default_class] = 'form-check-label'
         super
       end
 

data/app/components/sdr_view_components/forms/field_component.html.erb

@@ -1,6 +1,8 @@
-<%= tag.div **container_args do %>
-  <%= render SdrViewComponents::Forms::LabelComponent.new(form:, field_name:, **label_args) %>
+<%= tag.div class: container_classes, **container_args do %>
+  <%= render SdrViewComponents::Forms::LabelComponent.new(form:, field_name: label_field_name, **label_args) %>
   <%= render SdrViewComponents::Forms::HelpTextComponent.new(**help_text_args) %>
   <%= render input_component %>
   <%= render SdrViewComponents::Forms::InvalidFeedbackComponent.new(form:, field_name:, **error_args) %>
+
+  <%= additional_container_content %>
 <% end %>

data/app/components/sdr_view_components/forms/field_component.rb

@@ -4,12 +4,17 @@ module SdrViewComponents
   module Forms
     # Base component for all form fields.
     class FieldComponent < BaseComponent
-      def initialize(**args)
+      renders_one :additional_container_content
+
+      def initialize(form:, field_name:, container_classes: [], **args)
+        @form = form
+        @field_name = field_name
+        @container_classes = container_classes
         @args = args
         super()
       end
 
-      attr_reader :args
+      attr_reader :form, :args, :field_name
 
       # Any component that inherits from FieldComponent must implement this method
       # or provide its own template.
@@ -57,15 +62,16 @@ module SdrViewComponents
       def label_args
         args_for(args:, prefix: 'label_')
       end
-      ##########################################################################
 
-      def field_name
-        @field_name ||= args.delete(:field_name)
+      # Subclasses may override, e.g., for radio buttons.
+      def label_field_name
+        field_name
       end
 
-      def form
-        @form ||= args.delete(:form)
+      def container_classes
+        merge_classes(@container_classes)
       end
+      ##########################################################################
 
       private
 

data/app/components/sdr_view_components/forms/file_component.rb

@@ -4,13 +4,6 @@ module SdrViewComponents
   module Forms
     # Component for form file field
     class FileComponent < FieldComponent
-      def initialize(**args)
-        args[:container_class] = merge_classes('form-file', args[:container_class])
-        args[:input_class] = merge_classes('form-file-input', args[:input_class])
-        args[:label_default_class] = merge_classes('form-file-label', args[:input_class])
-        super
-      end
-
       def input_component
         SdrViewComponents::Forms::BasicFileComponent.new(form:, field_name:, **input_args)
       end

data/app/components/sdr_view_components/forms/help_text_component.html.erb

@@ -1,3 +1,3 @@
 <div>
-    <%= tag.p id:, class: 'form-text' do %><%= text || content %><% end %>
+    <%= tag.p id:, class: classes, **args do %><%= text || content %><% end %>
 </div>

data/app/components/sdr_view_components/forms/help_text_component.rb

@@ -7,17 +7,23 @@ module SdrViewComponents
     class HelpTextComponent < BaseComponent
       # this component can take plain text via 'help_text' or a block (which can contain html)
       # it will render the help_text if provided, else it will render the block content
-      def initialize(id:, text: nil)
+      def initialize(id:, text: nil, classes: [], **args)
         @text = text
         @id = id
+        @classes = classes
+        @args = args
         super()
       end
 
-      attr_reader :text, :id
+      attr_reader :text, :id, :args
 
       def render?
         text.present? || content.present?
       end
+
+      def classes
+        merge_classes('form-text', @classes)
+      end
     end
   end
 end

data/app/components/sdr_view_components/forms/invalid_feedback_component.rb

@@ -4,18 +4,18 @@ module SdrViewComponents
   module Forms
     # Component for rendering invalid feedback for a form field.
     class InvalidFeedbackComponent < BaseComponent
-      def initialize(field_name:, form:, classes: [], data: {})
+      def initialize(field_name:, form:, classes: [], **args)
         @field_name = field_name
         @form = form
         @classes = classes
-        @data = data
+        @args = args
         super()
       end
 
-      attr_reader :field_name, :form, :data
+      attr_reader :field_name, :form, :args
 
       def call
-        tag.div(class: classes, id:, data:) do
+        tag.div(class: classes, id:, **args) do
           errors.join(', ')
         end
       end

data/app/components/sdr_view_components/forms/radio_button_component.rb

@@ -5,15 +5,25 @@ module SdrViewComponents
     # Component for form radio button field
     class RadioButtonComponent < FieldComponent
       def initialize(**args)
-        args[:container_class] = merge_classes('form-check', args[:container_class])
-        args[:input_class] = merge_classes('form-check-input', args[:input_class])
-        args[:label_default_class] = merge_classes('form-check-label', args[:input_class])
+        args[:container_classes] = merge_classes('form-check', args[:container_classes])
+        args[:label_default_class] = 'form-check-label'
         super
       end
 
       def input_component
         SdrViewComponents::Forms::BasicRadioButtonComponent.new(form:, field_name:, **input_args)
       end
+
+      def label_field_name
+        "#{sanitize(field_name)}_#{sanitize(input_args[:value])}"
+      end
+
+      private
+
+      # From https://github.com/rails/rails/blob/main/actionview/lib/action_view/helpers/form_tag_helper.rb
+      def sanitize(value)
+        value.to_s.delete(']').tr('^-a-zA-Z0-9:.', '_')
+      end
     end
   end
 end

data/app/components/sdr_view_components/forms/text_area_component.rb

@@ -4,12 +4,6 @@ module SdrViewComponents
   module Forms
     # Component for form text area field
     class TextAreaComponent < FieldComponent
-      def initialize(**args)
-        args[:container_class] = merge_classes('form-text', args[:container_class])
-        args[:input_class] = merge_classes('form-control', args[:input_class])
-        super
-      end
-
       def input_component
         SdrViewComponents::Forms::BasicTextAreaComponent.new(form:, field_name:, **input_args)
       end

data/app/components/sdr_view_components/forms/text_field_component.rb

@@ -4,12 +4,6 @@ module SdrViewComponents
   module Forms
     # Component for form text field
     class TextFieldComponent < FieldComponent
-      def initialize(**args)
-        args[:container_class] = merge_classes('field-container', args[:container_class])
-        args[:input_class] = merge_classes('form-control', args[:input_class])
-        super
-      end
-
       def input_component
         SdrViewComponents::Forms::BasicTextFieldComponent.new(form:, field_name:, **input_args)
       end

data/lib/sdr_view_components/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrViewComponents
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sdr_view_components
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Aaron Collier
 bindir: bin
 cert_chain: []
-date: 2025-12-15 00:00:00.000000000 Z
+date: 2025-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,6 +86,7 @@ files:
 - app/components/sdr_view_components/elements/tooltip_component.html.erb
 - app/components/sdr_view_components/elements/tooltip_component.rb
 - app/components/sdr_view_components/forms/basic_checkbox_component.rb
+- app/components/sdr_view_components/forms/basic_component.rb
 - app/components/sdr_view_components/forms/basic_file_component.rb
 - app/components/sdr_view_components/forms/basic_radio_button_component.rb
 - app/components/sdr_view_components/forms/basic_text_area_component.rb