Merge pull request #435 from lidofinance/feature/ui-916-move-props-de…

…struction-to-component-declaration fix: move props destruction to component declaration
lidofinance · Aug 2, 2023 · 0fd54f5 · 0fd54f5
2 parents 8882e87 + 7a3e82f
commit 0fd54f5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/packages/input/Textarea.tsx b/packages/input/Textarea.tsx
@@ -6,8 +6,8 @@ import cn from 'classnames'
 export type TextareaProps = ComponentPropsWithoutRef<'textarea'> & CommonProps
 
 export const Textarea = forwardRef(
-  (props: TextareaProps, ref?: ForwardedRef<HTMLTextAreaElement>) => {
-    const {
+  (
+    {
       id,
       disabled = false,
       label,
@@ -24,7 +24,9 @@ export const Textarea = forwardRef(
       wrapperRef,
       children,
       ...rest
-    } = props
+    }: TextareaProps,
+    ref?: ForwardedRef<HTMLTextAreaElement>,
+  ) => {
     const hasLabel = !!label && variant === 'default'
 
     const hasError = !!error

diff --git a/packages/modal/Modal.tsx b/packages/modal/Modal.tsx
@@ -15,8 +15,8 @@ export type ModalProps = Omit<ModalOverlayProps, 'title' | 'in'> & {
 }
 
 export const Modal = forwardRef(
-  (props: ModalProps, ref?: ForwardedRef<HTMLDivElement>) => {
-    const {
+  (
+    {
       children,
       title,
       titleIcon,
@@ -27,7 +27,9 @@ export const Modal = forwardRef(
       onClose,
       onBack,
       ...rest
-    } = props
+    }: ModalProps,
+    ref?: ForwardedRef<HTMLDivElement>,
+  ) => {
     const withTitleIcon = !!titleIcon
     const withSubtitle = !!subtitle
     const withCloseButton = !!onClose

diff --git a/packages/popup-menu/PopupMenuProvider.tsx b/packages/popup-menu/PopupMenuProvider.tsx
@@ -11,10 +11,9 @@ export const usePopupMenuContext = (): PopupMenuContext => {
   return useContext(Context)
 }
 
-export const PopupMenuProvider: FC<PropsWithChildren<PopupMenuContext>> = (
-  props,
-) => {
-  const { variant, ...rest } = props
-
+export const PopupMenuProvider: FC<PropsWithChildren<PopupMenuContext>> = ({
+  variant,
+  ...rest
+}) => {
   return <Context.Provider value={{ variant }} {...rest} />
 }
diff --git a/packages/stack/StackProvider.tsx b/packages/stack/StackProvider.tsx
@@ -11,8 +11,9 @@ export const useStackContext = (): StackContext => {
   return useContext(Context)
 }
 
-export const StackProvider: FC<PropsWithChildren<StackContext>> = (props) => {
-  const { spacing, ...rest } = props
-
+export const StackProvider: FC<PropsWithChildren<StackContext>> = ({
+  spacing,
+  ...rest
+}) => {
   return <Context.Provider value={{ spacing }} {...rest} />
 }
diff --git a/packages/transition/withTransition.tsx b/packages/transition/withTransition.tsx
@@ -22,8 +22,8 @@ export default function withTransition<
 ): ForwardRefExoticComponent<
   PropsWithoutRef<WrappedProps<P>> & RefAttributes<E>
 > {
-  function Wrapped(props: WrappedProps<P>, externalRef: ForwardedRef<E>) {
-    const {
+  function Wrapped(
+    {
       in: state = false,
       timeout = DEFAULT_DURATION,
       mountOnEnter = true,
@@ -39,8 +39,9 @@ export default function withTransition<
       onExiting,
       onExited,
       ...rest
-    } = props
-
+    }: WrappedProps<P>,
+    externalRef: ForwardedRef<E>,
+  ) {
     const transitionProps = {
       in: state,
       timeout,