Skip to content
Draft
Changes from all commits
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
29 changes: 11 additions & 18 deletions src/core.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,15 @@ export function useNostr() {
export function useNostrEvents({
filter,
enabled = true,
onEvent,
onDone,
onSubscribe,
}: {
filter: Filter
enabled?: boolean
onEvent?: OnEventFunc
onDone?: OnDoneFunc
onSubscribe?: OnSubscribeFunc
}) {
const {
isLoading: isLoadingProvider,
Expand All @@ -145,9 +151,11 @@ export function useNostrEvents({
return
})

let onEventCallback: null | OnEventFunc = null
let onSubscribeCallback: null | OnSubscribeFunc = null
let onDoneCallback: null | OnDoneFunc = null
const onEventCallback: OnEventFunc = useCallback(onEvent, [onEvent])
const onSubscribeCallback: OnSubscribeFunc = useCallback(onSubscribe, [
onSubscribe,
])
const onDoneCallback: OnDoneFunc = useCallback(onDone, [onDone])

// Lets us detect changes in the nested filter object for the useEffect hook
const filterBase64 =
Expand Down Expand Up @@ -226,20 +234,5 @@ export function useNostrEvents({
onConnect,
connectedRelays,
unsubscribe,
onSubscribe: (_onSubscribeCallback: OnSubscribeFunc) => {
if (_onSubscribeCallback) {
onSubscribeCallback = _onSubscribeCallback
}
},
onEvent: (_onEventCallback: OnEventFunc) => {
if (_onEventCallback) {
onEventCallback = _onEventCallback
}
},
onDone: (_onDoneCallback: OnDoneFunc) => {
if (_onDoneCallback) {
onDoneCallback = _onDoneCallback
}
},
}
}