Skip to content

chore(deps): bump jotai from 2.14.0 to 3.0.0 #835

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
surajair merged 3 commits into from
Sep 15, 2026
+71 −129
Merged

chore(deps): bump jotai from 2.14.0 to 3.0.0 #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
706ae7a
chore(deps): bump jotai from 2.14.0 to 3.0.0
dependabot[bot] Sep 14, 2026
4fd88ea
Merge branch 'main' into dependabot/npm_and_yarn/jotai-3.0.0
surajair Sep 15, 2026
1893e73
test: stabilize useBlockSelectionQuerySync tests with jotai v3
Copilot Sep 15, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
"fuse.js": "7.1.0",
"himalaya": "1.1.1",
"i18next": "25.5.2",
"jotai": "2.14.0",
"jotai": "3.0.0",
"lodash-es": "4.18.1",
"lucide-react": "1.43.0",
"motion": "13.2.0",
Expand Down
23 changes: 8 additions & 15 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

175 changes: 62 additions & 113 deletions src/builder/hooks/use-block-selection-query-sync.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/**
* @vitest-environment happy-dom
*/
import { act, renderHook } from "@testing-library/react";
import { Provider, WritableAtom } from "jotai";
import { useHydrateAtoms } from "jotai/utils";
import { act, renderHook, waitFor } from "@testing-library/react";
import { createStore, Provider, WritableAtom } from "jotai";
import React from "react";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { presentBlocksAtom } from "~/builder/atoms/blocks";
Expand All @@ -13,22 +12,19 @@ import {
useBlockSelectionQuerySync,
} from "~/builder/hooks/use-block-selection-query-sync";
import { isPageLoadedAtom } from "~/builder/hooks/use-is-page-loaded";
import { selectedBlockIdsAtom, useSelectedBlockIds } from "~/builder/hooks/use-selected-blockIds";
import { selectedBlockIdsAtom } from "~/builder/hooks/use-selected-blockIds";
import { ChaiBlock } from "~/types/common";

type AtomTuple = [WritableAtom<any, any[], any>, any];

const HydrateAtoms = ({ initialValues, children }: { initialValues: AtomTuple[]; children: React.ReactNode }) => {
useHydrateAtoms(initialValues);
return children;
const createTestStore = (initialValues: AtomTuple[]) => {
const store = createStore();
initialValues.forEach(([atom, value]) => {
store.set(atom, value);
});
return store;
};

const TestProvider = ({ initialValues, children }: { initialValues: AtomTuple[]; children: React.ReactNode }) => (
<Provider>
<HydrateAtoms initialValues={initialValues}>{children}</HydrateAtoms>
</Provider>
);

const blocks: ChaiBlock[] = [
{ _id: "block-1", _type: "Box" },
{ _id: "block-2", _type: "Box", _parent: "block-1" },
Expand Down Expand Up @@ -89,136 +85,89 @@ describe("useBlockSelectionQuerySync", () => {
replaceStateSpy.mockRestore();
});

it("should preselect block from URL on page load", () => {
it("should preselect block from URL on page load", async () => {
window.history.replaceState({}, "", "/?bid=block-2");
const store = createTestStore([
[presentBlocksAtom, blocks],
[isPageLoadedAtom, true],
]);

renderHook(() => useBlockSelectionQuerySync(), {
wrapper: ({ children }) => <Provider store={store}>{children}</Provider>,
});

const { result } = renderHook(
() => {
useBlockSelectionQuerySync();
return useSelectedBlockIds();
},
{
wrapper: ({ children }) => (
<TestProvider
initialValues={[
[presentBlocksAtom, blocks],
[selectedBlockIdsAtom, []],
[isPageLoadedAtom, true],
]}>
{children}
</TestProvider>
),
},
);

expect(result.current[0]).toEqual(["block-2"]);
await waitFor(() => {
expect(store.get(selectedBlockIdsAtom)).toEqual(["block-2"]);
});
});

it("should clear stale block param if block does not exist", () => {
window.history.replaceState({}, "", "/?bid=non-existent");
const store = createTestStore([
[presentBlocksAtom, blocks],
[isPageLoadedAtom, true],
]);

renderHook(
() => {
useBlockSelectionQuerySync();
return useSelectedBlockIds();
},
{
wrapper: ({ children }) => (
<TestProvider
initialValues={[
[presentBlocksAtom, blocks],
[selectedBlockIdsAtom, []],
[isPageLoadedAtom, true],
]}>
{children}
</TestProvider>
),
},
);
renderHook(() => useBlockSelectionQuerySync(), {
wrapper: ({ children }) => <Provider store={store}>{children}</Provider>,
});

expect(new URLSearchParams(window.location.search).has("bid")).toBe(false);
});

it("should not preselect block when page is not loaded", () => {
window.history.replaceState({}, "", "/?bid=block-1");
const store = createTestStore([
[presentBlocksAtom, blocks],
[selectedBlockIdsAtom, []],
[isPageLoadedAtom, false],
]);

renderHook(() => useBlockSelectionQuerySync(), {
wrapper: ({ children }) => <Provider store={store}>{children}</Provider>,
});

const { result } = renderHook(
() => {
useBlockSelectionQuerySync();
return useSelectedBlockIds();
},
{
wrapper: ({ children }) => (
<TestProvider
initialValues={[
[presentBlocksAtom, blocks],
[selectedBlockIdsAtom, []],
[isPageLoadedAtom, false],
]}>
{children}
</TestProvider>
),
},
);

expect(result.current[0]).toEqual([]);
expect(store.get(selectedBlockIdsAtom)).toEqual([]);
});

it("should update URL when block selection changes", () => {
const { result } = renderHook(
() => {
useBlockSelectionQuerySync();
return useSelectedBlockIds();
},
{
wrapper: ({ children }) => (
<TestProvider
initialValues={[
[presentBlocksAtom, blocks],
[selectedBlockIdsAtom, []],
[isPageLoadedAtom, true],
]}>
{children}
</TestProvider>
),
},
);
const store = createTestStore([
[presentBlocksAtom, blocks],
[selectedBlockIdsAtom, []],
[isPageLoadedAtom, true],
]);

renderHook(() => useBlockSelectionQuerySync(), {
wrapper: ({ children }) => <Provider store={store}>{children}</Provider>,
});

act(() => {
result.current[1](["block-3"]);
store.set(selectedBlockIdsAtom, ["block-3"]);
});

expect(new URLSearchParams(window.location.search).get("bid")).toBe("block-3");
});

it("should remove block param from URL when selection is cleared", () => {
it("should remove block param from URL when selection is cleared", async () => {
window.history.replaceState({}, "", "/?bid=block-1");

const { result } = renderHook(
() => {
useBlockSelectionQuerySync();
return useSelectedBlockIds();
},
{
wrapper: ({ children }) => (
<TestProvider
initialValues={[
[presentBlocksAtom, blocks],
[selectedBlockIdsAtom, []],
[isPageLoadedAtom, true],
]}>
{children}
</TestProvider>
),
},
);
const store = createTestStore([
[presentBlocksAtom, blocks],
[selectedBlockIdsAtom, []],
[isPageLoadedAtom, true],
]);

renderHook(() => useBlockSelectionQuerySync(), {
wrapper: ({ children }) => <Provider store={store}>{children}</Provider>,
});

// First it restores block-1 from URL
expect(result.current[0]).toEqual(["block-1"]);
await waitFor(() => {
expect(store.get(selectedBlockIdsAtom)).toEqual(["block-1"]);
});

// Now clear selection
act(() => {
result.current[1]([]);
store.set(selectedBlockIdsAtom, []);
});

expect(new URLSearchParams(window.location.search).has("bid")).toBe(false);
Expand Down
Loading