jekyll-uj-powertools 1.6.22 → 1.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e12576d7e500881fe56b9a6fdf6963b458635435ae7f27ef03df1562410c7a
-  data.tar.gz: 2418ef5a2771bb1383be22a27830beb6d9d513652f48eb2741204315eb2ec442
+  metadata.gz: f8e4f51fc9ea4a48db55c09c67dc157e8ff10a2ac3ec70b0725cd691f22e8eeb
+  data.tar.gz: bd0025c8a7b871ce18e261c7b7a11d9eec2dfa756769905682eaecc681771d27
 SHA512:
-  metadata.gz: bde8bed7311f9b164d05608c4eef60984cb995598367f44ec05d8e46f21a6569692066a615e7f239f0f48dcdd92c693f660e508ab6e4b6b7dfdca945ffe67f45
-  data.tar.gz: 6b4ac3a7cb149197bad09eabacd25a8c2d05c899fede95e564464d37aa6e97e37de880e419269030419b8b44a46085bc88cecd0add0186e3125c1bb0d0ecee55
+  metadata.gz: 265cb3b441bf454a72cb0dd80fd7357c8a775e91602969b8ed2f35068825baf3b48571fbbe7841ca801a694f17c2c7f2bb107a7c860af1c965e369448c4f6d2a
+  data.tar.gz: 60a90ebbfc3a02462063ade9848b1f58ed50596a525a6a1fd9d4547de89cb048dbd712e8b9f6dedfee86e1003365a021fc2a615a4a9938914c94d6901dc9e210

data/jekyll-uj-powertools.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   # Gem info
   spec.name = "jekyll-uj-powertools"
-  spec.version = "1.6.22"
+  spec.version = "1.6.23"
 
   # Author info
   spec.authors = ["ITW Creative Works"]

data/lib/tags/logo.rb

@@ -77,24 +77,60 @@ module Jekyll
     def load_logo_from_file(logo_name, type, color)
       # Create cache key
       cache_key = "#{type}/#{color}/#{logo_name}"
-      
+
       # Return cached version if available
       return @@logo_cache[cache_key] if @@logo_cache.key?(cache_key)
-      
+
       # Build file path
       logo_path = File.join(Dir.pwd, 'node_modules', 'ultimate-jekyll-manager', 'assets', 'logos', type, color, "#{logo_name}.svg")
-      
+
       # Try to load the logo
       logo_svg = if File.exist?(logo_path)
                    File.read(logo_path)
                  else
                    DEFAULT_LOGO
                  end
-      
+
+      # Prefix all IDs to prevent conflicts when multiple SVGs are on the same page
+      logo_svg = prefix_svg_ids(logo_svg, logo_name)
+
       # Cache the result
       @@logo_cache[cache_key] = logo_svg
       return logo_svg
     end
+
+    # Prefix all IDs in an SVG with the logo name to prevent conflicts
+    # when multiple SVGs are inlined on the same page
+    def prefix_svg_ids(svg_content, prefix)
+      # Find all id attributes in the SVG
+      ids = svg_content.scan(/\bid=["']([^"']+)["']/).flatten.uniq
+
+      return svg_content if ids.empty?
+
+      result = svg_content.dup
+
+      ids.each do |id|
+        new_id = "#{prefix}-#{id}"
+
+        # Replace id definitions: id="X" and id='X'
+        result.gsub!(/\bid=(["'])#{Regexp.escape(id)}\1/, "id=\"#{new_id}\"")
+
+        # Replace url() references: url(#X) and url('#X') and url("#X")
+        result.gsub!(/url\(\s*##{Regexp.escape(id)}\s*\)/, "url(##{new_id})")
+        result.gsub!(/url\(\s*["']##{Regexp.escape(id)}["']\s*\)/, "url(##{new_id})")
+
+        # Replace xlink:href references: xlink:href="#X"
+        result.gsub!(/xlink:href=["']##{Regexp.escape(id)}["']/, "xlink:href=\"##{new_id}\"")
+
+        # Replace x:href references (custom namespace, convert to standard href): x:href="#X"
+        result.gsub!(/x:href=["']##{Regexp.escape(id)}["']/, "href=\"##{new_id}\"")
+
+        # Replace href references (modern SVG): href="#X"
+        result.gsub!(/\bhref=["']##{Regexp.escape(id)}["']/, "href=\"##{new_id}\"")
+      end
+
+      result
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-uj-powertools
 version: !ruby/object:Gem::Version
-  version: 1.6.22
+  version: 1.6.23
 platform: ruby
 authors:
 - ITW Creative Works
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-10 00:00:00.000000000 Z
+date: 2025-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll