From 946d38f53b95ef472808871d51632307fe8627ed Mon Sep 17 00:00:00 2001
From: Anton Golub <antongolub@antongolub.com>
Date: Wed, 9 Mar 2022 12:19:37 +0300
Subject: [PATCH] chore: snap #2

---
 packages/native/types/tsconfig.json |  4 ++++
 packages/styled/types/base.d.ts     | 20 ++++++++++++++++----
 packages/styled/types/tests.tsx     | 10 +++++-----
 packages/styled/types/tsconfig.json |  4 ++++
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/packages/native/types/tsconfig.json b/packages/native/types/tsconfig.json
index 12a464ad1..72502a70a 100644
--- a/packages/native/types/tsconfig.json
+++ b/packages/native/types/tsconfig.json
@@ -6,6 +6,10 @@
     "lib": ["es6", "dom"],
     "module": "commonjs",
     "noEmit": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
     "strict": true,
     "target": "es5",
     "typeRoots": ["../"],
diff --git a/packages/styled/types/base.d.ts b/packages/styled/types/base.d.ts
index 12f0b621d..0c71d9231 100644
--- a/packages/styled/types/base.d.ts
+++ b/packages/styled/types/base.d.ts
@@ -22,20 +22,32 @@ export { ComponentSelector, Interpolation }
  * Practical sense: you can define and reuse atomic `shouldForwardProp` filters that are strictly bound with some `ForwardedProps` type.
  */
 export interface FilteringStyledOptions<
-  Props = Record<PropertyKey, any>,
+  Props = AnyRecord,
   ForwardedProps extends keyof Props = keyof Props
 > {
   label?: string
-  shouldForwardProp?(propName: PropertyKey): propName is ForwardedProps
+  shouldForwardProp?: <P extends UnionToIntersection<ForwardedProps>>(
+    propName: P
+  ) => propName is P
   target?: string
 }
 
-export interface StyledOptions<Props = Record<PropertyKey, any>> {
+export interface StyledOptions<Props = AnyRecord> {
   label?: string
-  shouldForwardProp?(propName: keyof Props): boolean
+  shouldForwardProp?: <P extends keyof UnionToIntersection<Props>>(
+    propName: P
+  ) => boolean
   target?: string
 }
 
+type AnyRecord = Record<PropertyKey, any>
+
+export type UnionToIntersection<U, K = any> = (
+  U extends K ? (k: U) => void : never
+) extends (k: infer I) => void
+  ? I
+  : never
+
 /**
  * @typeparam ComponentProps  Props which will be included when withComponent is called
  * @typeparam SpecificComponentProps  Props which will *not* be included when withComponent is called
diff --git a/packages/styled/types/tests.tsx b/packages/styled/types/tests.tsx
index 6e9cd4951..c4b8da585 100644
--- a/packages/styled/types/tests.tsx
+++ b/packages/styled/types/tests.tsx
@@ -274,11 +274,11 @@ const Input5 = styled.input`
     'foo'
   >['shouldForwardProp'] = (prop: 'foo' | 'bar'): prop is 'bar' => true
 
-  styled('div', { shouldForwardProp: (prop: 'color') => true })({})
-
-  styled('div', {
-    shouldForwardProp: (prop: 'color'): prop is 'color' => true
-  })({})
+  // styled('div', { shouldForwardProp: (prop: 'color') => true })({})
+  //
+  // styled('div', {
+  //   shouldForwardProp: (prop: 'style'): prop is 'style' => true
+  // })({})
 
   // $ExpectError
   styled('div', { shouldForwardProp: (prop: 'foo') => true })({})
diff --git a/packages/styled/types/tsconfig.json b/packages/styled/types/tsconfig.json
index 47e662ca7..3bd01fbe7 100644
--- a/packages/styled/types/tsconfig.json
+++ b/packages/styled/types/tsconfig.json
@@ -7,6 +7,10 @@
     "lib": ["es6", "dom"],
     "module": "commonjs",
     "noEmit": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
     "strict": true,
     "target": "es5",
     "typeRoots": ["../"],