playbook_ui 13.32.0.pre.alpha.PLAY14103236 → 13.32.0.pre.alpha.play1416movealiaslogic3239

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfcc3d00f2ba85516f391b73f539917fe75b524bf076df79aab7cae826e31da9
-  data.tar.gz: f5cd5f8e5eec0305a9e2664d9297ccc8c5175985d8f170c489ce0a6848c993fb
+  metadata.gz: 38d2ad5fae80d023caae7a74a96bf549e74693d82376000d2d056ecdd94e5948
+  data.tar.gz: c3de45c50a99868c1a157179eb8912acfd173337bd94af3eb166c42d01c051ac
 SHA512:
-  metadata.gz: 14fb1e5915b55f24b752cf67fe0618f245c672072a2ca5bbf845c91bb983e9e6f593e9d910294852d3e924bb5df821eba923d10d6da9527aaebc2ef36e1d6b86
-  data.tar.gz: 945a1394b31fba92c98aa5a8fc46d722482ed1f1fbc87bdb2494c63c106587326ec69b3b8338616aa17862251f5b82f08b2a4403b5c4be764f94b2c26aea56dd
+  metadata.gz: e83a30785c99181d6f62a6632ad1d52c6c7970f8a53dd42e01041814fe5c9f09ee969aa0c2a39b180b20f565492c096e94744ce3149cf407c8c2ed09c99636ec
+  data.tar.gz: 37992e6abfc459bdb39b5a62292a43c3d49a79e17261136c955929836de307c9677653338fe9635c619dc0314ca69b498348cbacea044279d1dd924e5edac86f

data/app/pb_kits/playbook/pb_contact/contact.test.js

@@ -78,7 +78,7 @@ test('returns correct icon', () => {
   expect(screen.getByTestId('test-cell').querySelector('.pb_icon_kit')).toHaveClass('fa-mobile')
   expect(screen.getByTestId('test-home').querySelector('.pb_icon_kit')).toHaveClass('fa-phone')
   expect(screen.getByTestId('test-work').querySelector('.pb_icon_kit')).toHaveClass('fa-phone-office')
-  // expect(screen.getByTestId('test-work-cell').querySelector('.pb_icon_kit')).toHaveClass('fa-phone-laptop')
+  expect(screen.getByTestId('test-work-cell').querySelector('.pb_icon_kit')).toHaveClass('fa-phone-laptop')
   expect(screen.getByTestId('test-email').querySelector('.pb_icon_kit')).toHaveClass('fa-envelope')
   expect(screen.getByTestId('test-wrong-phone').querySelector('.pb_icon_kit')).toHaveClass('fa-phone-slash')
   expect(screen.getByTestId('test-wrong-type').querySelector('.pb_icon_kit')).toHaveClass('fa-phone')

data/app/pb_kits/playbook/pb_icon/_icon.tsx

@@ -3,7 +3,6 @@ import classnames from 'classnames'
 import { buildAriaProps, buildDataProps, buildHtmlProps } from '../utilities/props'
 import { GlobalProps, globalProps } from '../utilities/globalProps'
 import { isValidEmoji } from '../utilities/validEmojiChecker'
-import aliasesJson from './icon_aliases.json'
 
 export type IconSizes = "lg"
 | "xs"
@@ -41,19 +40,6 @@ type IconProps = {
   spin?: boolean,
 } & GlobalProps
 
-type AliasType = string | string[];
-
-interface Aliases {
-  [key: string]: AliasType;
-}
-
-interface AliasesJson {
-  aliases: Aliases;
-}
-
-const aliases: AliasesJson = aliasesJson;
-
-
 const flipMap = {
   horizontal: 'fa-flip-horizontal',
   vertical: 'fa-flip-vertical',
@@ -66,22 +52,6 @@ declare global {
   var PB_ICONS: {[key: string]: React.FunctionComponent<any>}
 }
 
-// Resolve alias function
-const resolveAlias = (icon: string): string => {
-  const alias = aliases.aliases[icon];
-
-  if (alias) {
-    if (Array.isArray(alias)) {
-      return alias[0];
-    } else {
-      return alias;
-    }
-  }
-
-  return icon;
-};
-
-
 const Icon = (props: IconProps) => {
   const {
     aria = {},
@@ -104,8 +74,7 @@ const Icon = (props: IconProps) => {
     spin = false,
   } = props
 
-  const resolvedIcon = resolveAlias(icon as string)
-  let iconElement: ReactSVGElement | null = typeof(resolvedIcon) === "object" ? resolvedIcon : null
+  let iconElement: ReactSVGElement | null = typeof(icon) === "object" ? icon : null
 
   const faClasses = {
     'fa-border': border,
@@ -121,12 +90,12 @@ const Icon = (props: IconProps) => {
 
   if (!customIcon && !iconElement) {
     const PowerIcon: React.FunctionComponent<any> | undefined =
-      window.PB_ICONS ? window.PB_ICONS[resolvedIcon as string] : null
+      window.PB_ICONS ? window.PB_ICONS[icon as string] : null
 
     if (PowerIcon) {
       iconElement = <PowerIcon /> as ReactSVGElement
     } else {
-      faClasses[`fa-${resolvedIcon}`] = resolvedIcon as string
+      faClasses[`fa-${icon}`] = icon as string
     }
   }
 
@@ -146,7 +115,7 @@ const Icon = (props: IconProps) => {
     className
   )
 
-  aria.label ? null : aria.label = `${resolvedIcon} icon`
+  aria.label ? null : aria.label = `${icon} icon`
   const ariaProps: {[key: string]: any} = buildAriaProps(aria)
   const dataProps: {[key: string]: any} = buildDataProps(data)
   const htmlProps = buildHtmlProps(htmlOptions)
@@ -168,7 +137,7 @@ const Icon = (props: IconProps) => {
           }
         </>
       )
-    else if (isValidEmoji(resolvedIcon as string))
+    else if (isValidEmoji(icon as string))
       return (
         <>
           <span
@@ -177,7 +146,7 @@ const Icon = (props: IconProps) => {
               className={classesEmoji}
               id={id}
           >
-            {resolvedIcon}
+            {icon}
           </span>
         </>
       )

data/app/pb_kits/playbook/pb_icon/icon.rb

@@ -39,8 +39,6 @@ module Playbook
       prop :spin, type: Playbook::Props::Boolean,
                   default: false
 
-      ALIASES = JSON.parse(File.read(Playbook::Engine.root.join("app/pb_kits/playbook/pb_icon/icon_aliases.json")))["aliases"].freeze
-
       def valid_emoji?
         emoji_regex = /\p{Emoji}/
         emoji_regex.match?(icon)
@@ -82,6 +80,14 @@ module Playbook
         )
       end
 
+      def icon_alias_map
+        return unless Rails.application.config.respond_to?(:icon_alias_path)
+
+        base_path = Rails.application.config.icon_alias_path
+        json = File.read(Rails.root.join(base_path))
+        JSON.parse(json)["aliases"].freeze
+      end
+
       def asset_path
         return unless Rails.application.config.respond_to?(:icon_path)
 
@@ -111,7 +117,7 @@ module Playbook
     private
 
       def resolve_alias(icon)
-        aliases = ALIASES[icon]
+        aliases = icon_alias_map[icon]
         return icon unless aliases
 
         if aliases.is_a?(Array)

data/app/pb_kits/playbook/pb_icon/icon_aliases.json

@@ -1,20 +1,13 @@
 {
     "aliases": {
-      "angles-down": "angle-double-down",
-      "arrow-alt-circle-left": "circle-left",
       "arrow-alt-circle-right": "circle-right",
+      "angles-down": "angle-double-down",
       "arrow-alt-down": "down",
       "arrow-alt-up": "up",
-      "arrow-circle-down": "circle-down-arrow",
       "arrow-right-long": "long-arrow-right",
       "arrow-to-bottom": "arrow-down-to-line",
       "arrows-h": "arrows-left-right",
-      "backward-step": "step-backward",
       "calendar-days": "calendar-alt",
-      "chevrondown": "chevron-down",
-      "chevrons-down": "chevron-double-down",
-      "chevrons-left": "chevron-double-left",
-      "chevrons-right": "chevron-double-right",
       "circle-arrow-right": "arrow-circle-right",
       "clock-rotate-left": "history",
       "close": [
@@ -25,37 +18,22 @@
       "exclamation-circle": "circle-exclamation",
       "external-link": "arrow-up-right-from-square",
       "file-lines": "file-alt",
-      "floppy-disk": "save",
-      "forward-step": "step-forward",
       "gear": "cog",
-      "hand-holding-dollar": "hand-holding-usd",
       "home": "house",
       "info-circle": "circle-info",
-      "location-pin": "map-marker",
       "map-o": "map",
       "message": "comment-alt",
       "minus-circle": "circle-minus",
-      "mobile-screen-button": "mobile-alt",
       "money": "money-bill",
       "mouse-pointer": "arrow-pointer",
       "nitro": "nitro-n",
-      "phone-laptop": "laptop-mobile",
       "play-circle": "circle-play",
       "plus-circle": "circle-plus",
       "plus-square": "square-plus",
       "powergon": "powergon-p",
       "question-circle": "circle-question",
       "roofing": "product-roofing",
-      "scissors": "shelves",
       "shelves": "inventory",
-      "shield-alt": "shield-halved",
-      "shuffle": "random",
-      "th-large": "table-cells-large",
-      "th-list": "table-list",
-      "thumbs-o-down": "thumbs-down",
-      "unlock": "lock-unlocked",
-      "unlock-keyhole": "lock-keyhole-unlocked",
-      "unlock-alt": "lock-keyhole-unlocked",
-      "usd-circle": "circle-dollar"
+      "th-list": "table-list"
     }
   }