From 42bb95a48bb8b42c038166b5b557fea446d84607 Mon Sep 17 00:00:00 2001 From: Harley Alexander Date: Tue, 29 Oct 2019 09:51:16 +1100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20improve=20DX:=20=20`useEve?= =?UTF-8?q?nt(data=3F:=20T)`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mocks.ts | 4 ++-- src/useClientTrigger.ts | 2 +- src/useEvent.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mocks.ts b/src/mocks.ts index a8af3ff..3e58792 100644 --- a/src/mocks.ts +++ b/src/mocks.ts @@ -5,9 +5,9 @@ class PusherChannelMock { /** Initialize PusherChannelMock with callbacks object. */ callbacks: { [name: string]: Function[] }; name: string; - constructor(name: string) { + constructor(name?: string) { this.callbacks = {}; - this.name = name; + this.name = name || "channel"; } /** diff --git a/src/useClientTrigger.ts b/src/useClientTrigger.ts index cf3d97a..afd02d0 100644 --- a/src/useClientTrigger.ts +++ b/src/useClientTrigger.ts @@ -13,7 +13,7 @@ export function useClientTrigger(channel: Channel | PresenceChannel) { const trigger = useCallback( (eventName: string, data?: any) => { invariant(eventName, "Must pass event name to trigger a client event."); - channel && channel.trigger(eventName, { data }); + channel && channel.trigger(eventName, data); }, [channel] ); diff --git a/src/useEvent.ts b/src/useEvent.ts index 93702c3..08e39bc 100644 --- a/src/useEvent.ts +++ b/src/useEvent.ts @@ -9,10 +9,10 @@ import { Channel, PresenceChannel, EventCallback } from "pusher-js"; * @param callback Callback to call on a new event * @param dependencies Dependencies the callback uses. */ -export function useEvent( +export function useEvent( channel: Channel | PresenceChannel | undefined, eventName: string, - callback: EventCallback, + callback: (data?: T) => void, dependencies: any[] = [] ) { invariant(eventName, "Must supply eventName and callback to onEvent");