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): Change to useLayoutEffect in useSnapshot #891

Merged
merged 3 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
3 changes: 2 additions & 1 deletion src/react.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
useCallback,
useDebugValue,
useEffect,
useLayoutEffect,
useMemo,
useRef,
useSyncExternalStore,
Expand Down Expand Up @@ -148,7 +149,7 @@ export function useSnapshot<T extends object>(
() => snapshot(proxyObject),
)
inRender = false
useEffect(() => {
useLayoutEffect(() => {
lastSnapshot.current = currSnapshot
})
if (import.meta.env?.MODE !== 'production') {
Expand Down
116 changes: 116 additions & 0 deletions tests/optimization.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
import { useState } from 'react'
import { fireEvent, render, waitFor } from '@testing-library/react'
import { expect, it, vi } from 'vitest'
import { proxy, snapshot, useSnapshot } from 'valtio'

Check warning on line 4 in tests/optimization.test.tsx

View workflow job for this annotation

GitHub Actions / lint

'snapshot' is defined but never used. Allowed unused vars must match /^_/u
dai-shi marked this conversation as resolved.
Show resolved Hide resolved

it('regression: useSnapshot renders should not fail consistency check with extra render (nested useSnapshot)', async () => {
const obj = proxy({ childCount: 0, parentCount: 0 })

const childRenderFn = vi.fn()
const Child = () => {
const snap = useSnapshot(obj)
childRenderFn(snap.childCount)
return (
<>
<div>childCount: {snap.childCount}</div>
<button onClick={() => ++obj.childCount}>childButton</button>
</>
)
}

const parentRenderFn = vi.fn()
const Parent = () => {
const snap = useSnapshot(obj)
parentRenderFn(snap.parentCount)
return (
<>
<div>parentCount: {snap.parentCount}</div>
<button onClick={() => ++obj.parentCount}>parentButton</button>
<Child />
</>
)
}

const { getByText } = render(<Parent />)

await waitFor(() => {
getByText('childCount: 0')
getByText('parentCount: 0')
})

expect(childRenderFn).toBeCalledTimes(1)
expect(childRenderFn).lastCalledWith(0)
expect(parentRenderFn).toBeCalledTimes(1)
expect(parentRenderFn).lastCalledWith(0)

obj.parentCount += 1

await waitFor(() => {
getByText('childCount: 0')
getByText('parentCount: 1')
})

expect(childRenderFn).toBeCalledTimes(2)
expect(childRenderFn).lastCalledWith(0)
expect(parentRenderFn).toBeCalledTimes(2)
expect(parentRenderFn).lastCalledWith(1)
})

it('regression: useSnapshot renders should not fail consistency check with extra render', async () => {
const obj = proxy({ childCount: 0, anotherValue: 0 })

const childRenderFn = vi.fn()
const Child = () => {
const snap = useSnapshot(obj)
childRenderFn(snap.childCount)
return (
<>
<div>childCount: {snap.childCount}</div>
<button onClick={() => ++obj.childCount}>childButton</button>
</>
)
}

const parentRenderFn = vi.fn()
const Parent = () => {
const [parentCount, setParentCount] = useState(0)

parentRenderFn(parentCount)

return (
<>
<div>parentCount: {parentCount}</div>
<button onClick={() => setParentCount((v) => v + 1)}>
parentButton
</button>
<Child />
</>
)
}

const { getByText } = render(<Parent />)

await waitFor(() => {
getByText('childCount: 0')
getByText('parentCount: 0')
})

expect(childRenderFn).toBeCalledTimes(1)
expect(childRenderFn).lastCalledWith(0)
expect(parentRenderFn).toBeCalledTimes(1)
expect(parentRenderFn).lastCalledWith(0)

obj.anotherValue += 1

fireEvent.click(getByText('parentButton'))

await waitFor(() => {
getByText('childCount: 0')
getByText('parentCount: 1')
})

expect(childRenderFn).toBeCalledTimes(2)
expect(childRenderFn).lastCalledWith(0)
expect(parentRenderFn).toBeCalledTimes(2)
expect(parentRenderFn).lastCalledWith(1)
})
Loading