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
5 changes: 5 additions & 0 deletions .changeset/tired-icons-cheat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@reflag/react-sdk": patch
---

Avoid loading state during bootstrapped initialization
16 changes: 14 additions & 2 deletions packages/react-sdk/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,26 @@ export function ReflagClientProvider({
initialLoading = true,
children,
}: ReflagClientProviderProps) {
const hasInitialized = useRef(client.getState() === "initialized");
const [isLoading, setIsLoading] = useState(
client.getState() !== "initialized" ? initialLoading : false,
hasInitialized.current ? false : initialLoading,
);

useOnEvent(
"stateUpdated",
(state) => {
setIsLoading(state === "initializing");
if (state === "initialized") {
hasInitialized.current = true;
setIsLoading(false);
return;
}

if (state === "initializing") {
setIsLoading(hasInitialized.current || initialLoading);
return;
}

setIsLoading(false);
},
client,
);
Expand Down
56 changes: 55 additions & 1 deletion packages/react-sdk/test/usage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,57 @@ describe("<ReflagBootstrappedProvider />", () => {
// Removed test "does not initialize when no flags are provided"
// because ReflagBootstrappedProvider requires flags to be provided

test("does not enter UI loading during initial bootstrap initialization", async () => {
const bootstrapFlags: BootstrappedFlags = {
context: { user, company, other },
flags: {
abc: {
key: "abc",
isEnabled: true,
targetingVersion: 1,
},
},
};
let resolveStorageRead: (value: string | null) => void;
const storageRead = new Promise<string | null>((resolve) => {
resolveStorageRead = resolve;
});
const storage = {
getItem: vi.fn(() => storageRead),
setItem: vi.fn(async () => undefined),
};
let client: ReflagClient | undefined;

function Content() {
client = useClient();
return (
<span data-testid="bootstrap-content">{String(useIsLoading())}</span>
);
}

const { queryByTestId, unmount } = render(
getBootstrapProvider(bootstrapFlags, {
storage,
loadingComponent: <span data-testid="loading">Loading...</span>,
children: <Content />,
}),
);

await waitFor(() => {
expect(client?.getState()).toBe("initializing");
});

expect(queryByTestId("loading")).toBeNull();
expect(queryByTestId("bootstrap-content")?.textContent).toBe("false");

resolveStorageRead!(null);
await waitFor(() => {
expect(client?.getState()).toBe("initialized");
});

unmount();
});

test("shows content after initialization", async () => {
const bootstrapFlags: BootstrappedFlags = {
context: {
Expand Down Expand Up @@ -1217,7 +1268,10 @@ describe("useIsLoading", () => {

const initializeSpy = vi
.spyOn(ReflagClient.prototype, "initialize")
.mockResolvedValue(undefined);
.mockImplementationOnce(async function () {
(this as any).hooks.trigger("stateUpdated", "initializing");
(this as any).hooks.trigger("stateUpdated", "initialized");
});
let resolveSetContext: (() => void) | undefined;
const setContextPromise = new Promise<void>((resolve) => {
resolveSetContext = resolve;
Expand Down
Loading