From 8d3423934b81b646a6424164df3b8daed9061074 Mon Sep 17 00:00:00 2001
From: Andrii Bodnar <andrii.bodnar@crowdin.com>
Date: Tue, 14 Mar 2023 16:30:08 +0200
Subject: [PATCH] Merge branch 'main' into next

---
 packages/react/src/Trans.tsx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/react/src/Trans.tsx b/packages/react/src/Trans.tsx
index 360bde2ca..106e7a413 100644
--- a/packages/react/src/Trans.tsx
+++ b/packages/react/src/Trans.tsx
@@ -14,8 +14,8 @@ export type TransRenderProps = {
 export type TransProps = {
   id: string
   message?: string
-  values: Record<string, unknown>
-  components: { [key: string]: React.ElementType | any }
+  values?: Record<string, unknown>
+  components?: { [key: string]: React.ElementType | any }
   formats?: Record<string, unknown>
   children?: React.ReactNode
   component?: React.ComponentType<TransRenderProps>
@@ -26,8 +26,8 @@ export function Trans(props: TransProps): React.ReactElement<any, any> | null {
   const { i18n, defaultComponent } = useLingui()
   const { render, component, id, message, formats } = props
 
-  const values = { ...props.values }
-  const components = { ...props.components }
+  const values = { ...(props.values || {}) }
+  const components = { ...(props.components || {}) }
 
   if (values) {
     /*
@@ -113,8 +113,3 @@ export function Trans(props: TransProps): React.ReactElement<any, any> | null {
     <Component>{translation}</Component>
   )
 }
-
-Trans.defaultProps = {
-  values: {},
-  components: {},
-}