diff --git a/src/components/node/Tag/index.tsx b/src/components/node/Tag/index.tsx index fe0a6a9f..50ad4deb 100644 --- a/src/components/node/Tag/index.tsx +++ b/src/components/node/Tag/index.tsx @@ -4,9 +4,14 @@ import { ITag } from '~/redux/types'; import classNames = require('classnames'); +const getTagFeature = (tag: ITag) => { + if (tag.title.substr(0, 1) === '/') return 'green'; + + return ''; +}; + interface IProps { - title: ITag['title']; - feature?: ITag['feature']; + tag: ITag; is_hoverable?: boolean; onInput?: ChangeEventHandler; @@ -14,23 +19,15 @@ interface IProps { onBlur?: FocusEventHandler; } -const Tag: FC = ({ - title, - feature, - - is_hoverable, - onInput, - onKeyUp, - onBlur, -}) => ( -
+const Tag: FC = ({ tag, is_hoverable, onInput, onKeyUp, onBlur }) => ( +
-
{title}
+
{tag.title}
{onInput && ( = ({ ); export { Tag }; - -//
diff --git a/src/components/node/Tags/index.tsx b/src/components/node/Tags/index.tsx index 76b3299a..6904a07b 100644 --- a/src/components/node/Tags/index.tsx +++ b/src/components/node/Tags/index.tsx @@ -68,21 +68,6 @@ export const Tags: FC = ({ tags, is_editable, onTagsChange, ...props }) onTagsChange(uniq([...tags, ...data]).map(tag => tag.title)); }, [tags, data, onTagsChange]); - // const onBlur = useCallback(() => { - // clearTimeout(timer.current); - // onSubmit(); - // }, [onSubmit, timer]); - - // useEffect(() => { - // timer.current = setTimeout(() => { - // onSubmit(); - // }, 3000); - - // return () => { - // clearTimeout(timer.current); - // }; - // }, [data]); - useEffect(() => { setData(data.filter(({ title }) => !tags.some(tag => tag.title.trim() === title.trim()))); }, [tags]); @@ -90,13 +75,16 @@ export const Tags: FC = ({ tags, is_editable, onTagsChange, ...props }) return ( {tags.map(tag => ( - - ))} - {data.map(tag => ( - + ))} - {is_editable && } + {data.map(tag => ( + + ))} + + {is_editable && ( + + )} ); };