From 02a9deedb43f121139266bfcbd7fe41a603f75e8 Mon Sep 17 00:00:00 2001 From: literat Date: Fri, 22 Sep 2023 11:49:26 +0200 Subject: [PATCH 1/2] Style(web-react): Must use destructurring assignment --- packages/web-react/src/components/Button/Button.tsx | 2 +- packages/web-react/src/components/Button/ButtonLink.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web-react/src/components/Button/Button.tsx b/packages/web-react/src/components/Button/Button.tsx index f3eb10f616..1a6a9d0c6e 100644 --- a/packages/web-react/src/components/Button/Button.tsx +++ b/packages/web-react/src/components/Button/Button.tsx @@ -37,7 +37,7 @@ const _Button = ( style={styleProps.style} > {children} - {props.isLoading && } + {restProps.isLoading && } ); }; diff --git a/packages/web-react/src/components/Button/ButtonLink.tsx b/packages/web-react/src/components/Button/ButtonLink.tsx index c4939f4d1b..45a05399b2 100644 --- a/packages/web-react/src/components/Button/ButtonLink.tsx +++ b/packages/web-react/src/components/Button/ButtonLink.tsx @@ -36,7 +36,7 @@ const _ButtonLink = ( style={styleProps.style} > {children} - {props.isLoading && } + {restProps.isLoading && } ); }; From db32ed1954acf68cc8d15b35b409352e7c4d6fe1 Mon Sep 17 00:00:00 2001 From: literat Date: Fri, 22 Sep 2023 11:50:11 +0200 Subject: [PATCH 2/2] Style(web-react): Alphabetical reordering in ButtonLink --- packages/web-react/src/components/Button/Button.tsx | 2 +- packages/web-react/src/components/Button/ButtonLink.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/web-react/src/components/Button/Button.tsx b/packages/web-react/src/components/Button/Button.tsx index 1a6a9d0c6e..33511580fe 100644 --- a/packages/web-react/src/components/Button/Button.tsx +++ b/packages/web-react/src/components/Button/Button.tsx @@ -1,5 +1,5 @@ -import React, { ElementType, ForwardedRef, forwardRef } from 'react'; import classNames from 'classnames'; +import React, { ElementType, ForwardedRef, forwardRef } from 'react'; import { useStyleProps } from '../../hooks'; import { SpiritButtonProps } from '../../types'; import { Spinner } from '../Spinner'; diff --git a/packages/web-react/src/components/Button/ButtonLink.tsx b/packages/web-react/src/components/Button/ButtonLink.tsx index 45a05399b2..6a93ab9d98 100644 --- a/packages/web-react/src/components/Button/ButtonLink.tsx +++ b/packages/web-react/src/components/Button/ButtonLink.tsx @@ -1,10 +1,10 @@ -import React, { ElementType, ForwardedRef, forwardRef } from 'react'; import classNames from 'classnames'; +import React, { ElementType, ForwardedRef, forwardRef } from 'react'; import { useStyleProps } from '../../hooks'; import { SpiritButtonLinkProps } from '../../types'; import { Spinner } from '../Spinner'; -import { useButtonStyleProps } from './useButtonStyleProps'; import { useButtonLinkAriaProps } from './useButtonAriaProps'; +import { useButtonStyleProps } from './useButtonStyleProps'; const defaultProps = { color: 'primary',