fix useSplitClient

Author: EmilianoSanchez

src/__tests__/useSplitTreatments.test.tsx

@@ -40,6 +40,8 @@ test('useSplitTreatments', async () => {
   const user2Client = outerFactory.client('user_2') as any;
 
   let countSplitContext = 0, countSplitTreatments = 0, countUseSplitTreatments = 0, countUseSplitTreatmentsUser2 = 0, countUseSplitTreatmentsUser2WithUpdate = 0;
+  const lastUpdateSetUser2 = new Set<number>();
+  const lastUpdateSetUser2WithUpdate = new Set<number>();
 
   render(
     <SplitFactory factory={outerFactory} >
@@ -61,13 +63,15 @@ test('useSplitTreatments', async () => {
           const context = useSplitTreatments(['split_test'], undefined, 'user_2');
           expect(context.client).toBe(user2Client);
           validateTreatments(context);
+          lastUpdateSetUser2.add(context.lastUpdate);
           countUseSplitTreatmentsUser2++;
           return null;
         })}
         {React.createElement(() => {
           const context = useSplitTreatments(['split_test'], undefined, 'user_2', { updateOnSdkUpdate: true });
           expect(context.client).toBe(user2Client);
           validateTreatments(context);
+          lastUpdateSetUser2WithUpdate.add(context.lastUpdate);
           countUseSplitTreatmentsUser2WithUpdate++;
           return null;
         })}
@@ -96,8 +100,10 @@ test('useSplitTreatments', async () => {
 
   // If useSplitTreatments uses a different client than the context one, it renders when the context renders and when the new client is ready and ready from cache.
   expect(countUseSplitTreatmentsUser2).toEqual(countSplitContext + 2);
+  expect(lastUpdateSetUser2.size).toEqual(3);
   // If it is used with `updateOnSdkUpdate: true`, it also renders when the client emits an SDK_UPDATE event.
   expect(countUseSplitTreatmentsUser2WithUpdate).toEqual(countSplitContext + 3);
+  expect(lastUpdateSetUser2WithUpdate.size).toEqual(4);
   expect(user2Client.getTreatmentsWithConfig).toHaveBeenCalledTimes(5);
   expect(user2Client.getTreatmentsWithConfig).toHaveBeenLastCalledWith(['split_test'], undefined);
 });

src/useSplitClient.ts

@@ -26,8 +26,6 @@ export function useSplitClient(key?: SplitIO.SplitKey, trafficType?: string, att
   const context = React.useContext(SplitContext);
   const { client: contextClient, factory } = context;
 
-  if (!factory) return context;
-
   let client = contextClient as IClientWithContext;
   if (key && factory) {
     client = getSplitClient(factory, key, trafficType);
@@ -39,6 +37,8 @@ export function useSplitClient(key?: SplitIO.SplitKey, trafficType?: string, att
   // Handle client events
   // NOTE: assuming that SDK events are scattered in time so that Date.now() timestamps are unique per event and trigger an update
   React.useEffect(() => {
+    if (!client) return;
+
     const setReady = () => {
       if (options.updateOnSdkReady) setLastUpdate(Date.now());
     }
@@ -72,6 +72,6 @@ export function useSplitClient(key?: SplitIO.SplitKey, trafficType?: string, att
   }, [client]);
 
   return {
-    factory, client, ...getStatus(client), lastUpdate
+    factory, client, ...getStatus(client), lastUpdate: client === contextClient ? context.lastUpdate : lastUpdate,
   };
 }