fix: block base inner types (#413)

Author: gorgeousvlad

src/components/BlockBase/BlockBase.tsx

@@ -2,15 +2,20 @@ import React, {PropsWithChildren} from 'react';
 
 import {BlockDecoration} from '../../customization/BlockDecoration';
 import {Col} from '../../grid';
-import {BlockBaseProps, ClassNameProps} from '../../models';
+import {BlockBaseProps, BlockDecorationProps, ClassNameProps} from '../../models';
 import {block} from '../../utils';
 import Anchor from '../Anchor/Anchor';
 
 import './BlockBase.scss';
 
 const b = block('block-base');
 
-const BlockBase = (props: PropsWithChildren<BlockBaseProps & ClassNameProps>) => {
+export type BlockBaseFullProps = BlockBaseProps &
+    BlockDecorationProps &
+    ClassNameProps &
+    PropsWithChildren;
+
+const BlockBase = (props: BlockBaseFullProps) => {
     const {anchor, visible, children, className, resetPaddings, qa, type, index} = props;
 
     return (

src/components/BlockBase/__tests__/BlockBase.test.tsx

@@ -5,13 +5,13 @@ import {render, screen} from '@testing-library/react';
 import {testCustomClassName} from '../../../../test-utils/shared/common';
 import {qaIdByDefault} from '../../../components/Anchor/Anchor';
 import {GridColumnSize} from '../../../grid';
-import {BlockBaseProps, BlockTypes, ClassNameProps, WithChildren} from '../../../models';
-import BlockBase from '../BlockBase';
+import {BlockTypes, ClassNameProps, WithChildren} from '../../../models';
+import BlockBase, {BlockBaseFullProps} from '../BlockBase';
 
 const qaId = 'block-base-component';
 const blockType = BlockTypes[0];
 
-type ComponentProps = WithChildren<BlockBaseProps & ClassNameProps>;
+type ComponentProps = WithChildren<BlockBaseFullProps & ClassNameProps>;
 
 describe('BlockBase', () => {
     test('render component by default', async () => {

src/containers/PageConstructor/components/ConstructorBlock/ConstructorBlock.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 
-import BlockBase from '../../../../components/BlockBase/BlockBase';
-import {Block, BlockBaseProps, WithChildren} from '../../../../models';
+import BlockBase, {BlockBaseFullProps} from '../../../../components/BlockBase/BlockBase';
+import {Block, WithChildren} from '../../../../models';
 import {block} from '../../../../utils';
 
-interface ConstructorBlockProps extends Pick<BlockBaseProps, 'index'> {
+interface ConstructorBlockProps extends Pick<BlockBaseFullProps, 'index'> {
     data: Block;
 }
 

src/models/constructor-items/blocks.ts

@@ -63,8 +63,6 @@ export interface Childable {
 
 //block props
 export interface BlockBaseProps {
-    type: BlockType;
-    index?: number;
     anchor?: AnchorProps;
     visible?: GridColumnSize;
     resetPaddings?: boolean;

src/models/customization.ts

@@ -1,6 +1,9 @@
 import {PropsWithChildren} from 'react';
 
-import {BlockBaseProps} from './constructor-items';
+import {BlockType} from './constructor-items';
 
-export type BlockDecorationProps = Pick<BlockBaseProps, 'index' | 'type'> & PropsWithChildren;
+export interface BlockDecorationProps extends PropsWithChildren {
+    type: BlockType;
+    index?: number;
+}
 export type BlockDecorator = (props: BlockDecorationProps) => React.ReactElement;