rails_heroicon 2.1.1 → 2.2.0

data/lib/rails_heroicon/helper.rb

@@ -3,6 +3,8 @@ require "action_view"
 module RailsHeroicon
   module Helper
     include ActionView::Helpers::TagHelper
+
+    mattr_accessor :icon_cache, default: {}
     # To add a heroicon, call <tt><%= heroicon "icon_name" %></tt> on your erb template.
     # Head over to https://heroicons.com to view all the icons.
     #
@@ -34,10 +36,14 @@ module RailsHeroicon
     # The helper method automatically sets <tt>aria-hidden=true</tt> if <tt>aria-label</tt> is not set, and
     # if <tt>aria-label</tt> is set, then <tt>role=img</tt> is set automatically.
     def heroicon(symbol, title: nil, **options)
-      icon = RailsHeroicon.new(symbol, **options)
+      cache_key = [symbol, title, options]
+      return icon_cache[cache_key] if icon_cache[cache_key]
 
+      icon = RailsHeroicon.new(symbol, **options)
       title_tag = content_tag(:title, title) if title
-      content_tag(:svg, title_tag.to_s.html_safe + icon.svg_path.html_safe, icon.options)
+      tag = content_tag(:svg, title_tag.to_s.html_safe + icon.svg_path.html_safe, icon.options)
+      icon_cache[cache_key] = tag
+      tag
     end
   end
 end

data/lib/rails_heroicon/rails_heroicon.rb

@@ -2,7 +2,7 @@ require_relative "errors"
 
 module RailsHeroicon
   class RailsHeroicon
-    VARIANTS = %w[outline solid mini].freeze
+    VARIANTS = %w[outline solid mini micro].freeze
 
     attr_reader :options
 
@@ -12,7 +12,7 @@ module RailsHeroicon
       @icon = icon.to_s
       @variant = variant.to_s
       @options = options.dup
-      @size = icon_size_with(size)
+      @size = default_or_defined_size(size)
       @options.merge!(svg_properties)
     end
 
@@ -29,13 +29,14 @@ module RailsHeroicon
     def svg_properties
       properties = {}
 
-      properties[:viewBox] = mini? ? "0 0 20 20" : "0 0 24 24"
+      properties[:xmlns] = "http://www.w3.org/2000/svg"
+      properties[:viewBox] = view_box
       properties[:height] = @size
       properties[:width] = @size
       properties[:version] = "1.1"
       properties[:fill] = outline? ? "none" : "currentColor"
       properties[:stroke] = outline? ? "currentColor" : "none"
-      properties[:"stroke-width"] = "1.5" if outline?
+      properties[:"stroke-width"] = stroke_width
 
       if options[:"aria-label"].nil? && options["aria-label"].nil? && options.dig(:aria, :label).nil?
         properties[:"aria-hidden"] = "true"
@@ -47,14 +48,27 @@ module RailsHeroicon
     end
 
     # If the user has explicitly stated the size attribute, then use that. If size attribute is not passed
-    # then default to 24 if variant is outline or solid, else default to 20 if variant is mini.
-    def icon_size_with(size)
+    # then default to 24 if variant is outline or solid, else default to 20 if variant is mini, else default to 16 if
+    # variant is micro.
+    def default_or_defined_size(size)
       return size if size
+      return 16 if micro?
       return 20 if mini?
 
       24
     end
 
+    def stroke_width
+      return unless outline?
+      @options[:"stroke-width"] || 1.5
+    end
+
+    def view_box
+      return "0 0 20 20" if mini?
+      return "0 0 16 16" if micro?
+      "0 0 24 24"
+    end
+
     def outline?
       @variant == "outline"
     end
@@ -66,5 +80,9 @@ module RailsHeroicon
     def mini?
       @variant == "mini"
     end
+
+    def micro?
+      @variant == "micro"
+    end
   end
 end

data/lib/rails_heroicon/version.rb

@@ -1,3 +1,3 @@
 module RailsHeroicon
-  VERSION = "2.1.1".freeze
+  VERSION = "2.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_heroicon
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - abeidahmed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails view helpers for the awesome Heroicons by Steve Schoger.