From d3092bb50f0aa1dafda7d071a3abd1117b2a1de9 Mon Sep 17 00:00:00 2001
From: Anton Golub <antongolub@antongolub.com>
Date: Tue, 8 Mar 2022 14:56:00 +0300
Subject: [PATCH] chore: use consistent default props type for both
 StyledOptions and FilteringStyledOptions

---
 packages/native/types/base.d.ts | 6 ++----
 packages/styled/types/base.d.ts | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/native/types/base.d.ts b/packages/native/types/base.d.ts
index f5bf6e683..dd25fde4b 100644
--- a/packages/native/types/base.d.ts
+++ b/packages/native/types/base.d.ts
@@ -69,10 +69,8 @@ export interface FilteringStyledOptions<
   shouldForwardProp?(propName: PropertyKey): propName is ForwardedProps
 }
 
-export interface StyledOptions<Props = null> {
-  shouldForwardProp?(
-    propName: Props extends null ? PropertyKey : keyof Props
-  ): boolean
+export interface StyledOptions<Props = Record<PropertyKey, any>> {
+  shouldForwardProp?(propName: keyof Props): boolean
 }
 
 /**
diff --git a/packages/styled/types/base.d.ts b/packages/styled/types/base.d.ts
index 007013f8b..12f0b621d 100644
--- a/packages/styled/types/base.d.ts
+++ b/packages/styled/types/base.d.ts
@@ -30,11 +30,9 @@ export interface FilteringStyledOptions<
   target?: string
 }
 
-export interface StyledOptions<Props = null> {
+export interface StyledOptions<Props = Record<PropertyKey, any>> {
   label?: string
-  shouldForwardProp?(
-    propName: Props extends null ? PropertyKey : keyof Props
-  ): boolean
+  shouldForwardProp?(propName: keyof Props): boolean
   target?: string
 }