Skip to content

Commit

Permalink
✨remove memoised callback, pass empty data object
Browse files Browse the repository at this point in the history
  • Loading branch information
Harley Alexander committed Oct 29, 2019
1 parent ba2f27a commit f13d3d6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/useClientTrigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export function useClientTrigger<T>(channel: Channel | PresenceChannel<T>) {

// memoize trigger so it's not being created every render
const trigger = useCallback(
(eventName: string, data?: any) => {
(eventName: string, data: any = {}) => {
invariant(eventName, "Must pass event name to trigger a client event.");
channel && channel.trigger(eventName, data);
},
Expand Down
16 changes: 12 additions & 4 deletions src/useEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,23 @@ export function useEvent<T>(
invariant(eventName, "Must supply eventName and callback to onEvent");
invariant(callback, "Must supply callback to onEvent");

const callbackRef = useCallback<EventCallback>(callback, dependencies);
useEffect(() => {
if (dependencies) {
console.warn(
"dependencies are no longer honoured - memoizing the callback is up to the developer."
);
}
}, [dependencies]);

// const callbackRef = useCallback<EventCallback>(callback, dependencies);
useEffect(() => {
if (channel === undefined) {
// console.warn("No channel supplied to onEvent. Not binding callback.");
return;
}
channel.bind(eventName, callbackRef);
channel.bind(eventName, callback);
return () => {
channel.unbind(eventName, callbackRef);
channel.unbind(eventName, callback);
};
}, [channel, eventName, callbackRef]);
}, [channel, eventName, callback]);
}

0 comments on commit f13d3d6

Please sign in to comment.