diff --git a/src/components/badge/Badge.css.ts b/src/components/badge/Badge.css.ts index 2b4716e..d0564da 100644 --- a/src/components/badge/Badge.css.ts +++ b/src/components/badge/Badge.css.ts @@ -77,6 +77,11 @@ export const Badge = recipe({ color: OnContainer, borderColor: ContainerLine, }, + None: { + backgroundColor: "inherit", + color: Main, + borderColor: Main, + }, }, outlined: { true: { diff --git a/src/components/badge/Badge.stories.tsx b/src/components/badge/Badge.stories.tsx index 8dbfa90..57c5b2f 100644 --- a/src/components/badge/Badge.stories.tsx +++ b/src/components/badge/Badge.stories.tsx @@ -16,7 +16,7 @@ export default { }, fill: { control: "select", - options: ["Solid", "Soft"], + options: ["Solid", "Soft", "None"], }, }, } as ComponentMeta; diff --git a/src/components/input/Input.tsx b/src/components/input/Input.tsx index 75d3b79..30e47fc 100644 --- a/src/components/input/Input.tsx +++ b/src/components/input/Input.tsx @@ -2,13 +2,17 @@ import React, { AllHTMLAttributes, forwardRef, ReactNode } from "react"; import classNames from "classnames"; import * as css from "./Input.css"; -type InputProps = AllHTMLAttributes & { +type InputProps = Omit, "size"> & { before?: ReactNode; after?: ReactNode; + inputSize?: number; }; export const Input = forwardRef( - ({ className, style, variant, size, outlined, radii, before, after, ...props }, ref) => ( + ( + { className, style, variant, size, inputSize = 1, outlined, radii, before, after, ...props }, + ref + ) => (
{before} - + {after}
)