Skip to content

Commit

Permalink
Testing without reference to File First
Browse files Browse the repository at this point in the history
  • Loading branch information
jasperfurniss committed Jun 25, 2024
1 parent 9f809a5 commit 61b9023
Showing 1 changed file with 17 additions and 18 deletions.
35 changes: 17 additions & 18 deletions playbook/app/pb_kits/playbook/pb_icon/icon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Icon < Playbook::KitBase
prop :spin, type: Playbook::Props::Boolean,
default: false

ALIASES = JSON.parse(File.read(Playbook::Engine.root.join("dist/icon_aliases.json")))
# ALIASES = JSON.parse(File.read(Playbook::Engine.root.join("dist/icon_aliases.json")))

def valid_emoji?
emoji_regex = /\p{Emoji}/
Expand Down Expand Up @@ -86,8 +86,7 @@ def asset_path
return unless Rails.application.config.respond_to?(:icon_path)

base_path = Rails.application.config.icon_path
resolved_icon = resolve_alias(icon)
icon_path = Dir.glob(Rails.root.join(base_path, "**", "#{resolved_icon}.svg")).first
icon_path = Dir.glob(Rails.root.join(base_path, "**", "#{icon}.svg")).first
icon_path if icon_path && File.exist?(icon_path)
end

Expand All @@ -110,21 +109,21 @@ def is_svg?

private

def resolve_alias(icon)
aliases = ALIASES[icon]
return icon unless aliases

if aliases.is_a?(Array)
aliases.find { |alias_name| file_exists?(alias_name) } || icon
else
aliases
end
end

def file_exists?(alias_name)
base_path = Rails.application.config.icon_path
File.exist?(Dir.glob(Rails.root.join(base_path, "**", "#{alias_name}.svg")).first)
end
# def resolve_alias(icon)
# aliases = ALIASES[icon]
# return icon unless aliases

# if aliases.is_a?(Array)
# aliases.find { |alias_name| file_exists?(alias_name) } || icon
# else
# aliases
# end
# end

# def file_exists?(alias_name)
# base_path = Rails.application.config.icon_path
# File.exist?(Dir.glob(Rails.root.join(base_path, "**", "#{alias_name}.svg")).first)
# end

def svg_size
size.nil? ? "1x" : size
Expand Down

0 comments on commit 61b9023

Please sign in to comment.