Skip to content
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.

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

feat(react-client): migrate from recoil to zustand #1870

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
24 changes: 13 additions & 11 deletions libs/react-client/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@chainlit/react-client",
"description": "Websocket client to connect to your chainlit app.",
"version": "0.2.3",
"version": "0.3.0",
"scripts": {
"build": "tsup src/index.ts --tsconfig tsconfig.build.json --clean --format esm,cjs --dts --external react --external recoil --minify --sourcemap --treeshake",
"dev": "tsup src/index.ts --clean --format esm,cjs --dts --external react --external recoil --minify --sourcemap --treeshake",
"build": "tsup src/index.ts --tsconfig tsconfig.build.json --clean --format esm,cjs --dts --external react --external zustand --minify --sourcemap --treeshake",
"dev": "tsup src/index.ts --clean --format esm,cjs --dts --external react --external zustand --minify --sourcemap --treeshake",
"lint": "eslint ./src --ext ts,tsx --report-unused-disable-directives --max-warnings 0 && tsc --noemit",
"format": "prettier '**/*.{ts,tsx}' --write",
"test": "echo no tests yet",
Expand All @@ -31,8 +31,9 @@
"types": "dist/index.d.ts",
"devDependencies": {
"@swc/core": "^1.3.86",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
"@types/lodash": "^4.14.199",
"@types/uuid": "^9.0.3",
"@vitejs/plugin-react": "^4.0.4",
Expand All @@ -46,18 +47,19 @@
"vitest": "^0.34.4"
},
"peerDependencies": {
"@types/react": "^18.3.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"recoil": "^0.7.7"
"@types/react": "^19.0.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"zustand": "^5.0.3"
},
"dependencies": {
"jwt-decode": "^3.1.2",
"lodash": "^4.17.21",
"socket.io-client": "^4.7.2",
"sonner": "^1.7.1",
"swr": "^2.2.2",
"uuid": "^9.0.0"
"swr": "^2.3.0",
"uuid": "^9.0.0",
"zustand": "^5.0.3"
},
"pnpm": {
"overrides": {
Expand Down
801 changes: 109 additions & 692 deletions libs/react-client/pnpm-lock.yaml

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions libs/react-client/src/api/hooks/auth/state.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { useRecoilState, useSetRecoilState } from 'recoil';
import { authState, threadHistoryState, userState } from 'src/state';
import { useAuthStore } from 'src/store/auth';

export const useAuthState = () => {
const [authConfig, setAuthConfig] = useRecoilState(authState);
const [user, setUser] = useRecoilState(userState);
const setThreadHistory = useSetRecoilState(threadHistoryState);
const authConfig = useAuthStore((s) => s.authConfig);
const setAuthConfig = useAuthStore((s) => s.setAuthConfig);
const user = useAuthStore((s) => s.user);
const setUser = useAuthStore((s) => s.setUser);
const setThreadHistory = useAuthStore((s) => s.setThreadHistory);

return {
authConfig,
Expand Down
1 change: 0 additions & 1 deletion libs/react-client/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export * from './useConfig';
export * from './api';
export * from './types';
export * from './context';
export * from './state';
export * from './utils/message';

export { Socket } from 'socket.io-client';
Expand Down
215 changes: 0 additions & 215 deletions libs/react-client/src/state.ts

This file was deleted.

52 changes: 52 additions & 0 deletions libs/react-client/src/store/auth.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { isEqual } from 'lodash';
import { groupByDate } from 'src/utils/group';
import { create } from 'zustand';

import { IAuthConfig, IUser, ThreadHistory } from '..';

interface AuthState {
authConfig?: IAuthConfig;
user?: IUser | null;

threadHistory?: ThreadHistory;

setAuthConfig: (authConfig?: IAuthConfig) => void;
setUser: (user?: IUser | null) => void;
setThreadHistory: (threadHistory?: ThreadHistory) => void;
}

export const useAuthStore = create<AuthState>((set, get) => ({
threadHistory: {
threads: undefined,
currentThreadId: undefined,
timeGroupedThreads: undefined,
pageInfo: undefined
},

setAuthConfig: (authConfig?: IAuthConfig) => {
set({ authConfig });
},

setUser: (user?: IUser | null) => {
set({ user });
},

setThreadHistory: (threadHistory?: ThreadHistory) => {
const oldValue = get().threadHistory;

let timeGroupedThreads = threadHistory?.timeGroupedThreads;
if (
threadHistory?.threads &&
!isEqual(threadHistory.threads, oldValue?.timeGroupedThreads)
) {
timeGroupedThreads = groupByDate(threadHistory.threads);
}

set({
threadHistory: {
...threadHistory,
timeGroupedThreads
}
});
}
}));
Loading