Skip to content

Mitigate chat re-rerenders in callwithchat composite #4301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesBurnside merged 6 commits into from
Mar 19, 2024
Merged

Mitigate chat re-rerenders in callwithchat composite #4301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60121b4
ensure theme is memoized when it is merged
JamesBurnside Mar 19, 2024
d97cd40
Change files
JamesBurnside Mar 19, 2024
65f7e39
Duplicate change files for beta release
JamesBurnside Mar 19, 2024
c76dee2
reduce
JamesBurnside Mar 19, 2024
b6c128a
Merge branch 'main' into jaburnsi/mitigate-chat-rerenders
JamesBurnside Mar 19, 2024
b48514c
Merge branch 'main' into jaburnsi/mitigate-chat-rerenders
JamesBurnside Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-bbcff981-b3c8-4443-8fe1-d10b89221703.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "",
"comment": "Ensure theme is memoized for calls to useTheme",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-bbcff981-b3c8-4443-8fe1-d10b89221703.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "",
"comment": "Ensure theme is memoized for calls to useTheme",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
8 changes: 5 additions & 3 deletions packages/react-components/src/theming/FluentThemeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

import React, { createContext, useContext } from 'react';
import React, { createContext, useContext, useMemo } from 'react';
import { ThemeProvider, PartialTheme, Theme, getTheme, mergeThemes, mergeStyles } from '@fluentui/react';
import { lightTheme } from './themes';

Expand Down Expand Up @@ -63,8 +63,10 @@ const ThemeContext = createContext<Theme>(defaultTheme);
export const FluentThemeProvider = (props: FluentThemeProviderProps): JSX.Element => {
const { fluentTheme, rtl, children, /* @conditional-compile-remove(image-overlay) */ rootStyle } = props;

let fluentV8Theme: Theme = mergeThemes(defaultTheme, fluentTheme);
fluentV8Theme = mergeThemes(fluentV8Theme, { rtl });
const fluentV8Theme = useMemo(() => {
const mergedTheme = mergeThemes(defaultTheme, fluentTheme);
Copy link
Copy Markdown
Member

@vhuseinova-msft vhuseinova-msft Mar 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch!

return mergeThemes(mergedTheme, { rtl });
}, [fluentTheme, rtl]);

return (
<ThemeContext.Provider value={fluentV8Theme}>
Expand Down
⚡