Revert "fix(b-icon): local component lookup"

jacobmllr95 · jacobmllr95 · commit 4aa544be536c · 2020-10-21T18:49:44.000+02:00
This reverts commit edb6ed6.
diff --git a/src/icons/icon.js b/src/icons/icon.js
@@ -5,15 +5,6 @@ import { pascalCase, trim } from '../utils/string'
 import { BIconBlank } from './icons'
 import { commonIconProps } from './helpers/icon-base'
 
-const findIconComponent = (parent, iconName) => {
-  if (!parent) {
-    return null
-  }
-  const components = (parent.$options || {}).components
-  const iconComponent = components[iconName]
-  return iconComponent || findIconComponent(parent.$parent, iconName)
-}
-
 // Helper BIcon component
 // Requires the requested icon component to be installed
 export const BIcon = /*#__PURE__*/ Vue.extend({
@@ -32,13 +23,13 @@ export const BIcon = /*#__PURE__*/ Vue.extend({
   },
   render(h, { data, props, parent }) {
     const icon = pascalCase(trim(props.icon || '')).replace(RX_ICON_PREFIX, '')
-
+    const iconName = `BIcon${icon}`
     // If parent context exists, we check to see if the icon has been registered
-    // either locally in the parent component, or globally at the `$root` level
+    // Either locally in the parent component, or globally at the `$root` level
     // If not registered, we render a blank icon
-    return h(
-      icon ? findIconComponent(parent, `BIcon${icon}`) || BIconBlank : BIconBlank,
-      mergeData(data, { props: { ...props, icon: null } })
-    )
+    const components = ((parent || {}).$options || {}).components
+    const componentRefOrName =
+      icon && components ? components[iconName] || BIconBlank : icon ? iconName : BIconBlank
+    return h(componentRefOrName, mergeData(data, { props: { ...props, icon: null } }))
   }
 })
