Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions flagsmith-core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,13 @@ const Flagsmith = class {
this.evaluationEvent = state.evaluationEvent || this.evaluationEvent;
this.identity = this.getContext()?.identity?.identifier
this.log("setState called", this)
// Hydration from server state (e.g. <FlagsmithProvider serverState={...}>
// without an options prop) must flip loadingState to loaded. Guarded on
// source===NONE so we never clobber a loaded state already set by
// init()/getFlags()/cache paths that also call setState internally.
if (this.loadingState.source === FlagSource.NONE && this.flags && Object.keys(this.flags).length > 0) {
this.setLoadingState(this._loadedState(null, FlagSource.SERVER));
}
}
}

Expand Down
19 changes: 19 additions & 0 deletions test/react.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,25 @@ describe('FlagsmithProvider', () => {
expect(JSON.parse(screen.getByTestId('flags').innerHTML)).toEqual(removeIds(defaultState.flags))
})
})
it('reports a loaded state when hydrated from serverState with no options', async () => {
const { flagsmith } = getFlagsmith({})
render(
<FlagsmithProvider flagsmith={flagsmith} serverState={defaultState}>
<FlagsmithPage />
</FlagsmithProvider>,
)

// Flags are available from serverState immediately.
expect(JSON.parse(screen.getByTestId('flags').innerHTML)).toEqual(removeIds(defaultState.flags))

// Loading state must not be stuck on isLoading/isFetching=true.
await waitFor(() => {
const loadingState = JSON.parse(screen.getByTestId('loading-state').innerHTML)
expect(loadingState.isLoading).toBe(false)
expect(loadingState.isFetching).toBe(false)
expect(loadingState.error).toBeNull()
})
})
it('ignores init response if identify gets called and resolves first', async () => {
const onChange = jest.fn()
const { flagsmith, initConfig, mockFetch } = getFlagsmith({ onChange })
Expand Down
Loading