Skip to content

(Fix) HtmlPanel crash bug #13

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
Asha20 merged 2 commits into from
Oct 4, 2024
Merged

(Fix) HtmlPanel crash bug #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b74d9d3
fix(htmlpanel) Properly reeinitialize session when user ID changes
Asha20 Oct 4, 2024
92231d7
fix(htmlpanel) Reinitialize session when auth params change
Asha20 Oct 4, 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
7 changes: 1 addition & 6 deletions example/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ function App() {
setConvId(convIds[nextConv]);
}, [convId]);

const createUser = useCallback(() => {
console.log("createUser");
return new Talk.User(me);
}, [me]);

const createConv = useCallback(
(session: Talk.Session) => {
console.log("createConv");
Expand Down Expand Up @@ -141,7 +136,7 @@ function App() {
<>
<Session
appId={import.meta.env.VITE_APP_ID}
syncUser={createUser}
syncUser={() => new Talk.User(me)}
onBrowserPermissionNeeded={onPerm}
onUnreadsChange={onUnreads}
sessionRef={sessionRef}
Expand Down
37 changes: 29 additions & 8 deletions lib/Session.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,21 @@ export function Session(props: SessionProps) {
Talk.ready.then(() => markReady(true));
}, []);

useEffect(() => {
if (ready) {
const me =
typeof syncUser === "function"
? syncUser()
: syncUser ?? new Talk.User(userId);
const me = ready
? typeof syncUser === "function"
? syncUser()
: syncUser ?? new Talk.User(userId)
: null;

const session = new Talk.Session({ appId, me, token, tokenFetcher, signature });
useEffect(() => {
if (me) {
const session = new Talk.Session({
appId,
me,
token,
tokenFetcher,
signature,
});
setSession(session);
if (sessionRef) {
sessionRef.current = session;
Expand All @@ -65,7 +72,21 @@ export function Session(props: SessionProps) {
}
};
}
}, [ready, signature, appId, userId, syncUser, sessionRef]);
// We intentionally add `me?.id` to the dependency array here instead of
// just `me`, because `me` is an object so a shallow comparison will always
// return `false`.
//
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
ready,
signature,
appId,
userId,
me?.id,
token,
tokenFetcher,
sessionRef,
]);

useMethod(
session,
Expand Down