fix(chat-settings): fix multiple imports

NAS-Service · Sep 10, 2022 · a09ad67 · a09ad67
1 parent 5081258
commit a09ad67
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 21 deletions.
diff --git a/apps/app/src/app/pages/chatbox/embed.tsx b/apps/app/src/app/pages/chatbox/embed.tsx
@@ -19,6 +19,24 @@ function EmbedChatbox() {
     [theme]
   );
 
+  useEffect(() => {
+    if (theme) {
+      (async () => {
+        const WebFont = await import('webfontloader');
+        WebFont.load({
+          google: {
+            families: [
+              theme.name.fontFamily +
+                ':100,200,300,400,500,600,700,800,900,950',
+              theme.message.fontFamily +
+                ':100,200,300,400,500,600,700,800,900,950',
+            ],
+          },
+        });
+      })();
+    }
+  }, [theme]);
+
   useEffect(() => {
     if (theme) {
       void client.connect();

diff --git a/libs/shared/ui/src/lib/components/chat/chat-demo/chat-demo.tsx b/libs/shared/ui/src/lib/components/chat/chat-demo/chat-demo.tsx
@@ -26,6 +26,24 @@ export function ChatDemo(props: ChatDemoProps) {
     pushMessage();
   }, []);
 
+  useEffect(() => {
+    if (settings) {
+      (async () => {
+        const WebFont = await import('webfontloader');
+        WebFont.load({
+          google: {
+            families: [
+              settings.name.fontFamily +
+                ':100,200,300,400,500,600,700,800,900,950',
+              settings.message.fontFamily +
+                ':100,200,300,400,500,600,700,800,900,950',
+            ],
+          },
+        });
+      })();
+    }
+  }, [settings.name.fontFamily, settings.message.fontFamily]);
+
   return (
     <>
       {demo.map((message, index) => (

diff --git a/libs/shared/ui/src/lib/components/chat/chat-message/chat-message.tsx b/libs/shared/ui/src/lib/components/chat/chat-message/chat-message.tsx
@@ -72,22 +72,6 @@ export function ChatMessage(props: ChatMessageProps) {
     }
   }, [settings]);
 
-  useEffect(() => {
-    if (nameStyle.fontFamily && messageStyle.fontFamily) {
-      (async () => {
-        const WebFont = await import('webfontloader');
-        WebFont.load({
-          google: {
-            families: [
-              nameStyle.fontFamily as string,
-              messageStyle.fontFamily as string,
-            ],
-          },
-        });
-      })();
-    }
-  }, [nameStyle.fontFamily, messageStyle.fontFamily]);
-
   return (
     <div style={containerStyle} className="flex w-full">
       <div style={nameStyle} className="shrink-0">

diff --git a/libs/shared/ui/src/lib/components/chat/chat-settings/chat-settings.tsx b/libs/shared/ui/src/lib/components/chat/chat-settings/chat-settings.tsx
@@ -22,8 +22,7 @@ export function ChatSettings(props: ChatSettingsProps) {
   });
 
   useEffect(() => {
-    onSettingsChange(getValues());
-    const subscription = watch((value) => console.log(value));
+    const subscription = watch((value) => onSettingsChange(value));
     return () => subscription.unsubscribe();
   }, [watch, onSettingsChange, getValues]);
 

diff --git a/libs/shared/ui/src/lib/components/forms/spacing/spacing.tsx b/libs/shared/ui/src/lib/components/forms/spacing/spacing.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import Input from '../input/input';
 import Label from '../label/label';
 
-interface Spacing {
+interface SpacingValue {
   top?: number;
   left?: number;
   right?: number;
@@ -17,8 +17,8 @@ interface Radius {
 }
 
 export interface SpacingProps {
-  value?: Spacing & Radius;
-  onValueChange?: (value: Spacing | Radius) => void;
+  value?: SpacingValue & Radius;
+  onValueChange?: (value: SpacingValue | Radius) => void;
   label?: string;
   className?: string;
   type?: 'spacing' | 'radius';