Skip to content

chore (Hooks): Move common client ready logic to a separate function #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 17, 2020
Merged

chore (Hooks): Move common client ready logic to a separate function #34

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4532790
move common client ready logic to a separate function
Mar 16, 2020
bf1f788
refactor to use set state and beef up the types!
Mar 17, 2020
1030379
Use object spread instead of object.assign
Mar 17, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use object spread instead of object.assign
  • Loading branch information
James Fox committed Mar 17, 2020
commit 1030379fdafe6f68f9ccbdeffd6126a056c724b1
8 changes: 4 additions & 4 deletions src/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,20 @@ const initializeWhenClientReadyFn = (
logger.info(`${type}="${name}" successfully set for user="${optimizely.user.id}"`);
return;
}
setState((state: HookState) => Object.assign({}, state, { didTimeout: true }));
setState((state: HookState) => ({ ...state, didTimeout: true }));
logger.info(`${type}="${name}" could not be set before timeout of ${timeout}ms, reason="${res.reason || ''}"`);
// Since we timed out, wait for the dataReadyPromise to resolve before setting up.
return res.dataReadyPromise!.then(() => {
logger.info(`${type}="${name}" is now set, but after timeout.`);
});
})
.then(() => {
setState((state: HookState) => Object.assign({}, state, { clientReady: true }, getCurrentDecisionValues()));
setState((state: HookState) => ({ ...state, ...getCurrentDecisionValues(), clientReady: true }));
if (options.autoUpdate) {
cleanupFns.push(
setupAutoUpdateListeners(optimizely, type, name, logger, () => {
if (cleanupFns.length) {
setState((state: HookState) => Object.assign({}, state, getCurrentDecisionValues()));
setState((state: HookState) => ({ ...state, ...getCurrentDecisionValues() }));
}
})
);
Expand Down Expand Up @@ -164,7 +164,7 @@ export const useFeature: UseFeature = (featureKey, options = {}, overrides = {})
didTimeout: false,
};
if (isServerSide) {
return Object.assign(initialState, getCurrentValues());
return { ...initialState, ...getCurrentValues() };
}
return initialState;
});
Expand Down