diff --git a/webapp/src/components/Icons/base.tsx b/webapp/src/components/Icons/base.tsx index 06bd6cf..8b4e121 100644 --- a/webapp/src/components/Icons/base.tsx +++ b/webapp/src/components/Icons/base.tsx @@ -1,5 +1,5 @@ import { createAppUseStyles } from 'styles/theme'; -import { AnchorHTMLAttributes, FC } from "react"; +import { AnchorHTMLAttributes, FC, SVGProps } from "react"; export type IconStyleProps = { @@ -23,9 +23,9 @@ export const useIconStyles = createAppUseStyles(theme => ({ })) export type IconBaseProps = AnchorHTMLAttributes & IconStyleProps; -export const IconBase: FC = ({ +export const IconBase: FC }> = ({ children, - viewBox, + svgProps = {}, size = 1, color, units, @@ -34,7 +34,7 @@ export const IconBase: FC = ({ }) => { const { classes } = useIconStyles({ size, color, units, }); return - + {children} diff --git a/webapp/src/components/Icons/index.stories.tsx b/webapp/src/components/Icons/index.stories.tsx index f3c0473..48631f6 100644 --- a/webapp/src/components/Icons/index.stories.tsx +++ b/webapp/src/components/Icons/index.stories.tsx @@ -1,7 +1,7 @@ import { ComponentStory } from "@storybook/react"; import { usePageTheme } from "styles/page"; import { IconBase } from "./base"; -import { PencilIcon, CheckMarkIcon, TrashIcon } from "."; +import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon } from "."; import { AddIcon } from './index'; export default { @@ -17,6 +17,7 @@ export const IconList: ComponentStory = (args) => { + } IconList.args = { diff --git a/webapp/src/components/Icons/index.tsx b/webapp/src/components/Icons/index.tsx index 126a966..2e6feb0 100644 --- a/webapp/src/components/Icons/index.tsx +++ b/webapp/src/components/Icons/index.tsx @@ -2,7 +2,9 @@ import { FC } from "react"; import { IconBase, IconBaseProps } from "./base"; -export const PencilIcon: FC = props => +export const PencilIcon: FC = props => ; -export const CheckMarkIcon: FC = props => +export const CheckMarkIcon: FC = props => ; -export const AddIcon: FC = props => +export const AddIcon: FC = props => +export const TrashIcon: FC = props => + + +export const InfoIcon: FC = props => +