From 6a659ad9716398f43149da5df3f41feae59eb632 Mon Sep 17 00:00:00 2001
From: Stephen Marshall <smarshall1980@gmail.com>
Date: Wed, 20 Mar 2024 09:39:07 -0400
Subject: [PATCH] Add svg-inline--fa to pb icons

---
 playbook/app/pb_kits/playbook/pb_icon/_icon.tsx | 1 +
 playbook/app/pb_kits/playbook/pb_icon/icon.rb   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/playbook/app/pb_kits/playbook/pb_icon/_icon.tsx b/playbook/app/pb_kits/playbook/pb_icon/_icon.tsx
index efb39c6816..467730441d 100644
--- a/playbook/app/pb_kits/playbook/pb_icon/_icon.tsx
+++ b/playbook/app/pb_kits/playbook/pb_icon/_icon.tsx
@@ -103,6 +103,7 @@ const Icon = (props: IconProps) => {
     flipMap[flip],
     (!iconElement && !customIcon) ? 'pb_icon_kit' : '',
     (iconElement || customIcon) ? 'pb_custom_icon' : fontStyle,
+    iconElement ? 'svg-inline--fa' : '',
     faClasses,
     globalProps(props),
     className
diff --git a/playbook/app/pb_kits/playbook/pb_icon/icon.rb b/playbook/app/pb_kits/playbook/pb_icon/icon.rb
index 439b942ae3..ee065d6e22 100644
--- a/playbook/app/pb_kits/playbook/pb_icon/icon.rb
+++ b/playbook/app/pb_kits/playbook/pb_icon/icon.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/StringConcatenation, Style/HashLikeCase
+# rubocop:disable Style/HashLikeCase
 
 require "open-uri"
 
@@ -89,7 +89,7 @@ def asset_path
       def render_svg
         doc = Nokogiri::XML(URI.open(asset_path || icon || custom_icon)) # rubocop:disable Security/Open
         svg = doc.at_css "svg"
-        svg["class"] = "pb_custom_icon " + object.custom_icon_classname
+        svg["class"] = %w[pb_custom_icon svg-inline--fa].concat([object.custom_icon_classname]).join(" ")
         svg["id"] = object.id
         svg["data"] = object.data
         svg["aria"] = object.aria
@@ -167,4 +167,4 @@ def spin_class
   end
 end
 
-# rubocop:enable Style/StringConcatenation, Style/HashLikeCase
+# rubocop:enable Style/HashLikeCase