Skip to content
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

[Bug fix] CallId switch losing participants fix #5725

Merged
merged 10 commits into from
Mar 27, 2025
Merged

[Bug fix] CallId switch losing participants fix #5725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee7ac44
update useAdapted selector to always use the up to date callId
dmceachernmsft Mar 20, 2025
752226c
Change files
dmceachernmsft Mar 20, 2025
671a8d4
fix build
dmceachernmsft Mar 20, 2025
898fbde
Merge branch 'main' into dmceachernmsft/callid-fix
dmceachernmsft Mar 20, 2025
d439dba
Merge branch 'main' into dmceachernmsft/callid-fix
dmceachernmsft Mar 21, 2025
6ea26bd
remove callid from array
dmceachernmsft Mar 21, 2025
9ec332d
Merge branch 'dmceachernmsft/callid-fix' of https://github.com/Azure/…
dmceachernmsft Mar 21, 2025
e334b6d
Merge branch 'main' into dmceachernmsft/callid-fix
dmceachernmsft Mar 24, 2025
c31d7c0
Merge branch 'main' into dmceachernmsft/callid-fix
JamesBurnside Mar 25, 2025
79cb8c4
Merge branch 'main' into dmceachernmsft/callid-fix
dmceachernmsft Mar 27, 2025
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-f68338ad-fc4f-463e-b91a-4a6d648986d7.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": "Calls",
"comment": "update useAdapted selector to always use the up to date callId",
"packageName": "@azure/communication-react",
"email": "[email protected]",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-f68338ad-fc4f-463e-b91a-4a6d648986d7.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": "Calls",
"comment": "update useAdapted selector to always use the up to date callId",
"packageName": "@azure/communication-react",
"email": "[email protected]",
"dependentChangeType": "patch"
}
14 changes: 4 additions & 10 deletions packages/react-composites/src/composites/CallComposite/hooks/useAdaptedSelector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/* eslint-disable @typescript-eslint/no-explicit-any */

import { useState, useEffect, useRef, useMemo } from 'react';
import { useState, useEffect, useRef } from 'react';

import memoizeOne from 'memoize-one';
import { useAdapter } from '../adapter/CallAdapterProvider';
Expand Down Expand Up @@ -52,14 +52,8 @@ export const useSelectorWithAdaptation = <
});

const callId = adapter.getState().call?.id;
const callConfigProps = useMemo(
() => ({
callId
}),
[callId]
);

const [props, setProps] = useState(selector(adaptState(adapter.getState()), selectorProps ?? callConfigProps));
const [props, setProps] = useState(selector(adaptState(adapter.getState()), selectorProps ?? { callId }));
const propRef = useRef(props);
propRef.current = props;

Expand All @@ -68,7 +62,7 @@ export const useSelectorWithAdaptation = <
if (!mounted.current) {
return;
}
const newProps = selector(adaptState(state), selectorProps ?? callConfigProps);
const newProps = selector(adaptState(state), selectorProps ?? { callId: state.call?.id });
Copy link
Member

Choose a reason for hiding this comment

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

I assume it's ok { callId: state.call?.id } will be a new object each time selector is called, but perhaps we should check that selector from reselect doesn't require the props to be memoized

Copy link
Member Author

Choose a reason for hiding this comment

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

Looking at their docs for create selector it does not seem that they need anything to be memoized. they have lots of options to memoize the selector though
https://reselect.js.org/api/createSelector

Copy link
Member

Choose a reason for hiding this comment

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

Just verified this, put a console log inside the if (propRef.current !== newProps) { (and one in an else to that) and validate there is no difference if a cached { callId } is used vs creating the callId object each pass 👍

if (propRef.current !== newProps) {
setProps(newProps);
}
Expand All @@ -77,7 +71,7 @@ export const useSelectorWithAdaptation = <
return () => {
adapter.offStateChange(onStateChange);
};
}, [adaptState, adapter, selector, selectorProps, callConfigProps]);
}, [adaptState, adapter, selector, selectorProps]);
return props;
};

Expand Down