Fix bug

khiga8 · khiga8 · commit 87a0e9f77336 · 2024-05-16T16:14:31.000Z
diff --git a/lib/utils/get-element-type.js b/lib/utils/get-element-type.js
@@ -16,15 +16,16 @@ function getElementType(context, node, lazyElementCheck = false) {
 
   // check if the node contains a polymorphic prop
   const polymorphicPropName = settings?.github?.polymorphicPropName ?? 'as'
-  const rawElement = getLiteralPropValue(getProp(node.attributes, polymorphicPropName)) ?? elementType(node)
 
-  // if a component configuration does not exists, return the raw element
-  if (!settings?.github?.components?.[rawElement]) return rawElement
+  const rawElement = elementType(node)
 
-  const defaultComponent = settings.github.components[rawElement]
-
-  // check if the default component is also defined in the configuration
-  return defaultComponent ? defaultComponent : defaultComponent
+  if (getProp(node.attributes, polymorphicPropName)) {
+    return getLiteralPropValue(getProp(node.attributes, polymorphicPropName)) ?? rawElement
+  } else if (settings?.github?.components?.[rawElement]) {
+    return settings.github.components[rawElement]
+  } else {
+    return rawElement
+  }
 }
 
 module.exports = {getElementType}
diff --git a/tests/utils/get-element-type.mjs b/tests/utils/get-element-type.mjs
@@ -64,14 +64,16 @@ describe('getElementType', function () {
     expect(getElementType({}, node)).to.equal('Box')
   })
 
-  it('returns raw type when polymorphic prop is set to component, and not the mapped value', function () {
+  it('returns raw type when polymorphic prop is set to com, and not the mapped value', function () {
     // <Box as={Link} />
     const setting = mockSetting({
       Box: 'div',
     })
 
     // eslint-disable-next-line no-undef
-    const node = mockJSXOpeningElement('Box', [mockJSXAttribute('as', Link)])
+    const node = mockJSXOpeningElement('Box', [
+      mockJSXConditionalAttribute('as', 'isNavigationOpen', 'generic', 'navigation'),
+    ])
     expect(getElementType(setting, node)).to.equal('Box')
   })
 })
