hakumi_components 0.1.18.pre → 0.1.19.pre

data/app/components/hakumi_components/typography/link/component.rb

@@ -1,26 +1,83 @@
+# typed: strict
 # frozen_string_literal: true
 
 module HakumiComponents
   module Typography
     module Link
       class Component < BaseComponent
-        def initialize(href:, target: nil, rel: nil, **html_options)
-          @href = href
-          @target = target
-          @rel = rel
-          super(**html_options)
+        extend T::Sig
+
+        sig do
+          params(
+            href: String,
+            target: T.nilable(String),
+            rel: T.nilable(String),
+            type: T.nilable(Symbol),
+            disabled: T::Boolean,
+            mark: T::Boolean,
+            code: T::Boolean,
+            keyboard: T::Boolean,
+            underline: T::Boolean,
+            delete: T::Boolean,
+            strong: T::Boolean,
+            italic: T::Boolean,
+            copyable: T::Boolean,
+            copied_text: T.nilable(String),
+            copy_error_text: T.nilable(String),
+            html_options: Types::HtmlPrimitive
+          ).void
+        end
+        def initialize(
+          href:,
+          target: nil,
+          rel: nil,
+          type: nil,
+          disabled: false,
+          mark: false,
+          code: false,
+          keyboard: false,
+          underline: false,
+          delete: false,
+          strong: false,
+          italic: false,
+          copyable: false,
+          copied_text: nil,
+          copy_error_text: nil,
+          **html_options
+        )
+          @href = T.let(href, String)
+          @target = T.let(target, T.nilable(String))
+          @rel = T.let(rel, T.nilable(String))
+          super(
+            type: type,
+            disabled: disabled,
+            mark: mark,
+            code: code,
+            keyboard: keyboard,
+            underline: underline,
+            delete: delete,
+            strong: strong,
+            italic: italic,
+            copyable: copyable,
+            copied_text: copied_text,
+            copy_error_text: copy_error_text,
+            **html_options
+          )
         end
 
         private
 
+        sig { override.returns(Symbol) }
         def tag_name
           :a
         end
 
+        sig { override.returns(String) }
         def wrapper_classes
-          super + " hakumi-typography-link"
+          [ super, "hakumi-typography-link" ].join(" ")
         end
 
+        sig { override.returns(Types::HtmlAttributes) }
         def wrapper_attributes
           attrs = super
           attrs[:href] = @href

data/app/components/hakumi_components/typography/paragraph/component.rb

@@ -1,9 +1,15 @@
+# typed: strict
+# frozen_string_literal: true
+
 module HakumiComponents
   module Typography
     module Paragraph
       class Component < BaseComponent
+        extend T::Sig
+
         private
 
+        sig { override.returns(Symbol) }
         def tag_name
           :div
         end

data/app/components/hakumi_components/typography/text/component.rb

@@ -1,7 +1,11 @@
+# typed: strict
+# frozen_string_literal: true
+
 module HakumiComponents
   module Typography
     module Text
       class Component < BaseComponent
+        extend T::Sig
       end
     end
   end

data/app/components/hakumi_components/typography/title/component.rb

@@ -1,27 +1,82 @@
+# typed: strict
+# frozen_string_literal: true
+
 module HakumiComponents
   module Typography
     module Title
       class Component < BaseComponent
-        LEVELS = [ 1, 2, 3, 4, 5 ].freeze
+        extend T::Sig
+
+        LEVELS = T.let([ 1, 2, 3, 4, 5 ].freeze, T::Array[Integer])
 
-        def initialize(level: 1, **html_options)
-          @level = level
-          super(**html_options)
+        sig do
+          params(
+            level: Integer,
+            type: T.nilable(Symbol),
+            disabled: T::Boolean,
+            mark: T::Boolean,
+            code: T::Boolean,
+            keyboard: T::Boolean,
+            underline: T::Boolean,
+            delete: T::Boolean,
+            strong: T::Boolean,
+            italic: T::Boolean,
+            copyable: T::Boolean,
+            copied_text: T.nilable(String),
+            copy_error_text: T.nilable(String),
+            html_options: Types::HtmlPrimitive
+          ).void
+        end
+        def initialize(
+          level: 1,
+          type: nil,
+          disabled: false,
+          mark: false,
+          code: false,
+          keyboard: false,
+          underline: false,
+          delete: false,
+          strong: false,
+          italic: false,
+          copyable: false,
+          copied_text: nil,
+          copy_error_text: nil,
+          **html_options
+        )
+          @level = T.let(level, Integer)
+          super(
+            type: type,
+            disabled: disabled,
+            mark: mark,
+            code: code,
+            keyboard: keyboard,
+            underline: underline,
+            delete: delete,
+            strong: strong,
+            italic: italic,
+            copyable: copyable,
+            copied_text: copied_text,
+            copy_error_text: copy_error_text,
+            **html_options
+          )
         end
 
         private
 
+        sig { override.void }
         def validate_props!
           super
           validate_inclusion!(:level, LEVELS)
         end
 
+        sig { override.returns(Symbol) }
         def tag_name
-          "h#{@level}"
+          :"h#{@level}"
         end
 
+        sig { override.returns(String) }
         def wrapper_classes
-          super + " hakumi-typography-h#{@level}"
+          [ super, "hakumi-typography-h#{@level}" ].join(" ")
         end
       end
     end

data/app/components/hakumi_components/upload/component.html.erb

@@ -1,117 +1,135 @@
-<div <%= tag.attributes(wrapper_attributes) %>>
-  <input <%= tag.attributes(input_attributes) %>>
+<% upload_control = capture do %>
+  <div <%= tag.attributes(wrapper_attributes) %>>
+    <input <%= tag.attributes(input_attributes) %>>
 
-  <% if list_type_avatar? %>
-    <div class="hakumi-upload-avatar-wrapper" data-hakumi--upload-target="avatarWrapper" data-action="click->hakumi--upload#triggerInput">
-      <%= render HakumiComponents::Avatar::Component.new(
-        icon: @avatar_icon,
-        size: @avatar_size,
-        shape: @avatar_shape,
-        data: { hakumi__upload_target: "avatar" }
-      ) %>
-      <div class="hakumi-upload-avatar-overlay <%= avatar_overlay_class %>">
-        <%= render HakumiComponents::Icon::Component.new(name: :camera, size: 20) %>
-        <span>Upload</span>
-      </div>
-    </div>
-  <% elsif @drag %>
-    <div class="hakumi-upload-dragger"
-         data-hakumi--upload-target="dropzone"
-         data-action="click->hakumi--upload#triggerInput dragover->hakumi--upload#dragOver dragleave->hakumi--upload#dragLeave drop->hakumi--upload#drop">
-      <div class="hakumi-upload-dragger-content">
-        <div class="hakumi-upload-dragger-icon">
-          <%= render HakumiComponents::Icon::Component.new(name: :upload) %>
+    <% if list_type_avatar? %>
+      <div class="hakumi-upload-avatar-wrapper" data-hakumi--upload-target="avatarWrapper" data-action="click->hakumi--upload#triggerInput">
+        <%= render HakumiComponents::Avatar::Component.new(
+          icon: avatar_icon,
+          size: avatar_size,
+          shape: avatar_shape,
+          data: { hakumi__upload_target: "avatar" }
+        ) %>
+        <div class="hakumi-upload-avatar-overlay <%= avatar_overlay_class %>">
+          <%= render HakumiComponents::Icon::Component.new(name: :camera, size: 20) %>
+          <span><%= action_label %></span>
         </div>
-        <div class="hakumi-upload-dragger-title">Click or drag file to this area to upload</div>
-        <div class="hakumi-upload-dragger-hint">Support for a single or bulk upload.</div>
       </div>
+    <% elsif drag? %>
+      <div class="hakumi-upload-dragger"
+           data-hakumi--upload-target="dropzone"
+           data-action="click->hakumi--upload#triggerInput dragover->hakumi--upload#dragOver dragleave->hakumi--upload#dragLeave drop->hakumi--upload#drop">
+        <div class="hakumi-upload-dragger-content">
+          <div class="hakumi-upload-dragger-icon">
+            <%= render HakumiComponents::Icon::Component.new(name: :upload) %>
+          </div>
+          <div class="hakumi-upload-dragger-title">Click or drag file to this area to upload</div>
+          <div class="hakumi-upload-dragger-hint">Support for a single or bulk upload.</div>
+        </div>
 
-      <div class="hakumi-upload-dragger-action">
+        <div class="hakumi-upload-dragger-action">
+          <%= render HakumiComponents::Button::Component.new(
+            type: :primary,
+            disabled: disabled?,
+            data: { action: "click->hakumi--upload#triggerInput:stop" }
+          ) do %>
+            <%= action_label %>
+          <% end %>
+        </div>
+      </div>
+    <% elsif !inline_trigger? %>
+      <div class="hakumi-upload-select">
         <%= render HakumiComponents::Button::Component.new(
           type: :primary,
-          disabled: @disabled,
-          data: { action: "click->hakumi--upload#triggerInput:stop" }
+          disabled: disabled?,
+          data: { action: "click->hakumi--upload#triggerInput" }
         ) do %>
           <%= action_label %>
         <% end %>
       </div>
-    </div>
-  <% elsif !inline_trigger? %>
-    <div class="hakumi-upload-select">
-      <%= render HakumiComponents::Button::Component.new(
-        type: :primary,
-        disabled: @disabled,
-        data: { action: "click->hakumi--upload#triggerInput" }
-      ) do %>
-        <%= action_label %>
-      <% end %>
-    </div>
-  <% end %>
+    <% end %>
 
-  <% if @show_upload_list %>
-    <ul class="<%= upload_list_classes %>" data-hakumi--upload-target="list">
-      <% normalized_file_list.each do |file| %>
-        <li class="<%= file_item_classes(file) %>" data-uid="<%= file[:uid] %>">
-          <div class="hakumi-upload-list-item-info">
-            <% if list_type_picture? && file[:url].present? %>
-              <span class="hakumi-upload-list-item-thumbnail">
-                <img src="<%= file[:url] %>" alt="<%= file[:name] %>">
-              </span>
-            <% end %>
-            <span class="hakumi-upload-list-item-name"><%= file[:name] %></span>
-            <% if @list_type == :picture_card %>
-              <%# Actions inside info for picture_card (absolute positioning overlay) %>
+    <% if show_upload_list? %>
+      <ul class="<%= upload_list_classes %>" data-hakumi--upload-target="list">
+        <% normalized_file_list.each do |file| %>
+          <li class="<%= file_item_classes(file) %>" data-uid="<%= file.uid %>">
+            <div class="hakumi-upload-list-item-info">
+              <% if list_type_picture? && file.url.present? %>
+                <span class="hakumi-upload-list-item-thumbnail">
+                  <img src="<%= file.url %>" alt="<%= file.name %>">
+                </span>
+              <% end %>
+              <span class="hakumi-upload-list-item-name"><%= file.name %></span>
+              <% if picture_card? %>
+                <div class="hakumi-upload-list-item-actions">
+                  <% if file.url.present? && file.status == "done" %>
+                    <button type="button"
+                            class="hakumi-upload-list-item-action hakumi-upload-list-item-view"
+                            data-action="click->hakumi--upload#previewFromEvent"
+                            data-uid="<%= file.uid %>">
+                      <%= render HakumiComponents::Icon::Component.new(name: :eye) %>
+                    </button>
+                  <% end %>
+                  <button type="button"
+                          class="hakumi-upload-list-item-action hakumi-upload-list-item-remove"
+                          data-action="click->hakumi--upload#removeFromEvent"
+                          data-uid="<%= file.uid %>">
+                    <%= render HakumiComponents::Icon::Component.new(name: :delete) %>
+                  </button>
+                </div>
+              <% end %>
+            </div>
+
+            <% unless picture_card? %>
               <div class="hakumi-upload-list-item-actions">
-                <% if file[:url].present? && file[:status] == "done" %>
+                <% if list_type_picture? && file.url.present? %>
                   <button type="button"
                           class="hakumi-upload-list-item-action hakumi-upload-list-item-view"
                           data-action="click->hakumi--upload#previewFromEvent"
-                          data-uid="<%= file[:uid] %>">
+                          data-uid="<%= file.uid %>">
                     <%= render HakumiComponents::Icon::Component.new(name: :eye) %>
                   </button>
                 <% end %>
                 <button type="button"
                         class="hakumi-upload-list-item-action hakumi-upload-list-item-remove"
                         data-action="click->hakumi--upload#removeFromEvent"
-                        data-uid="<%= file[:uid] %>">
+                        data-uid="<%= file.uid %>">
                   <%= render HakumiComponents::Icon::Component.new(name: :delete) %>
                 </button>
               </div>
             <% end %>
-          </div>
 
-          <% unless @list_type == :picture_card %>
-            <%# Actions outside info for text/picture list types %>
-            <div class="hakumi-upload-list-item-actions">
-              <% if list_type_picture? && file[:url].present? %>
-                <button type="button"
-                        class="hakumi-upload-list-item-action hakumi-upload-list-item-view"
-                        data-action="click->hakumi--upload#previewFromEvent"
-                        data-uid="<%= file[:uid] %>">
-                  <%= render HakumiComponents::Icon::Component.new(name: :eye) %>
-                </button>
-              <% end %>
-              <button type="button"
-                      class="hakumi-upload-list-item-action hakumi-upload-list-item-remove"
-                      data-action="click->hakumi--upload#removeFromEvent"
-                      data-uid="<%= file[:uid] %>">
-                <%= render HakumiComponents::Icon::Component.new(name: :delete) %>
-              </button>
+            <div class="hakumi-upload-list-item-progress" style="<%= progress_style(file) %>">
+              <div class="hakumi-upload-list-item-progress-bar"></div>
             </div>
-          <% end %>
+          </li>
+        <% end %>
 
-          <div class="hakumi-upload-list-item-progress" style="<%= progress_style(file) %>">
-            <div class="hakumi-upload-list-item-progress-bar"></div>
-          </div>
-        </li>
-      <% end %>
+        <% if inline_trigger? %>
+          <li class="hakumi-upload-list-item-trigger" data-hakumi--upload-target="inlineTrigger" data-action="click->hakumi--upload#triggerInput">
+            <%= render HakumiComponents::Icon::Component.new(name: :plus, size: 24) %>
+            <span><%= action_label %></span>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
+<% end %>
 
-      <% if inline_trigger? %>
-        <li class="hakumi-upload-list-item-trigger" data-hakumi--upload-target="inlineTrigger" data-action="click->hakumi--upload#triggerInput">
-          <%= render HakumiComponents::Icon::Component.new(name: :plus, size: 24) %>
-          <span>Upload</span>
-        </li>
-      <% end %>
-    </ul>
-  <% end %>
-</div>
+<% if standalone? %>
+  <%= upload_control %>
+<% else %>
+  <div <%= tag.attributes(form_item_attributes).to_s.html_safe %>>
+    <%= render_label(field_id: input_id) %>
+
+    <div class="hakumi-form-item-control">
+      <div class="hakumi-form-item-control-input">
+        <div class="hakumi-form-item-control-input-content">
+          <%= upload_control %>
+        </div>
+      </div>
+
+      <%= render_explain %>
+    </div>
+  </div>
+<% end %>