Merge pull request #175 from Azure-Samples/mgamis/post-1.22.0-release…

…-update 1.22.0 post-release update
Azure-Samples · Dec 20, 2024 · 2e7550c · 2e7550c
2 parents 5c45819 + 5cd49cd
commit 2e7550c
Show file tree

Hide file tree

Showing 7 changed files with 738 additions and 693 deletions.
diff --git a/Chat/package-lock.json b/Chat/package-lock.json
diff --git a/Chat/package.json b/Chat/package.json
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@azure/abort-controller": "^1.1.0",
-    "@azure/communication-chat": "^1.5.2",
+    "@azure/communication-chat": "^1.5.4",
     "@azure/communication-common": "^2.3.1",
     "@azure/communication-identity": "^1.3.0",
-    "@azure/communication-react": "1.21.0",
+    "@azure/communication-react": "1.22.0",
     "@azure/logger": "^1.0.4",
     "@fluentui/react": "^8.115.2",
     "@fluentui/react-file-type-icons": "8.11.4",

diff --git a/Chat/public/index.html b/Chat/public/index.html
@@ -5,7 +5,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta name="description" content="Web site created using create-react-app" />
     <title>ACS Chat Sample App</title>

diff --git a/Chat/src/app/ChatHeader.tsx b/Chat/src/app/ChatHeader.tsx
@@ -22,7 +22,7 @@ export interface ChatHeaderProps {
 export const ChatHeader = (props: ChatHeaderProps): JSX.Element => {
   const theme = useTheme();
 
-  const leaveString = 'Leave';
+  const leaveString = 'Leave Chat';
   return (
     <Stack
       horizontal={true}

diff --git a/Chat/src/app/styles/ChatHeader.styles.ts b/Chat/src/app/styles/ChatHeader.styles.ts
@@ -15,7 +15,7 @@ export const chatHeaderContainerStyle = mergeStyles({
 
 export const leaveButtonStyle = mergeStyles({
   marginRight: '0.625rem',
-  width: '6.688rem',
+  width: '8rem',
   borderWidth: '0.125rem',
   fontSize: '0.875rem', // 14px
   fontWeight: 600

diff --git a/Chat/src/app/theming/SwitchableFluentThemeProvider.tsx b/Chat/src/app/theming/SwitchableFluentThemeProvider.tsx
@@ -63,7 +63,7 @@ interface SwitchableFluentThemeContext {
   themeStore: ThemeCollection;
 }
 
-const defaultTheme: NamedTheme = defaultThemes.Light;
+const defaultTheme: NamedTheme = defaultThemes.Light as NamedTheme;
 
 /**
  * React useContext for FluentTheme state of SwitchableFluentThemeProvider

diff --git a/Chat/src/app/theming/ThemeSelector.tsx b/Chat/src/app/theming/ThemeSelector.tsx
@@ -31,6 +31,11 @@ export const ThemeSelector = (props: ThemeSelectorProps): JSX.Element => {
     if (option) {
       const themeName = option.key.toString();
       const theme = themeStore[themeName];
+
+      if (!theme) {
+        throw new Error(`Theme ${themeName} not found in theme store`);
+      }
+
       setCurrentTheme(theme);
     }
   };