0.3.0

examples/next/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "next": "12.2.2",
-    "next-international": "workspace:0.2.0",
+    "next-international": "workspace:0.3.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

packages/international-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "international-types",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Type-safe internationalization (i18n) utility types",
   "types": "dist/index.d.ts",
   "keywords": [

packages/next-international/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-international",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Type-safe internationalization (i18n) for Next.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,6 +36,6 @@
     "react": "^18.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "international-types": "0.2.0"
+    "international-types": "0.3.0"
   }
 }

packages/next-international/src/i18n/create-use-i18n.ts

@@ -1,4 +1,4 @@
-import React, { useContext, Context } from 'react';
+import React, { useContext, Context, isValidElement, cloneElement, ReactNode } from 'react';
 import type {
   BaseLocale,
   LocaleKeys,
@@ -45,29 +45,28 @@ export function createUsei18n<Locale extends BaseLocale>(I18nContext: Context<Lo
         }
 
         let isString = true;
+
         const result = value.split(/({[^}]*})/).map((part, index) => {
           const match = part.match(/{(.*)}/);
+
           if (match) {
             const param = match[1] as keyof Locale;
             const paramValue = (paramObject as LocaleMap<Locale>)[param];
-            if (typeof paramValue !== 'string') {
-              isString = false;
-            }
-            if (React.isValidElement(paramValue)) {
-              return React.cloneElement(paramValue, { key: `${String(param)}-${index}` });
-            } else {
-              return paramValue as React.ReactNode;
-            }
+
+            if (typeof paramValue !== 'string') isString = false;
+
+            return isValidElement(paramValue)
+              ? cloneElement(paramValue, { key: `${String(param)}-${index}` })
+              : (paramValue as ReactNode);
           }
+
           // if there's no match - it's not a variable and just a normal string
           return part;
         });
-        if (isString) {
-          return result.join('');
-        } else {
-          return result;
-        }
+
+        return isString ? result.join('') : result;
       }
+
       return t;
     }