From 1ecf3965236faec9704c09b5ad337f429149f527 Mon Sep 17 00:00:00 2001 From: Juli Ovechkina Date: Wed, 22 Feb 2023 14:43:18 +0300 Subject: [PATCH 1/2] fix(BasicCard): add target --- src/models/constructor-items/sub-blocks.ts | 1 + src/sub-blocks/BasicCard/BasicCard.tsx | 4 ++-- src/sub-blocks/BasicCard/__stories__/BasicCard.stories.tsx | 2 +- src/sub-blocks/BasicCard/schema.ts | 4 ++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/models/constructor-items/sub-blocks.ts b/src/models/constructor-items/sub-blocks.ts index 9b7b9a18f..1497b9dae 100644 --- a/src/models/constructor-items/sub-blocks.ts +++ b/src/models/constructor-items/sub-blocks.ts @@ -140,6 +140,7 @@ export interface BasicCardProps Omit { url: string; icon?: ImageProps; + target?: string; } export interface BannerCardProps { diff --git a/src/sub-blocks/BasicCard/BasicCard.tsx b/src/sub-blocks/BasicCard/BasicCard.tsx index bdfe8315f..cbb60dc73 100644 --- a/src/sub-blocks/BasicCard/BasicCard.tsx +++ b/src/sub-blocks/BasicCard/BasicCard.tsx @@ -12,11 +12,11 @@ import './BasicCard.scss'; const b = block('basic-card'); const BasicCard = (props: BasicCardProps) => { - const {url, title, text, border, icon, additionalInfo, links, buttons} = props; + const {url, title, text, border, icon, additionalInfo, links, buttons, target} = props; const iconProps = icon && getMediaImage(icon); return ( - + {iconProps && } = (args) => (
- +
); diff --git a/src/sub-blocks/BasicCard/schema.ts b/src/sub-blocks/BasicCard/schema.ts index cf31c57f2..093519f26 100644 --- a/src/sub-blocks/BasicCard/schema.ts +++ b/src/sub-blocks/BasicCard/schema.ts @@ -18,6 +18,10 @@ export const BasicCard = { type: 'string', }, icon: ImageProps, + target: { + type: 'string', + enum: ['_blank', '_parent', '_top', '_self'], + }, }, }, }; From e703e2b97b4acb0040b7b4e4f7c5f42f472c4297 Mon Sep 17 00:00:00 2001 From: Juli Ovechkina Date: Wed, 22 Feb 2023 15:10:29 +0300 Subject: [PATCH 2/2] fix: card params --- src/sub-blocks/BasicCard/BasicCard.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sub-blocks/BasicCard/BasicCard.tsx b/src/sub-blocks/BasicCard/BasicCard.tsx index cbb60dc73..277be0ced 100644 --- a/src/sub-blocks/BasicCard/BasicCard.tsx +++ b/src/sub-blocks/BasicCard/BasicCard.tsx @@ -12,11 +12,11 @@ import './BasicCard.scss'; const b = block('basic-card'); const BasicCard = (props: BasicCardProps) => { - const {url, title, text, border, icon, additionalInfo, links, buttons, target} = props; + const {title, text, icon, additionalInfo, links, buttons, ...cardParams} = props; const iconProps = icon && getMediaImage(icon); return ( - + {iconProps && }