mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2025-01-10 18:27:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed event source not being properly closed with new boundToMercureHub HOC

Browse source
This commit is contained in:
Alejandro Celaya 2020-09-12 12:06:53 +02:00
parent cfb165d240
commit fe3e08de0f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mercure/helpers/boundToMercureHub.tsx
View file

@ -1,4 +1,5 @@
import React, { FC, useEffect } from 'react';
import { pipe } from 'ramda';
import { CreateVisit } from '../../visits/types';
import { MercureInfo } from '../reducers/mercureInfo';
import { bindToMercureTopic } from './index';
@ -21,11 +22,10 @@ export function boundToMercureHub<T = {}>(
useEffect(() => {
const onMessage = (visit: CreateVisit) => interval ? pendingUpdates.add(visit) : createNewVisits([ visit ]);
bindToMercureTopic(mercureInfo, getTopicForProps(props), onMessage, loadMercureInfo);
const closeEventSource = bindToMercureTopic(mercureInfo, getTopicForProps(props), onMessage, loadMercureInfo);
if (!interval) {
return undefined;
return closeEventSource;
}
const timer = setInterval(() => {
@ -33,7 +33,7 @@ export function boundToMercureHub<T = {}>(
pendingUpdates.clear();
}, interval * 1000 * 60);
return () => clearInterval(timer);
return pipe(() => clearInterval(timer), () => closeEventSource?.());
}, [ mercureInfo ]);
return <WrappedComponent {...props} />;