fix(card): remove validator (#45)

Co-authored-by: Nikolay Tverdokhlebov <[email protected]>

Author: niktverd

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.5.0](https://github.com/gravity-ui/page-constructor/issues/44) (2022-11-03)
+
+### Features
+
+* remove card validator and types
+
 ## [1.4.2](https://github.com/gravity-ui/page-constructor/pull/46) (2022-11-07)
 
 ### Bug Fixes

src/components/CardBase/schema.ts

@@ -37,8 +37,6 @@ import {
     ContentLayoutBlock,
 } from './blocks';
 
-import {CardBase} from './components';
-
 export const blockMap = {
     [BlockType.SliderBlock]: SliderBlock,
     [BlockType.SimpleBlock]: SimpleBlock,
@@ -80,8 +78,4 @@ export const subBlockMap = {
     [SubBlockType.BasicCard]: BasicCard,
     [SubBlockType.Content]: Content,
     [SubBlockType.Quote]: Quote,
-    /**
-     * @deprecated Will be removed, use basic card instead
-     */
-    [SubBlockType.Card]: CardBase,
 };

src/constructor-items.ts

@@ -331,8 +331,6 @@ export interface CardBaseProps {
     border?: CardBorder;
 }
 
-export interface CardProps extends CardBaseProps, CardData {}
-
 export interface CardHeader {
     title?: string;
     image?: ImageProps;

src/models/constructor-items/common.ts

@@ -7,7 +7,6 @@ import {
     ButtonPixel,
     ButtonProps,
     CardBaseProps,
-    CardProps,
     ContentTheme,
     DividerSize,
     ImageObjectProps,
@@ -171,10 +170,6 @@ export type DividerModel = {
     type: SubBlockType.Divider;
 } & DividerProps;
 
-export type CardModel = {
-    type: SubBlockType.Card;
-} & CardProps;
-
 export type QuoteModel = {
     type: SubBlockType.Quote;
 } & QuoteProps;
@@ -217,7 +212,6 @@ export type BannerCardModel = {
 
 export type SubBlockModels =
     | DividerModel
-    | CardModel
     | QuoteModel
     | NewsCardModel
     | PartnerModel

src/models/constructor-items/sub-blocks.ts

@@ -25,7 +25,6 @@ import {
 } from './validators/blocks';
 
 import {
-    CardBlock,
     PartnerBlock,
     MediaCardBlock,
     TutorialCard,
@@ -68,7 +67,6 @@ export function generateDefaultSchema(config?: SchemaCustomConfig) {
                         type: 'string',
                         enum: [
                             'divider',
-                            'card',
                             'quote',
                             'event',
                             'post',
@@ -129,7 +127,6 @@ export function generateDefaultSchema(config?: SchemaCustomConfig) {
                     type: {
                         type: 'string',
                         enum: [
-                            'card',
                             'partner',
                             'post',
                             'media-card',
@@ -148,7 +145,6 @@ export function generateDefaultSchema(config?: SchemaCustomConfig) {
                 select: {$data: '0/type'},
                 selectCases: {
                     // Cards
-                    ...CardBlock,
                     ...PartnerBlock,
                     ...MediaCardBlock,
                     ...BannerCard,

src/schema/index.ts

@@ -482,3 +482,10 @@ export const MediaProps = {
     },
     dataLens: DataLensProps,
 };
+
+export const CardBase = {
+    border: {
+        type: 'string',
+        enum: ['border', 'shadow', 'none'],
+    },
+};

src/schema/validators/common.ts

@@ -9,8 +9,3 @@ export * from '../../sub-blocks/CardWithImage/schema';
 export * from '../../sub-blocks/Quote/schema';
 export * from '../../sub-blocks/Divider/schema';
 export * from '../../sub-blocks/BasicCard/schema';
-
-/**
- * @deprecated Will be removed
- */
-export * from '../../components/CardBase/schema';

src/schema/validators/sub-blocks.ts

@@ -1,5 +1,4 @@
-import {BaseProps, withTheme} from '../../schema/validators/common';
-import {CardBase} from '../../components/CardBase/schema';
+import {BaseProps, CardBase, withTheme} from '../../schema/validators/common';
 import {ContentBase} from '../Content/schema';
 import {ImageObjectProps} from '../../components/Image/schema';
 import _ from 'lodash';

src/sub-blocks/BackgroundCard/schema.ts

@@ -1,7 +1,6 @@
 import _ from 'lodash';
 
-import {BaseProps} from '../../schema/validators/common';
-import {CardBase} from '../../components/CardBase/schema';
+import {BaseProps, CardBase} from '../../schema/validators/common';
 import {ContentBase} from '../Content/schema';
 import {ImageProps} from '../../components/Image/schema';