react-i18next 11.13.0 → 11.14.0

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 11.14.0
+
+- Remove generics from Trans component to suppress warning issue [1400](https://github.com/i18next/react-i18next/pull/1400)
+- Add type support to plurals [1399](https://github.com/i18next/react-i18next/pull/1399)
+
 ### 11.13.0
 
 - feat(types): add type-safe support to keyPrefix option [1390](https://github.com/i18next/react-i18next/pull/1390)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-i18next",
-  "version": "11.13.0",
+  "version": "11.14.0",
   "description": "Internationalization for react done right. Using the i18next i18n ecosystem.",
   "main": "dist/commonjs/index.js",
   "types": "./index.d.ts",

package/ts4.1/index.d.ts

@@ -35,8 +35,10 @@ export interface Resources {}
  * declare module 'react-i18next' {
  *   interface CustomTypeOptions {
  *     defaultNS: 'custom';
- *     returnNull: false,
- *     returnEmptyString: false,
+ *     returnNull: false;
+ *     returnEmptyString: false;
+ *     keySeparator: '.';
+ *     jsonFormat: 'v4';
  *     resources: {
  *       custom: {
  *         foo: 'foo';
@@ -56,6 +58,7 @@ type TypeOptions = MergeBy<
     returnEmptyString: true;
     keySeparator: '.';
     defaultNS: 'translation';
+    jsonFormat: 'v4';
     resources: Resources;
   },
   CustomTypeOptions
@@ -92,6 +95,12 @@ declare module 'i18next' {
   }
 }
 
+type WithOrWithoutPlural<K> = TypeOptions['jsonFormat'] extends 'v4'
+  ? K extends `${infer B}_${'zero' | 'one' | 'two' | 'few' | 'many' | 'other'}`
+    ? B | K
+    : K
+  : K;
+
 // Normalize single namespace
 type AppendKeys<K1, K2, S extends string = TypeOptions['keySeparator']> = `${K1 & string}${S}${K2 &
   string}`;
@@ -100,11 +109,11 @@ type AppendKeys2<K1, K2, S extends string = TypeOptions['keySeparator']> = `${K1
 type Normalize2<T, K = keyof T> = K extends keyof T
   ? T[K] extends Record<string, any>
     ? T[K] extends readonly any[]
-      ? AppendKeys2<K, keyof T[K]> | AppendKeys2<K, Normalize2<T[K]>>
-      : AppendKeys<K, keyof T[K]> | AppendKeys<K, Normalize2<T[K]>>
+      ? AppendKeys2<K, WithOrWithoutPlural<keyof T[K]>> | AppendKeys2<K, Normalize2<T[K]>>
+      : AppendKeys<K, WithOrWithoutPlural<keyof T[K]>> | AppendKeys<K, Normalize2<T[K]>>
     : never
   : never;
-type Normalize<T> = keyof T | Normalize2<T>;
+type Normalize<T> = WithOrWithoutPlural<keyof T> | Normalize2<T>;
 
 // Normalize multiple namespaces
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void
@@ -203,8 +212,8 @@ export interface TFunction<
   ): TFuncReturn<N, TKeys, TDefaultResult>;
 }
 
+type I18nKeyType<N extends Namespace> = TFuncKey<N> extends infer A ? A : never;
 export interface TransProps<
-  K extends TFuncKey<N> extends infer A ? A : never,
   N extends Namespace = DefaultNamespace,
   E extends Element = HTMLDivElement
 > extends React.HTMLProps<E> {
@@ -213,18 +222,17 @@ export interface TransProps<
   count?: number;
   defaults?: string;
   i18n?: i18n;
-  i18nKey?: K | K[];
+  i18nKey?: I18nKeyType<N> | I18nKeyType<N>[];
   ns?: N;
   parent?: string | React.ComponentType<any> | null; // used in React.createElement if not null
   tOptions?: {};
   values?: {};
   t?: TFunction<N>;
 }
-export function Trans<
-  K extends TFuncKey<N> extends infer A ? A : never,
-  N extends Namespace = DefaultNamespace,
-  E extends Element = HTMLDivElement
->(props: TransProps<K, N, E>): React.ReactElement;
+
+export function Trans<N extends Namespace = DefaultNamespace, E extends Element = HTMLDivElement>(
+  props: TransProps<N, E>,
+): React.ReactElement;
 
 export function useSSR(initialI18nStore: Resource, initialLanguage: string): void;