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

fix(react, types): relax react types #1589

Merged
merged 2 commits into from
Mar 6, 2023
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
6 changes: 4 additions & 2 deletions src/react.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const { useSyncExternalStoreWithSelector } = useSyncExternalStoreExports

type ExtractState<S> = S extends { getState: () => infer T } ? T : never

type WithReact<S extends StoreApi<unknown>> = S & {
type ReadonlyStoreApi<T> = Pick<StoreApi<T>, 'getState' | 'subscribe'>

type WithReact<S extends ReadonlyStoreApi<unknown>> = S & {
getServerState?: () => ExtractState<S>
}

Expand Down Expand Up @@ -46,7 +48,7 @@ export function useStore<TState, StateSlice>(
return slice
}

export type UseBoundStore<S extends WithReact<StoreApi<unknown>>> = {
export type UseBoundStore<S extends WithReact<ReadonlyStoreApi<unknown>>> = {
(): ExtractState<S>
<U>(
selector: (state: ExtractState<S>) => U,
Expand Down
14 changes: 14 additions & 0 deletions tests/types.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,17 @@ it('StateCreator subtyping', () => {
const _testSubtyping: StateCreator<State, [['zustand/persist', unknown]]> =
{} as StateCreator<State, []>
})

it('set state exists on store with readonly store', () => {
interface State {
count: number
increment: () => void
}

const useStore = create<State>()((set, get) => ({
count: 0,
increment: () => set({ count: get().count + 1 }),
}))

useStore.setState((state) => ({ ...state, count: state.count + 1 }))
})