fix(polymorphic): merge default props (#26)

danilowoz · Jun 22, 2021 · 623694f · 623694f
1 parent f3195bb
commit 623694f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/lib/__snapshots__/styl.test.tsx.snap b/lib/__snapshots__/styl.test.tsx.snap
@@ -36,6 +36,21 @@ exports[`styl props polymorphic > TouchableWithoutFeedback 1`] = `
 </Text>
 `;
 
+exports[`styl props polymorphic merge props 1`] = `
+<Text
+  style={
+    Array [
+      Object {
+        "color": "blue",
+      },
+      Object {},
+    ]
+  }
+>
+  Text
+</Text>
+`;
+
 exports[`styl props renders custom props 1`] = `
 <Text
   color="blue"

diff --git a/lib/styl.test.tsx b/lib/styl.test.tsx
@@ -130,6 +130,16 @@ describe('styl', () => {
       const json = render.toJSON()
       expect(json).toMatchSnapshot()
     })
+
+    it('polymorphic merge props', () => {
+      const Title = styl(Text)<{ color?: string }>({ color: 'blue' })
+
+      const render = renderer.create(<Title>Text</Title>)
+
+      // Snapshot
+      const json = render.toJSON()
+      expect(json).toMatchSnapshot()
+    })
   })
 
   describe('theme/provider', () => {

diff --git a/lib/styl.ts b/lib/styl.ts
@@ -64,7 +64,7 @@ interface Polymorphic<
 > {
   <As extends ComponentType<any> = IntrinsicElement>(
     props: As extends JSXElementConstructor<infer AsProps>
-      ? OwnProps & { ref?: As } & { as?: As } & AsProps
+      ? DefaultProps & OwnProps & { ref?: As } & { as?: As } & AsProps
       : never
   ): ReactElement | null
 }