The Open Standard for Generative UI
Crayon components v2 (#137)
subham92cc4c00d4e9
diff --git a/js/packages/react-ui/package.json b/js/packages/react-ui/package.jsonindex ef31ffe5b..897348027 100644--- a/js/packages/react-ui/package.json+++ b/js/packages/react-ui/package.json@@ -2,7 +2,7 @@"type": "module","name": "@crayonai/react-ui","license": "MIT",- "version": "0.7.16",+ "version": "0.8.0","description": "Component library for Generative UI SDK","main": "dist/index.js","types": "dist/index.d.ts",diff --git a/js/packages/react-ui/src/components/Accordion/Accordion.tsx b/js/packages/react-ui/src/components/Accordion/Accordion.tsxindex 5cb39ef82..7e8e2f3b4 100644--- a/js/packages/react-ui/src/components/Accordion/Accordion.tsx+++ b/js/packages/react-ui/src/components/Accordion/Accordion.tsx@@ -3,43 +3,47 @@ import clsx from "clsx";import { ChevronDownIcon } from "lucide-react";import React, { forwardRef } from "react";-export type AccordionProps =+type AccordionVariant = "clear" | "card" | "sunk";++export type AccordionProps = (| AccordionPrimitive.AccordionSingleProps- | AccordionPrimitive.AccordionMultipleProps;+ | AccordionPrimitive.AccordionMultipleProps+) & {+ variant?: AccordionVariant;+};++const variantMap: Record<AccordionVariant, string> = {+ clear: "crayon-accordion-clear",+ card: "crayon-accordion-card",+ sunk: "crayon-accordion-sunk",+};export const Accordion = forwardRef<React.ComponentRef<typeof AccordionPrimitive.Root>,AccordionProps->(({ className, style, ...props }, ref) => (+>(({ className, style, variant = "clear", ...props }, ref) => (<AccordionPrimitive.Rootref={ref}- className={clsx("crayon-accordion", className)}+ className={clsx("crayon-accordion", variantMap[variant], className)}style={style}{...props}/>));-type AccordionItemVariant = "card" | "sunk";export interface AccordionItemPropsextends React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item> {className?: string;style?: React.CSSProperties;value: string;- variant?: AccordionItemVariant;}-const variantMap: Record<AccordionItemVariant, string> = {- card: "crayon-accordion-item-card",- sunk: "crayon-accordion-item-sunk",-};-export const AccordionItem = forwardRef<React.ComponentRef<typeof AccordionPrimitive.Item>,AccordionItemProps->(({ className, style, value, variant = "card", ...props }, ref) => (+>(({ className, style, value, ...props }, ref) => (<AccordionPrimitive.Itemref={ref}- className={clsx("crayon-accordion-item", variantMap[variant], className)}+ className={clsx("crayon-accordion-item", className)}style={style}value={value}{...props}diff --git a/js/packages/react-ui/src/components/Accordion/accordion.scss b/js/packages/react-ui/src/components/Accordion/accordion.scssindex e586c9be1..152286619 100644--- a/js/packages/react-ui/src/components/Accordion/accordion.scss+++ b/js/packages/react-ui/src/components/Accordion/accordion.scss@@ -2,42 +2,100 @@.crayon-accordion {box-sizing: border-box;- border-radius: 6px;- box-shadow: cssUtils.$shadow-m;+ border-radius: cssUtils.$rounded-2xl;border: 1px solid cssUtils.$stroke-default;+ padding: cssUtils.$spacing-m;+ padding-bottom: 0;- &-item {- box-sizing: border-box;- overflow: hidden;- border-bottom: 1px solid cssUtils.$stroke-default;-- &-card {- .crayon-accordion-content {- &-wrapper {- padding: cssUtils.$spacing-l;- gap: cssUtils.$spacing-l;+ &-clear {+ border: 1px solid transparent;+ box-shadow: none;+ padding: 0;+ .crayon-accordion-trigger {+ box-shadow: none;+ padding-left: 0;+ padding-right: 0;+ padding-top: cssUtils.$spacing-l;+ padding-bottom: cssUtils.$spacing-l;+ }+ .crayon-accordion-item {+ &:first-child {+ .crayon-accordion-trigger {+ padding-top: 0;}}+ &:last-child {+ border-bottom-left-radius: 0px;+ border-bottom-right-radius: 0px;+ border-bottom: 1px solid transparent;+ }+ }+ .crayon-accordion-content {+ &-wrapper {+ padding: 0;+ padding-bottom: cssUtils.$spacing-l;+ gap: cssUtils.$spacing-m;+ }+ }+ }+ &-card {+ .crayon-accordion-content {+ &-wrapper {+ padding: 0;+ padding-bottom: cssUtils.$spacing-m;+ gap: cssUtils.$spacing-l;+ }}- &-sunk {- .crayon-accordion-trigger {- background-color: cssUtils.$bg-sunk;+ .crayon-accordion-item {+ &:last-child {+ .crayon-accordion-trigger {+ border-bottom: none;+ }+ }+ }+ .crayon-accordion-item {+ &:last-child {+ border-bottom-left-radius: 0px;+ border-bottom-right-radius: 0px;+ border-bottom: none;}+ }+ }- .crayon-accordion-content {- background-color: cssUtils.$bg-sunk;+ &-sunk {+ background-color: cssUtils.$bg-sunk;++ .crayon-accordion-content {+ &-wrapper {+ padding: 0;+ padding-bottom: cssUtils.$spacing-m;+ gap: cssUtils.$spacing-l;+ }+ }- &-wrapper {- padding: cssUtils.$spacing-l;- gap: cssUtils.$spacing-l;+ .crayon-accordion-item {+ &:last-child {+ .crayon-accordion-trigger {+ border-bottom: none;}}}+ }++ &-item {+ box-sizing: border-box;+ overflow: hidden;+ border-bottom: 1px solid cssUtils.$stroke-default;+&:first-child {margin-top: 0;border-top-left-radius: 4px;border-top-right-radius: 4px;++ .crayon-accordion-trigger {+ padding-top: 0;+ }}&:last-child {border-bottom-left-radius: 4px;@@ -61,14 +119,14 @@box-sizing: border-box;@include cssUtils.typography("body", "default");background-color: transparent;- padding: cssUtils.$spacing-s;+ padding: cssUtils.$spacing-l 0;width: 100%;flex: 1;display: flex;align-items: center;justify-content: space-between;color: cssUtils.$primary-text;- box-shadow: cssUtils.$shadow-m;+ cursor: pointer;&-content {display: flex;@@ -79,16 +137,15 @@display: flex;align-items: center;justify-content: center;- height: 14px;- width: 14px;+ height: 16px;+ width: 16px;}}&-icon {color: cssUtils.$primary-text;- @include cssUtils.typography("primary", "default");- height: 14px;- width: 14px;+ height: 16px;+ width: 16px;transition: transform 300ms cubic-bezier(0.87, 0, 0.13, 1);}&[data-state="open"] {@@ -112,7 +169,7 @@box-sizing: border-box;display: flex;flex-direction: column;- padding: cssUtils.$spacing-l;+ padding: 0;gap: cssUtils.$spacing-l;}}diff --git a/js/packages/react-ui/src/components/Accordion/stories/accordion.stories.tsx b/js/packages/react-ui/src/components/Accordion/stories/accordion.stories.tsxindex 5b4be1c5e..d633d19fa 100644--- a/js/packages/react-ui/src/components/Accordion/stories/accordion.stories.tsx+++ b/js/packages/react-ui/src/components/Accordion/stories/accordion.stories.tsx@@ -9,7 +9,7 @@ interface AccordionStoryProps {type: "single" | "multiple";collapsible?: boolean;defaultValue?: string;- variant?: "card" | "sunk";+ variant?: "clear" | "card" | "sunk";showIcons?: boolean;}@@ -61,7 +61,7 @@ const meta: Meta<AccordionStoryProps> = {},variant: {control: "radio",- options: ["card", "sunk"],+ options: ["clear", "card", "sunk"],description: "The visual style variant of the accordion",defaultValue: "card",table: {@@ -170,7 +170,7 @@ export const SingleAccordion: Story = {args: {type: "single",collapsible: true,- variant: "card",+ variant: "clear",showIcons: true,},parameters: {@@ -181,9 +181,9 @@ export const SingleAccordion: Story = {},},render: (args) => (- <Accordion type={args.type} collapsible={args.collapsible}>+ <Accordion type={args.type} collapsible={args.collapsible} variant={args.variant}>{cityItems.map((item) => (- <AccordionItem key={item.value} value={item.value} variant={args.variant}>+ <AccordionItem key={item.value} value={item.value}><AccordionTrigger text={item.title} /><AccordionContent><CardHeader title={item.subtitle} subtitle={item.description} />@@ -209,9 +209,9 @@ export const MultipleAccordion: Story = {},},render: (args) => (- <Accordion type="multiple">+ <Accordion type="multiple" variant={args.variant}>{landscapeItems.map((item) => (- <AccordionItem key={item.value} value={item.value} variant={args.variant}>+ <AccordionItem key={item.value} value={item.value}><AccordionTrigger text={item.title} /><AccordionContent><CardHeader title={item.subtitle} subtitle={item.description} />@@ -238,9 +238,9 @@ export const WithIconsAccordion: Story = {},},render: (args) => (- <Accordion type={args.type} collapsible={args.collapsible}>+ <Accordion type={args.type} collapsible={args.collapsible} variant={args.variant}>{animalItems.map((item) => (- <AccordionItem key={item.value} value={item.value} variant={args.variant}>+ <AccordionItem key={item.value} value={item.value}><AccordionTrigger text={item.title} icon={item.icon} /><AccordionContent><CardHeaderdiff --git a/js/packages/react-ui/src/components/Button/Button.tsx b/js/packages/react-ui/src/components/Button/Button.tsxindex 4e3249b9a..fa76ab6ab 100644--- a/js/packages/react-ui/src/components/Button/Button.tsx+++ b/js/packages/react-ui/src/components/Button/Button.tsx@@ -3,20 +3,28 @@ import { forwardRef, ReactNode } from "react";type ButtonVariant = "primary" | "secondary" | "tertiary";type ButtonSize = "small" | "medium" | "large";+type ButtonType = "normal" | "destructive";export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {variant?: ButtonVariant;size?: ButtonSize;iconLeft?: ReactNode;iconRight?: ReactNode;+ buttonType?: ButtonType;}-const variantMap: Record<ButtonVariant, string> = {+const normalVariantMap: Record<ButtonVariant, string> = {primary: "crayon-button-base-primary",secondary: "crayon-button-base-secondary",tertiary: "crayon-button-base-tertiary",};+const destructiveVariantMap: Record<ButtonVariant, string> = {+ primary: "crayon-button-base-destructive-primary",+ secondary: "crayon-button-base-destructive-secondary",+ tertiary: "crayon-button-base-destructive-tertiary",+};+const sizeMap: Record<ButtonSize, string> = {small: "crayon-button-base-small",medium: "crayon-button-base-medium",@@ -25,9 +33,19 @@ const sizeMap: Record<ButtonSize, string> = {export const Button = forwardRef<HTMLButtonElement, ButtonProps>((- { children, variant = "primary", size = "medium", iconLeft, iconRight, className, ...props },+ {+ children,+ variant = "primary",+ size = "medium",+ iconLeft,+ iconRight,+ className,+ buttonType = "normal",+ ...props+ },ref,) => {+ const variantMap = buttonType === "destructive" ? destructiveVariantMap : normalVariantMap;return (<buttonref={ref}diff --git a/js/packages/react-ui/src/components/Button/button.scss b/js/packages/react-ui/src/components/Button/button.scssindex d305ffc97..e00ad8dd1 100644--- a/js/packages/react-ui/src/components/Button/button.scss+++ b/js/packages/react-ui/src/components/Button/button.scss@@ -3,13 +3,12 @@.crayon-button-base {box-sizing: border-box;@include cssUtils.typography(body, default);- padding: cssUtils.$spacing-m;border-radius: cssUtils.$rounded-m;border: 1px solid transparent;cursor: pointer;transition: all 0.2s ease;display: flex;- gap: cssUtils.$spacing-2xs;+ gap: cssUtils.$spacing-xs;align-items: center;& svg {height: 1rem;@@ -18,53 +17,118 @@// Primary variant&-primary {- background-color: cssUtils.$bg-brand-el;- color: cssUtils.$brand-text;- &:hover {- background-color: cssUtils.$bg-brand-el-hover;+ background-color: cssUtils.$interactive-accent;+ color: cssUtils.$accent-primary-text;+ border-color: cssUtils.$stroke-accent;+ &:not(:disabled):hover {+ background-color: cssUtils.$interactive-accent-hover;}&:disabled {- opacity: 0.5;+ background-color: var(--crayon-interactive-accent-disabled);cursor: not-allowed;}+ &:not(:disabled):active {+ background-color: cssUtils.$interactive-accent-pressed;+ }}// Secondary variant&-secondary {- background-color: cssUtils.$bg-container;+ background-color: cssUtils.$interactive-default;color: cssUtils.$primary-text;- border-color: cssUtils.$stroke-default;- &:hover {- background-color: cssUtils.$bg-container-hover;+ border-color: cssUtils.$stroke-interactive-el;+ &:not(:disabled):hover {+ background-color: cssUtils.$interactive-hover;}&:disabled {+ background-color: cssUtils.$interactive-default;color: cssUtils.$disabled-text;- border-color: cssUtils.$stroke-default;cursor: not-allowed;}+ &:not(:disabled):active {+ background-color: cssUtils.$interactive-hover;+ }}// Tertiary variant&-tertiary {- background-color: transparent;+ background-color: cssUtils.$interactive-default;color: cssUtils.$primary-text;- &:hover {- background-color: cssUtils.$bg-container-hover;+ &:not(:disabled):hover {+ background-color: cssUtils.$interactive-hover;}&:disabled {+ background-color: cssUtils.$interactive-disabled;+ border-color: cssUtils.$stroke-default;color: cssUtils.$disabled-text;cursor: not-allowed;}+ &:not(:disabled):active {+ background-color: cssUtils.$interactive-hover;+ border-color: cssUtils.$stroke-interactive-el;+ }+ }++ // Destructive variant+ // Primary variant+ &-destructive-primary {+ background-color: cssUtils.$interactive-destructive-accent;+ color: cssUtils.$danger-inverted-primary-text;+ border-color: cssUtils.$stroke-accent;+ &:not(:disabled):hover {+ background-color: cssUtils.$interactive-destructive-accent-hover;+ }+ &:disabled {+ background-color: cssUtils.$interactive-destructive-accent-disabled;+ cursor: not-allowed;+ }+ &:not(:disabled):active {+ background-color: cssUtils.$interactive-destructive-accent-pressed;+ }+ }+ // Secondary variant+ &-destructive-secondary {+ background-color: cssUtils.$interactive-destructive;+ color: cssUtils.$danger-primary-text;+ border-color: cssUtils.$stroke-danger;+ &:not(:disabled):hover {+ background-color: cssUtils.$interactive-destructive-hover;+ }+ &:disabled {+ background-color: cssUtils.$interactive-destructive-disabled;+ color: cssUtils.$danger-disabled-text;+ cursor: not-allowed;+ }+ &:not(:disabled):active {+ background-color: cssUtils.$interactive-destructive-hover;+ }+ }+ // Tertiary variant+ &-destructive-tertiary {+ color: cssUtils.$danger-primary-text;+ &:not(:disabled):hover {+ background-color: cssUtils.$interactive-destructive-hover;+ }+ &:disabled {+ color: cssUtils.$danger-disabled-text;+ cursor: not-allowed;+ }+ &:not(:disabled):active {+ background-color: cssUtils.$interactive-destructive-hover;+ border-color: cssUtils.$stroke-danger;+ }}// Sizes&-small {- padding: cssUtils.$spacing-2xs cssUtils.$spacing-xs;+ border-radius: cssUtils.$rounded-s;+ padding: calc(cssUtils.$spacing-2xs - 1.5px) cssUtils.$spacing-s;+ @include cssUtils.typography(body, small);}&-medium {- padding: cssUtils.$spacing-xs cssUtils.$spacing-m;+ padding: calc(cssUtils.$spacing-xs - 1px) cssUtils.$spacing-m;}&-large {- padding: cssUtils.$spacing-s cssUtils.$spacing-m;+ padding: calc(cssUtils.$spacing-s - 1px) cssUtils.$spacing-m;}}diff --git a/js/packages/react-ui/src/components/Button/stories/Button.stories.tsx b/js/packages/react-ui/src/components/Button/stories/Button.stories.tsxindex 74cf5300d..5c5663c30 100644--- a/js/packages/react-ui/src/components/Button/stories/Button.stories.tsx+++ b/js/packages/react-ui/src/components/Button/stories/Button.stories.tsx@@ -11,9 +11,15 @@ export const Primary: Story = {variant: "primary",size: "medium",disabled: false,+ buttonType: "normal",},render: (args) => (- <Button variant={args.variant} size={args.size} disabled={args.disabled}>+ <Button+ variant={args.variant}+ size={args.size}+ disabled={args.disabled}+ buttonType={args.buttonType}+ >{args.children}</Button>),@@ -23,6 +29,7 @@ export const Secondary: Story = {args: {children: "Secondary",variant: "secondary",+ buttonType: "normal",},};@@ -31,6 +38,7 @@ export const Tertiary: Story = {args: {children: "Tertiary",variant: "tertiary",+ buttonType: "normal",},};@@ -117,6 +125,13 @@ const meta: Meta<typeof Button> = {category: "Icons",},},+ buttonType: {+ control: "radio",+ options: ["normal", "destructive"],+ table: {+ category: "Appearance",+ },+ },},tags: ["autodocs", "!dev"],};diff --git a/js/packages/react-ui/src/components/Calendar/components/calendarHelperComponents.scss b/js/packages/react-ui/src/components/Calendar/components/calendarHelperComponents.scssindex 06c912713..be79cc680 100644--- a/js/packages/react-ui/src/components/Calendar/components/calendarHelperComponents.scss+++ b/js/packages/react-ui/src/components/Calendar/components/calendarHelperComponents.scss@@ -1,5 +1,21 @@@use "../../../cssUtils" as cssUtils;+.crayon-calendar-container .crayon-calendar-select-trigger {+ background-color: transparent;+ border-color: transparent;++ &:hover {+ background-color: cssUtils.$interactive-hover;+ border-color: cssUtils.$stroke-interactive-el;+ color: cssUtils.$primary-text;+ }++ &[data-state="open"] {+ background-color: cssUtils.$interactive-hover;+ border-color: cssUtils.$stroke-interactive-el;+ }+}+.crayon-calendar-container .crayon-calendar-select-content-months {padding: cssUtils.$spacing-2xs 0;background-color: cssUtils.$bg-container;@@ -32,7 +48,7 @@padding: cssUtils.$spacing-s;&:hover {- background-color: cssUtils.$bg-container-hover;+ background-color: cssUtils.$bg-sunk;}}}diff --git a/js/packages/react-ui/src/components/Calendar/components/helperComponents.tsx b/js/packages/react-ui/src/components/Calendar/components/helperComponents.tsxindex b2b070252..64dd0556c 100644--- a/js/packages/react-ui/src/components/Calendar/components/helperComponents.tsx+++ b/js/packages/react-ui/src/components/Calendar/components/helperComponents.tsx@@ -91,7 +91,7 @@ export const MonthsDropdown = (key={key}aria-label={ariaLabel}>- <SelectTrigger className={className}>+ <SelectTrigger className={clsx("crayon-calendar-select-trigger", className)}><SelectValue placeholder={"Select a month"} /></SelectTrigger><SelectContent@@ -180,7 +180,7 @@ export const YearsDropdown = (key={key}aria-label={ariaLabel}>- <SelectTrigger className={className}>+ <SelectTrigger className={clsx("crayon-calendar-select-trigger", className)}><SelectValue placeholder={"Select a month"} /></SelectTrigger><SelectContentdiff --git a/js/packages/react-ui/src/components/Calendar/utils/calendarBaseStyle.scss b/js/packages/react-ui/src/components/Calendar/utils/calendarBaseStyle.scssindex 880aa10c0..38ded7fc5 100644--- a/js/packages/react-ui/src/components/Calendar/utils/calendarBaseStyle.scss+++ b/js/packages/react-ui/src/components/Calendar/utils/calendarBaseStyle.scss@@ -13,8 +13,8 @@flex-direction: column;align-items: center;justify-content: center;- border-radius: cssUtils.$rounded-xl;- border: 1px solid cssUtils.$stroke-default;+ border-radius: cssUtils.$rounded-2xl;+ border: 1px solid cssUtils.$stroke-interactive-el;width: 100%;}@@ -83,7 +83,7 @@}.crayon-calendar-chevron {- fill: cssUtils.$bg-brand-el;+ fill: cssUtils.$interactive-accent;}.crayon-calendar-month {@@ -129,8 +129,8 @@}.crayon-calendar-single-day-selected {- background: cssUtils.$bg-brand-el;- color: cssUtils.$brand-text;+ background: cssUtils.$interactive-accent;+ color: cssUtils.$accent-primary-text;border-radius: cssUtils.$rounded-m;}@@ -138,19 +138,19 @@/* ------------------------------------------------------------ */.crayon-calendar-range-start {- color: cssUtils.$brand-text;- background: cssUtils.$bg-brand-el;+ color: cssUtils.$accent-primary-text;+ background: cssUtils.$interactive-accent;border-top-left-radius: cssUtils.$rounded-m;border-bottom-left-radius: cssUtils.$rounded-m;}.crayon-calendar-range-middle {- background: cssUtils.$bg-sunk;+ background: cssUtils.$interactive-hover;}.crayon-calendar-range-end {- color: cssUtils.$brand-text;- background: cssUtils.$bg-brand-el;+ color: cssUtils.$accent-primary-text;+ background: cssUtils.$interactive-accent;border-top-right-radius: cssUtils.$rounded-m;border-bottom-right-radius: cssUtils.$rounded-m;}diff --git a/js/packages/react-ui/src/components/Callout/callout.scss b/js/packages/react-ui/src/components/Callout/callout.scssindex 9e6fcc414..b79799827 100644--- a/js/packages/react-ui/src/components/Callout/callout.scss+++ b/js/packages/react-ui/src/components/Callout/callout.scss@@ -8,8 +8,9 @@padding: cssUtils.$spacing-m;border-radius: cssUtils.$rounded-xl;box-sizing: border-box;+&-neutral {- background-color: cssUtils.$bg-container-hover;+ background-color: cssUtils.$bg-sunk;border: 1px solid cssUtils.$stroke-default;color: cssUtils.$primary-text;.crayon-callout-content-title {@@ -20,27 +21,35 @@&-info {background-color: cssUtils.$bg-info;border: 1px solid cssUtils.$stroke-default;- color: cssUtils.$info-text;+ color: cssUtils.$info-primary-text;.crayon-callout-content-title {- color: cssUtils.$info-text;+ color: cssUtils.$info-primary-text;}}&-warning {background-color: cssUtils.$bg-danger;border: 1px solid cssUtils.$stroke-default;- color: cssUtils.$danger-text;+ color: cssUtils.$danger-primary-text;.crayon-callout-content-title {- color: cssUtils.$danger-text;+ color: cssUtils.$danger-primary-text;}}&-success {background-color: cssUtils.$bg-success;border: 1px solid cssUtils.$stroke-default;- color: cssUtils.$success-text;+ color: cssUtils.$success-primary-text;.crayon-callout-content-title {- color: cssUtils.$success-text;+ color: cssUtils.$success-primary-text;+ }+ }++ &-danger {+ border-left: 4px solid #bc2e37;+ color: cssUtils.$danger-primary-text;+ .crayon-callout-content-title {+ color: #a7272f;}}@@ -52,7 +61,6 @@justify-content: center;padding: cssUtils.$spacing-3xs;}-&-icon-inner {width: 16px;height: 16px;@@ -60,7 +68,6 @@align-items: center;justify-content: center;}-&-content {display: flex;flex-direction: column;diff --git a/js/packages/react-ui/src/components/Callout/stories/callout.stories.tsx b/js/packages/react-ui/src/components/Callout/stories/callout.stories.tsxindex e98b34ff0..0d1293caf 100644--- a/js/packages/react-ui/src/components/Callout/stories/callout.stories.tsx+++ b/js/packages/react-ui/src/components/Callout/stories/callout.stories.tsx@@ -17,7 +17,7 @@ const meta: Meta<CalloutProps> = {argTypes: {variant: {control: "select",- options: ["neutral", "info", "warning", "success"],+ options: ["neutral", "info", "warning", "success", "danger"],description: "The visual style variant of the callout",table: {category: "Appearance",diff --git a/js/packages/react-ui/src/components/CardHeader/CardHeader.tsx b/js/packages/react-ui/src/components/CardHeader/CardHeader.tsxindex 40f43f9f2..e4fcedb3e 100644--- a/js/packages/react-ui/src/components/CardHeader/CardHeader.tsx+++ b/js/packages/react-ui/src/components/CardHeader/CardHeader.tsx@@ -3,7 +3,7 @@ import { cloneElement, CSSProperties, forwardRef, ReactElement, ReactNode } fromimport { ButtonProps } from "../Button";import { IconButtonProps } from "../IconButton";-export interface CardHeaderProps {+export interface CardHeaderProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "title"> {icon?: ReactNode;title?: ReactNode;subtitle?: ReactNode;diff --git a/js/packages/react-ui/src/components/CardHeader/cardHeader.scss b/js/packages/react-ui/src/components/CardHeader/cardHeader.scssindex d0ef795b7..96f9e425f 100644--- a/js/packages/react-ui/src/components/CardHeader/cardHeader.scss+++ b/js/packages/react-ui/src/components/CardHeader/cardHeader.scss@@ -3,7 +3,7 @@.crayon-header {display: flex;flex-direction: column;- gap: cssUtils.$spacing-2xs;+ gap: cssUtils.$spacing-3xs;overflow-wrap: break-word;&-top {diff --git a/js/packages/react-ui/src/components/Carousel/Carousel.tsx b/js/packages/react-ui/src/components/Carousel/Carousel.tsxindex c8f43726d..8c8248f97 100644--- a/js/packages/react-ui/src/components/Carousel/Carousel.tsx+++ b/js/packages/react-ui/src/components/Carousel/Carousel.tsx@@ -86,7 +86,6 @@ export const CarouselContent = forwardRef<HTMLDivElement, React.HTMLAttributes<Hreturn (<div ref={scrollDivRef} className={clsx("crayon-carousel-content", className)} {...props}>- <div />{content}</div>);@@ -137,7 +136,7 @@ export const CarouselPrevious = forwardRef<<div className={clsx("crayon-carousel-button crayon-carousel-button-left", className)}><IconButtonref={ref}- shape="circle"+ shape="square"variant="secondary"size="small"onClick={() => scroll("left")}@@ -182,7 +181,7 @@ export const CarouselNext = forwardRef<HTMLButtonElement, React.ComponentProps<t<div className={clsx("crayon-carousel-button crayon-carousel-button-right", className)}><IconButtonref={ref}- shape="circle"+ shape="square"variant="secondary"size="small"onClick={() => scroll("right")}diff --git a/js/packages/react-ui/src/components/Carousel/carousel.scss b/js/packages/react-ui/src/components/Carousel/carousel.scssindex 2deecda6f..57c83549b 100644--- a/js/packages/react-ui/src/components/Carousel/carousel.scss+++ b/js/packages/react-ui/src/components/Carousel/carousel.scss@@ -36,7 +36,7 @@gap: cssUtils.$spacing-s;min-width: 200px;max-width: 200px;- border-radius: cssUtils.$rounded-m;+ border-radius: cssUtils.$rounded-2xl;background-color: cssUtils.$bg-container;padding: cssUtils.$spacing-m;border: 1px solid cssUtils.$stroke-default;@@ -47,13 +47,18 @@top: 50%;z-index: 10;transform: translateY(-50%);+ background: cssUtils.$bg-container;+ display: flex;+ align-items: center;+ justify-content: center;+ border-radius: cssUtils.$rounded-s;&-left {- left: 0;+ left: -12px;}&-right {- right: 0;+ right: -12px;}}}diff --git a/js/packages/react-ui/src/components/Carousel/stories/carousel.stories.tsx b/js/packages/react-ui/src/components/Carousel/stories/carousel.stories.tsxindex 87edcaa1a..5934b14b3 100644--- a/js/packages/react-ui/src/components/Carousel/stories/carousel.stories.tsx+++ b/js/packages/react-ui/src/components/Carousel/stories/carousel.stories.tsx@@ -13,6 +13,7 @@ import {Trophy,UtensilsCrossed,} from "lucide-react";+import { Card } from "../../Card";import { CardHeader } from "../../CardHeader";import { IconButton } from "../../IconButton";import { Image } from "../../Image";@@ -196,22 +197,24 @@ export const Default: Story = {}));return (- <Carousel itemsToScroll={itemsToScroll} noSnap={noSnap} showButtons={showButtons}>- <CarouselContent>- {repeatedItems.map((item) => (- <CarouselItem key={item.id}>- <CardHeader- title={item.title}- subtitle={item.subtitle}- actions={[<IconButton variant="tertiary" size="small" icon={item.icon} />]}- />- <Image src={item.imageUrl ?? ""} alt={`${item.title} image`} scale="fill" />- </CarouselItem>- ))}- </CarouselContent>- <CarouselPrevious icon={<ChevronLeft />} />- <CarouselNext icon={<ChevronRight />} />- </Carousel>+ <Card style={{ width: "700px" }}>+ <Carousel itemsToScroll={itemsToScroll} noSnap={noSnap} showButtons={showButtons}>+ <CarouselContent>+ {repeatedItems.map((item) => (+ <CarouselItem key={item.id}>+ <CardHeader+ title={item.title}+ subtitle={item.subtitle}+ actions={[<IconButton variant="tertiary" size="small" icon={item.icon} />]}+ />+ <Image src={item.imageUrl ?? ""} alt={`${item.title} image`} scale="fill" />+ </CarouselItem>+ ))}+ </CarouselContent>+ <CarouselPrevious icon={<ChevronLeft />} />+ <CarouselNext icon={<ChevronRight />} />+ </Carousel>+ </Card>);},};diff --git a/js/packages/react-ui/src/components/CheckBoxGroup/checkBoxGroup.scss b/js/packages/react-ui/src/components/CheckBoxGroup/checkBoxGroup.scssindex 3126b1c1d..f980b708c 100644--- a/js/packages/react-ui/src/components/CheckBoxGroup/checkBoxGroup.scss+++ b/js/packages/react-ui/src/components/CheckBoxGroup/checkBoxGroup.scss@@ -4,9 +4,9 @@box-sizing: border-box;display: flex;flex-direction: column;- gap: cssUtils.$spacing-3xs;+ gap: cssUtils.$spacing-xs;border: 1px solid;- border-radius: cssUtils.$rounded-m;+ border-radius: cssUtils.$rounded-xl;&-clear {border-color: transparent;@@ -16,12 +16,12 @@&-card {border-color: cssUtils.$stroke-default;- padding: cssUtils.$spacing-l;+ padding: cssUtils.$spacing-m;}&-sunk {border-color: cssUtils.$stroke-default;background-color: cssUtils.$bg-sunk;- padding: cssUtils.$spacing-l;+ padding: cssUtils.$spacing-m;}}diff --git a/js/packages/react-ui/src/components/CheckBoxItem/CheckBoxItem.tsx b/js/packages/react-ui/src/components/CheckBoxItem/CheckBoxItem.tsxindex a5b197bb8..8ce922cc9 100644--- a/js/packages/react-ui/src/components/CheckBoxItem/CheckBoxItem.tsx+++ b/js/packages/react-ui/src/components/CheckBoxItem/CheckBoxItem.tsx@@ -1,8 +1,6 @@import * as Checkbox from "@radix-ui/react-checkbox";import clsx from "clsx";-import { Check } from "lucide-react";-import { CSSProperties, forwardRef, ReactNode } from "react";-import { useId } from "../../polyfills";+import { CSSProperties, forwardRef, ReactNode, useId } from "react";export interface CheckBoxItemProps {label?: ReactNode;@@ -32,7 +30,21 @@ const CheckBoxItem = forwardRef<HTMLButtonElement, CheckBoxItemProps>((props, rerequired={required}><Checkbox.Indicator className="crayon-checkbox-item-indicator">- <Check size={11} />+ <svg+ width="10"+ height="8"+ viewBox="0 0 10 8"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+ >+ <path+ d="M9 1L3.5 6.5L1 4"+ stroke="currentColor"+ stroke-width="1.5"+ stroke-linecap="round"+ stroke-linejoin="round"+ />+ </svg></Checkbox.Indicator></Checkbox.Root>{label && (diff --git a/js/packages/react-ui/src/components/CheckBoxItem/checkBoxItem.scss b/js/packages/react-ui/src/components/CheckBoxItem/checkBoxItem.scssindex 2a3a179d4..8edd42cc7 100644--- a/js/packages/react-ui/src/components/CheckBoxItem/checkBoxItem.scss+++ b/js/packages/react-ui/src/components/CheckBoxItem/checkBoxItem.scss@@ -3,34 +3,32 @@.crayon-checkbox-item-container {display: flex;align-items: center;- gap: cssUtils.$spacing-xs;+ gap: cssUtils.$spacing-s;+ padding: cssUtils.$spacing-3xs cssUtils.$spacing-0;width: 100%;max-width: 100%;overflow: hidden;- padding-top: cssUtils.$spacing-3xs;- padding-bottom: cssUtils.$spacing-3xs;- padding-left: cssUtils.$spacing-0;- padding-right: cssUtils.$spacing-2xs;}.crayon-checkbox-item-root {display: inline-flex;align-items: center;justify-content: center;- width: 14px;- height: 14px;- border-radius: 2px;+ width: 16px;+ height: 16px;+ border-radius: cssUtils.$rounded-xs;border: 1px solid cssUtils.$stroke-interactive-el;- background-color: cssUtils.$bg-container;cursor: pointer;&[data-state="checked"] {- background-color: cssUtils.$bg-brand-el;+ background-color: cssUtils.$interactive-accent;color: cssUtils.$primary-text;}- &:not(:disabled):hover {- border-color: cssUtils.$stroke-interactive-el-hover;+ &:not(:disabled):not([data-state="checked"]):hover {+ border-color: cssUtils.$stroke-interactive-el;+ background-color: cssUtils.$bg-sunk;+ color: cssUtils.$secondary-text;}&:disabled {@@ -43,7 +41,7 @@display: flex;align-items: center;justify-content: center;- color: cssUtils.$brand-text;+ color: cssUtils.$accent-primary-text;}.crayon-checkbox-item-label {diff --git a/js/packages/react-ui/src/components/CodeBlock/codeBlock.scss b/js/packages/react-ui/src/components/CodeBlock/codeBlock.scssindex 0c86050d9..ebf46dd8e 100644--- a/js/packages/react-ui/src/components/CodeBlock/codeBlock.scss+++ b/js/packages/react-ui/src/components/CodeBlock/codeBlock.scss@@ -17,7 +17,7 @@opacity: 0;transition: opacity 0.2s ease-in-out;&.crayon-code-block-copy-button-copied {- color: cssUtils.$success-text;+ color: cssUtils.$success-primary-text;background-color: cssUtils.$bg-success;}}diff --git a/js/packages/react-ui/src/components/DatePicker/helpers/components/HelperComponents.tsx b/js/packages/react-ui/src/components/DatePicker/helpers/components/HelperComponents.tsxindex 5cf831186..b8d56b65b 100644--- a/js/packages/react-ui/src/components/DatePicker/helpers/components/HelperComponents.tsx+++ b/js/packages/react-ui/src/components/DatePicker/helpers/components/HelperComponents.tsx@@ -134,7 +134,7 @@ export const MonthsDropdown = (key={key}aria-label={ariaLabel}>- <SelectTrigger className={className}>+ <SelectTrigger className={clsx("crayon-date-picker-select-trigger", className)}><SelectValue placeholder={"Select a month"} /></SelectTrigger><SelectContent@@ -222,7 +222,7 @@ export const YearsDropdown = (key={key}aria-label={ariaLabel}>- <SelectTrigger className={className}>+ <SelectTrigger className={clsx("crayon-date-picker-select-trigger", className)}><SelectValue placeholder={"Select a month"} /></SelectTrigger><SelectContentdiff --git a/js/packages/react-ui/src/components/DatePicker/helpers/components/floatingDatePickerRenderer.scss b/js/packages/react-ui/src/components/DatePicker/helpers/components/floatingDatePickerRenderer.scssindex d11918b62..dc3e7457e 100644--- a/js/packages/react-ui/src/components/DatePicker/helpers/components/floatingDatePickerRenderer.scss+++ b/js/packages/react-ui/src/components/DatePicker/helpers/components/floatingDatePickerRenderer.scss@@ -20,8 +20,8 @@align-items: center;justify-content: space-between;border: 1px solid cssUtils.$stroke-default;- border-radius: cssUtils.$rounded-xs;- background: cssUtils.$bg-container;+ border-radius: cssUtils.$rounded-m;+ background: cssUtils.$bg-sunk;padding: cssUtils.$spacing-xs cssUtils.$spacing-s;@include cssUtils.typography(primary, default);color: cssUtils.$primary-text;@@ -35,14 +35,14 @@}&-open {- border-color: cssUtils.$stroke-interactive-el-selected;- background-color: cssUtils.$bg-container-hover;+ border-color: cssUtils.$stroke-interactive-el;+ background-color: cssUtils.$bg-sunk;}&-not-open {&:hover {- border-color: cssUtils.$stroke-default;- background-color: cssUtils.$bg-container-hover;+ border-color: cssUtils.$stroke-interactive-el;+ background-color: cssUtils.$bg-sunk;}}@@ -81,6 +81,8 @@.crayon-date-picker-renderer-floating-menu {background: cssUtils.$bg-container;- border-radius: cssUtils.$rounded-m;+ border-radius: cssUtils.$rounded-2xl;box-shadow: cssUtils.$shadow-s;+ border: 1px solid cssUtils.$stroke-interactive-el;+ overflow: hidden;}diff --git a/js/packages/react-ui/src/components/DatePicker/helpers/components/helperComponents.scss b/js/packages/react-ui/src/components/DatePicker/helpers/components/helperComponents.scssindex 57d70d8d7..f17ebf340 100644--- a/js/packages/react-ui/src/components/DatePicker/helpers/components/helperComponents.scss+++ b/js/packages/react-ui/src/components/DatePicker/helpers/components/helperComponents.scss@@ -16,7 +16,7 @@border-color: transparent;.crayon-date-picker-select-viewport {display: grid;- grid-template-columns: repeat(3, 1fr);+ grid-template-columns: repeat(4, 1fr);gap: 4px;&-mobile {@@ -28,13 +28,26 @@display: flex;align-items: center;justify-content: center;- align-self: center;- justify-self: center;border-radius: cssUtils.$rounded-s;padding: cssUtils.$spacing-s;&:hover {- background-color: cssUtils.$bg-container-hover;+ background-color: cssUtils.$bg-sunk;}}}+.crayon-date-picker-renderer-floating-menu .crayon-date-picker-select-trigger {+ background-color: transparent;+ border-color: transparent;++ &:hover {+ background-color: cssUtils.$interactive-hover;+ border-color: cssUtils.$stroke-interactive-el;+ color: cssUtils.$primary-text;+ }++ &[data-state="open"] {+ background-color: cssUtils.$interactive-hover;+ border-color: cssUtils.$stroke-interactive-el;+ }+}diff --git a/js/packages/react-ui/src/components/DatePicker/helpers/utils/datePickerBaseStyle.scss b/js/packages/react-ui/src/components/DatePicker/helpers/utils/datePickerBaseStyle.scssindex e02fca816..26f198944 100644--- a/js/packages/react-ui/src/components/DatePicker/helpers/utils/datePickerBaseStyle.scss+++ b/js/packages/react-ui/src/components/DatePicker/helpers/utils/datePickerBaseStyle.scss@@ -12,7 +12,6 @@flex-direction: column;align-items: center;justify-content: center;- border-radius: cssUtils.$rounded-xl;}.crayon-date-picker-nav {@@ -65,7 +64,7 @@.crayon-date-picker-today {&[data-today]:not([aria-selected]) {- background-color: cssUtils.$bg-sunk;+ background-color: cssUtils.$interactive-hover;border-radius: cssUtils.$rounded-m;}}@@ -80,7 +79,7 @@}.crayon-date-picker-chevron {- fill: cssUtils.$bg-brand-el;+ fill: cssUtils.$interactive-accent;}.crayon-date-picker-month {@@ -121,8 +120,8 @@}.crayon-date-picker-single-day-selected {- background: cssUtils.$bg-brand-el;- color: cssUtils.$brand-text;+ background: cssUtils.$interactive-accent;+ color: cssUtils.$accent-primary-text;border-radius: cssUtils.$rounded-m;}@@ -130,19 +129,19 @@/* ------------------------------------------------------------ */.crayon-date-picker-range-start {- color: cssUtils.$brand-text;- background: cssUtils.$bg-brand-el;+ color: cssUtils.$accent-primary-text;+ background: cssUtils.$interactive-accent;border-top-left-radius: cssUtils.$rounded-m;border-bottom-left-radius: cssUtils.$rounded-m;}.crayon-date-picker-range-middle {- background: cssUtils.$bg-sunk;+ background: cssUtils.$interactive-hover;}.crayon-date-picker-range-end {- color: cssUtils.$brand-text;- background: cssUtils.$bg-brand-el;+ color: cssUtils.$accent-primary-text;+ background: cssUtils.$interactive-accent;border-top-right-radius: cssUtils.$rounded-m;border-bottom-right-radius: cssUtils.$rounded-m;}diff --git a/js/packages/react-ui/src/components/FollowUpBlock/FollowUpBlock.tsx b/js/packages/react-ui/src/components/FollowUpBlock/FollowUpBlock.tsxindex 2a3a209d3..64848e758 100644--- a/js/packages/react-ui/src/components/FollowUpBlock/FollowUpBlock.tsx+++ b/js/packages/react-ui/src/components/FollowUpBlock/FollowUpBlock.tsx@@ -2,16 +2,16 @@ import clsx from "clsx";import { CSSProperties, forwardRef, ReactElement } from "react";import { FollowUpItemProps } from "../FollowUpItem";-export interface FollowUpBlockProps {+export interface FollowUpBlockProps extends React.HTMLAttributes<HTMLDivElement> {children: ReactElement<FollowUpItemProps> | ReactElement<FollowUpItemProps>[];className?: string;style?: CSSProperties;}const FollowUpBlock = forwardRef<HTMLDivElement, FollowUpBlockProps>((props, ref) => {- const { children, className, style } = props;+ const { children, className, style, ...rest } = props;return (- <div ref={ref} className={clsx("crayon-follow-up-block", className)} style={style}>+ <div ref={ref} className={clsx("crayon-follow-up-block", className)} style={style} {...rest}>{children}</div>);diff --git a/js/packages/react-ui/src/components/FollowUpBlock/followUpBlock.scss b/js/packages/react-ui/src/components/FollowUpBlock/followUpBlock.scssindex ac6064542..dbe3de83c 100644--- a/js/packages/react-ui/src/components/FollowUpBlock/followUpBlock.scss+++ b/js/packages/react-ui/src/components/FollowUpBlock/followUpBlock.scss@@ -4,5 +4,4 @@box-sizing: border-box;display: flex;flex-direction: column;- gap: cssUtils.$spacing-3xs;}diff --git a/js/packages/react-ui/src/components/FollowUpItem/followUpItem.scss b/js/packages/react-ui/src/components/FollowUpItem/followUpItem.scssindex df57f9cf4..af021beb7 100644--- a/js/packages/react-ui/src/components/FollowUpItem/followUpItem.scss+++ b/js/packages/react-ui/src/components/FollowUpItem/followUpItem.scss@@ -4,14 +4,18 @@@include cssUtils.button-reset;@include cssUtils.typography(primary, default);box-sizing: border-box;- padding: cssUtils.$spacing-xs cssUtils.$spacing-0;- border-bottom: 1px solid cssUtils.$stroke-default;+ padding: cssUtils.$spacing-s cssUtils.$spacing-0;+ border-bottom: 1px solid cssUtils.$stroke-interactive-el;background-color: transparent;- gap: cssUtils.$spacing-xs;+ gap: cssUtils.$spacing-s;display: flex;align-items: center;justify-content: space-between;width: 100%;color: cssUtils.$primary-text;cursor: pointer;++ &:last-child {+ border-bottom: none;+ }}diff --git a/js/packages/react-ui/src/components/FormControl/Hint/hint.scss b/js/packages/react-ui/src/components/FormControl/Hint/hint.scssindex a550c6ef1..b6c357cfd 100644--- a/js/packages/react-ui/src/components/FormControl/Hint/hint.scss+++ b/js/packages/react-ui/src/components/FormControl/Hint/hint.scss@@ -7,4 +7,5 @@display: flex;align-items: center;gap: cssUtils.$spacing-2xs;+ padding-left: cssUtils.$spacing-2xs;}diff --git a/js/packages/react-ui/src/components/FormControl/formControl.scss b/js/packages/react-ui/src/components/FormControl/formControl.scssindex dc6718724..26d632cb5 100644--- a/js/packages/react-ui/src/components/FormControl/formControl.scss+++ b/js/packages/react-ui/src/components/FormControl/formControl.scss@@ -6,4 +6,10 @@display: flex;flex-direction: column;gap: cssUtils.$spacing-s;++ &:has(.crayon-label) {+ .crayon-label {+ padding-left: cssUtils.$spacing-2xs;+ }+ }}diff --git a/js/packages/react-ui/src/components/IconButton/IconButton.tsx b/js/packages/react-ui/src/components/IconButton/IconButton.tsxindex 2b7f29782..a96cd4fe9 100644--- a/js/packages/react-ui/src/components/IconButton/IconButton.tsx+++ b/js/packages/react-ui/src/components/IconButton/IconButton.tsx@@ -4,6 +4,7 @@ import { ButtonHTMLAttributes, forwardRef, ReactNode } from "react";type IconButtonVariant = "primary" | "secondary" | "tertiary";type IconButtonSize = "extra-small" | "small" | "medium" | "large";type IconButtonShape = "square" | "circle";+type IconButtonAppearance = "normal" | "destructive";export interface IconButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {icon: ReactNode;@@ -11,14 +12,21 @@ export interface IconButtonProps extends ButtonHTMLAttributes<HTMLButtonElement>size?: IconButtonSize;shape?: IconButtonShape;className?: string;+ appearance?: IconButtonAppearance;}-const iconButtonVariants = {+const normalIconButtonVariants = {primary: "crayon-icon-button-primary",secondary: "crayon-icon-button-secondary",tertiary: "crayon-icon-button-tertiary",} as const;+const destructiveIconButtonVariants = {+ primary: "crayon-icon-button-destructive-primary",+ secondary: "crayon-icon-button-destructive-secondary",+ tertiary: "crayon-icon-button-destructive-tertiary",+} as const;+const iconButtonSizes = {"extra-small": "crayon-icon-button-extra-small",small: "crayon-icon-button-small",@@ -38,9 +46,13 @@ export const IconButton = forwardRef<HTMLButtonElement, IconButtonProps>((props,variant = "primary",size = "medium",shape = "square",+ appearance = "normal",...rest} = props;+ const iconButtonVariants =+ appearance === "normal" ? normalIconButtonVariants : destructiveIconButtonVariants;+return (<buttonref={ref}diff --git a/js/packages/react-ui/src/components/IconButton/iconButton.scss b/js/packages/react-ui/src/components/IconButton/iconButton.scssindex 45092fde1..275adfc82 100644--- a/js/packages/react-ui/src/components/IconButton/iconButton.scss+++ b/js/packages/react-ui/src/components/IconButton/iconButton.scss@@ -6,16 +6,10 @@align-items: center;justify-content: center;border: 1px solid transparent;- gap: cssUtils.$spacing-xs;cursor: pointer;transition: all 0.2s ease;padding: 0;- &:disabled {- opacity: 0.5;- cursor: not-allowed;- }-//icon&-icon {display: flex;@@ -25,28 +19,110 @@// variants&-primary {- background-color: cssUtils.$bg-brand-el;- border-color: cssUtils.$stroke-default;- color: cssUtils.$brand-text;+ background-color: cssUtils.$interactive-accent;+ color: cssUtils.$accent-primary-text;+ border-color: cssUtils.$stroke-accent;+ &:hover {+ background-color: cssUtils.$interactive-accent-hover;+ }+ &:disabled {+ background-color: cssUtils.$interactive-accent-disabled;+ cursor: not-allowed;+ }+ &:active {+ background-color: cssUtils.$interactive-accent-pressed;+ }}&-secondary {- background-color: cssUtils.$bg-container;- border-color: cssUtils.$stroke-default;+ background-color: cssUtils.$interactive-default;color: cssUtils.$primary-text;+ border-color: cssUtils.$stroke-interactive-el;+ &:hover {+ background-color: cssUtils.$interactive-hover;+ }+ &:disabled {+ background-color: cssUtils.$interactive-default;+ color: cssUtils.$disabled-text;+ cursor: not-allowed;+ }+ &:active {+ background-color: cssUtils.$interactive-hover;+ }}&-tertiary {- background-color: transparent;- border-color: transparent;+ background-color: cssUtils.$interactive-default;color: cssUtils.$primary-text;+ &:hover {+ background-color: cssUtils.$interactive-hover;+ }+ &:disabled {+ background-color: cssUtils.$interactive-disabled;+ border-color: cssUtils.$stroke-default;+ color: cssUtils.$disabled-text;+ cursor: not-allowed;+ }+ &:active {+ background-color: cssUtils.$interactive-hover;+ border-color: cssUtils.$stroke-interactive-el;+ }+ }++ // destructive variants+ &-destructive-primary {+ background-color: cssUtils.$interactive-destructive-accent;+ color: cssUtils.$danger-inverted-primary-text;+ border-color: cssUtils.$stroke-accent;+ &:hover {+ background-color: cssUtils.$interactive-destructive-accent-hover;+ }+ &:disabled {+ background-color: cssUtils.$interactive-destructive-accent-disabled;+ cursor: not-allowed;+ }+ &:active {+ background-color: cssUtils.$interactive-destructive-accent-pressed;+ }+ }++ &-destructive-secondary {+ background-color: cssUtils.$interactive-destructive;+ color: cssUtils.$danger-primary-text;+ border-color: cssUtils.$stroke-danger;+ &:hover {+ background-color: cssUtils.$interactive-destructive-hover;+ }+ &:disabled {+ background-color: cssUtils.$interactive-destructive-disabled;+ color: cssUtils.$danger-disabled-text;+ cursor: not-allowed;+ }+ &:active {+ background-color: cssUtils.$interactive-destructive-hover;+ }+ }++ &-destructive-tertiary {+ color: cssUtils.$danger-primary-text;+ &:hover {+ background-color: cssUtils.$interactive-destructive-hover;+ }+ &:disabled {+ color: cssUtils.$danger-disabled-text;+ cursor: not-allowed;+ }+ &:active {+ background-color: cssUtils.$interactive-destructive-hover;+ border-color: cssUtils.$stroke-danger;+ }}// sizes&-extra-small {width: 20px;height: 20px;- box-shadow: cssUtils.$shadow-s;+& .crayon-icon-button-icon {height: 14px;width: 14px;@@ -56,17 +132,17 @@&-small {width: 28px;height: 28px;- box-shadow: cssUtils.$shadow-s;+& .crayon-icon-button-icon {- height: 14px;- width: 14px;+ height: 16px;+ width: 16px;}}&-medium {width: 32px;height: 32px;- box-shadow: cssUtils.$shadow-m;+& .crayon-icon-button-icon {height: 16px;width: 16px;@@ -79,7 +155,7 @@min-width: 36px;min-height: 36px;font-size: 16px;- box-shadow: cssUtils.$shadow-l;+& .crayon-icon-button-icon {height: 16px;width: 16px;@@ -89,6 +165,13 @@// shapes&-square {border-radius: cssUtils.$rounded-s;+ &.crayon-icon-button-extra-small {+ border-radius: cssUtils.$rounded-xs;+ }+ &.crayon-icon-button-medium,+ &.crayon-icon-button-large {+ border-radius: cssUtils.$rounded-m;+ }}&-circle {diff --git a/js/packages/react-ui/src/components/IconButton/stories/iconButton.stories.tsx b/js/packages/react-ui/src/components/IconButton/stories/iconButton.stories.tsxindex 9febdc5a8..c3be03ebb 100644--- a/js/packages/react-ui/src/components/IconButton/stories/iconButton.stories.tsx+++ b/js/packages/react-ui/src/components/IconButton/stories/iconButton.stories.tsx@@ -69,6 +69,14 @@ const meta: Meta<typeof IconButton> = {type: { summary: "string" },},},+ appearance: {+ control: "radio",+ options: ["normal", "destructive"],+ description: "The appearance of the button",+ table: {+ category: "Appearance",+ },+ },},tags: ["!dev", "autodocs"],};@@ -84,6 +92,7 @@ export const PrimaryButton: Story = {variant: "primary",shape: "square",size: "medium",+ appearance: "normal",},render: (args) => <IconButton {...args} />,};diff --git a/js/packages/react-ui/src/components/Input/input.scss b/js/packages/react-ui/src/components/Input/input.scssindex e383b460d..02cfa2565 100644--- a/js/packages/react-ui/src/components/Input/input.scss+++ b/js/packages/react-ui/src/components/Input/input.scss@@ -3,11 +3,11 @@.crayon-input {@include cssUtils.typography(body, default);border: 1px solid cssUtils.$stroke-default;- border-radius: cssUtils.$rounded-xs;+ border-radius: cssUtils.$rounded-m;box-sizing: border-box;width: 100%;gap: cssUtils.$spacing-xs;- background-color: cssUtils.$bg-container;+ background-color: cssUtils.$bg-sunk;color: cssUtils.$primary-text;&-small {@@ -22,16 +22,21 @@padding: cssUtils.$spacing-s;}&::placeholder {- color: cssUtils.$disabled-text;+ color: cssUtils.$secondary-text;}&:focus {outline: none;- border-color: cssUtils.$stroke-interactive-el-hover;+ border-color: cssUtils.$stroke-interactive-el;}&:disabled {- background-color: cssUtils.$bg-container;+ background-color: cssUtils.$bg-sunk;border: 1px solid cssUtils.$stroke-default;cursor: not-allowed;+ color: cssUtils.$disabled-text;+ }++ &:not(:focus):not(:disabled):hover {+ border-color: cssUtils.$stroke-interactive-el;}}diff --git a/js/packages/react-ui/src/components/Label/label.scss b/js/packages/react-ui/src/components/Label/label.scssindex 5252b8724..5f13d6776 100644--- a/js/packages/react-ui/src/components/Label/label.scss+++ b/js/packages/react-ui/src/components/Label/label.scss@@ -3,7 +3,7 @@.crayon-label {box-sizing: border-box;@include cssUtils.typography(primary, default);- color: cssUtils.$secondary-text;+ color: cssUtils.$primary-text;&-disabled {color: cssUtils.$disabled-text;diff --git a/js/packages/react-ui/src/components/ListBlock/listBlock.scss b/js/packages/react-ui/src/components/ListBlock/listBlock.scssindex 28318d36c..8cf6a97a6 100644--- a/js/packages/react-ui/src/components/ListBlock/listBlock.scss+++ b/js/packages/react-ui/src/components/ListBlock/listBlock.scss@@ -6,5 +6,6 @@flex-direction: column;width: 100%;border: 1px solid cssUtils.$stroke-default;- border-radius: cssUtils.$rounded-m;+ border-radius: cssUtils.$rounded-xl;+ overflow: hidden;}diff --git a/js/packages/react-ui/src/components/ListBlock/stories/ListBlock.stories.tsx b/js/packages/react-ui/src/components/ListBlock/stories/ListBlock.stories.tsxindex 7b0e861c0..ba826a40e 100644--- a/js/packages/react-ui/src/components/ListBlock/stories/ListBlock.stories.tsx+++ b/js/packages/react-ui/src/components/ListBlock/stories/ListBlock.stories.tsx@@ -1,5 +1,5 @@import type { Meta, StoryObj } from "@storybook/react";-import { ChevronRight, Mail, User } from "lucide-react";+import { ChevronRight, User } from "lucide-react";import { ListItem } from "../../ListItem";import { ListBlock } from "../ListBlock";@@ -64,13 +64,13 @@ export const ListBlockWithItems: Story = {actionIcon={<ChevronRight size={16} />}/><ListItem- decorativeIcon={<Mail size={16} />}+ decorativeIcon={<User size={16} />}title="Jane Smith"subtitle="Product Designer"actionIcon={<ChevronRight size={16} />}/><ListItem- decorativeIcon={<Mail size={16} />}+ decorativeIcon={<User size={16} />}title="Ankit Das"subtitle="Software Developer"actionIcon={<ChevronRight size={16} />}diff --git a/js/packages/react-ui/src/components/ListItem/ListItem.tsx b/js/packages/react-ui/src/components/ListItem/ListItem.tsxindex a7900b017..6a5e5e6af 100644--- a/js/packages/react-ui/src/components/ListItem/ListItem.tsx+++ b/js/packages/react-ui/src/components/ListItem/ListItem.tsx@@ -4,10 +4,10 @@ import React, { CSSProperties, ReactNode } from "react";export interface ListItemProps {className?: string;style?: CSSProperties;- decorativeIcon?: ReactNode;title?: ReactNode;subtitle?: ReactNode;actionIcon?: ReactNode;+ decorativeIcon?: ReactNode;onClick?: () => void;}diff --git a/js/packages/react-ui/src/components/ListItem/listItem.scss b/js/packages/react-ui/src/components/ListItem/listItem.scssindex 62f7202ad..c881848ae 100644--- a/js/packages/react-ui/src/components/ListItem/listItem.scss+++ b/js/packages/react-ui/src/components/ListItem/listItem.scss@@ -6,7 +6,8 @@align-items: center;justify-content: space-between;border-bottom: 1px solid cssUtils.$stroke-default;- padding: cssUtils.$spacing-s;+ padding: cssUtils.$spacing-m;+ gap: cssUtils.$spacing-s;cursor: pointer;&:last-child {@@ -17,6 +18,10 @@color: cssUtils.$secondary-text;}+ &:hover {+ background-color: cssUtils.$bg-sunk;+ }+.crayon-list-item-content {box-sizing: border-box;flex: 1;@@ -24,13 +29,13 @@flex-direction: column;align-items: flex-start;width: 100%;- gap: cssUtils.$spacing-2xs;+ gap: cssUtils.$spacing-3xs;&-action-icon {display: flex;align-items: center;justify-content: center;- padding: cssUtils.$spacing-3xs;+ padding-top: cssUtils.$spacing-2xs;}}diff --git a/js/packages/react-ui/src/components/ListItem/stories/ListItem.stories.tsx b/js/packages/react-ui/src/components/ListItem/stories/ListItem.stories.tsxindex 73ce9c461..cd1f86b61 100644--- a/js/packages/react-ui/src/components/ListItem/stories/ListItem.stories.tsx+++ b/js/packages/react-ui/src/components/ListItem/stories/ListItem.stories.tsx@@ -1,5 +1,5 @@import type { Meta, StoryObj } from "@storybook/react";-import { ChevronRight, Mail } from "lucide-react";+import { ChevronRight, User } from "lucide-react";import { ListItem } from "../ListItem";const meta: Meta<typeof ListItem> = {@@ -15,14 +15,6 @@ const meta: Meta<typeof ListItem> = {},},argTypes: {- decorativeIcon: {- control: false,- description: "The decorative icon to display above the title",- table: {- category: "Content",- type: { summary: "ReactNode" },- },- },title: {control: "text",description: "The main title text of the list item",@@ -39,6 +31,14 @@ const meta: Meta<typeof ListItem> = {type: { summary: "ReactNode" },},},+ decorativeIcon: {+ control: false,+ description: "The decorative icon or image to display on the left side of the list item",+ table: {+ category: "Content",+ type: { summary: "ReactNode" },+ },+ },actionIcon: {control: false,description: "The action icon to display on the right side of the list item",@@ -77,9 +77,9 @@ type Story = StoryObj<typeof ListItem>;export const ListItemStory: Story = {args: {+ decorativeIcon: <User size={16} />,title: "List Item Title",subtitle: "Subtitle text goes here",- decorativeIcon: <Mail size={16} />,actionIcon: <ChevronRight size={16} />,},};diff --git a/js/packages/react-ui/src/components/MarkDownRenderer/markDownRenderer.scss b/js/packages/react-ui/src/components/MarkDownRenderer/markDownRenderer.scssindex f4182969d..470ac172c 100644--- a/js/packages/react-ui/src/components/MarkDownRenderer/markDownRenderer.scss+++ b/js/packages/react-ui/src/components/MarkDownRenderer/markDownRenderer.scss@@ -34,7 +34,7 @@/* Link Styles */.crayon-markdown-renderer-link {- color: cssUtils.$info-text;+ color: cssUtils.$info-primary-text;cursor: pointer;text-decoration: none;transition: color 0.2s ease-in-out;diff --git a/js/packages/react-ui/src/components/RadioGroup/radioGroup.scss b/js/packages/react-ui/src/components/RadioGroup/radioGroup.scssindex 09b4a3820..b2ba8ab53 100644--- a/js/packages/react-ui/src/components/RadioGroup/radioGroup.scss+++ b/js/packages/react-ui/src/components/RadioGroup/radioGroup.scss@@ -4,9 +4,9 @@box-sizing: border-box;display: flex;flex-direction: column;- gap: cssUtils.$spacing-3xs;+ gap: cssUtils.$spacing-xs;border: 1px solid;- border-radius: cssUtils.$rounded-m;+ border-radius: cssUtils.$rounded-xl;&-clear {border-color: transparent;@@ -16,12 +16,12 @@&-card {border-color: cssUtils.$stroke-default;- padding: cssUtils.$spacing-l;+ padding: cssUtils.$spacing-m;}&-sunk {border-color: cssUtils.$stroke-default;background-color: cssUtils.$bg-sunk;- padding: cssUtils.$spacing-l;+ padding: cssUtils.$spacing-m;}}diff --git a/js/packages/react-ui/src/components/RadioItem/RadioItem.tsx b/js/packages/react-ui/src/components/RadioItem/RadioItem.tsxindex 5f33b29eb..1066d1ece 100644--- a/js/packages/react-ui/src/components/RadioItem/RadioItem.tsx+++ b/js/packages/react-ui/src/components/RadioItem/RadioItem.tsx@@ -27,25 +27,25 @@ const RadioItem = forwardRef<HTMLButtonElement, RadioItemProps>((props, ref) =>id={id}><svg- width={14}- height={14}+ width={16}+ height={16}fill="none"- viewBox="0 0 15 15"+ viewBox="0 0 16 16"className="crayon-radio-item-svg"><path // This is the circle that is filled between the border and the circlefill="currentColor"- d="M1 7a7 7 0 1 1 14 0A7 7 0 0 1 1 7Z"+ d="M1 8a7 7 0 1 1 14 0A7 7 0 0 1 1 8Z"className="crayon-radio-item-svg-path"/><path // This is the borderstroke="currentColor"- d="M1.5 7a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"+ d="M1.5 8a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0Z"className="crayon-radio-item-svg-border"/><path // This is the inner circlefill="currentColor"- d="M4.5 7a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0Z"+ d="M4 8a4 4 0 1 1 8 0 4 4 0 0 1-8 0Z"className="crayon-radio-item-svg-inner"/></svg>diff --git a/js/packages/react-ui/src/components/RadioItem/radioItem.scss b/js/packages/react-ui/src/components/RadioItem/radioItem.scssindex 080e9a860..6dfc4b77a 100644--- a/js/packages/react-ui/src/components/RadioItem/radioItem.scss+++ b/js/packages/react-ui/src/components/RadioItem/radioItem.scss@@ -3,11 +3,8 @@.crayon-radio-item-container {display: flex;align-items: center;- gap: cssUtils.$spacing-xs;- padding-top: cssUtils.$spacing-3xs;- padding-bottom: cssUtils.$spacing-3xs;- padding-left: cssUtils.$spacing-0;- padding-right: cssUtils.$spacing-2xs;+ gap: cssUtils.$spacing-s;+ padding: cssUtils.$spacing-3xs cssUtils.$spacing-0;width: 100%;max-width: 100%;overflow: hidden;@@ -17,8 +14,8 @@box-sizing: border-box;border-radius: cssUtils.$rounded-full;border: none;- height: 14px;- width: 14px;+ height: 16px;+ width: 16px;cursor: pointer;background-color: transparent;@@ -52,7 +49,7 @@}.crayon-radio-item-root[data-state="checked"] & {- fill: cssUtils.$bg-container;+ fill: cssUtils.$interactive-accent;}}@@ -63,14 +60,14 @@}.crayon-radio-item-root[data-state="checked"] & {- stroke: cssUtils.$stroke-interactive-el-hover;+ stroke: cssUtils.$stroke-accent;}}// Inner circle path.crayon-radio-item-svg-inner {.crayon-radio-item-root[data-state="checked"] & {- fill: cssUtils.$bg-brand-el;+ fill: cssUtils.$bg-container;}.crayon-radio-item-root[data-state="unchecked"] & {@@ -78,7 +75,7 @@}.crayon-radio-item-root[data-state="unchecked"]:hover:not(:disabled) & {- fill: cssUtils.$stroke-default;+ fill: cssUtils.$stroke-interactive-el;}}.crayon-radio-item-label {diff --git a/js/packages/react-ui/src/components/Select/select.scss b/js/packages/react-ui/src/components/Select/select.scssindex 42b32240f..aa248d7fd 100644--- a/js/packages/react-ui/src/components/Select/select.scss+++ b/js/packages/react-ui/src/components/Select/select.scss@@ -2,7 +2,7 @@.crayon-select-trigger {box-sizing: border-box;- background-color: cssUtils.$bg-container;+ background-color: cssUtils.$bg-sunk;color: cssUtils.$primary-text;@include cssUtils.typography(label, default);border: 1px solid cssUtils.$stroke-default;@@ -12,37 +12,40 @@justify-content: space-between;&:hover {- background: cssUtils.$bg-container-hover;+ background: cssUtils.$bg-sunk;border-color: cssUtils.$stroke-interactive-el;color: cssUtils.$secondary-text;+ &:not([data-placeholder]) {+ color: cssUtils.$primary-text;+ }}&:disabled {background-color: cssUtils.$bg-sunk;color: cssUtils.$disabled-text;- border-color: cssUtils.$disabled-text;+ border-color: cssUtils.$stroke-default;cursor: not-allowed;}&[data-state="open"] {border-color: cssUtils.$stroke-interactive-el;- background-color: cssUtils.$bg-fill;+ background-color: cssUtils.$bg-sunk;}&[data-placeholder] {- color: cssUtils.$disabled-text;+ color: cssUtils.$secondary-text;}&-sm {padding: cssUtils.$spacing-2xs cssUtils.$spacing-s;- border-radius: cssUtils.$rounded-xs;+ border-radius: cssUtils.$rounded-s;}&-md {padding: cssUtils.$spacing-xs cssUtils.$spacing-s;- border-radius: cssUtils.$rounded-xs;+ border-radius: cssUtils.$rounded-m;}&-lg {padding: cssUtils.$spacing-s;- border-radius: cssUtils.$rounded-xs;+ border-radius: cssUtils.$rounded-m;}&-icon {height: 16px;@@ -57,7 +60,7 @@max-height: 380px;min-width: var(--radix-select-trigger-width);overflow: hidden;- border-radius: cssUtils.$rounded-m;+ border-radius: cssUtils.$rounded-l;background-color: cssUtils.$bg-container;border: 1px solid cssUtils.$stroke-default;box-shadow: cssUtils.$shadow-m;@@ -75,8 +78,9 @@.crayon-select-label {box-sizing: border-box;- padding: cssUtils.$spacing-xs cssUtils.$spacing-s;+ padding: cssUtils.$spacing-xs cssUtils.$spacing-2xs;@include cssUtils.typography(primary, default);+ color: cssUtils.$disabled-text;}.crayon-select-item {@@ -88,12 +92,17 @@align-items: center;justify-content: space-between;border-radius: cssUtils.$rounded-s;- padding-top: 6px;- padding-bottom: 6px;+ padding-top: cssUtils.$spacing-2xs;+ padding-bottom: cssUtils.$spacing-2xs;+ margin-bottom: cssUtils.$spacing-2xs;@include cssUtils.typography(primary, default);color: cssUtils.$primary-text;outline: 0;+ &:last-child {+ margin-bottom: 0;+ }+// Variants based on showTick&--with-tick {padding-left: cssUtils.$spacing-xs;@@ -115,11 +124,14 @@color: cssUtils.$primary-text;}+ &:not([data-state="checked"]):hover {+ background-color: cssUtils.$bg-sunk;+ color: cssUtils.$primary-text;+ }+&:focus {background-color: cssUtils.$bg-sunk;color: cssUtils.$primary-text;- outline: 1px solid cssUtils.$stroke-interactive-el;- outline-offset: -1px;}&[data-state="checked"] {@@ -145,7 +157,7 @@&-text {flex: 1;@include cssUtils.typography(primary, default);- color: cssUtils.$disabled-text;+ color: cssUtils.$secondary-text;}&-value {diff --git a/js/packages/react-ui/src/components/Slider/Slider.tsx b/js/packages/react-ui/src/components/Slider/Slider.tsxindex 2c35b7626..86571c103 100644--- a/js/packages/react-ui/src/components/Slider/Slider.tsx+++ b/js/packages/react-ui/src/components/Slider/Slider.tsx@@ -1,6 +1,6 @@import * as SliderPrimitive from "@radix-ui/react-slider";import clsx from "clsx";-import { forwardRef, useMemo, useState } from "react";+import { forwardRef, ReactNode, useMemo, useState } from "react";export interface SliderProps extends React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root> {variant: "continuous" | "discrete" | "range";@@ -11,6 +11,8 @@ export interface SliderProps extends React.ComponentPropsWithoutRef<typeof SlidedefaultValue?: number[];className?: string;style?: React.CSSProperties;+ leftContent?: ReactNode;+ rightContent?: ReactNode;}export const Slider = forwardRef<React.ComponentRef<typeof SliderPrimitive.Root>, SliderProps>(@@ -26,6 +28,8 @@ export const Slider = forwardRef<React.ComponentRef<typeof SliderPrimitive.Root>defaultValue,className,style,+ leftContent,+ rightContent,...props},ref,@@ -77,9 +81,9 @@ export const Slider = forwardRef<React.ComponentRef<typeof SliderPrimitive.Root>const renderDots = () => {if (variant === "discrete" && step) {- const numSteps = Math.floor((max - min) / step) - 1;- return Array.from({ length: numSteps }, (_, index) => {- const value = min + step * (index + 1);+ const numSteps = Math.floor((max - min) / step);+ return Array.from({ length: numSteps + 1 }, (_, index) => {+ const value = min + step * index;const position = ((value - min) / (max - min)) * 100;return <div key={value} className="slider-dots-dot" style={{ left: `${position}%` }} />;});@@ -88,32 +92,42 @@ export const Slider = forwardRef<React.ComponentRef<typeof SliderPrimitive.Root>};return (- <SliderPrimitive.Root- ref={ref}- className={clsx("slider-root", { "slider--disabled": disabled }, className)}- {...props}- min={min}- max={max}- step={step}- value={value}- onValueChange={(value) => {- setInternalValue(value);- onValueChange?.(value);- }}- minStepsBetweenThumbs={1}- disabled={disabled}- key={variant}- defaultValue={defaultValue}- style={style}- >- <SliderPrimitive.Track className="slider-track">- <SliderPrimitive.Range className="slider-range" />- {variant === "discrete" && renderDots()}- </SliderPrimitive.Track>- {thumbs}- </SliderPrimitive.Root>+ <div className="slider-wrapper">+ {leftContent && <div className="slider-left-content">{leftContent}</div>}+ <div className="slider-container">+ <SliderPrimitive.Root+ ref={ref}+ className={clsx("slider-root", { "slider--disabled": disabled }, className)}+ {...props}+ min={min}+ max={max}+ step={step}+ value={value}+ onValueChange={(value) => {+ setInternalValue(value);+ onValueChange?.(value);+ }}+ minStepsBetweenThumbs={1}+ disabled={disabled}+ key={variant}+ defaultValue={defaultValue}+ style={style}+ >+ <SliderPrimitive.Track className="slider-track">+ <SliderPrimitive.Range+ className={clsx("slider-range", {+ "slider-range--at-min":+ (variant === "continuous" || variant === "discrete") &&+ valueToShow?.[0] === min,+ })}+ />+ {variant === "discrete" && renderDots()}+ </SliderPrimitive.Track>+ {thumbs}+ </SliderPrimitive.Root>+ </div>+ {rightContent && <div className="slider-right-content">{rightContent}</div>}+ </div>);},);--export default Slider;diff --git a/js/packages/react-ui/src/components/Slider/slider.scss b/js/packages/react-ui/src/components/Slider/slider.scssindex 94972aa1c..3d9d773fb 100644--- a/js/packages/react-ui/src/components/Slider/slider.scss+++ b/js/packages/react-ui/src/components/Slider/slider.scss@@ -1,6 +1,38 @@@use "../../cssUtils" as cssUtils;.slider {+ &-wrapper {+ display: flex;+ align-items: center;+ gap: cssUtils.$spacing-s;+ width: 100%;+ }++ &-left-content,+ &-right-content {+ display: flex;+ align-items: center;+ min-width: fit-content;+ color: cssUtils.$primary-text;+ @include cssUtils.typography(label, small);++ svg {+ width: 16px;+ height: 16px;+ }+ }++ &-container {+ padding: 0 8px;+ background-color: cssUtils.$bg-sunk;+ height: 16px;+ width: 100%;+ display: flex;+ align-items: center;+ justify-content: center;+ border-radius: cssUtils.$rounded-s;+ }+&-root {position: relative;display: flex;@@ -15,27 +47,31 @@&-track {position: relative;- height: 6px;+ height: 16px;flex-grow: 1;border-radius: cssUtils.$rounded-full;- background-color: cssUtils.$bg-sunk;}&-range {position: absolute;height: 100%;- border-radius: cssUtils.$rounded-full;- background-color: cssUtils.$bg-brand-el;+ border-radius: cssUtils.$rounded-s;+ background-color: cssUtils.$interactive-accent;+ margin-left: -8px;+ margin-right: -8px;++ &--at-min {+ background-color: transparent;+ }}&-thumb {outline: none;-&-handle {display: block;- width: 16px;- height: 16px;- border-radius: cssUtils.$rounded-3xs;+ width: 12px;+ height: 12px;+ border-radius: cssUtils.$rounded-xs;outline: 1px solid cssUtils.$stroke-default;background-color: cssUtils.$bg-container;overflow: hidden;@@ -51,14 +87,14 @@transition: background-color 0.2s;&:hover {- background-color: cssUtils.$bg-container-hover;+ background-color: cssUtils.$bg-sunk;}&-dot {width: 4px;height: 4px;border-radius: cssUtils.$rounded-full;- background-color: cssUtils.$bg-brand-el;+ background-color: cssUtils.$interactive-accent;}}}@@ -66,7 +102,7 @@&-value {@include cssUtils.typography(label, small);position: absolute;- top: -30px;+ top: -35px;left: 50%;border-radius: cssUtils.$rounded-2xs;transform: translateX(-50%);@@ -88,12 +124,12 @@&-dots {&-dot {position: absolute;- top: 1px;+ top: 50%;+ transform: translateY(-50%);width: 4px;height: 4px;border-radius: cssUtils.$rounded-full;background-color: cssUtils.$bg-container;- transform: translateX(-50%);}}diff --git a/js/packages/react-ui/src/components/Slider/stories/slider.stories.tsx b/js/packages/react-ui/src/components/Slider/stories/slider.stories.tsxindex 2d327116e..e9b30975f 100644--- a/js/packages/react-ui/src/components/Slider/stories/slider.stories.tsx+++ b/js/packages/react-ui/src/components/Slider/stories/slider.stories.tsx@@ -1,4 +1,5 @@import type { Meta, StoryObj } from "@storybook/react";+import { Volume1Icon, Volume2Icon } from "lucide-react";import { Slider, SliderProps } from "../Slider";const meta: Meta<SliderProps> = {@@ -107,6 +108,22 @@ const meta: Meta<SliderProps> = {type: { summary: "React.CSSProperties" },},},+ leftContent: {+ control: "text",+ description: "Content to display on the left side of the slider",+ table: {+ category: "Appearance",+ type: { summary: "React.ReactNode" },+ },+ },+ rightContent: {+ control: "text",+ description: "Content to display on the right side of the slider",+ table: {+ category: "Appearance",+ type: { summary: "React.ReactNode" },+ },+ },},decorators: [@@ -173,3 +190,23 @@ export const Range: Story = {},},};++export const WithLeftAndRightContent: Story = {+ args: {+ variant: "continuous",+ min: 0,+ max: 100,+ step: 1,+ defaultValue: [25],+ disabled: false,+ leftContent: <Volume1Icon />,+ rightContent: <Volume2Icon />,+ },+ parameters: {+ docs: {+ description: {+ story: "A slider with left and right content",+ },+ },+ },+};diff --git a/js/packages/react-ui/src/components/Steps/steps.scss b/js/packages/react-ui/src/components/Steps/steps.scssindex 3f615b552..ded880e11 100644--- a/js/packages/react-ui/src/components/Steps/steps.scss+++ b/js/packages/react-ui/src/components/Steps/steps.scss@@ -14,7 +14,7 @@.crayon-step-item {display: flex;position: relative;- gap: cssUtils.$spacing-s;+ gap: cssUtils.$spacing-m;}.crayon-step-connector {@@ -35,8 +35,8 @@display: flex;align-items: center;justify-content: center;- width: 20px;- height: 20px;+ width: 24px;+ height: 24px;border-radius: 50%;background-color: cssUtils.$bg-elevated;color: cssUtils.$secondary-text;@@ -49,8 +49,7 @@width: 1px;flex-grow: 1;z-index: 1;- background-color: cssUtils.$bg-container-hover;-+ background-color: cssUtils.$bg-sunk;.crayon-step-item:last-child & {display: none;}@@ -78,5 +77,5 @@flex-direction: column;align-items: center;gap: calc(cssUtils.$spacing-m + 2px);- @include cssUtils.typography(body, small);+ @include cssUtils.typography(body, default);}diff --git a/js/packages/react-ui/src/components/SwitchGroup/switchGroup.scss b/js/packages/react-ui/src/components/SwitchGroup/switchGroup.scssindex 2bf0b3a1c..9d445d52f 100644--- a/js/packages/react-ui/src/components/SwitchGroup/switchGroup.scss+++ b/js/packages/react-ui/src/components/SwitchGroup/switchGroup.scss@@ -4,9 +4,9 @@box-sizing: border-box;display: flex;flex-direction: column;- gap: cssUtils.$spacing-3xs;+ gap: cssUtils.$spacing-xs;border: 1px solid;- border-radius: cssUtils.$rounded-m;+ border-radius: cssUtils.$rounded-xl;&-clear {border-color: transparent;@@ -16,12 +16,12 @@&-card {border-color: cssUtils.$stroke-default;- padding: cssUtils.$spacing-l;+ padding: cssUtils.$spacing-m;}&-sunk {border-color: cssUtils.$stroke-default;background-color: cssUtils.$bg-sunk;- padding: cssUtils.$spacing-l;+ padding: cssUtils.$spacing-m;}}diff --git a/js/packages/react-ui/src/components/SwitchItem/switchItem.scss b/js/packages/react-ui/src/components/SwitchItem/switchItem.scssindex 97f7ef0b3..f08dc05ce 100644--- a/js/packages/react-ui/src/components/SwitchItem/switchItem.scss+++ b/js/packages/react-ui/src/components/SwitchItem/switchItem.scss@@ -4,36 +4,34 @@box-sizing: border-box;display: flex;align-items: center;- gap: cssUtils.$spacing-xs;+ gap: cssUtils.$spacing-s;max-width: 100%;width: 100%;overflow: hidden;- padding-top: cssUtils.$spacing-3xs;- padding-bottom: cssUtils.$spacing-3xs;- padding-left: cssUtils.$spacing-0;- padding-right: cssUtils.$spacing-xs;+ padding: cssUtils.$spacing-3xs cssUtils.$spacing-0;}.crayon-switch-item-root {position: relative;display: inline-block;- height: 15px;+ height: 16px;width: 24px;cursor: pointer;border-radius: cssUtils.$rounded-full;padding: cssUtils.$spacing-3xs;border: 1px solid cssUtils.$stroke-default;- background-color: cssUtils.$bg-fill;+ background-color: cssUtils.$bg-sunk;transition-property: background-color;transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);transition-duration: 150ms;&:not([data-disabled], [data-state="checked"]):hover {- background-color: cssUtils.$bg-sunk;+ border: 1px solid cssUtils.$stroke-interactive-el;}&[data-state="checked"] {- background-color: cssUtils.$bg-brand-el;+ background-color: cssUtils.$interactive-accent;+ border: 1px solid cssUtils.$stroke-accent;}&[data-disabled] {@@ -48,16 +46,16 @@height: 10px;width: 10px;border-radius: cssUtils.$rounded-full;- border: 1px solid cssUtils.$stroke-default;+ border: none;background-color: cssUtils.$bg-container;- transform: translateY(-50%) translateX(-1px);+ transform: translateY(-50%) translateX(0px);transition-property: transform;transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);transition-duration: 150ms;box-shadow: cssUtils.$shadow-s;&[data-state="checked"] {- transform: translateY(-50%) translateX(7.5px);+ transform: translateY(-50%) translateX(8px);border-color: cssUtils.$stroke-interactive-el;}}diff --git a/js/packages/react-ui/src/components/Table/table.scss b/js/packages/react-ui/src/components/Table/table.scssindex db34ce164..2ab0708e4 100644--- a/js/packages/react-ui/src/components/Table/table.scss+++ b/js/packages/react-ui/src/components/Table/table.scss@@ -7,20 +7,12 @@}.crayon-table {- @include cssUtils.typography(label, heavy);+ @include cssUtils.typography(label, small);width: 100%;caption-side: bottom;border-collapse: collapse;}-.crayon-table-body {- & tr {- &:hover {- background-color: cssUtils.$bg-container-hover;- }- }-}-.crayon-table-footer {border-top: 1px solid cssUtils.$stroke-default;@@ -32,13 +24,14 @@.crayon-table-cell,.crayon-table-head {padding: cssUtils.$spacing-m;+ padding-left: 0;color: cssUtils.$primary-text;}.crayon-table-head {border-bottom: 1px solid cssUtils.$stroke-default;& .crayon-table-head-label {- @include cssUtils.typography(label, heavy);+ @include cssUtils.typography(label, small-heavy);color: cssUtils.$secondary-text;display: inline-flex;flex-grow: 1;diff --git a/js/packages/react-ui/src/components/Tabs/Tabs.tsx b/js/packages/react-ui/src/components/Tabs/Tabs.tsxindex 712827eb5..5c8799f4d 100644--- a/js/packages/react-ui/src/components/Tabs/Tabs.tsx+++ b/js/packages/react-ui/src/components/Tabs/Tabs.tsx@@ -88,14 +88,16 @@ export const TabsList = forwardRef<React.ComponentRef<typeof TabsPrimitive.List>return (<div className="crayon-tabs-list-container">{showLeftButton && (- <IconButton- className="crayon-tabs-scroll-button crayon-tabs-scroll-left"- onClick={scrollLeft}- aria-label="Scroll tabs left"- icon={<ChevronLeft />}- variant="secondary"- size="small"- />+ <div className="crayon-tabs-scroll-button-container-left">+ <IconButton+ className="crayon-tabs-scroll-button crayon-tabs-scroll-left"+ onClick={scrollLeft}+ aria-label="Scroll tabs left"+ icon={<ChevronLeft />}+ variant="secondary"+ size="small"+ />+ </div>)}<TabsPrimitive.List@@ -115,14 +117,16 @@ export const TabsList = forwardRef<React.ComponentRef<typeof TabsPrimitive.List>/>{showRightButton && (- <IconButton- className="crayon-tabs-scroll-button crayon-tabs-scroll-right"- onClick={scrollRight}- aria-label="Scroll tabs right"- icon={<ChevronRight />}- variant="secondary"- size="small"- />+ <div className="crayon-tabs-scroll-button-container-right">+ <IconButton+ className="crayon-tabs-scroll-button crayon-tabs-scroll-right"+ onClick={scrollRight}+ aria-label="Scroll tabs right"+ icon={<ChevronRight />}+ variant="secondary"+ size="small"+ />+ </div>)}</div>);diff --git a/js/packages/react-ui/src/components/Tabs/stories/tabs.stories.tsx b/js/packages/react-ui/src/components/Tabs/stories/tabs.stories.tsxindex 426f58071..1f50684b5 100644--- a/js/packages/react-ui/src/components/Tabs/stories/tabs.stories.tsx+++ b/js/packages/react-ui/src/components/Tabs/stories/tabs.stories.tsx@@ -1,5 +1,6 @@import type { Meta, StoryObj } from "@storybook/react";import { BusFront, PlaneTakeoff, Ship } from "lucide-react";+import { Card } from "../../Card/Card";import { CardHeader } from "../../CardHeader";import { IconButton } from "../../IconButton";import { Image } from "../../Image";@@ -73,49 +74,60 @@ export const Default: Story = {defaultValue: "tab1",},render: (args) => (- <Tabs {...args}>- <TabsList>- <TabsTrigger value="tab1" text="Paris" />- <TabsTrigger value="tab2" text="Tokyo" />- <TabsTrigger value="tab3" text="New York" />- </TabsList>- <TabsContent value="tab1">- <CardHeader- title="Paris, France"- subtitle="The City of Light"- actions={[<IconButton variant="tertiary" size="small" icon={<PlaneTakeoff />} />]}- />- <Image- src="https://images.unsplash.com/photo-1502602898657-3e91760cbb34"- alt="Eiffel Tower in Paris"- scale="fill"- />- </TabsContent>- <TabsContent value="tab2">- <CardHeader- title="Tokyo, Japan"- subtitle="Where Tradition Meets Future"- actions={[<IconButton variant="tertiary" size="small" icon={<Ship />} />]}- />- <Image- src="https://images.unsplash.com/photo-1536098561742-ca998e48cbcc"- alt="Tokyo cityscape with Mount Fuji"- scale="fill"- />- </TabsContent>- <TabsContent value="tab3">- <CardHeader- title="New York City, USA"- subtitle="The City That Never Sleeps"- actions={[<IconButton variant="tertiary" size="small" icon={<BusFront />} />]}- />- <Image- src="https://images.unsplash.com/photo-1496442226666-8d4d0e62e6e9"- alt="New York City skyline"- scale="fill"- />- </TabsContent>- </Tabs>+ <Card>+ <Tabs {...args}>+ <TabsList>+ <TabsTrigger value="tab1" text="Paris" />+ <TabsTrigger value="tab2" text="Tokyo" />+ <TabsTrigger value="tab3" text="New York" />+ <TabsTrigger value="tab1" text="Paris" />+ <TabsTrigger value="tab2" text="Tokyo" />+ <TabsTrigger value="tab3" text="New York" />+ <TabsTrigger value="tab1" text="Paris" />+ <TabsTrigger value="tab2" text="Tokyo" />+ <TabsTrigger value="tab3" text="New York" />+ <TabsTrigger value="tab1" text="Paris" />+ <TabsTrigger value="tab2" text="Tokyo" />+ <TabsTrigger value="tab3" text="New York" />+ </TabsList>+ <TabsContent value="tab1">+ <CardHeader+ title="Paris, France"+ subtitle="The City of Light"+ actions={[<IconButton variant="tertiary" size="small" icon={<PlaneTakeoff />} />]}+ />+ <Image+ src="https://images.unsplash.com/photo-1502602898657-3e91760cbb34"+ alt="Eiffel Tower in Paris"+ scale="fill"+ />+ </TabsContent>+ <TabsContent value="tab2">+ <CardHeader+ title="Tokyo, Japan"+ subtitle="Where Tradition Meets Future"+ actions={[<IconButton variant="tertiary" size="small" icon={<Ship />} />]}+ />+ <Image+ src="https://images.unsplash.com/photo-1536098561742-ca998e48cbcc"+ alt="Tokyo cityscape with Mount Fuji"+ scale="fill"+ />+ </TabsContent>+ <TabsContent value="tab3">+ <CardHeader+ title="New York City, USA"+ subtitle="The City That Never Sleeps"+ actions={[<IconButton variant="tertiary" size="small" icon={<BusFront />} />]}+ />+ <Image+ src="https://images.unsplash.com/photo-1496442226666-8d4d0e62e6e9"+ alt="New York City skyline"+ scale="fill"+ />+ </TabsContent>+ </Tabs>+ </Card>),};diff --git a/js/packages/react-ui/src/components/Tabs/tabs.scss b/js/packages/react-ui/src/components/Tabs/tabs.scssindex cd6d0eb9f..67d0b4063 100644--- a/js/packages/react-ui/src/components/Tabs/tabs.scss+++ b/js/packages/react-ui/src/components/Tabs/tabs.scss@@ -8,9 +8,48 @@&-clear {.crayon-tabs-content {- padding: cssUtils.$spacing-3xs cssUtils.$spacing-xs;+ padding: cssUtils.$spacing-3xs 0;border: transparent;}+ .crayon-tabs-list {+ border-radius: 0;+ gap: cssUtils.$spacing-m;+ background: none;+ padding: 0;+ box-sizing: border-box;+ flex: 1;+ display: flex;+ width: 100%;+ position: relative;+ overflow-x: auto;+ scrollbar-width: none;+ -ms-overflow-style: none;+ scroll-behavior: smooth;+ &::-webkit-scrollbar {+ display: none;+ }+ }+ .crayon-tabs-trigger {+ width: auto;+ min-width: 0;+ border: 0px;+ border-radius: cssUtils.$rounded-0;+ border-bottom: 1.5px solid transparent;+ flex-shrink: 0;+ padding: 10.5px 0;+ &[data-state="active"] {+ border: 0px;+ box-shadow: none;+ border-bottom: 1.5px solid cssUtils.$stroke-interactive-el-selected;+ background-color: transparent;+ }+ &:not([data-state="active"]):hover {+ color: cssUtils.$primary-text;+ border: 0px;+ border-bottom: 1.5px solid transparent;+ background-color: transparent;+ }+ }}&-card {@@ -18,6 +57,13 @@padding: cssUtils.$spacing-l;border: 1px solid cssUtils.$stroke-default;}+ .crayon-tabs-scroll-button-container-left {+ border-radius: 10px 0 0 10px;+ }++ .crayon-tabs-scroll-button-container-right {+ border-radius: 0 10px 10px 0;+ }}&-sunk {@@ -26,6 +72,13 @@border: 1px solid cssUtils.$stroke-default;background-color: cssUtils.$bg-sunk;}+ .crayon-tabs-scroll-button-container-left {+ border-radius: 10px 0 0 10px;+ }++ .crayon-tabs-scroll-button-container-right {+ border-radius: 0 10px 10px 0;+ }}}@@ -33,11 +86,49 @@position: relative;display: flex;align-items: center;+ overflow: hidden;++ &::after {+ content: "";+ position: absolute;+ bottom: 0;+ height: 1px;+ left: 0;+ right: 0;+ border-bottom: 1px solid cssUtils.$stroke-interactive-el;+ pointer-events: none;+ }}-.crayon-tabs-scroll-button {+.crayon-tabs-scroll-button-container-left {+ position: absolute;+ height: 100%;+ left: 0;+ z-index: 1;+ display: flex;+ align-items: center;+ justify-content: center;+ padding: 0 10px;+ filter: blur(0.9);+ padding: 0 4px 0 0;+ background-color: cssUtils.$bg-container;+}++.crayon-tabs-scroll-button-container-right {position: absolute;+ height: 100%;+ right: 0;z-index: 1;+ display: flex;+ align-items: center;+ justify-content: center;+ padding: 0 10px;+ filter: blur(0.9);+ padding: 0 0 0 4px;+ background-color: cssUtils.$bg-container;+}++.crayon-tabs-scroll-button {display: flex;align-items: center;justify-content: center;@@ -56,12 +147,10 @@width: 100%;box-sizing: border-box;display: flex;+ gap: cssUtils.$spacing-3xs;flex-direction: row;- gap: cssUtils.$spacing-s;padding: cssUtils.$spacing-2xs;- padding-left: cssUtils.$spacing-xs;- padding-right: cssUtils.$spacing-xs;- border-radius: cssUtils.$rounded-s;+ border-radius: cssUtils.$rounded-l;background-color: cssUtils.$bg-sunk;overflow-x: auto;scrollbar-width: none;@@ -73,15 +162,16 @@}.crayon-tabs-trigger {+ cursor: pointer;display: flex;flex-direction: row;align-items: center;justify-content: center;gap: cssUtils.$spacing-2xs;box-sizing: border-box;- padding: cssUtils.$spacing-2xs cssUtils.$spacing-s cssUtils.$spacing-2xs cssUtils.$spacing-2xs;+ padding: cssUtils.$spacing-3xs cssUtils.$spacing-s;border: 1px solid transparent;- border-radius: cssUtils.$rounded-xs;+ border-radius: cssUtils.$rounded-s;min-width: 7.3rem;width: 100%;background-color: transparent;@@ -89,8 +179,15 @@@include cssUtils.typography(label, default);&[data-state="active"] {background-color: cssUtils.$bg-elevated;- border-color: cssUtils.$stroke-default;+ border: 1px solid cssUtils.$stroke-default;color: cssUtils.$primary-text;+ box-shadow: cssUtils.$shadow-s;+ }+ &:not([data-state="active"]):hover {+ background-color: cssUtils.$bg-sunk;+ border: 1px solid cssUtils.$stroke-default;+ color: cssUtils.$secondary-text;+ box-shadow: cssUtils.$shadow-s;}&-text {text-align: center;diff --git a/js/packages/react-ui/src/components/Tag/Tag.tsx b/js/packages/react-ui/src/components/Tag/Tag.tsxindex 909d05955..b17181573 100644--- a/js/packages/react-ui/src/components/Tag/Tag.tsx+++ b/js/packages/react-ui/src/components/Tag/Tag.tsx@@ -1,18 +1,42 @@import clsx from "clsx";import { CSSProperties, forwardRef, ReactNode } from "react";+type TagSize = "md" | "lg";+type TagVariant = "neutral" | "info" | "success" | "warning" | "danger";++const sizeMap: Record<TagSize, string> = {+ md: "crayon-tag-md",+ lg: "crayon-tag-lg",+};++const variantMap: Record<TagVariant, string> = {+ neutral: "crayon-tag-neutral",+ info: "crayon-tag-info",+ success: "crayon-tag-success",+ warning: "crayon-tag-warning",+ danger: "crayon-tag-danger",+};+export interface TagProps {className?: string;styles?: CSSProperties;icon?: ReactNode;text: ReactNode;+ size?: TagSize;+ variant?: TagVariant;}export const Tag = forwardRef<HTMLDivElement, TagProps>((props, ref) => {+ const { className, styles, icon, text, size = "md", variant = "neutral", ...rest } = props;return (- <div ref={ref} className={clsx("crayon-tag", props.className)} style={props.styles}>- {props.icon && <span className="crayon-tag-icon">{props.icon}</span>}- <span className="crayon-tag-text">{props.text}</span>+ <div+ ref={ref}+ className={clsx("crayon-tag", sizeMap[size], variantMap[variant], className)}+ style={styles}+ {...rest}+ >+ {icon && <span className="crayon-tag-icon">{icon}</span>}+ <span className="crayon-tag-text">{text}</span></div>);});diff --git a/js/packages/react-ui/src/components/Tag/stories/Tag.stories.tsx b/js/packages/react-ui/src/components/Tag/stories/Tag.stories.tsxindex 80b0e62ca..0a829ec1f 100644--- a/js/packages/react-ui/src/components/Tag/stories/Tag.stories.tsx+++ b/js/packages/react-ui/src/components/Tag/stories/Tag.stories.tsx@@ -1,5 +1,5 @@import type { Meta, StoryObj } from "@storybook/react";-import { User } from "lucide-react";+import { AlertCircle, AlertTriangle, CheckCircle, User } from "lucide-react";import { Tag } from "../Tag";const meta: Meta<typeof Tag> = {@@ -30,6 +30,26 @@ const meta: Meta<typeof Tag> = {type: { summary: "ReactNode" },},},+ size: {+ control: "select",+ options: ["md", "lg"],+ description: "The size of the tag",+ table: {+ category: "Appearance",+ type: { summary: "md | lg" },+ defaultValue: { summary: "md" },+ },+ },+ variant: {+ control: "select",+ options: ["neutral", "info", "success", "warning", "danger"],+ description: "The variant of the tag",+ table: {+ category: "Appearance",+ type: { summary: "neutral | info | success | warning | danger" },+ defaultValue: { summary: "neutral" },+ },+ },className: {control: false,description: "Additional CSS class name for custom styling",@@ -60,3 +80,58 @@ export const Default: Story = {icon: <User size={16} />,},};++// Size Variants+export const Medium: Story = {+ args: {+ text: "Medium Tag",+ size: "md",+ },+};++export const Large: Story = {+ args: {+ text: "Large Tag",+ size: "lg",+ },+};++// Color Variants+export const Neutral: Story = {+ args: {+ text: "Neutral Tag",+ variant: "neutral",+ },+};++export const Info: Story = {+ args: {+ text: "Info Tag",+ variant: "info",+ icon: <AlertCircle size={16} />,+ },+};++export const Success: Story = {+ args: {+ text: "Success Tag",+ variant: "success",+ icon: <CheckCircle size={16} />,+ },+};++export const Warning: Story = {+ args: {+ text: "Warning Tag",+ variant: "warning",+ icon: <AlertTriangle size={16} />,+ },+};++export const Danger: Story = {+ args: {+ text: "Danger Tag",+ variant: "danger",+ icon: <AlertCircle size={16} />,+ },+};diff --git a/js/packages/react-ui/src/components/Tag/tag.scss b/js/packages/react-ui/src/components/Tag/tag.scssindex 4701b48aa..29bd18432 100644--- a/js/packages/react-ui/src/components/Tag/tag.scss+++ b/js/packages/react-ui/src/components/Tag/tag.scss@@ -6,14 +6,8 @@align-items: center;overflow: hidden;max-width: 100%;- height: auto;- border: 1px solid cssUtils.$stroke-default;- border-radius: cssUtils.$rounded-s;- padding: cssUtils.$spacing-2xs cssUtils.$spacing-s cssUtils.$spacing-2xs cssUtils.$spacing-2xs;- background: cssUtils.$bg-elevated;- color: cssUtils.$primary-text;- @include cssUtils.typography(label, small);gap: cssUtils.$spacing-2xs;+ @include cssUtils.typography(label, small);&-icon {display: flex;@@ -25,4 +19,41 @@white-space: nowrap;text-overflow: ellipsis;}++ &-md {+ padding: cssUtils.$spacing-xs cssUtils.$spacing-s;+ border-radius: cssUtils.$rounded-s;+ height: 32px;+ }++ &-lg {+ padding: cssUtils.$spacing-s cssUtils.$spacing-m;+ border-radius: cssUtils.$rounded-m;+ height: 36px;+ }++ &-neutral {+ background-color: cssUtils.$bg-sunk;+ color: cssUtils.$primary-text;+ }++ &-info {+ background-color: cssUtils.$bg-info;+ color: cssUtils.$info-primary-text;+ }++ &-success {+ background-color: cssUtils.$bg-success;+ color: cssUtils.$success-primary-text;+ }++ &-warning {+ background-color: cssUtils.$bg-alert;+ color: cssUtils.$alert-primary-text;+ }++ &-danger {+ background-color: cssUtils.$bg-danger;+ color: cssUtils.$danger-primary-text;+ }}diff --git a/js/packages/react-ui/src/components/TagBlock/stories/TagBlock.stories.tsx b/js/packages/react-ui/src/components/TagBlock/stories/TagBlock.stories.tsxindex 23af2d39a..fc05b861c 100644--- a/js/packages/react-ui/src/components/TagBlock/stories/TagBlock.stories.tsx+++ b/js/packages/react-ui/src/components/TagBlock/stories/TagBlock.stories.tsx@@ -1,5 +1,5 @@import type { Meta, StoryObj } from "@storybook/react";-import { Heart, Star, User } from "lucide-react";+import { Heart, Info, Star, User } from "lucide-react";import { Tag } from "../../Tag";import { TagBlock } from "../TagBlock";@@ -52,9 +52,11 @@ type Story = StoryObj<typeof TagBlock>;export const Default: Story = {render: (args) => (<TagBlock {...args}>- <Tag icon={<User size={16} />} text="User" />- <Tag icon={<Star size={16} />} text="Star" />- <Tag icon={<Heart size={16} />} text="Heart" />+ <Tag variant="info" icon={<Info size={16} />} size="md" text="Info" />+ <Tag variant="success" icon={<Star size={16} />} size="md" text="Star" />+ <Tag variant="warning" icon={<Heart size={16} />} size="lg" text="Heart" />+ <Tag variant="danger" icon={<User size={16} />} size="lg" text="User" />+ <Tag variant="neutral" icon={<User size={16} />} size="lg" text="User" /></TagBlock>),};diff --git a/js/packages/react-ui/src/components/TextArea/textArea.scss b/js/packages/react-ui/src/components/TextArea/textArea.scssindex b9f01d3a4..54060eb60 100644--- a/js/packages/react-ui/src/components/TextArea/textArea.scss+++ b/js/packages/react-ui/src/components/TextArea/textArea.scss@@ -4,10 +4,10 @@box-sizing: border-box;width: 100%;border: 1px solid cssUtils.$stroke-default;- border-radius: cssUtils.$rounded-s;+ border-radius: cssUtils.$rounded-m;padding: cssUtils.$spacing-xs cssUtils.$spacing-s;gap: cssUtils.$spacing-xs;- background-color: cssUtils.$bg-container;+ background-color: cssUtils.$bg-sunk;color: cssUtils.$primary-text;outline: none;resize: none;diff --git a/js/packages/react-ui/src/components/TextCallout/TextCallout.tsx b/js/packages/react-ui/src/components/TextCallout/TextCallout.tsxnew file mode 100644index 000000000..6ed1a51ec--- /dev/null+++ b/js/packages/react-ui/src/components/TextCallout/TextCallout.tsx@@ -0,0 +1,37 @@+import clsx from "clsx";+import React from "react";++type TextCalloutVariant = "neutral" | "info" | "warning" | "success" | "danger";++export interface TextCalloutProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "title"> {+ variant?: TextCalloutVariant;+ title?: React.ReactNode;+ description?: React.ReactNode;+}++const variantMap: Record<TextCalloutVariant, string> = {+ neutral: "crayon-text-callout-neutral",+ info: "crayon-text-callout-info",+ warning: "crayon-text-callout-warning",+ success: "crayon-text-callout-success",+ danger: "crayon-text-callout-danger",+};++export const TextCallout = React.forwardRef<HTMLDivElement, TextCalloutProps>((props, ref) => {+ const { className, variant = "neutral", title, description, ...rest } = props;++ return (+ <div+ ref={ref}+ className={clsx("crayon-text-callout", variantMap[variant], className)}+ {...rest}+ >+ <div className="crayon-text-callout-content">+ {title && <span className="crayon-text-callout-content-title">{title}</span>}+ {description && (+ <span className="crayon-text-callout-content-description">{description}</span>+ )}+ </div>+ </div>+ );+});diff --git a/js/packages/react-ui/src/components/TextCallout/dependencies.ts b/js/packages/react-ui/src/components/TextCallout/dependencies.tsnew file mode 100644index 000000000..b036e4687--- /dev/null+++ b/js/packages/react-ui/src/components/TextCallout/dependencies.ts@@ -0,0 +1,3 @@+const dependencies = ["TextCallout"];++export default dependencies;diff --git a/js/packages/react-ui/src/components/TextCallout/index.ts b/js/packages/react-ui/src/components/TextCallout/index.tsnew file mode 100644index 000000000..7f629ec20--- /dev/null+++ b/js/packages/react-ui/src/components/TextCallout/index.ts@@ -0,0 +1 @@+export * from "./TextCallout";diff --git a/js/packages/react-ui/src/components/TextCallout/stories/TextCallout.stories.tsx b/js/packages/react-ui/src/components/TextCallout/stories/TextCallout.stories.tsxnew file mode 100644index 000000000..d8d362c4a--- /dev/null+++ b/js/packages/react-ui/src/components/TextCallout/stories/TextCallout.stories.tsx@@ -0,0 +1,57 @@+import type { Meta, StoryObj } from "@storybook/react";+import { TextCallout, TextCalloutProps } from "../TextCallout";++const meta: Meta<TextCalloutProps> = {+ title: "Components/TextCallout",+ component: TextCallout,+ parameters: {+ layout: "centered",+ docs: {+ description: {+ component: "```tsx\nimport { CalloutV2 } from '@crayon-ui/react-ui';\n```",+ },+ },+ },+ tags: ["!dev", "autodocs"],+ argTypes: {+ variant: {+ control: "select",+ options: ["neutral", "info", "warning", "success", "danger"],+ description: "The visual style variant of the callout",+ table: {+ category: "Appearance",+ type: { summary: "CalloutVariant" },+ defaultValue: { summary: "neutral" },+ },+ },+ title: {+ control: "text",+ description: "The title of the callout",+ table: {+ category: "Content",+ defaultValue: { summary: "Important Information" },+ type: { summary: "React.ReactNode" },+ },+ },+ description: {+ control: "text",+ description: "The description text of the callout",+ table: {+ category: "Content",+ defaultValue: { summary: "This is a neutral callout with some important information." },+ type: { summary: "React.ReactNode" },+ },+ },+ },+} satisfies Meta<typeof TextCallout>;++export default meta;+type Story = StoryObj<typeof meta>;++export const Default: Story = {+ args: {+ title: "Important Information",+ description: "This is a neutral callout with some important information.",+ variant: "neutral",+ },+};diff --git a/js/packages/react-ui/src/components/TextCallout/textCallout.scss b/js/packages/react-ui/src/components/TextCallout/textCallout.scssnew file mode 100644index 000000000..c5bb64b3a--- /dev/null+++ b/js/packages/react-ui/src/components/TextCallout/textCallout.scss@@ -0,0 +1,68 @@+@use "../../cssUtils" as cssUtils;++.crayon-text-callout {+ width: 100%;+ display: flex;+ flex-direction: row;+ gap: cssUtils.$spacing-xs;+ padding: 0 16px 0 16px;+ box-sizing: border-box;++ &-neutral {+ border-left: 2px solid cssUtils.$stroke-interactive-el-selected;+ color: cssUtils.$primary-text;+ .crayon-text-callout-content-title {+ color: cssUtils.$primary-text;+ }+ }++ &-info {+ border-left: 2px solid cssUtils.$stroke-info-emphasis;+ color: cssUtils.$info-primary-text;+ }++ &-warning {+ border-left: 2px solid cssUtils.$stroke-alert-emphasis;+ color: cssUtils.$alert-primary-text;+ }++ &-success {+ border-left: 2px solid cssUtils.$stroke-success-emphasis;+ color: cssUtils.$success-primary-text;+ }++ &-danger {+ border-left: 2px solid cssUtils.$stroke-danger-emphasis;+ color: cssUtils.$danger-primary-text;+ }++ &-icon {+ width: 16px;+ height: 16px;+ display: flex;+ align-items: center;+ justify-content: center;+ padding: cssUtils.$spacing-3xs;+ }++ &-icon-inner {+ width: 16px;+ height: 16px;+ display: flex;+ align-items: center;+ justify-content: center;+ }++ &-content {+ display: flex;+ flex-direction: column;+ &-title {+ @include cssUtils.typography(body, heavy);+ }++ &-description {+ @include cssUtils.typography(body, default);+ color: cssUtils.$primary-text;+ }+ }+}diff --git a/js/packages/react-ui/src/components/ThemeProvider/ThemeProvider.tsx b/js/packages/react-ui/src/components/ThemeProvider/ThemeProvider.tsxindex b26c0f828..fdf85bfc5 100644--- a/js/packages/react-ui/src/components/ThemeProvider/ThemeProvider.tsx+++ b/js/packages/react-ui/src/components/ThemeProvider/ThemeProvider.tsx@@ -31,66 +31,145 @@ export const useTheme = () => {const lightTheme: ColorTheme = {// Background colors- backgroundFills: "rgb(245, 245, 245)",- brandElFills: "rgb(0, 0, 0)",- brandElHoverFills: "rgba(0, 0, 0, 0.8)",- containerFills: "rgb(255, 255, 255)",+ backgroundFills: "rgba(250,250,250,1)",+ containerFills: "rgba(253, 253, 253)",overlayFills: "rgba(0, 0, 0, 0.4)",- sunkFills: "rgba(0, 0, 0, 0.04)",- containerHoverFills: "rgba(0, 0, 0, 0.04)",- dangerFills: "rgba(217, 45, 32, 0.08)",- successFills: "rgba(7, 148, 85, 0.08)",- infoFills: "rgba(56, 148, 255, 0.08)",- elevatedFills: "rgba(255, 255, 255, 0.3)",+ sunkFills: "rgba(0, 0, 0, 0.06)",+ dangerFills: "rgba(203,63,73,0.1)",+ successFills: "rgba(13,160,93,0.1)",+ infoFills: "rgba(56, 148, 255, 0.1)",+ alertFills: "rgba(255, 199, 0, 0.1)",+ invertedFills: "rgba(21, 21, 21, 1)",+ elevatedFills: "rgba(255, 255, 255, 0.6)",+ sunkBgFills: "rgba(0, 0, 0, 0.04)",// Border colors- strokeDefault: "rgba(0, 0, 0, 0.06)",- strokeInteractiveEl: "rgba(0, 0, 0, 0.12)",- strokeInteractiveElHover: "rgba(0, 0, 0, 0.4)",- strokeInteractiveElSelected: "rgb(0, 0, 0)",+ strokeDefault: "rgba(0, 0, 0, 0.04)",+ strokeInteractiveEl: "rgba(0, 0, 0, 0.08)",+ strokeInteractiveElSelected: "rgba(21,21,21,1)",+ strokeEmphasis: "rgba(0, 0, 0, 0.2)",+ strokeAccent: "rgba(255, 255, 255, 0.08)",+ strokeAccentEmphasis: "rgba(255, 255, 255, 0.3)",+ strokeInfo: "rgba(56, 148, 255, 0.08)",+ strokeInfoEmphasis: "rgba(24, 130, 255, 1)",+ strokeAlert: "rgba(255, 199, 0, 0.08)",+ strokeAlertEmphasis: "rgba(255,199,0,1)",+ strokeSuccess: "rgba(13, 160, 94, 0.08)",+ strokeSuccessEmphasis: "rgba(13, 160, 94, 1)",+ strokeDanger: "rgba(203, 63, 73, 0.08)",+ strokeDangerEmphasis: "rgba(200, 44, 55, 1)",// Text colors- brandText: "rgba(255, 255, 255, 1)",- brandSecondaryText: "rgba(255, 255, 255, 0.4)",primaryText: "rgba(0, 0, 0, 1)",secondaryText: "rgba(0, 0, 0, 0.4)",disabledText: "rgba(0, 0, 0, 0.2)",- dangerText: "rgba(217, 45, 32, 1)",- successText: "rgba(7, 148, 85, 1)",linkText: "rgba(0, 0, 0, 1)",- infoText: "rgba(56, 148, 255, 1)",+ accentPrimaryText: "rgba(255, 255, 255, 1)",+ accentSecondaryText: "rgba(255, 255, 255, 0.4)",+ accentDisabledText: "rgba(255, 255, 255, 0.2)",+ successPrimaryText: "rgba(8,93,58,1)",+ successInvertedText: "rgba(220, 250, 230, 1)",+ alertPrimaryText: "rgba(221, 159, 0, 1)",+ alertInvertedText: "rgba(255, 246, 205, 1)",+ dangerPrimaryText: "rgba(167,39,47,1)",+ dangerSecondaryText: "rgba(203, 63, 73, 1)",+ dangerDisabledText: "rgba(235, 167, 171, 1)",+ dangerInvertedPrimaryText: "rgba(255, 255, 255, 1)",+ dangerInvertedSecondaryText: "rgba(255, 255, 255, 0.4)",+ dangerInvertedDisabledText: "rgba(255, 255, 255, 0.2)",+ infoPrimaryText: "rgba(21,93,177,1)",+ infoInvertedText: "rgba(219, 236, 255, 1)",++ // Interactive colors+ interactiveDefault: "rgba(255, 255, 255, 0.02)",+ interactiveHover: "rgba(0, 0, 0, 0.06)",+ interactivePressed: "rgba(0, 0, 0, 0.04)",+ interactiveDisabled: "rgba(0, 0, 0, 0.02)",+ interactiveAccent: "rgba(0,0,0,1)",+ interactiveAccentHover: "rgba(0,0,0,0.8)",+ // not setting this to make it backward compatible+ // pressed state was not there in the previous version+ // so we are using the hover state as the pressed state+ // interactiveAccentPressed: "rgba(0,0,0,1)",+ interactiveAccentDisabled: "rgba(0,0,0,0.4)",+ interactiveDestructive: "rgba(203, 63, 73, 0.02)",+ interactiveDestructiveHover: "rgba(203, 63, 73, 0.08)",+ interactiveDestructivePressed: "rgba(203, 63, 73, 0.1)",+ interactiveDestructiveDisabled: "rgba(203, 63, 73, 0.02)",+ interactiveDestructiveAccent: "rgba(200, 44, 55, 1)",+ interactiveDestructiveAccentHover: "rgba(203, 63, 73, 1)",+ interactiveDestructiveAccentPressed: "rgba(167, 39, 47, 1)",+ interactiveDestructiveAccentDisabled: "rgba(203, 63, 73, 0.4)",} as const;const darkTheme: ColorTheme = {// Background colors- backgroundFills: "rgb(28, 28, 28)",- brandElFills: "rgb(255, 255, 255)",- brandElHoverFills: "rgba(255, 255, 255, 0.8)",- containerFills: "rgb(43, 43, 43)",+ backgroundFills: "rgba(21,21,21,1)",+ containerFills: "rgba(28,28,28,1)",overlayFills: "rgba(0, 0, 0, 0.4)",- sunkFills: "rgba(0, 0, 0, 0.2)",- containerHoverFills: "rgba(255, 255, 255, 0.1)",- dangerFills: "rgba(217, 45, 32, 0.1)",- successFills: "rgba(7, 148, 85, 0.1)",- infoFills: "rgba(56, 148, 255, 0.1)",- elevatedFills: "rgba(255, 255, 255, 0.1)",+ sunkFills: "rgba(255,255,255,0.08)",+ dangerFills: "rgba(203,63,73,0.2)",+ successFills: "rgba(13,160, 94, 0.2)",+ infoFills: "rgba(56, 148, 255, 0.2)",+ alertFills: "rgba(255, 199, 0, 0.2)",+ elevatedFills: "rgba(255, 255, 255, 0.06)",+ invertedFills: "rgba(253, 253, 253, 1)",+ sunkBgFills: "rgba(0, 0, 0, 0.16)",// Border colors- strokeDefault: "rgba(255, 255, 255, 0.06)",- strokeInteractiveEl: "rgba(255, 255, 255, 0.12)",- strokeInteractiveElHover: "rgba(255, 255, 255, 0.4)",- strokeInteractiveElSelected: "rgba(255, 255, 255, 1)",+ strokeDefault: "rgba(255, 255, 255, 0.04)",+ strokeInteractiveEl: "rgba(255, 255, 255, 0.1)",+ strokeInteractiveElSelected: "rgba(253, 253, 253, 1)",+ strokeEmphasis: "rgba(255, 255, 255, 0.2)",+ strokeAccent: "rgba(0, 0, 0, 0.08)",+ strokeAccentEmphasis: "rgba(0, 0, 0, 0.3)",+ strokeInfo: "rgba(56, 148, 255, 0.2)",+ strokeInfoEmphasis: "rgba(24, 130, 255, 1)",+ strokeAlert: "rgba(255, 199, 0, 0.2)",+ strokeAlertEmphasis: "rgba(255, 199, 0, 1)",+ strokeSuccess: "rgba(13, 160, 94, 0.2)",+ strokeSuccessEmphasis: "rgba(13, 160, 94, 1)",+ strokeDanger: "rgba(203, 63, 73, 0.2)",+ strokeDangerEmphasis: "rgba(200, 44, 55, 1)",// Text colors- brandText: "rgba(0, 0, 0, 1)",- brandSecondaryText: "rgba(255, 255, 255, 0.4)",primaryText: "rgba(255, 255, 255, 1)",- secondaryText: "rgba(255, 255, 255, 0.6)",+ secondaryText: "rgba(255, 255, 255, 0.4)",disabledText: "rgba(255, 255, 255, 0.2)",- dangerText: "rgba(253, 162, 155, 1)",- successText: "rgba(117, 224, 167, 1)",linkText: "rgba(255, 255, 255, 1)",- infoText: "rgba(125, 179, 247, 1)",+ accentPrimaryText: "rgba(0,0,0,1)",+ accentSecondaryText: "rgba(0,0,0,0.4)",+ accentDisabledText: "rgba(0,0,0,0.2)",+ successPrimaryText: "rgba(23,178,106,1)",+ successInvertedText: "rgba(2, 79, 48, 1)",+ alertPrimaryText: "rgba(243, 207, 80, 1)",+ alertInvertedText: "rgba(187, 122, 0, 1)",+ dangerPrimaryText: " rgba(203,63,73,1)",+ dangerSecondaryText: "rgba(167, 39, 47, 1)",+ dangerDisabledText: "rgba(130, 26, 32, 1)",+ dangerInvertedPrimaryText: "rgba(255, 255, 255, 1)",+ dangerInvertedSecondaryText: "rgba(255, 255, 255, 0.4)",+ dangerInvertedDisabledText: "rgba(255, 255, 255, 0.2)",+ infoPrimaryText: "rgba(70,160,247,1)",+ infoInvertedText: "rgba(13, 75, 148, 1)",++ // Interactive colors+ interactiveDefault: "rgba(0, 0, 0, 0.02)",+ interactiveHover: "rgba(255, 255, 255, 0.06)",+ interactivePressed: "rgba(255, 255, 255, 0.04)",+ interactiveDisabled: "rgba(255, 255, 255, 0.02)",+ interactiveAccent: "rgba(255,255,255,1)",+ interactiveAccentHover: "rgba(255,255,255,0.8)",+ interactiveAccentPressed: "rgba(255,255,255, 1)",+ interactiveAccentDisabled: "rgba(255, 255, 255, 0.4)",+ interactiveDestructive: "rgba(203, 63, 73, 0.04)",+ interactiveDestructiveHover: "rgba(203, 63, 73, 0.1)",+ interactiveDestructivePressed: "rgba(203, 63, 73, 0.2)",+ interactiveDestructiveDisabled: "rgba(203, 63, 73, 0.04)",+ interactiveDestructiveAccent: "rgba(200, 44, 55, 1)",+ interactiveDestructiveAccentHover: "rgba(210, 65, 75, 1)",+ interactiveDestructiveAccentPressed: "rgba(167, 39, 47, 1)",+ interactiveDestructiveAccentDisabled: "rgba(203, 63, 73, 0.4)",} as const;// Shared theme properties that don't change between light/dark modes@@ -125,82 +204,100 @@ const layoutTheme: LayoutTheme = {const typographyTheme: TypographyTheme = {// Typography- fontPrimary: '400 14px/20px "Inter"',- fontPrimaryLetterSpacing: "0px",+ // fontPrimary: '400 16px/20px "Inter"',+ // fontPrimaryLetterSpacing: "0px",// Display & Headings// Large- fontHeadingLarge: '600 28px/36px "Inter"',- fontHeadingLargeLetterSpacing: "0px",+ fontHeadingLarge: '600 28px/1.15 "Inter"',+ fontHeadingLargeLetterSpacing: "-0.75px",// Medium- fontHeadingMedium: '600 24px/32px "Inter"',- fontHeadingMediumLetterSpacing: "0px",+ fontHeadingMedium: '600 24px/1.15 "Inter"',+ fontHeadingMediumLetterSpacing: "-0.75px",// Small- fontHeadingSmall: '600 18px/24px "Inter"',- fontHeadingSmallLetterSpacing: "0px",+ fontHeadingSmall: '600 18px/1.25 "Inter"',+ fontHeadingSmallLetterSpacing: "-0.25px",+ // Extra Small+ fontHeadingExtraSmall: '600 16px/1.25 "Inter"',+ fontHeadingExtraSmallLetterSpacing: "0px",// Title Variants// Default- fontTitle: '500 14px/20px "Inter"',- fontTitleLetterSpacing: "0px",+ // fontTitle: '500 16px/20px "Inter"',+ // fontTitleLetterSpacing: "0px",// Medium- fontTitleMedium: '500 16px/24px "Inter"',- fontTitleMediumLetterSpacing: "0px",+ // fontTitleMedium: '500 16px/20px "Inter"',+ // fontTitleMediumLetterSpacing: "0px",// Small- fontTitleSmall: '500 14px/20px "Inter"',- fontTitleSmallLetterSpacing: "0px",+ // fontTitleSmall: '500 16px/20px "Inter"',+ // fontTitleSmallLetterSpacing: "0px",// Body Text// Regular- fontBody: '400 14px/18px "Inter"',+ fontBody: '400 16px/1.5 "Inter"',fontBodyLetterSpacing: "0px",- fontBodyMedium: '400 16px/24px "Inter"',- fontBodyMediumLetterSpacing: "0px",+ // fontBodyMedium: '400 16px/20px "Inter"',+ // fontBodyMediumLetterSpacing: "0px",- fontBodySmall: '400 14px/20px "Inter"',+ fontBodySmall: '400 14px/1.5 "Inter"',fontBodySmallLetterSpacing: "0px",+// Heavy- fontBodyHeavy: '600 16px/24px "Inter"',+ fontBodyHeavy: '500 16px/1.5 "Inter"',fontBodyHeavyLetterSpacing: "0px",- fontBodySmallHeavy: '600 14px/20px "Inter"',+ fontBodySmallHeavy: '500 14px/1.5 "Inter"',fontBodySmallHeavyLetterSpacing: "0px",+// Special- fontBodyLink: '500 14px/18px "Inter"',+ fontBodyLink: '400 16px/1.5 "Inter"',fontBodyLinkLetterSpacing: "0px",+ fontBodyLarge: '400 18px/1.5 "Inter"',+ fontBodyLargeLetterSpacing: "0px",++ fontBodyLargeHeavy: '500 18px/1.5 "Inter"',+ fontBodyLargeHeavyLetterSpacing: "0px",+// Label System// Large- fontLabelLarge: '400 12px/16px "Inter"',+ fontLabelLarge: '400 18px/1.2 "Inter"',fontLabelLargeLetterSpacing: "0px",- fontLabelLargeHeavy: '500 12px/16px "Inter"',+ fontLabelLargeHeavy: '500 18px/1.2 "Inter"',fontLabelLargeHeavyLetterSpacing: "0px",// Regular- fontLabel: '400 12px/16px "Inter"',+ fontLabel: '400 16px/1.2 "Inter"',fontLabelLetterSpacing: "0px",- fontLabelHeavy: '500 12px/16px "Inter"',+ fontLabelHeavy: '500 16px/1.2 "Inter"',fontLabelHeavyLetterSpacing: "0px",// Medium- fontLabelMedium: '400 10px/16px "Inter"',- fontLabelMediumLetterSpacing: "0px",+ // fontLabelMedium: '400 16px/20px "Inter"',+ // fontLabelMediumLetterSpacing: "0px",- fontLabelMediumHeavy: '600 10px/16px "Inter"',- fontLabelMediumHeavyLetterSpacing: "0px",+ // fontLabelMediumHeavy: '600 16px/20px "Inter"',+ // fontLabelMediumHeavyLetterSpacing: "0px",// Small- fontLabelSmall: '400 10px/16px "Inter"',+ fontLabelSmall: '400 14px/1.2 "Inter"',fontLabelSmallLetterSpacing: "0px",- fontLabelSmallHeavy: '500 10px/16px "Inter"',+ fontLabelSmallHeavy: '500 14px/1.2 "Inter"',fontLabelSmallHeavyLetterSpacing: "0px",// Extra Small- fontLabelExtraSmall: '400 8px/12px "Inter"',+ fontLabelExtraSmall: '400 12px/1.2 "Inter"',fontLabelExtraSmallLetterSpacing: "0px",- fontLabelExtraSmallHeavy: '500 8px/12px "Inter"',+ fontLabelExtraSmallHeavy: '500 12px/1.2 "Inter"',fontLabelExtraSmallHeavyLetterSpacing: "0px",++ // 2Extra Small+ fontLabel2ExtraSmall: '400 10px/1.2 "Inter"',+ fontLabel2ExtraSmallLetterSpacing: "0px",++ fontLabel2ExtraSmallHeavy: '500 10px/1.2 "Inter"',+ fontLabel2ExtraSmallHeavyLetterSpacing: "0px",} as const;const effectTheme: EffectTheme = {@@ -244,11 +341,42 @@ export const ThemeProvider = ({--crayon-success-fills: ${theme.successFills};--crayon-info-fills: ${theme.infoFills};--crayon-elevated-fills: ${theme.elevatedFills};+ --crayon-alert-fills: ${theme.alertFills};+ --crayon-inverted-fills: ${theme.invertedFills};+ --crayon-sunk-bg-fills: ${theme.sunkBgFills};++ --crayon-interactive-default: ${theme.interactiveDefault};+ --crayon-interactive-hover: ${theme.interactiveHover};+ --crayon-interactive-pressed: ${theme.interactivePressed};+ --crayon-interactive-disabled: ${theme.interactiveDisabled};+ --crayon-interactive-accent: ${theme.brandElFills || theme.interactiveAccent};+ --crayon-interactive-accent-hover: ${theme.brandElHoverFills || theme.interactiveAccentHover};+ --crayon-interactive-accent-pressed: ${theme.brandElHoverFills || theme.interactiveAccentPressed || theme.interactiveAccentHover};+ --crayon-interactive-accent-disabled: ${theme.interactiveAccentDisabled};+ --crayon-interactive-destructive: ${theme.interactiveDestructive};+ --crayon-interactive-destructive-hover: ${theme.interactiveDestructiveHover};+ --crayon-interactive-destructive-pressed: ${theme.interactiveDestructivePressed};+ --crayon-interactive-destructive-disabled: ${theme.interactiveDestructiveDisabled};+ --crayon-interactive-destructive-accent: ${theme.interactiveDestructiveAccent};+ --crayon-interactive-destructive-accent-hover: ${theme.interactiveDestructiveAccentHover};+ --crayon-interactive-destructive-accent-pressed: ${theme.interactiveDestructiveAccentPressed};+ --crayon-interactive-destructive-accent-disabled: ${theme.interactiveDestructiveAccentDisabled};--crayon-stroke-default: ${theme.strokeDefault};--crayon-stroke-interactive-el: ${theme.strokeInteractiveEl};--crayon-stroke-interactive-el-hover: ${theme.strokeInteractiveElHover};--crayon-stroke-interactive-el-selected: ${theme.strokeInteractiveElSelected};+ --crayon-stroke-emphasis: ${theme.strokeInteractiveElHover || theme.strokeEmphasis};+ --crayon-stroke-accent: ${theme.strokeAccent};+ --crayon-stroke-accent-emphasis: ${theme.strokeAccentEmphasis};+ --crayon-stroke-info: ${theme.strokeInfo};+ --crayon-stroke-info-emphasis: ${theme.strokeInfoEmphasis};+ --crayon-stroke-alert: ${theme.strokeAlert};+ --crayon-stroke-alert-emphasis: ${theme.strokeAlertEmphasis};+ --crayon-stroke-success: ${theme.strokeSuccess};+ --crayon-stroke-success-emphasis: ${theme.strokeSuccessEmphasis};+ --crayon-stroke-danger: ${theme.strokeDanger};+ --crayon-stroke-danger-emphasis: ${theme.strokeDangerEmphasis};--crayon-brand-text: ${theme.brandText};--crayon-brand-secondary-text: ${theme.brandSecondaryText};@@ -259,6 +387,21 @@ export const ThemeProvider = ({--crayon-success-text: ${theme.successText};--crayon-link-text: ${theme.linkText};--crayon-info-text: ${theme.infoText};+ --crayon-accent-primary-text: ${theme.brandText || theme.accentPrimaryText};+ --crayon-accent-secondary-text: ${theme.brandSecondaryText || theme.accentSecondaryText};+ --crayon-accent-disabled-text: ${theme.accentDisabledText};+ --crayon-success-primary-text: ${theme.successText || theme.successPrimaryText};+ --crayon-success-inverted-text: ${theme.successInvertedText};+ --crayon-alert-primary-text: ${theme.alertPrimaryText};+ --crayon-alert-inverted-text: ${theme.alertInvertedText};+ --crayon-danger-primary-text: ${theme.dangerText || theme.dangerPrimaryText};+ --crayon-danger-secondary-text: ${theme.dangerSecondaryText};+ --crayon-danger-disabled-text: ${theme.dangerDisabledText};+ --crayon-danger-inverted-primary-text: ${theme.dangerInvertedPrimaryText};+ --crayon-danger-inverted-secondary-text: ${theme.dangerInvertedSecondaryText};+ --crayon-danger-inverted-disabled-text: ${theme.dangerInvertedDisabledText};+ --crayon-info-primary-text: ${theme.infoText || theme.infoPrimaryText};+ --crayon-info-inverted-text: ${theme.infoInvertedText};--crayon-spacing-0: ${theme.spacing0};--crayon-spacing-3xs: ${theme.spacing3xs};@@ -283,22 +426,22 @@ export const ThemeProvider = ({--crayon-rounded-3xl: ${theme.rounded3xl};--crayon-rounded-full: ${theme.roundedFull};- --crayon-font-primary: ${theme.fontPrimary};+ --crayon-font-primary: ${theme.fontPrimary || theme.fontBody};--crayon-font-primary-letter-spacing: ${theme.fontPrimaryLetterSpacing};- --crayon-font-title: ${theme.fontTitle};- --crayon-font-title-letter-spacing: ${theme.fontTitleLetterSpacing};- --crayon-font-title-medium: ${theme.fontTitleMedium};- --crayon-font-title-medium-letter-spacing: ${theme.fontTitleMediumLetterSpacing};- --crayon-font-title-small: ${theme.fontTitleSmall};- --crayon-font-title-small-letter-spacing: ${theme.fontTitleSmallLetterSpacing};+ --crayon-font-title: ${theme.fontTitle || theme.fontBodyHeavy};+ --crayon-font-title-letter-spacing: ${theme.fontTitleLetterSpacing || theme.fontBodyHeavyLetterSpacing};+ --crayon-font-title-medium: ${theme.fontTitleMedium || theme.fontBodyLargeHeavy};+ --crayon-font-title-medium-letter-spacing: ${theme.fontTitleMediumLetterSpacing || theme.fontBodyLargeHeavyLetterSpacing};+ --crayon-font-title-small: ${theme.fontTitleSmall || theme.fontBodySmallHeavy};+ --crayon-font-title-small-letter-spacing: ${theme.fontTitleSmallLetterSpacing || theme.fontBodySmallHeavyLetterSpacing};--crayon-font-body: ${theme.fontBody};--crayon-font-body-letter-spacing: ${theme.fontBodyLetterSpacing};--crayon-font-body-link: ${theme.fontBodyLink};--crayon-font-body-link-letter-spacing: ${theme.fontBodyLinkLetterSpacing};--crayon-font-body-heavy: ${theme.fontBodyHeavy};--crayon-font-body-heavy-letter-spacing: ${theme.fontBodyHeavyLetterSpacing};- --crayon-font-body-medium: ${theme.fontBodyMedium};- --crayon-font-body-medium-letter-spacing: ${theme.fontBodyMediumLetterSpacing};+ --crayon-font-body-medium: ${theme.fontBodyMedium || theme.fontBody};+ --crayon-font-body-medium-letter-spacing: ${theme.fontBodyMediumLetterSpacing || theme.fontBodyLetterSpacing};--crayon-font-body-small-heavy: ${theme.fontBodySmallHeavy};--crayon-font-body-small-heavy-letter-spacing: ${theme.fontBodySmallHeavyLetterSpacing};--crayon-font-body-small: ${theme.fontBodySmall};@@ -319,16 +462,26 @@ export const ThemeProvider = ({--crayon-font-label-large-heavy-letter-spacing: ${theme.fontLabelLargeHeavyLetterSpacing};--crayon-font-label-large: ${theme.fontLabelLarge};--crayon-font-label-large-letter-spacing: ${theme.fontLabelLargeLetterSpacing};- --crayon-font-label-medium-heavy: ${theme.fontLabelMediumHeavy};- --crayon-font-label-medium-heavy-letter-spacing: ${theme.fontLabelMediumHeavyLetterSpacing};- --crayon-font-label-medium: ${theme.fontLabelMedium};- --crayon-font-label-medium-letter-spacing: ${theme.fontLabelMediumLetterSpacing};+ --crayon-font-label-medium-heavy: ${theme.fontLabelMediumHeavy || theme.fontLabelHeavy};+ --crayon-font-label-medium-heavy-letter-spacing: ${theme.fontLabelMediumHeavyLetterSpacing || theme.fontLabelHeavyLetterSpacing};+ --crayon-font-label-medium: ${theme.fontLabelMedium || theme.fontLabel};+ --crayon-font-label-medium-letter-spacing: ${theme.fontLabelMediumLetterSpacing || theme.fontLabelLetterSpacing};--crayon-font-heading-large: ${theme.fontHeadingLarge};--crayon-font-heading-large-letter-spacing: ${theme.fontHeadingLargeLetterSpacing};--crayon-font-heading-medium: ${theme.fontHeadingMedium};--crayon-font-heading-medium-letter-spacing: ${theme.fontHeadingMediumLetterSpacing};--crayon-font-heading-small: ${theme.fontHeadingSmall};--crayon-font-heading-small-letter-spacing: ${theme.fontHeadingSmallLetterSpacing};+ --crayon-font-heading-extra-small: ${theme.fontHeadingExtraSmall};+ --crayon-font-heading-extra-small-letter-spacing: ${theme.fontHeadingExtraSmallLetterSpacing};+ --crayon-font-body-large-heavy: ${theme.fontBodyLargeHeavy};+ --crayon-font-body-large-heavy-letter-spacing: ${theme.fontBodyLargeHeavyLetterSpacing};+ --crayon-font-body-large: ${theme.fontBodyLarge};+ --crayon-font-body-large-letter-spacing: ${theme.fontBodyLargeLetterSpacing};+ --crayon-font-label-2-extra-small: ${theme.fontLabel2ExtraSmall};+ --crayon-font-label-2-extra-small-letter-spacing: ${theme.fontLabel2ExtraSmallLetterSpacing};+ --crayon-font-label-2-extra-small-heavy: ${theme.fontLabel2ExtraSmallHeavy};+ --crayon-font-label-2-extra-small-heavy-letter-spacing: ${theme.fontLabel2ExtraSmallHeavyLetterSpacing};--crayon-shadow-s: ${theme.shadowS};--crayon-shadow-m: ${theme.shadowM};@@ -340,8 +493,8 @@ export const ThemeProvider = ({--crayon-chat-container-bg: ${theme.chatContainerBg || theme.backgroundFills};--crayon-chat-assistant-response-bg: ${theme.chatAssistantResponseBg || theme.containerFills};--crayon-chat-assistant-response-text: ${theme.chatAssistantResponseText || theme.primaryText};- --crayon-chat-user-response-bg: ${theme.chatUserResponseBg || theme.brandElFills};- --crayon-chat-user-response-text: ${theme.chatUserResponseText || theme.brandText};+ --crayon-chat-user-response-bg: ${theme.chatUserResponseBg || theme.brandElFills || theme.interactiveAccent};+ --crayon-chat-user-response-text: ${theme.chatUserResponseText || theme.brandText || theme.accentPrimaryText};}`}</style>{children}diff --git a/js/packages/react-ui/src/components/ThemeProvider/themePresets.ts b/js/packages/react-ui/src/components/ThemeProvider/themePresets.tsindex 9ebc35967..d658e46e2 100644--- a/js/packages/react-ui/src/components/ThemeProvider/themePresets.ts+++ b/js/packages/react-ui/src/components/ThemeProvider/themePresets.ts@@ -1,28 +1,29 @@const commonTheme = ({ font }: { font: string }) => ({fontPrimary: `400 16px/20px "${font}"`,- fontHeadingLarge: `600 16px/20px "${font}"`,- fontHeadingMedium: `600 16px/20px "${font}"`,- fontHeadingSmall: `600 16px/20px "${font}"`,+ fontHeadingLarge: `600 28px/32.2px "${font}"`,+ fontHeadingMedium: `600 24px/27.6px "${font}"`,+ fontHeadingSmall: `500 18px/22.5px "${font}"`,fontTitle: `500 16px/20px "${font}"`,fontTitleMedium: `500 16px/20px "${font}"`,fontTitleSmall: `500 16px/20px "${font}"`,- fontBody: `400 16px/20px "${font}"`,+ fontBody: `400 16px/24px "${font}"`,+ fontBodyLargeHeavy: `500 18px/27px "${font}"`,+ fontBodyLarge: `400 18px/27px "${font}"`,fontBodyMedium: `400 16px/20px "${font}"`,- fontBodySmall: `400 16px/20px "${font}"`,- fontBodyHeavy: `600 16px/20px "${font}"`,+ fontBodySmall: `400 14px/21px "${font}"`,+ fontBodyHeavy: `500 16px/24px "${font}"`,fontBodySmallHeavy: `600 16px/20px "${font}"`,- fontBodyLink: `500 16px/20px "${font}"`,- fontLabelLarge: `400 16px/20px "${font}"`,- fontLabelLargeHeavy: `500 16px/20px "${font}"`,- fontLabel: `400 16px/20px "${font}"`,- fontLabelHeavy: `500 16px/20px "${font}"`,+ fontBodyLink: `500 16px/24px "${font}"`,+ fontLabelLarge: `400 16px/19.2px "${font}"`,+ fontLabelLargeHeavy: `500 16px/19.2px "${font}"`,+ fontLabel: `400 14px/16.8px "${font}"`,+ fontLabelHeavy: `500 14px/16.8px "${font}"`,fontLabelMedium: `400 16px/20px "${font}"`,fontLabelMediumHeavy: `600 16px/20px "${font}"`,- fontLabelSmall: `400 16px/20px "${font}"`,- fontLabelSmallHeavy: `500 16px/20px "${font}"`,- fontLabelExtraSmall: `400 16px/20px "${font}"`,- fontLabelExtraSmallHeavy: `500 16px/20px "${font}"`,-+ fontLabelSmall: `400 12px/14.4px "${font}"`,+ fontLabelSmallHeavy: `500 12px/14.4px "${font}"`,+ fontLabelExtraSmall: `400 10px/12px "${font}"`,+ fontLabelExtraSmallHeavy: `500 10px/12px "${font}"`,shadowS: "0px 1px 2px rgba(0, 0, 0, 0.04)",shadowM: "0px 4px 6px rgba(0, 0, 0, 0.04)",shadowL: "0px 1px 8px rgba(0, 0, 0, 0.08)",@@ -33,28 +34,77 @@ export const themePresets = {default: {theme: {...commonTheme({ font: "Inter" }),- backgroundFills: "rgba(245, 245, 245, 1)",- brandElFills: "rgba(127, 86, 217, 1)",- brandElHoverFills: "rgba(127, 86, 217, 0.8)",- containerFills: "rgba(255, 255, 255, 1)",+ // Background colors+ backgroundFills: "rgba(250,250,250,1)",+ containerFills: "rgba(253, 253, 253)",overlayFills: "rgba(0, 0, 0, 0.4)",- sunkFills: "rgba(0, 0, 0, 0.04)",- containerHoverFills: "rgba(255, 255, 255, 0.04)",- dangerFills: "rgba(217, 45, 32, 0.08)",- successFills: "rgba(7, 148, 85, 0.08)",- strokeDefault: "rgba(0, 0, 0, 0.06)",- strokeInteractiveEl: "rgba(0, 0, 0, 0.12)",- strokeInteractiveElHover: "rgba(0, 0, 0, 0.4)",- strokeInteractiveElSelected: "rgba(0, 0, 0, 1)",- brandText: "rgba(255, 255, 255, 1)",- brandSecondaryText: "rgba(255, 255, 255, 0.4)",+ sunkFills: "rgba(0, 0, 0, 0.06)",+ dangerFills: "rgba(203,63,73,0.1)",+ successFills: "rgba(13,160,93,0.1)",+ infoFills: "rgba(56, 148, 255, 0.1)",+ alertFills: "rgba(255, 199, 0, 0.1)",+ invertedFills: "rgba(21, 21, 21, 1)",+ elevatedFills: "rgba(255, 255, 255, 0.6)",+ sunkBgFills: "rgba(0, 0, 0, 0.04)",++ // Border colors+ strokeDefault: "rgba(0, 0, 0, 0.04)",+ strokeInteractiveEl: "rgba(0, 0, 0, 0.08)",+ strokeInteractiveElSelected: "rgba(21,21,21,1)",+ strokeEmphasis: "rgba(0, 0, 0, 0.2)",+ strokeAccent: "rgba(255, 255, 255, 0.08)",+ strokeAccentEmphasis: "rgba(255, 255, 255, 0.3)",+ strokeInfo: "rgba(56, 148, 255, 0.08)",+ strokeInfoEmphasis: "rgba(24, 130, 255, 1)",+ strokeAlert: "rgba(255, 199, 0, 0.08)",+ strokeAlertEmphasis: "rgba(255,199,0,1)",+ strokeSuccess: "rgba(13, 160, 94, 0.08)",+ strokeSuccessEmphasis: "rgba(13, 160, 94, 1)",+ strokeDanger: "rgba(203, 63, 73, 0.08)",+ strokeDangerEmphasis: "rgba(200, 44, 55, 1)",++ // Text colorsprimaryText: "rgba(0, 0, 0, 1)",secondaryText: "rgba(0, 0, 0, 0.4)",disabledText: "rgba(0, 0, 0, 0.2)",- dangerText: "rgba(217, 45, 32, 1)",- successText: "rgba(7, 148, 85, 1)",linkText: "rgba(0, 0, 0, 1)",- infoText: "rgba(56, 148, 255, 1)",+ accentPrimaryText: "rgba(255, 255, 255, 1)",+ accentSecondaryText: "rgba(255, 255, 255, 0.4)",+ accentDisabledText: "rgba(255, 255, 255, 0.2)",+ successPrimaryText: "rgba(8,93,58,1)",+ successInvertedText: "rgba(220, 250, 230, 1)",+ alertPrimaryText: "rgba(221, 159, 0, 1)",+ alertInvertedText: "rgba(255, 246, 205, 1)",+ dangerPrimaryText: "rgba(167,39,47,1)",+ dangerSecondaryText: "rgba(203, 63, 73, 1)",+ dangerDisabledText: "rgba(235, 167, 171, 1)",+ dangerInvertedPrimaryText: "rgba(255, 255, 255, 1)",+ dangerInvertedSecondaryText: "rgba(255, 255, 255, 0.4)",+ dangerInvertedDisabledText: "rgba(255, 255, 255, 0.2)",+ infoPrimaryText: "rgba(21,93,177,1)",+ infoInvertedText: "rgba(219, 236, 255, 1)",++ // Interactive colors+ interactiveDefault: "rgba(255, 255, 255, 0.02)",+ interactiveHover: "rgba(0, 0, 0, 0.06)",+ interactivePressed: "rgba(0, 0, 0, 0.04)",+ interactiveDisabled: "rgba(0, 0, 0, 0.02)",+ interactiveAccent: "rgba(0,0,0,1)",+ interactiveAccentHover: "rgba(0,0,0,0.8)",+ // not setting this to make it backward compatible+ // pressed state was not there in the previous version+ // so we are using the hover state as the pressed state+ // interactiveAccentPressed: "rgba(0,0,0,1)",+ interactiveAccentDisabled: "rgba(0,0,0,0.4)",+ interactiveDestructive: "rgba(203, 63, 73, 0.02)",+ interactiveDestructiveHover: "rgba(203, 63, 73, 0.08)",+ interactiveDestructivePressed: "rgba(203, 63, 73, 0.1)",+ interactiveDestructiveDisabled: "rgba(203, 63, 73, 0.02)",+ interactiveDestructiveAccent: "rgba(200, 44, 55, 1)",+ interactiveDestructiveAccentHover: "rgba(203, 63, 73, 1)",+ interactiveDestructiveAccentPressed: "rgba(167, 39, 47, 1)",+ interactiveDestructiveAccentDisabled: "rgba(203, 63, 73, 0.4)",+chatContainerBg: "rgba(255, 255, 255, 1)",chatAssistantResponseBg: "rgba(255, 255, 255, 1)",chatUserResponseBg: "rgba(127, 86, 217, 1)",@@ -86,28 +136,74 @@ export const themePresets = {},darkTheme: {...commonTheme({ font: "Inter" }),- backgroundFills: "rgba(28, 28, 28, 1)",- brandElFills: "rgba(127, 86, 217, 1)",- brandElHoverFills: "rgba(127, 86, 217, 0.8)",- containerFills: "rgba(43, 43, 43, 1)",+ // Background colors+ backgroundFills: "rgba(21,21,21,1)",+ containerFills: "rgba(28,28,28,1)",overlayFills: "rgba(0, 0, 0, 0.4)",- sunkFills: "rgba(0, 0, 0, 0.2)",- containerHoverFills: "rgba(255, 255, 255, 0.1)",- dangerFills: "rgba(217, 45, 32, 0.1)",- successFills: "rgba(7, 148, 85, 0.1)",- strokeDefault: "rgba(255, 255, 255, 0.06)",- strokeInteractiveEl: "rgba(255, 255, 255, 0.12)",- strokeInteractiveElHover: "rgba(255, 255, 255, 0.4)",- strokeInteractiveElSelected: "rgba(255, 255, 255, 1)",- brandText: "rgba(255, 255, 255, 1)",- brandSecondaryText: "rgba(255, 255, 255, 0.4)",+ sunkFills: "rgba(255,255,255,0.08)",+ dangerFills: "rgba(203,63,73,0.2)",+ successFills: "rgba(13,160, 94, 0.2)",+ infoFills: "rgba(56, 148, 255, 0.2)",+ alertFills: "rgba(255, 199, 0, 0.2)",+ elevatedFills: "rgba(255, 255, 255, 0.06)",+ invertedFills: "rgba(253, 253, 253, 1)",+ sunkBgFills: "rgba(0, 0, 0, 0.16)",++ // Border colors+ strokeDefault: "rgba(255, 255, 255, 0.04)",+ strokeInteractiveEl: "rgba(255, 255, 255, 0.1)",+ strokeInteractiveElSelected: "rgba(253, 253, 253, 1)",+ strokeEmphasis: "rgba(255, 255, 255, 0.2)",+ strokeAccent: "rgba(0, 0, 0, 0.08)",+ strokeAccentEmphasis: "rgba(0, 0, 0, 0.3)",+ strokeInfo: "rgba(56, 148, 255, 0.2)",+ strokeInfoEmphasis: "rgba(24, 130, 255, 1)",+ strokeAlert: "rgba(255, 199, 0, 0.2)",+ strokeAlertEmphasis: "rgba(255, 199, 0, 1)",+ strokeSuccess: "rgba(13, 160, 94, 0.2)",+ strokeSuccessEmphasis: "rgba(13, 160, 94, 1)",+ strokeDanger: "rgba(203, 63, 73, 0.2)",+ strokeDangerEmphasis: "rgba(200, 44, 55, 1)",++ // Text colorsprimaryText: "rgba(255, 255, 255, 1)",- secondaryText: "rgba(255, 255, 255, 0.6)",+ secondaryText: "rgba(255, 255, 255, 0.4)",disabledText: "rgba(255, 255, 255, 0.2)",- dangerText: "rgba(253, 162, 155, 1)",- successText: "rgba(117, 224, 167, 1)",linkText: "rgba(255, 255, 255, 1)",- infoText: "rgba(125, 179, 247, 1)",+ accentPrimaryText: "rgba(0,0,0,1)",+ accentSecondaryText: "rgba(0,0,0,0.4)",+ accentDisabledText: "rgba(0,0,0,0.2)",+ successPrimaryText: "rgba(23,178,106,1)",+ successInvertedText: "rgba(2, 79, 48, 1)",+ alertPrimaryText: "rgba(243, 207, 80, 1)",+ alertInvertedText: "rgba(187, 122, 0, 1)",+ dangerPrimaryText: " rgba(203,63,73,1)",+ dangerSecondaryText: "rgba(167, 39, 47, 1)",+ dangerDisabledText: "rgba(130, 26, 32, 1)",+ dangerInvertedPrimaryText: "rgba(255, 255, 255, 1)",+ dangerInvertedSecondaryText: "rgba(255, 255, 255, 0.4)",+ dangerInvertedDisabledText: "rgba(255, 255, 255, 0.2)",+ infoPrimaryText: "rgba(70,160,247,1)",+ infoInvertedText: "rgba(13, 75, 148, 1)",++ // Interactive colors+ interactiveDefault: "rgba(0, 0, 0, 0.02)",+ interactiveHover: "rgba(255, 255, 255, 0.06)",+ interactivePressed: "rgba(255, 255, 255, 0.04)",+ interactiveDisabled: "rgba(255, 255, 255, 0.02)",+ interactiveAccent: "rgba(255,255,255,1)",+ interactiveAccentHover: "rgba(255,255,255,0.8)",+ interactiveAccentPressed: "rgba(255,255,255, 1)",+ interactiveAccentDisabled: "rgba(255, 255, 255, 0.4)",+ interactiveDestructive: "rgba(203, 63, 73, 0.04)",+ interactiveDestructiveHover: "rgba(203, 63, 73, 0.1)",+ interactiveDestructivePressed: "rgba(203, 63, 73, 0.2)",+ interactiveDestructiveDisabled: "rgba(203, 63, 73, 0.04)",+ interactiveDestructiveAccent: "rgba(200, 44, 55, 1)",+ interactiveDestructiveAccentHover: "rgba(210, 65, 75, 1)",+ interactiveDestructiveAccentPressed: "rgba(167, 39, 47, 1)",+ interactiveDestructiveAccentDisabled: "rgba(203, 63, 73, 0.4)",+chatContainerBg: "rgba(43, 43, 43, 1)",chatAssistantResponseBg: "rgba(43, 43, 43, 1)",chatUserResponseBg: "rgba(127, 86, 217, 1)",diff --git a/js/packages/react-ui/src/components/ThemeProvider/types.ts b/js/packages/react-ui/src/components/ThemeProvider/types.tsindex b77684cdd..06c399f48 100644--- a/js/packages/react-ui/src/components/ThemeProvider/types.ts+++ b/js/packages/react-ui/src/components/ThemeProvider/types.ts@@ -5,32 +5,106 @@ export type ThemeMode = "light" | "dark";export interface ColorTheme {// Background colorsbackgroundFills?: string;+ /**+ * @deprecated -- use interactiveAccent instead+ */brandElFills?: string;+ /**+ * @deprecated -- use interactiveAccentHover instead+ */brandElHoverFills?: string;containerFills?: string;overlayFills?: string;sunkFills?: string;+ /**+ * @deprecated -- use sunkFills instead+ */containerHoverFills?: string;dangerFills?: string;successFills?: string;infoFills?: string;elevatedFills?: string;+ alertFills?: string;+ sunkBgFills?: string;+ invertedFills?: string;// Border colorsstrokeDefault?: string;strokeInteractiveEl?: string;+ /**+ * @deprecated -- use strokeEmphasis instead+ */strokeInteractiveElHover?: string;strokeInteractiveElSelected?: string;+ strokeEmphasis?: string;+ strokeAccent?: string;+ strokeAccentEmphasis?: string;+ strokeInfo?: string;+ strokeInfoEmphasis?: string;+ strokeAlert?: string;+ strokeAlertEmphasis?: string;+ strokeSuccess?: string;+ strokeSuccessEmphasis?: string;+ strokeDanger?: string;+ strokeDangerEmphasis?: string;// Text colors+ /**+ * @deprecated -- use accentPrimaryText instead+ */brandText?: string;+ /**+ * @deprecated -- use accentSecondaryText instead+ */brandSecondaryText?: string;primaryText?: string;secondaryText?: string;disabledText?: string;+ /**+ * @deprecated -- use dangerPrimaryText instead+ */dangerText?: string;+ /**+ * @deprecated -- use successPrimaryText instead+ */successText?: string;linkText?: string;+ /**+ * @deprecated -- use infoPrimaryText instead+ */infoText?: string;+ accentPrimaryText?: string;+ accentSecondaryText?: string;+ accentDisabledText?: string;+ successPrimaryText?: string;+ successInvertedText?: string;+ alertPrimaryText?: string;+ alertInvertedText?: string;+ dangerPrimaryText?: string;+ dangerSecondaryText?: string;+ dangerDisabledText?: string;+ dangerInvertedPrimaryText?: string;+ dangerInvertedSecondaryText?: string;+ dangerInvertedDisabledText?: string;+ infoPrimaryText?: string;+ infoInvertedText?: string;++ // Interactive colors+ interactiveDefault?: string;+ interactiveHover?: string;+ interactivePressed?: string;+ interactiveDisabled?: string;+ interactiveAccent?: string;+ interactiveAccentHover?: string;+ interactiveAccentPressed?: string;+ interactiveAccentDisabled?: string;+ interactiveDestructive?: string;+ interactiveDestructiveHover?: string;+ interactiveDestructivePressed?: string;+ interactiveDestructiveDisabled?: string;+ interactiveDestructiveAccent?: string;+ interactiveDestructiveAccentHover?: string;+ interactiveDestructiveAccentPressed?: string;+ interactiveDestructiveAccentDisabled?: string;// chat colorschatContainerBg?: string;@@ -73,14 +147,26 @@ export interface LayoutTheme {// Typography-related theme propertiesexport interface TypographyTheme {// Primary Font+ /**+ * @deprecated -- use fontBody instead+ */fontPrimary?: string;fontPrimaryLetterSpacing?: string;- // Title Variants+ // Title Variant+ /**+ * @deprecated -- use fontBodyHeavy instead+ */fontTitle?: string;fontTitleLetterSpacing?: string;+ /**+ * @deprecated -- use fontBodyLargeHeavy instead+ */fontTitleMedium?: string;fontTitleMediumLetterSpacing?: string;+ /**+ * @deprecated -- use fontBodySmallHeavy instead+ */fontTitleSmall?: string;fontTitleSmallLetterSpacing?: string;@@ -91,13 +177,22 @@ export interface TypographyTheme {fontBodyLinkLetterSpacing?: string;fontBodyHeavy?: string;fontBodyHeavyLetterSpacing?: string;+ /**+ * @deprecated -- use fontBody instead+ */fontBodyMedium?: string;+ /**+ * @deprecated -- use fontBodyLetterSpacing instead+ */fontBodyMediumLetterSpacing?: string;fontBodySmallHeavy?: string;fontBodySmallHeavyLetterSpacing?: string;fontBodySmall?: string;fontBodySmallLetterSpacing?: string;-+ fontBodyLarge?: string;+ fontBodyLargeLetterSpacing?: string;+ fontBodyLargeHeavy?: string;+ fontBodyLargeHeavyLetterSpacing?: string;// Label SystemfontLabel?: string;fontLabelLetterSpacing?: string;@@ -115,9 +210,21 @@ export interface TypographyTheme {fontLabelLargeHeavyLetterSpacing?: string;fontLabelLarge?: string;fontLabelLargeLetterSpacing?: string;+ /**+ * @deprecated -- use fontLabelHeavy instead+ */fontLabelMediumHeavy?: string;+ /**+ * @deprecated -- use fontLabelHeavyLetterSpacing instead+ */fontLabelMediumHeavyLetterSpacing?: string;+ /**+ * @deprecated -- use fontLabel instead+ */fontLabelMedium?: string;+ /**+ * @deprecated -- use fontLabelMediumLetterSpacing instead+ */fontLabelMediumLetterSpacing?: string;// Headings@@ -127,6 +234,14 @@ export interface TypographyTheme {fontHeadingMediumLetterSpacing?: string;fontHeadingSmall?: string;fontHeadingSmallLetterSpacing?: string;+ fontHeadingExtraSmall?: string;+ fontHeadingExtraSmallLetterSpacing?: string;++ // 2Extra Small+ fontLabel2ExtraSmall?: string;+ fontLabel2ExtraSmallLetterSpacing?: string;+ fontLabel2ExtraSmallHeavy?: string;+ fontLabel2ExtraSmallHeavyLetterSpacing?: string;}// Effect-related theme propertiesdiff --git a/js/packages/react-ui/src/components/ToggleItem/toggleItem.scss b/js/packages/react-ui/src/components/ToggleItem/toggleItem.scssindex b644e16b6..0039cb9cc 100644--- a/js/packages/react-ui/src/components/ToggleItem/toggleItem.scss+++ b/js/packages/react-ui/src/components/ToggleItem/toggleItem.scss@@ -15,7 +15,7 @@color: cssUtils.$primary-text;border-color: cssUtils.$stroke-default;&:hover {- background-color: cssUtils.$bg-container-hover;+ background-color: cssUtils.$bg-sunk;}&:disabled {color: cssUtils.$disabled-text;@@ -24,10 +24,10 @@}&[data-state="on"] {- background-color: cssUtils.$bg-brand-el;- color: cssUtils.$brand-text;+ background-color: cssUtils.$interactive-accent;+ color: cssUtils.$accent-primary-text;&:hover {- background-color: cssUtils.$bg-brand-el-hover;+ background-color: cssUtils.$interactive-accent-hover;}&:disabled {opacity: 0.5;diff --git a/js/packages/react-ui/src/components/index.scss b/js/packages/react-ui/src/components/index.scssindex 8cb87f0a1..a3148eeed 100644--- a/js/packages/react-ui/src/components/index.scss+++ b/js/packages/react-ui/src/components/index.scss@@ -41,3 +41,4 @@@forward "./TextContent/textContent.scss";@forward "./ToggleGroup/toggleGroup.scss";@forward "./ToggleItem/toggleItem.scss";+@forward "./TextCallout/textCallout.scss";diff --git a/js/packages/react-ui/src/cssUtils.scss b/js/packages/react-ui/src/cssUtils.scssindex 2b8e89ae1..d309f0d8b 100644--- a/js/packages/react-ui/src/cssUtils.scss+++ b/js/packages/react-ui/src/cssUtils.scss@@ -13,6 +13,28 @@ $bg-danger: var(--crayon-danger-fills);$bg-success: var(--crayon-success-fills);$bg-info: var(--crayon-info-fills);$bg-elevated: var(--crayon-elevated-fills);+$bg-alert: var(--crayon-alert-fills);+$bg-inverted: var(--crayon-inverted-fills);+$bg-sunk-bg: var(--crayon-sunk-bg-fills);++// Crayon Interactive Colors++$interactive-default: var(--crayon-interactive-default);+$interactive-hover: var(--crayon-interactive-hover);+$interactive-pressed: var(--crayon-interactive-pressed);+$interactive-disabled: var(--crayon-interactive-disabled);+$interactive-accent: var(--crayon-interactive-accent);+$interactive-accent-hover: var(--crayon-interactive-accent-hover);+$interactive-accent-pressed: var(--crayon-interactive-accent-pressed);+$interactive-accent-disabled: var(--crayon-interactive-accent-disabled);+$interactive-destructive: var(--crayon-interactive-destructive);+$interactive-destructive-hover: var(--crayon-interactive-destructive-hover);+$interactive-destructive-pressed: var(--crayon-interactive-destructive-pressed);+$interactive-destructive-disabled: var(--crayon-interactive-destructive-disabled);+$interactive-destructive-accent: var(--crayon-interactive-destructive-accent);+$interactive-destructive-accent-hover: var(--crayon-interactive-destructive-accent-hover);+$interactive-destructive-accent-pressed: var(--crayon-interactive-destructive-accent-pressed);+$interactive-destructive-accent-disabled: var(--crayon-interactive-destructive-accent-disabled);// Crayon Stroke Colors@@ -20,6 +42,17 @@ $stroke-default: var(--crayon-stroke-default);$stroke-interactive-el: var(--crayon-stroke-interactive-el);$stroke-interactive-el-hover: var(--crayon-stroke-interactive-el-hover);$stroke-interactive-el-selected: var(--crayon-stroke-interactive-el-selected);+$stroke-emphasis: var(--crayon-stroke-emphasis);+$stroke-accent: var(--crayon-stroke-accent);+$stroke-accent-emphasis: var(--crayon-stroke-accent-emphasis);+$stroke-info: var(--crayon-stroke-info);+$stroke-info-emphasis: var(--crayon-stroke-info-emphasis);+$stroke-alert: var(--crayon-stroke-alert);+$stroke-alert-emphasis: var(--crayon-stroke-alert-emphasis);+$stroke-success: var(--crayon-stroke-success);+$stroke-success-emphasis: var(--crayon-stroke-success-emphasis);+$stroke-danger: var(--crayon-stroke-danger);+$stroke-danger-emphasis: var(--crayon-stroke-danger-emphasis);// Crayon Text Colors@@ -32,6 +65,21 @@ $danger-text: var(--crayon-danger-text);$success-text: var(--crayon-success-text);$link-text: var(--crayon-link-text);$info-text: var(--crayon-info-text);+$accent-primary-text: var(--crayon-accent-primary-text);+$accent-secondary-text: var(--crayon-accent-secondary-text);+$accent-disabled-text: var(--crayon-accent-disabled-text);+$success-primary-text: var(--crayon-success-primary-text);+$success-inverted-text: var(--crayon-success-inverted-text);+$alert-primary-text: var(--crayon-alert-primary-text);+$alert-inverted-text: var(--crayon-alert-inverted-text);+$danger-primary-text: var(--crayon-danger-primary-text);+$danger-secondary-text: var(--crayon-danger-secondary-text);+$danger-disabled-text: var(--crayon-danger-disabled-text);+$danger-inverted-primary-text: var(--crayon-danger-inverted-primary-text);+$danger-inverted-secondary-text: var(--crayon-danger-inverted-secondary-text);+$danger-inverted-disabled-text: var(--crayon-danger-inverted-disabled-text);+$info-primary-text: var(--crayon-info-primary-text);+$info-inverted-text: var(--crayon-info-inverted-text);// Crayon Spacing@@ -89,6 +137,8 @@ $typography: (medium: typography(crayon-font-body-medium),small: typography(crayon-font-body-small),small-heavy: typography(crayon-font-body-small-heavy),+ large: typography(crayon-font-body-large),+ large-heavy: typography(crayon-font-body-large-heavy),),label: (default: typography(crayon-font-label),@@ -101,11 +151,14 @@ $typography: (large-heavy: typography(crayon-font-label-large-heavy),medium: typography(crayon-font-label-medium),medium-heavy: typography(crayon-font-label-medium-heavy),+ 2-extra-small: typography(crayon-font-label-2-extra-small),+ 2-extra-small-heavy: typography(crayon-font-label-2-extra-small-heavy),),heading: (large: typography(crayon-font-heading-large),medium: typography(crayon-font-heading-medium),small: typography(crayon-font-heading-small),+ extra-small: typography(crayon-font-heading-extra-small),),primary: (default: typography(crayon-font-primary),diff --git a/js/packages/react-ui/src/index.ts b/js/packages/react-ui/src/index.tsindex 5020b2e07..c382a3496 100644--- a/js/packages/react-ui/src/index.ts+++ b/js/packages/react-ui/src/index.ts@@ -38,6 +38,7 @@ export * from "./components/Tabs";export * from "./components/Tag";export * from "./components/TagBlock";export * from "./components/TextArea";+export * from "./components/TextCallout";export * from "./components/TextContent";export { Theme, ThemeProvider, themePresets } from "./components/ThemeProvider";