From 11ff718a9c516e974a9b8d577f56bd4e7769e6a8 Mon Sep 17 00:00:00 2001 From: Danila Dergachev Date: Mon, 11 Sep 2023 14:31:38 +0200 Subject: [PATCH] revert to using void as cleanup type for useFacetEffect --- examples/benchmarking/src/listMemoFacet.tsx | 4 ---- .../@react-facet/core/src/hooks/useFacetCallback.spec.tsx | 1 - .../@react-facet/core/src/hooks/useFacetEffect.spec.tsx | 1 - packages/@react-facet/core/src/hooks/useFacetEffect.tsx | 4 ++-- packages/@react-facet/core/src/hooks/useFacetMap.spec.tsx | 8 -------- .../@react-facet/core/src/hooks/useFacetMemo.spec.tsx | 8 -------- packages/@react-facet/core/src/hooks/useFacetRef.ts | 1 - .../@react-facet/core/src/hooks/useFacetWrap.spec.tsx | 4 ---- 8 files changed, 2 insertions(+), 29 deletions(-) diff --git a/examples/benchmarking/src/listMemoFacet.tsx b/examples/benchmarking/src/listMemoFacet.tsx index cc0e3961..4d89d930 100644 --- a/examples/benchmarking/src/listMemoFacet.tsx +++ b/examples/benchmarking/src/listMemoFacet.tsx @@ -50,7 +50,6 @@ const ListItem = ({ item }: { item: Facet }) => { useFacetEffect( (health) => { randomWork(health) - return undefined }, [], [health], @@ -59,7 +58,6 @@ const ListItem = ({ item }: { item: Facet }) => { useFacetEffect( (name) => { randomWork(name) - return undefined }, [], [name], @@ -68,7 +66,6 @@ const ListItem = ({ item }: { item: Facet }) => { useFacetEffect( (name) => { randomWork(name) - return undefined }, [], [name], @@ -77,7 +74,6 @@ const ListItem = ({ item }: { item: Facet }) => { useFacetEffect( (name) => { randomWork(name) - return undefined }, [], [name], diff --git a/packages/@react-facet/core/src/hooks/useFacetCallback.spec.tsx b/packages/@react-facet/core/src/hooks/useFacetCallback.spec.tsx index 84de5a05..741c8728 100644 --- a/packages/@react-facet/core/src/hooks/useFacetCallback.spec.tsx +++ b/packages/@react-facet/core/src/hooks/useFacetCallback.spec.tsx @@ -104,7 +104,6 @@ it('should work with uninitialized values', () => { useFacetEffect( () => { handler() - return undefined }, [handler], [internalDemoFacet], diff --git a/packages/@react-facet/core/src/hooks/useFacetEffect.spec.tsx b/packages/@react-facet/core/src/hooks/useFacetEffect.spec.tsx index 0cc821a8..625ee08b 100644 --- a/packages/@react-facet/core/src/hooks/useFacetEffect.spec.tsx +++ b/packages/@react-facet/core/src/hooks/useFacetEffect.spec.tsx @@ -42,7 +42,6 @@ it('triggers the effect when a dependency changes', () => { useFacetEffect( (value) => { callback(`${value} ${dependency}`) - return undefined }, [dependency], [demoFacet], diff --git a/packages/@react-facet/core/src/hooks/useFacetEffect.tsx b/packages/@react-facet/core/src/hooks/useFacetEffect.tsx index 7d22ba48..623fa27f 100644 --- a/packages/@react-facet/core/src/hooks/useFacetEffect.tsx +++ b/packages/@react-facet/core/src/hooks/useFacetEffect.tsx @@ -4,7 +4,7 @@ import { cancelScheduledTask, scheduleTask } from '../scheduler' export const createUseFacetEffect = (useHook: typeof useEffect | typeof useLayoutEffect) => { return function [], T extends [...Y]>( - effect: (...args: ExtractFacetValues) => undefined | Cleanup, + effect: (...args: ExtractFacetValues) => void | Cleanup, dependencies: unknown[], facets: T, ) { @@ -12,7 +12,7 @@ export const createUseFacetEffect = (useHook: typeof useEffect | typeof useLayou const effectMemoized = useCallback(effect as (...args: unknown[]) => ReturnType, dependencies) useHook(() => { - let cleanup: undefined | Cleanup + let cleanup: void | Cleanup if (facets.length === 1) { const unsubscribe = facets[0].observe((value) => { diff --git a/packages/@react-facet/core/src/hooks/useFacetMap.spec.tsx b/packages/@react-facet/core/src/hooks/useFacetMap.spec.tsx index 6a83b751..86f78c93 100644 --- a/packages/@react-facet/core/src/hooks/useFacetMap.spec.tsx +++ b/packages/@react-facet/core/src/hooks/useFacetMap.spec.tsx @@ -105,7 +105,6 @@ describe('multiple dependencies', () => { useFacetEffect( (value) => { mock(value.name) - return undefined }, [], [adaptValue], @@ -148,7 +147,6 @@ describe('multiple dependencies', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -191,7 +189,6 @@ describe('multiple dependencies', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -234,7 +231,6 @@ describe('multiple dependencies', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -392,7 +388,6 @@ describe('single dependency', () => { useFacetEffect( (value) => { mock(value.name) - return undefined }, [], [adaptValue], @@ -434,7 +429,6 @@ describe('single dependency', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -476,7 +470,6 @@ describe('single dependency', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -518,7 +511,6 @@ describe('single dependency', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], diff --git a/packages/@react-facet/core/src/hooks/useFacetMemo.spec.tsx b/packages/@react-facet/core/src/hooks/useFacetMemo.spec.tsx index cc1fe33b..ec378acb 100644 --- a/packages/@react-facet/core/src/hooks/useFacetMemo.spec.tsx +++ b/packages/@react-facet/core/src/hooks/useFacetMemo.spec.tsx @@ -105,7 +105,6 @@ describe('multiple dependencies', () => { useFacetEffect( (value) => { mock(value.name) - return undefined }, [], [adaptValue], @@ -148,7 +147,6 @@ describe('multiple dependencies', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -191,7 +189,6 @@ describe('multiple dependencies', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -234,7 +231,6 @@ describe('multiple dependencies', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -392,7 +388,6 @@ describe('single dependency', () => { useFacetEffect( (value) => { mock(value.name) - return undefined }, [], [adaptValue], @@ -434,7 +429,6 @@ describe('single dependency', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -476,7 +470,6 @@ describe('single dependency', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], @@ -518,7 +511,6 @@ describe('single dependency', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [adaptValue], diff --git a/packages/@react-facet/core/src/hooks/useFacetRef.ts b/packages/@react-facet/core/src/hooks/useFacetRef.ts index eb2251e6..1ec00cf7 100644 --- a/packages/@react-facet/core/src/hooks/useFacetRef.ts +++ b/packages/@react-facet/core/src/hooks/useFacetRef.ts @@ -14,7 +14,6 @@ export function useFacetRef(facet: Facet, defaultValue?: T): MutableRefObj useFacetEffect( (value) => { ref.current = value - return undefined }, [], [facet], diff --git a/packages/@react-facet/core/src/hooks/useFacetWrap.spec.tsx b/packages/@react-facet/core/src/hooks/useFacetWrap.spec.tsx index 0a141e54..c2f1739f 100644 --- a/packages/@react-facet/core/src/hooks/useFacetWrap.spec.tsx +++ b/packages/@react-facet/core/src/hooks/useFacetWrap.spec.tsx @@ -14,7 +14,6 @@ it('wraps a value, updating the facet when it changes', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [facetifiedValue], @@ -39,7 +38,6 @@ it('wraps a value, with the default equality check (preventing unnecessary updat useFacetEffect( (value) => { mock(value) - return undefined }, [], [facetifiedValue], @@ -64,7 +62,6 @@ it('forwards a facet', () => { useFacetEffect( (value) => { mock(value) - return undefined }, [], [facetifiedValue], @@ -125,7 +122,6 @@ const testEffectUpdatesOnStaticValue = (value: FacetProp, expectUpdates: useFacetEffect( () => { mock() - return undefined }, [], [undefinedFacet],