From 3f54b3f28dbddd0c906e4f0af0c10bc76ae1c0c3 Mon Sep 17 00:00:00 2001 From: Bulat Shelkhonov Date: Sun, 24 Nov 2024 13:20:57 +0300 Subject: [PATCH 1/2] fix button cell text --- .../Blocks/Cell/components/ButtonCell/ButtonCell.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Blocks/Cell/components/ButtonCell/ButtonCell.tsx b/src/components/Blocks/Cell/components/ButtonCell/ButtonCell.tsx index d4565f9..2bb0eed 100644 --- a/src/components/Blocks/Cell/components/ButtonCell/ButtonCell.tsx +++ b/src/components/Blocks/Cell/components/ButtonCell/ButtonCell.tsx @@ -8,7 +8,6 @@ import { hasReactNode } from 'helpers/react/node'; import { usePlatform } from 'hooks/usePlatform'; import { Tappable, TappableProps } from 'components/Service/Tappable/Tappable'; -import { Subheadline } from 'components/Typography/Subheadline/Subheadline'; import { Text } from 'components/Typography/Text/Text'; export interface ButtonCellProps extends Omit { @@ -38,7 +37,6 @@ export const ButtonCell = forwardRef(({ ...restProps }: ButtonCellProps, ref) => { const platform = usePlatform(); - const Typography = platform === 'ios' ? Subheadline : Text; return ( {hasReactNode(before) && before} - {hasReactNode(children) && {children}} + {hasReactNode(children) && {children}} {hasReactNode(after) && after} ); From 2871dbc42aa80641200f682bfb5b0b4357c4a1c4 Mon Sep 17 00:00:00 2001 From: Bulat Shelkhonov Date: Mon, 25 Nov 2024 14:04:27 +0300 Subject: [PATCH 2/2] fix text for base --- .../Blocks/Cell/components/ButtonCell/ButtonCell.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Blocks/Cell/components/ButtonCell/ButtonCell.tsx b/src/components/Blocks/Cell/components/ButtonCell/ButtonCell.tsx index 2bb0eed..09a9787 100644 --- a/src/components/Blocks/Cell/components/ButtonCell/ButtonCell.tsx +++ b/src/components/Blocks/Cell/components/ButtonCell/ButtonCell.tsx @@ -8,6 +8,7 @@ import { hasReactNode } from 'helpers/react/node'; import { usePlatform } from 'hooks/usePlatform'; import { Tappable, TappableProps } from 'components/Service/Tappable/Tappable'; +import { Subheadline } from 'components/Typography/Subheadline/Subheadline'; import { Text } from 'components/Typography/Text/Text'; export interface ButtonCellProps extends Omit { @@ -37,6 +38,7 @@ export const ButtonCell = forwardRef(({ ...restProps }: ButtonCellProps, ref) => { const platform = usePlatform(); + const Typography = platform === 'ios' ? Text : Subheadline; return ( {hasReactNode(before) && before} - {hasReactNode(children) && {children}} + {hasReactNode(children) && {children}} {hasReactNode(after) && after} );