@@ -63,10 +63,8 @@ const QUERY_SORT_ORDER = `order(${SORT_FIELD} ${SORT_ORDER})`
63
63
export function useCommentsStore ( opts : CommentsStoreOptions ) : CommentsStoreReturnType {
64
64
const { client, documentId, onLatestTransactionIdReceived, transactionsIdMap, releaseId} = opts
65
65
66
- const query = useMemo ( ( ) => {
67
- const filters = [ ...QUERY_FILTERS , releaseId ? VERSION_FILTER : NO_VERSION_FILTER ]
68
- return `*[${ filters . join ( ' && ' ) } ] ${ QUERY_PROJECTION } | ${ QUERY_SORT_ORDER } `
69
- } , [ releaseId ] )
66
+ const filters = [ ...QUERY_FILTERS , releaseId ? VERSION_FILTER : NO_VERSION_FILTER ] . join ( ' && ' )
67
+ const query = useMemo ( ( ) => `*[${ filters } ] ${ QUERY_PROJECTION } | ${ QUERY_SORT_ORDER } ` , [ filters ] )
70
68
71
69
const [ state , dispatch ] = useReducer ( commentsReducer , INITIAL_STATE )
72
70
const [ loading , setLoading ] = useState < boolean > ( client !== null )
@@ -170,15 +168,15 @@ export function useCommentsStore(opts: CommentsStoreOptions): CommentsStoreRetur
170
168
const listener$ = useMemo ( ( ) => {
171
169
if ( ! client ) return of ( )
172
170
173
- const events$ = client . observable . listen ( query , params , LISTEN_OPTIONS ) . pipe (
171
+ const events$ = client . observable . listen ( `*[ ${ filters } ]` , params , LISTEN_OPTIONS ) . pipe (
174
172
catchError ( ( err ) => {
175
173
setError ( err )
176
174
return of ( err )
177
175
} ) ,
178
176
)
179
177
180
178
return events$
181
- } , [ client , params , query ] )
179
+ } , [ client , filters , params ] )
182
180
183
181
useEffect ( ( ) => {
184
182
const sub = listener$ . subscribe ( handleListenerEvent )
0 commit comments