feat(js sdk): Prepare for Next.js TG-272 (#425)

tolgee · Sep 8, 2021 · 7c75a1b · 7c75a1b
1 parent 5811f90
commit 7c75a1b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/packages/core/src/Tolgee.test.ts b/packages/core/src/Tolgee.test.ts
@@ -255,6 +255,7 @@ describe('Tolgee', () => {
   });
 
   test('will return proper initialLoading', () => {
+    tolgee.properties.config.mode = 'production';
     tolgee.properties.config.preloadFallback = true;
     tolgee.properties.currentLanguage = 'cs';
     tolgee.properties.config.staticData = {
@@ -267,6 +268,8 @@ describe('Tolgee', () => {
     tolgee.properties.config.preloadFallback = true;
     tolgee.properties.config.staticData.en = {};
     expect(tolgee.initialLoading).toEqual(false);
+    tolgee.properties.config.mode = 'development';
+    expect(tolgee.initialLoading).toEqual(true);
   });
 
   describe('lang setter', () => {

diff --git a/packages/core/src/Tolgee.ts b/packages/core/src/Tolgee.ts
@@ -57,6 +57,10 @@ export class Tolgee {
    * fetching so initial loading is not needed at all.
    */
   get initialLoading(): boolean {
+    if (this.properties?.config?.mode !== 'production') {
+      return true;
+    }
+
     const currentLang = this.properties.currentLanguage;
     const fallbackLang = this.properties.config.fallbackLanguage;
     const fallbackPreloading = this.properties.config.preloadFallback;

diff --git a/packages/react/src/T.tsx b/packages/react/src/T.tsx
@@ -12,12 +12,15 @@ type TProps = {
 export const T: FunctionComponent<TProps> = (props: TProps) => {
   const context = useTolgeeContext();
 
+  const noWrap = typeof window !== 'undefined' ? props.noWrap : true;
+
   const [translated, setTranslated] = useState(
-    context.tolgee.instant(props.children, props.parameters, props.noWrap, true)
+    context.tolgee.instant(props.children, props.parameters, noWrap, true)
   );
+
   const translate = () =>
     context.tolgee
-      .translate(props.children, props.parameters, props.noWrap)
+      .translate(props.children, props.parameters, noWrap)
       .then((t) => {
         setTranslated(t);
       });

diff --git a/packages/react/src/TolgeeProvider.tsx b/packages/react/src/TolgeeProvider.tsx
@@ -18,6 +18,13 @@ export const TolgeeProvider: FunctionComponent<TolgeeProviderProps> = (
 
   const [loading, setLoading] = useState(tolgee.initialLoading);
 
+  useEffect(() => {
+    if (config.forceLanguage !== undefined) {
+      tolgee.properties.config.forceLanguage = config.forceLanguage;
+      tolgee.lang = config.forceLanguage;
+    }
+  }, [config.forceLanguage]);
+
   useEffect(() => {
     tolgee.run().then(() => setLoading(false));