fix: fix import replacement for jsx elements

finkef · Oct 27, 2021 · 35adec3 · 35adec3
1 parent 08098af
commit 35adec3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/src/__tests__/__fixtures__/provider-import.js b/src/__tests__/__fixtures__/provider-import.js
@@ -0,0 +1,3 @@
+import { TailwindProvider } from "../../macro"
+
+;<TailwindProvider />
diff --git a/src/__tests__/__snapshots__/macro.test.ts.snap b/src/__tests__/__snapshots__/macro.test.ts.snap
@@ -681,6 +681,20 @@ const _useStyles = _ReactNativeTailwindMacro.createUseTailwindStyles({
 })
 
 
+`;
+
+exports[`react-native-tailwind.macro provider-import.js: provider-import.js 1`] = `
+
+import { TailwindProvider } from "../../macro"
+
+;<TailwindProvider />
+
+      ↓ ↓ ↓ ↓ ↓ ↓
+
+import * as _ReactNativeTailwindMacro from "../../macro/exports"
+;<_ReactNativeTailwindMacro.TailwindProvider />
+
+
 `;
 
 exports[`react-native-tailwind.macro reference-style-prop.js: reference-style-prop.js 1`] = `

diff --git a/src/macro/handle-lib-import.ts b/src/macro/handle-lib-import.ts
@@ -18,10 +18,18 @@ export function handleLibImport(params: HandlerParams<Node>) {
     throw new MacroError(`Invalid import "${importName}"`)
 
   // Replace with imported version
-  path.replaceWith(
-    t.memberExpression(
-      t.identifier(program.state.importIdentifier),
-      t.identifier(importName)
+  if (path.isJSXIdentifier())
+    path.replaceWith(
+      t.jsxMemberExpression(
+        t.jsxIdentifier(program.state.importIdentifier),
+        t.jsxIdentifier(importName)
+      )
+    )
+  else
+    path.replaceWith(
+      t.memberExpression(
+        t.identifier(program.state.importIdentifier),
+        t.identifier(importName)
+      )
     )
-  )
 }