Skip to content

fix: correct chatAdapterOptions handling inside useAzureCommunicationChatAdapter #6050

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

Open
neilcampbell wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −3
Open

fix: correct chatAdapterOptions handling inside useAzureCommunicationChatAdapter #6050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions ...es/react-composites/src/composites/ChatComposite/adapter/AzureCommunicationChatAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ export const useAzureCommunicationChatAdapter = (
*/
beforeDispose?: (adapter: ChatAdapter) => Promise<void>
): ChatAdapter | undefined => {
const { credential, displayName, endpoint, threadId, userId } = args;
const { credential, displayName, endpoint, threadId, userId, chatAdapterOptions } = args;

// State update needed to rerender the parent component when a new adapter is created.
const [adapter, setAdapter] = useState<ChatAdapter | undefined>(undefined);
Expand All @@ -688,12 +688,14 @@ export const useAzureCommunicationChatAdapter = (

const afterCreateRef = useRef<((adapter: ChatAdapter) => Promise<ChatAdapter>) | undefined>(undefined);
const beforeDisposeRef = useRef<((adapter: ChatAdapter) => Promise<void>) | undefined>(undefined);
const chatAdapterOptionsRef = useRef<ChatAdapterOptions | undefined>(undefined);
// These refs are updated on *each* render, so that the latest values
// are used in the `useEffect` closures below.
// Using a Ref ensures that new values for the callbacks do not trigger the
// useEffect blocks, and a new adapter creation / distruction is not triggered.
afterCreateRef.current = afterCreate;
beforeDisposeRef.current = beforeDispose;
chatAdapterOptionsRef.current = chatAdapterOptions;

useEffect(
() => {
Expand Down Expand Up @@ -725,7 +727,8 @@ export const useAzureCommunicationChatAdapter = (
displayName,
endpoint,
threadId,
userId
userId,
...(chatAdapterOptionsRef.current ? { chatAdapterOptions: chatAdapterOptionsRef.current } : undefined)
});
if (afterCreateRef.current) {
newAdapter = await afterCreateRef.current(newAdapter);
Expand All @@ -736,7 +739,17 @@ export const useAzureCommunicationChatAdapter = (
})();
},
// Explicitly list all arguments so that caller doesn't have to memoize the `args` object.
[adapterRef, afterCreateRef, beforeDisposeRef, credential, displayName, endpoint, threadId, userId]
[
adapterRef,
afterCreateRef,
beforeDisposeRef,
chatAdapterOptionsRef,
credential,
displayName,
endpoint,
threadId,
userId
]
);

// Dispose any existing adapter when the component unmounts.
Expand Down