hakumi_components 0.1.18.pre → 0.1.19.pre

data/app/components/hakumi_components/modal/confirm/component.rb

@@ -1,26 +1,66 @@
+# typed: strict
 # frozen_string_literal: true
 
 module HakumiComponents
   module Modal
     module Confirm
       class Component < HakumiComponents::BaseComponent
+        extend T::Sig
+
+        Type = T.type_alias { T.any(Symbol, String) }
+        TYPES = T.let(%i[confirm info success error warning].freeze, T::Array[Symbol])
+
+        sig do
+          params(
+            params: T.any(ActionController::Parameters, HakumiComponents::Types::HtmlAttributes)
+          ).returns(HakumiComponents::Types::HtmlAttributes)
+        end
+        def self.extract_controller_locals(params)
+          {
+            open: boolean_html_param(html_param(params, :open)),
+            title: html_primitive_param(html_param(params, :title)),
+            type: symbol_html_param(html_param(params, :type))
+          }.compact
+        end
+
+        sig do
+          params(
+            id: String,
+            open: T::Boolean,
+            title: HakumiComponents::Types::Renderable,
+            type: Type,
+            html_options: HakumiComponents::Types::HtmlAttributeValue
+          ).void
+        end
         def initialize(
           id:,
           open: false,
-          title: "Confirm",
+          title: nil,
           type: :confirm,
-          **html_attributes
+          **html_options
         )
-          @id = id
-          @open = open
-          @title = title
-          @type = type
-          @html_attributes = html_attributes
-          super()
+          @id = T.let(id, String)
+          @open = T.let(cast_boolean(open) ? true : false, T::Boolean)
+          @title = T.let(title, HakumiComponents::Types::Renderable)
+          @type = T.let(type.to_sym, Symbol)
+          @html_options = T.let(html_options, HakumiComponents::Types::HtmlAttributes)
+
+          validate_props!
+        end
+
+        sig { returns(HakumiComponents::Types::Renderable) }
+        def resolved_title
+          @title || t_default(:title, default: "Confirm")
         end
 
         private
 
+        sig { void }
+        def validate_props!
+          validate_inclusion!(:type, TYPES)
+        end
+
+        sig { returns(Symbol) }
         def icon_name
           case @type
           when :info then :info_circle
@@ -31,6 +71,7 @@ module HakumiComponents
           end
         end
 
+        sig { returns(String) }
         def icon_color
           case @type
           when :info then "#1890ff"

data/app/components/hakumi_components/modal/error/component.rb

@@ -1,50 +1,19 @@
+# typed: strict
 # frozen_string_literal: true
 
 module HakumiComponents
   module Modal
     module Error
-      class Component < HakumiComponents::BaseComponent
-        def initialize(
-          id:,
-          title: "Error",
-          message: nil,
-          open: false,
-          ok_text: "OK",
-          **html_attributes
-        )
-          @id = id
-          @title = title
-          @message = message
-          @open = open
-          @ok_text = ok_text
-          @html_attributes = html_attributes
-          super()
-        end
+      class Component < HakumiComponents::Modal::StatusComponent
+        extend T::Sig
 
-        def call
-          render(HakumiComponents::Modal::Component.new(
-            id: @id,
-            open: @open,
-            closable: false,
-            mask_closable: false,
-            **@html_attributes
-          )) do |modal|
-            modal.with_header { @title }
+        private
 
-            modal.with_footer do
-              render(HakumiComponents::Button::Component.new(type: :primary, danger: true, data: { "hakumi-action": "close" })) { @ok_text }
-            end
+        sig { override.returns(Symbol) }
+        def status_type = :error
 
-            content_tag(:div, class: "hakumi-modal-confirm-body-wrapper") do
-              safe_join([
-                render(HakumiComponents::Icon::Component.new(name: :close_circle, theme: :filled, color: "#ff4d4f", size: 22)),
-                content_tag(:div, class: "hakumi-modal-confirm-content") do
-                  content_tag(:p, @message || content)
-                end
-              ])
-            end
-          end
-        end
+        sig { override.returns(T::Boolean) }
+        def ok_button_danger? = true
       end
     end
   end

data/app/components/hakumi_components/modal/info/component.rb

@@ -1,50 +1,16 @@
+# typed: strict
 # frozen_string_literal: true
 
 module HakumiComponents
   module Modal
     module Info
-      class Component < HakumiComponents::BaseComponent
-        def initialize(
-          id:,
-          title: "Info",
-          message: nil,
-          open: false,
-          ok_text: "OK",
-          **html_attributes
-        )
-          @id = id
-          @title = title
-          @message = message
-          @open = open
-          @ok_text = ok_text
-          @html_attributes = html_attributes
-          super()
-        end
+      class Component < HakumiComponents::Modal::StatusComponent
+        extend T::Sig
 
-        def call
-          render(HakumiComponents::Modal::Component.new(
-            id: @id,
-            open: @open,
-            closable: false,
-            mask_closable: false,
-            **@html_attributes
-          )) do |modal|
-            modal.with_header { @title }
+        private
 
-            modal.with_footer do
-              render(HakumiComponents::Button::Component.new(type: :primary, data: { "hakumi-action": "close" })) { @ok_text }
-            end
-
-            content_tag(:div, class: "hakumi-modal-confirm-body-wrapper") do
-              safe_join([
-                render(HakumiComponents::Icon::Component.new(name: :info_circle, theme: :filled, color: "#1890ff", size: 22)),
-                content_tag(:div, class: "hakumi-modal-confirm-content") do
-                  content_tag(:p, @message || content)
-                end
-              ])
-            end
-          end
-        end
+        sig { override.returns(Symbol) }
+        def status_type = :info
       end
     end
   end

data/app/components/hakumi_components/modal/status_component.rb

@@ -0,0 +1,150 @@
+# typed: strict
+# frozen_string_literal: true
+
+module HakumiComponents
+  module Modal
+    class StatusComponent < HakumiComponents::BaseComponent
+      extend T::Sig
+
+      IconConfig = T.type_alias { [ Symbol, String ] }
+      ICON_CONFIG = T.let({
+        info: [ :info_circle, "#1890ff" ],
+        success: [ :check_circle, "#52c41a" ],
+        error: [ :close_circle, "#ff4d4f" ],
+        warning: [ :warning, "#faad14" ]
+      }.freeze, T::Hash[Symbol, IconConfig])
+
+      sig do
+        params(
+          id: String,
+          title: HakumiComponents::Types::Renderable,
+          message: HakumiComponents::Types::Renderable,
+          open: T::Boolean,
+          ok_text: T.nilable(String),
+          cancel_text: T.nilable(String),
+          html_options: HakumiComponents::Types::HtmlAttributeValue
+        ).void
+      end
+      def initialize(
+        id:,
+        title: nil,
+        message: nil,
+        open: false,
+        ok_text: nil,
+        cancel_text: nil,
+        **html_options
+      )
+        @id = T.let(id, String)
+        @title = T.let(title, HakumiComponents::Types::Renderable)
+        @message = T.let(message, HakumiComponents::Types::Renderable)
+        @open = T.let(cast_boolean(open) ? true : false, T::Boolean)
+        @ok_text = ok_text
+        @cancel_text = cancel_text
+        @html_options = T.let(html_options, HakumiComponents::Types::HtmlAttributes)
+      end
+
+      sig { returns(ActiveSupport::SafeBuffer) }
+      def call
+        modal = HakumiComponents::Modal::Component.new(
+          id: @id,
+          title: resolved_title,
+          open: @open,
+          closable: false,
+          mask_closable: false,
+          **@html_options
+        )
+        modal.with_footer { footer_buttons }
+
+        render(modal) do
+          content_tag(:div, class: "hakumi-modal-confirm-body-wrapper") do
+            safe_join([
+              icon_element,
+              content_element
+            ])
+          end
+        end
+      end
+
+      private
+
+      sig { returns(Symbol) }
+      def status_type
+        raise NotImplementedError, "subclasses must define status_type"
+      end
+
+      sig { returns(IconConfig) }
+      def icon_config
+        ICON_CONFIG.fetch(status_type)
+      end
+
+      sig { returns(HakumiComponents::Types::Renderable) }
+      def resolved_title
+        @title || t_default(:title, default: status_type.to_s.capitalize)
+      end
+
+      sig { returns(String) }
+      def resolved_ok_text
+        @ok_text || t_default(:ok, default: default_ok_text)
+      end
+
+      sig { returns(String) }
+      def resolved_cancel_text
+        @cancel_text || t_default(:cancel, default: "Cancel")
+      end
+
+      sig { returns(String) }
+      def default_ok_text
+        "OK"
+      end
+
+      sig { returns(T::Boolean) }
+      def show_cancel?
+        false
+      end
+
+      sig { returns(Symbol) }
+      def ok_button_type
+        :primary
+      end
+
+      sig { returns(T::Boolean) }
+      def ok_button_danger?
+        false
+      end
+
+      sig { returns(String) }
+      def ok_button_action
+        "close"
+      end
+
+      sig { returns(ActiveSupport::SafeBuffer) }
+      def footer_buttons
+        buttons = T.let([], T::Array[ActiveSupport::SafeBuffer])
+        if show_cancel?
+          buttons << render(HakumiComponents::Button::Component.new(data: { "hakumi-action": "cancel" })) { resolved_cancel_text }
+        end
+        buttons << render(
+          HakumiComponents::Button::Component.new(
+            type: ok_button_type,
+            danger: ok_button_danger?,
+            data: { "hakumi-action": ok_button_action }
+          )
+        ) { resolved_ok_text }
+        safe_join(buttons)
+      end
+
+      sig { returns(ActiveSupport::SafeBuffer) }
+      def icon_element
+        name, color = icon_config
+        render(HakumiComponents::Icon::Component.new(name: name, theme: :filled, color: color, size: 22))
+      end
+
+      sig { returns(ActiveSupport::SafeBuffer) }
+      def content_element
+        content_tag(:div, class: "hakumi-modal-confirm-content") do
+          content_tag(:p, render_value(@message || content))
+        end
+      end
+    end
+  end
+end

data/app/components/hakumi_components/modal/success/component.rb

@@ -1,50 +1,16 @@
+# typed: strict
 # frozen_string_literal: true
 
 module HakumiComponents
   module Modal
     module Success
-      class Component < HakumiComponents::BaseComponent
-        def initialize(
-          id:,
-          title: "Success",
-          message: nil,
-          open: false,
-          ok_text: "OK",
-          **html_attributes
-        )
-          @id = id
-          @title = title
-          @message = message
-          @open = open
-          @ok_text = ok_text
-          @html_attributes = html_attributes
-          super()
-        end
+      class Component < HakumiComponents::Modal::StatusComponent
+        extend T::Sig
 
-        def call
-          render(HakumiComponents::Modal::Component.new(
-            id: @id,
-            open: @open,
-            closable: false,
-            mask_closable: false,
-            **@html_attributes
-          )) do |modal|
-            modal.with_header { @title }
+        private
 
-            modal.with_footer do
-              render(HakumiComponents::Button::Component.new(type: :primary, data: { "hakumi-action": "close" })) { @ok_text }
-            end
-
-            content_tag(:div, class: "hakumi-modal-confirm-body-wrapper") do
-              safe_join([
-                render(HakumiComponents::Icon::Component.new(name: :check_circle, theme: :filled, color: "#52c41a", size: 22)),
-                content_tag(:div, class: "hakumi-modal-confirm-content") do
-                  content_tag(:p, @message || content)
-                end
-              ])
-            end
-          end
-        end
+        sig { override.returns(Symbol) }
+        def status_type = :success
       end
     end
   end

data/app/components/hakumi_components/modal/warning/component.rb

@@ -1,55 +1,25 @@
+# typed: strict
 # frozen_string_literal: true
 
 module HakumiComponents
   module Modal
     module Warning
-      class Component < HakumiComponents::BaseComponent
-        def initialize(
-          id:,
-          title: "Warning",
-          message: nil,
-          open: false,
-          ok_text: "Proceed",
-          cancel_text: "Cancel",
-          **html_attributes
-        )
-          @id = id
-          @title = title
-          @message = message
-          @open = open
-          @ok_text = ok_text
-          @cancel_text = cancel_text
-          @html_attributes = html_attributes
-          super()
-        end
+      class Component < HakumiComponents::Modal::StatusComponent
+        extend T::Sig
 
-        def call
-          render(HakumiComponents::Modal::Component.new(
-            id: @id,
-            open: @open,
-            closable: false,
-            mask_closable: false,
-            **@html_attributes
-          )) do |modal|
-            modal.with_header { @title }
+        private
 
-            modal.with_footer do
-              safe_join([
-                render(HakumiComponents::Button::Component.new(data: { "hakumi-action": "cancel" })) { @cancel_text },
-                render(HakumiComponents::Button::Component.new(type: :primary, data: { "hakumi-action": "confirm" })) { @ok_text }
-              ])
-            end
+        sig { override.returns(Symbol) }
+        def status_type = :warning
 
-            content_tag(:div, class: "hakumi-modal-confirm-body-wrapper") do
-              safe_join([
-                render(HakumiComponents::Icon::Component.new(name: :warning, theme: :filled, color: "#faad14", size: 22)),
-                content_tag(:div, class: "hakumi-modal-confirm-content") do
-                  content_tag(:p, @message || content)
-                end
-              ])
-            end
-          end
-        end
+        sig { override.returns(String) }
+        def default_ok_text = "Proceed"
+
+        sig { override.returns(T::Boolean) }
+        def show_cancel? = true
+
+        sig { override.returns(String) }
+        def ok_button_action = "confirm"
       end
     end
   end

data/app/components/hakumi_components/notification/component.rb

@@ -1,32 +1,61 @@
+# typed: strict
 # frozen_string_literal: true
 
 module HakumiComponents
   module Notification
     class Component < HakumiComponents::BaseComponent
-      TYPES = %i[success info warning error].freeze
-      PLACEMENTS = %w[top topLeft topRight bottom bottomLeft bottomRight].freeze
+      extend T::Sig
 
-      # Extracts locals from controller params for dynamic rendering
+      Type = T.type_alias { T.any(Symbol, String) }
+      Placement = T.type_alias { T.any(Symbol, String) }
+      TYPES = T.let(%i[success info warning error].freeze, T::Array[Symbol])
+      PLACEMENTS = T.let(%i[top topLeft topRight bottom bottomLeft bottomRight].freeze, T::Array[Symbol])
+
+      sig do
+        params(
+          params: T.any(ActionController::Parameters, HakumiComponents::Types::HtmlAttributes)
+        ).returns(HakumiComponents::Types::HtmlAttributes)
+      end
       def self.extract_controller_locals(params)
         {
-          title: params[:title].presence || params[:message].presence,
-          description: params[:description].presence,
-          type: params[:type]&.to_sym,
-          duration: params[:duration]&.to_f,
-          key: params[:key],
-          placement: params[:placement],
-          icon: params[:icon],
-          close_icon: params[:close_icon],
-          btn: params[:btn],
-          max_count: params[:max_count]&.to_i,
-          top: params[:top]&.to_i,
-          bottom: params[:bottom]&.to_i,
-          pause_on_hover: ActiveModel::Type::Boolean.new.cast(params[:pause_on_hover]),
-          show_progress: ActiveModel::Type::Boolean.new.cast(params[:show_progress]),
-          stack_threshold: params[:stack_threshold]&.to_i
+          title: html_primitive_param(html_param(params, :title)) || html_primitive_param(html_param(params, :message)),
+          description: html_primitive_param(html_param(params, :description)),
+          type: symbol_html_param(html_param(params, :type)),
+          duration: float_html_param(html_param(params, :duration)),
+          key: html_primitive_param(html_param(params, :key)),
+          placement: symbol_html_param(html_param(params, :placement)),
+          icon: html_primitive_param(html_param(params, :icon)),
+          close_icon: html_primitive_param(html_param(params, :close_icon)),
+          btn: html_primitive_param(html_param(params, :btn)),
+          max_count: integer_html_param(html_param(params, :max_count)),
+          top: integer_html_param(html_param(params, :top)),
+          bottom: integer_html_param(html_param(params, :bottom)),
+          pause_on_hover: boolean_html_param(html_param(params, :pause_on_hover)),
+          show_progress: boolean_html_param(html_param(params, :show_progress)),
+          stack_threshold: integer_html_param(html_param(params, :stack_threshold))
         }
       end
 
+      sig do
+        params(
+          title: HakumiComponents::Types::HtmlPrimitive,
+          description: HakumiComponents::Types::HtmlPrimitive,
+          type: T.nilable(Type),
+          duration: T.nilable(Float),
+          key: HakumiComponents::Types::HtmlPrimitive,
+          placement: T.nilable(Placement),
+          icon: HakumiComponents::Types::HtmlPrimitive,
+          close_icon: HakumiComponents::Types::HtmlPrimitive,
+          btn: HakumiComponents::Types::HtmlPrimitive,
+          max_count: T.nilable(Integer),
+          top: T.nilable(Integer),
+          bottom: T.nilable(Integer),
+          pause_on_hover: T.nilable(T::Boolean),
+          show_progress: T.nilable(T::Boolean),
+          stack_threshold: T.nilable(Integer),
+          html_options: HakumiComponents::Types::HtmlAttributeValue
+        ).void
+      end
       def initialize(
         title: nil,
         description: nil,
@@ -45,40 +74,42 @@ module HakumiComponents
         stack_threshold: nil,
         **html_options
       )
-        @title = title
-        @description = description
-        @type = type
-        @duration = duration
-        @key = key
-        @placement = placement
-        @icon = icon
-        @close_icon = close_icon
-        @btn = btn
-        @max_count = max_count
-        @top = top
-        @bottom = bottom
-        @pause_on_hover = pause_on_hover
-        @show_progress = show_progress
-        @stack_threshold = stack_threshold
-        @html_options = html_options
+        @title = T.let(title, HakumiComponents::Types::HtmlPrimitive)
+        @description = T.let(description, HakumiComponents::Types::HtmlPrimitive)
+        @type = T.let(type&.to_sym, T.nilable(Symbol))
+        @duration = T.let(duration, T.nilable(Float))
+        @key = T.let(key, HakumiComponents::Types::HtmlPrimitive)
+        @placement = T.let(placement&.to_sym, T.nilable(Symbol))
+        @icon = T.let(icon, HakumiComponents::Types::HtmlPrimitive)
+        @close_icon = T.let(close_icon, HakumiComponents::Types::HtmlPrimitive)
+        @btn = T.let(btn, HakumiComponents::Types::HtmlPrimitive)
+        @max_count = T.let(max_count, T.nilable(Integer))
+        @top = T.let(top, T.nilable(Integer))
+        @bottom = T.let(bottom, T.nilable(Integer))
+        @pause_on_hover = T.let(pause_on_hover, T.nilable(T::Boolean))
+        @show_progress = T.let(show_progress, T.nilable(T::Boolean))
+        @stack_threshold = T.let(stack_threshold, T.nilable(Integer))
+        @html_options = T.let(html_options, HakumiComponents::Types::HtmlAttributes)
 
         validate_props!
       end
 
+      sig { returns(HakumiComponents::Types::HtmlAttributes) }
       def root_attributes
         base_attrs = {
           id: "notification",
-          class: class_names("notification", {}, [ @html_options[:class] ]),
+          class: component_classes("notification", {}, @html_options),
           data: data_attributes
         }
 
         merge_attributes(base_attrs, @html_options)
       end
 
+      sig { returns(HakumiComponents::Types::DataAttributes) }
       def data_attributes
-        attrs = {
+        attrs = T.let({
           controller: "hakumi--notification"
-        }
+        }, HakumiComponents::Types::DataAttributes)
 
         attrs[:hakumi__notification_duration_value] = @duration unless @duration.nil?
         attrs[:hakumi__notification_max_count_value] = @max_count unless @max_count.nil?
@@ -95,12 +126,14 @@ module HakumiComponents
         attrs
       end
 
+      sig { returns(ActiveSupport::SafeBuffer) }
       def call
-        tag.div(**root_attributes)
+        content_tag(:div, nil, root_attributes)
       end
 
       private
 
+      sig { returns(HakumiComponents::Types::StimulusValues) }
       def initial_payload
         {
           title: @title,
@@ -117,6 +150,7 @@ module HakumiComponents
         }.compact
       end
 
+      sig { void }
       def validate_props!
         validate_inclusion!(:type, TYPES)
         validate_inclusion!(:placement, PLACEMENTS)