From 4d6b44ca86b9f082d8e51418f9d62103d1777462 Mon Sep 17 00:00:00 2001 From: karinamaulitova Date: Wed, 2 Aug 2023 16:59:58 +0200 Subject: [PATCH 1/2] fix: move withTransition types to a component file --- packages/transition/index.ts | 2 +- packages/transition/types.ts | 28 ------------------------- packages/transition/withTransition.tsx | 29 +++++++++++++++++++++++++- 3 files changed, 29 insertions(+), 30 deletions(-) delete mode 100644 packages/transition/types.ts diff --git a/packages/transition/index.ts b/packages/transition/index.ts index 1fc5bdcd..2613f385 100644 --- a/packages/transition/index.ts +++ b/packages/transition/index.ts @@ -1,2 +1,2 @@ export * from './withTransition' -export * from './types' + diff --git a/packages/transition/types.ts b/packages/transition/types.ts deleted file mode 100644 index d71f8104..00000000 --- a/packages/transition/types.ts +++ /dev/null @@ -1,28 +0,0 @@ -import type { - TransitionProps, - TransitionStatus, - TransitionActions, -} from 'react-transition-group/Transition' - -export type TransitionWrapperProps = Partial< - Pick< - TransitionProps, - | 'in' - | 'mountOnEnter' - | 'unmountOnExit' - | 'timeout' - | 'addEndListener' - | 'onEnter' - | 'onEntering' - | 'onEntered' - | 'onExit' - | 'onExiting' - | 'onExited' - > & - Pick -> - -export type TransitionInnerProps = { - duration: number - transitionStatus: TransitionStatus -} diff --git a/packages/transition/withTransition.tsx b/packages/transition/withTransition.tsx index a3d1c5ed..86a2bd3e 100644 --- a/packages/transition/withTransition.tsx +++ b/packages/transition/withTransition.tsx @@ -9,8 +9,35 @@ import { import { useMergeRefs } from '../hooks' import { Transition } from 'react-transition-group' import { DEFAULT_DURATION } from './constants' -import { TransitionWrapperProps, TransitionInnerProps } from './types' +import type { + TransitionProps, + TransitionStatus, + TransitionActions, +} from 'react-transition-group/Transition' + +export type TransitionWrapperProps = Partial< + Pick< + TransitionProps, + | 'in' + | 'mountOnEnter' + | 'unmountOnExit' + | 'timeout' + | 'addEndListener' + | 'onEnter' + | 'onEntering' + | 'onEntered' + | 'onExit' + | 'onExiting' + | 'onExited' + > & + Pick +> + +export type TransitionInnerProps = { + duration: number + transitionStatus: TransitionStatus +} type WrappedProps = Omit & TransitionWrapperProps From d1b6badb9972a94e786566a35c61edfb60f59cca Mon Sep 17 00:00:00 2001 From: karinamaulitova Date: Wed, 2 Aug 2023 17:00:18 +0200 Subject: [PATCH 2/2] fix: formatting --- packages/transition/index.ts | 1 - packages/transition/withTransition.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/transition/index.ts b/packages/transition/index.ts index 2613f385..58d2339a 100644 --- a/packages/transition/index.ts +++ b/packages/transition/index.ts @@ -1,2 +1 @@ export * from './withTransition' - diff --git a/packages/transition/withTransition.tsx b/packages/transition/withTransition.tsx index 86a2bd3e..dc7339b9 100644 --- a/packages/transition/withTransition.tsx +++ b/packages/transition/withTransition.tsx @@ -31,7 +31,7 @@ export type TransitionWrapperProps = Partial< | 'onExiting' | 'onExited' > & - Pick + Pick > export type TransitionInnerProps = {