From df11567d9f3891222c1931705c90ae2f902274eb Mon Sep 17 00:00:00 2001 From: Nikita Gorin <36075690+NikitaCG@users.noreply.github.com> Date: Tue, 26 Mar 2024 16:51:24 +0300 Subject: [PATCH] fix: cardBasePropTypes fix (#874) --- src/components/CardBase/CardBase.tsx | 13 +++++++------ src/components/CardBase/__tests__/CardBase.test.tsx | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/CardBase/CardBase.tsx b/src/components/CardBase/CardBase.tsx index a6d46b8a8..37bb43f1a 100644 --- a/src/components/CardBase/CardBase.tsx +++ b/src/components/CardBase/CardBase.tsx @@ -15,7 +15,6 @@ import { CardBaseProps as CardBaseParams, DefaultEventNames, ImageProps, - WithChildren, } from '../../models'; import {block, getQaAttrubutes} from '../../utils'; import BackgroundImage from '../BackgroundImage/BackgroundImage'; @@ -23,7 +22,7 @@ import RouterLink from '../RouterLink/RouterLink'; import './CardBase.scss'; -export interface CardBaseProps extends AnalyticsEventsBase, CardBaseParams, PropsWithChildren { +interface CardBaseProps extends AnalyticsEventsBase, CardBaseParams { className?: string; bodyClassName?: string; contentClassName?: string; @@ -34,6 +33,8 @@ export interface CardBaseProps extends AnalyticsEventsBase, CardBaseParams, Prop extraProps?: React.HTMLAttributes; } +export type CardBasePropsType = PropsWithChildren; + export interface CardHeaderBaseProps { className?: string; image?: ImageProps | null; @@ -45,11 +46,11 @@ export interface CardFooterBaseProps { const b = block('card-base-block'); -const Header: React.FC> = () => null; -const Content: React.FC> = () => null; -const Footer: React.FC> = () => null; +const Header: React.FC> = () => null; +const Content: React.FC> = () => null; +const Footer: React.FC> = () => null; -export const Layout = (props: CardBaseProps) => { +export const Layout = (props: CardBasePropsType) => { const { className, bodyClassName, diff --git a/src/components/CardBase/__tests__/CardBase.test.tsx b/src/components/CardBase/__tests__/CardBase.test.tsx index 498b0c99f..4d3220911 100644 --- a/src/components/CardBase/__tests__/CardBase.test.tsx +++ b/src/components/CardBase/__tests__/CardBase.test.tsx @@ -9,7 +9,7 @@ import {PageConstructorProvider} from '../../../containers/PageConstructor'; import {AnalyticsContextProps} from '../../../context/analyticsContext'; import {CardBorder} from '../../../models'; import {getQaAttrubutes} from '../../../utils'; -import CardBase, {CardBaseProps} from '../CardBase'; +import CardBase, {CardBasePropsType} from '../CardBase'; const qaId = 'card-base-component'; const qaAttributes = getQaAttrubutes(qaId, 'header', 'footer', 'body', 'content'); @@ -64,7 +64,7 @@ describe('CardBase', () => { test('add className', () => { const children = text; - testCustomClassName({ + testCustomClassName({ component: CardBase, props: {children, qa: qaId}, });