From b8c15cfd9903293734e9e57789c31eaa8dd27162 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Fri, 5 Jun 2020 17:33:29 +0700 Subject: [PATCH] made comment block props type --- src/components/comment/CommentEmbedBlock/index.tsx | 7 +++---- src/components/comment/CommentTextBlock/index.tsx | 6 ++---- src/components/node/CommentContent/index.tsx | 1 - src/constants/comment.ts | 4 ++++ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/comment/CommentEmbedBlock/index.tsx b/src/components/comment/CommentEmbedBlock/index.tsx index 7ea44c48..e973cd2e 100644 --- a/src/components/comment/CommentEmbedBlock/index.tsx +++ b/src/components/comment/CommentEmbedBlock/index.tsx @@ -1,5 +1,5 @@ import React, { FC, memo, useMemo, useEffect } from 'react'; -import { ICommentBlock } from '~/constants/comment'; +import { ICommentBlockProps } from '~/constants/comment'; import styles from './styles.scss'; import { getYoutubeThumb } from '~/utils/dom'; import { selectPlayer } from '~/redux/player/selectors'; @@ -16,9 +16,8 @@ const mapDispatchToProps = { }; type Props = ReturnType & - typeof mapDispatchToProps & { - block: ICommentBlock; - }; + typeof mapDispatchToProps & + ICommentBlockProps & {}; const CommentEmbedBlockUnconnected: FC = memo( ({ block, youtubes, playerGetYoutubeInfo }) => { diff --git a/src/components/comment/CommentTextBlock/index.tsx b/src/components/comment/CommentTextBlock/index.tsx index e453aba9..9c9e07af 100644 --- a/src/components/comment/CommentTextBlock/index.tsx +++ b/src/components/comment/CommentTextBlock/index.tsx @@ -1,10 +1,8 @@ import React, { FC } from 'react'; -import { ICommentBlock } from '~/constants/comment'; +import { ICommentBlockProps } from '~/constants/comment'; import styles from './styles.scss'; -interface IProps { - block: ICommentBlock; -} +interface IProps extends ICommentBlockProps {} const CommentTextBlock: FC = ({ block }) => { return ( diff --git a/src/components/node/CommentContent/index.tsx b/src/components/node/CommentContent/index.tsx index 68e925b0..a7978d67 100644 --- a/src/components/node/CommentContent/index.tsx +++ b/src/components/node/CommentContent/index.tsx @@ -12,7 +12,6 @@ import { AudioPlayer } from '~/components/media/AudioPlayer'; import classnames from 'classnames'; import { PRESETS } from '~/constants/urls'; import { COMMENT_BLOCK_RENDERERS } from '~/constants/comment'; -import { Icon } from '~/components/input/Icon'; import { nodeLockComment, nodeEditComment } from '~/redux/node/actions'; import { CommentMenu } from '../CommentMenu'; diff --git a/src/constants/comment.ts b/src/constants/comment.ts index 916f18a2..9689c167 100644 --- a/src/constants/comment.ts +++ b/src/constants/comment.ts @@ -27,6 +27,10 @@ export type ICommentBlock = { content: string; }; +export type ICommentBlockProps = { + block: ICommentBlock; +}; + export const COMMENT_BLOCK_RENDERERS = { [COMMENT_BLOCK_TYPES.TEXT]: CommentTextBlock, [COMMENT_BLOCK_TYPES.MARK]: CommentTextBlock,