From 92cd937dff9b4ec0805961cf25bb58fb82b5b9d1 Mon Sep 17 00:00:00 2001 From: Chris Trevino Date: Sun, 7 Mar 2021 06:29:46 -0800 Subject: [PATCH 1/3] fix: simplify useDragType --- packages/react-dnd/src/hooks/useDrag/useDragType.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/react-dnd/src/hooks/useDrag/useDragType.ts b/packages/react-dnd/src/hooks/useDrag/useDragType.ts index 9822437016..099ba4fc20 100644 --- a/packages/react-dnd/src/hooks/useDrag/useDragType.ts +++ b/packages/react-dnd/src/hooks/useDrag/useDragType.ts @@ -7,9 +7,8 @@ export function useDragType( spec: DragSourceHookSpec, ): Identifier { return useMemo(() => { - const result: Identifier | null = - spec.type ?? (spec.item?.type as Identifier) ?? null - invariant(result != null, 'spec.type or spec.item.type must be defined') + const result: Identifier = spec.type + invariant(result != null, 'spec.type must be defined') return result }, [spec]) } From 2d954c29ea27a7fdbdd04979280cd6cca9be8632 Mon Sep 17 00:00:00 2001 From: Chris Trevino Date: Sun, 7 Mar 2021 06:32:09 -0800 Subject: [PATCH 2/3] chore: cut semver --- .yarn/versions/e6267e85.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .yarn/versions/e6267e85.yml diff --git a/.yarn/versions/e6267e85.yml b/.yarn/versions/e6267e85.yml new file mode 100644 index 0000000000..ec9423135c --- /dev/null +++ b/.yarn/versions/e6267e85.yml @@ -0,0 +1,8 @@ +releases: + react-dnd: patch + +declined: + - react-dnd-documentation + - react-dnd-examples-decorators + - react-dnd-examples-hooks + - react-dnd-test-utils From c34a251a856a940a646d591c2aad12517fe158dd Mon Sep 17 00:00:00 2001 From: Chris Trevino Date: Sun, 7 Mar 2021 06:38:06 -0800 Subject: [PATCH 3/3] fix: test update --- packages/react-dnd/src/hooks/__tests__/useDrag.spec.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/react-dnd/src/hooks/__tests__/useDrag.spec.tsx b/packages/react-dnd/src/hooks/__tests__/useDrag.spec.tsx index 9535a550e8..6d6fd7c6e7 100644 --- a/packages/react-dnd/src/hooks/__tests__/useDrag.spec.tsx +++ b/packages/react-dnd/src/hooks/__tests__/useDrag.spec.tsx @@ -34,9 +34,7 @@ describe('The useDrag hook', () => { try { const errorMock = jest.fn() console.error = errorMock - expect(() => render()).toThrow( - /spec.type or spec.item.type must be defined/, - ) + expect(() => render()).toThrow(/spec.type must be defined/) } finally { console.error = err }