Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Update use-echo.ts
  • Loading branch information
joetannenbaum committed May 5, 2025
commit 67dea8d676a07544e2a39914cf7fe63ac364514f
31 changes: 27 additions & 4 deletions packages/react/src/hooks/use-echo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,17 @@ export const useEcho = <
>(
channelName: string,
event: string | string[],
callback: (payload: TPayload) => void,
callback: (payload: TPayload, eventName: string) => void,
dependencies: any[] = [],
visibility: TVisibility = "private" as TVisibility,
) => {
const callbackFunc = useCallback(callback, dependencies);
const callbacks = useRef<
Record<string, (payload: TPayload, eventName: string) => void>
>({});
const allCallbackFunc = useCallback(
(eventName: string, payload: TPayload) => callback(payload, eventName),
dependencies,
);
const subscription = useRef<Connection<TDriver> | null>(null);
const listening = useRef(false);

Expand All @@ -104,7 +110,11 @@ export const useEcho = <
}

events.forEach((e) => {
subscription.current!.stopListening(e, callbackFunc);
if (e !== "*") {
subscription.current!.stopListening(e, callbacks.current[e]);
} else if ("stopListeningToAll" in subscription.current!) {
subscription.current.stopListeningToAll(allCallbackFunc);
}
});

listening.current = false;
Expand All @@ -116,7 +126,20 @@ export const useEcho = <
}

events.forEach((e) => {
subscription.current!.listen(e, callbackFunc);
if (e !== "*") {
const cb =
callbacks.current[e] ??
((payload: TPayload) => callback(payload, e));

subscription.current!.listen(e, cb);
} else if ("listenToAll" in subscription.current!) {
subscription.current.listenToAll(allCallbackFunc);
} else {
// eslint-disable-next-line no-console
console.warn(
"listenToAll is not supported for this channel type",
);
}
});

listening.current = true;
Expand Down