Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions packages/components/src/tailwind/Button/Button.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import { Button } from './Button';
import { BinIcon } from '../../components/icons/BinIcon';
import type { Meta, StoryObj } from '@storybook/react';
import { SevenContext } from '../SevenContext/SevenContext';

const meta = {
title: 'Tailwind/Button',
Expand Down Expand Up @@ -145,3 +146,44 @@ export const WithTWClassName: Story = {
accent: true,
},
};

import { tv } from 'tailwind-variants';

export const buttonStyles = tv({
base: '',
variants: {
variant: {
primary: 'bg-red-600 text-white',
},
},
});

export const Custom: Story = {
render: (args) => (
<div className="flex gap-8">
<SevenContext.Provider
value={{
button: {
base: '',
variants: {
variant: {
primary: 'bg-red-600 text-white',
},
},
},
}}
>
<Button {...args}>Custom</Button>
</SevenContext.Provider>
<Button variant="neutral">Neutral</Button>
<Button variant="primary" accent={true}>
Pimary
</Button>
</div>
),
args: {
customize: buttonStyles,
variant: 'primary',
accent: true,
},
};
37 changes: 27 additions & 10 deletions packages/components/src/tailwind/Button/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React from 'react';
import React, { useContext } from 'react';
import {
composeRenderProps,
Button as RACButton,
type ButtonProps as RACButtonProps,
} from 'react-aria-components';
import { tv } from 'tailwind-variants';
import { focusRing } from '../utils';

import { SevenContext } from '../SevenContext/SevenContext';
import { twMerge } from 'tailwind-merge';
export interface ButtonProps extends RACButtonProps {
variant?: 'neutral' | 'primary' | 'destructive';
size?: 'S' | 'L';
Expand Down Expand Up @@ -67,17 +68,33 @@ const button = tv({
});

export function Button(props: ButtonProps) {
const tvvalues = useContext(SevenContext);
return (
<RACButton
{...props}
className={composeRenderProps(props.className, (className, renderProps) =>
button({
...renderProps,
variant: props.variant,
size: props.size,
accent: props.accent,
className,
}),
className={composeRenderProps(
props.className,
(className, renderProps) => {
const result = twMerge(
className,
button({
...renderProps,
variant: props.variant,
size: props.size,
accent: props.accent,
}),
tvvalues.button
? tv(tvvalues.button as any)({
...renderProps,
// @ts-ignore
variant: props.variant,
size: props.size,
accent: props.accent,
})
: '',
);
return result;
},
)}
/>
);
Expand Down
26 changes: 23 additions & 3 deletions packages/components/src/tailwind/Checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { type ReactNode } from 'react';
import React, { useContext, type ReactNode } from 'react';
import { CheckboxIcon, DashIcon } from '../../components/icons';
import {
Checkbox as AriaCheckbox,
Expand All @@ -11,6 +11,9 @@ import {
import { tv } from 'tailwind-variants';
import { Description, FieldError, Label } from '../Field/Field';
import { composeTailwindRenderProps, focusRing } from '../utils';
import { SevenContext } from '../SevenContext/SevenContext';
import clsx from 'clsx';
import { twMerge } from 'tailwind-merge';

export interface CheckboxGroupProps
extends Omit<AriaCheckboxGroupProps, 'children'> {
Expand Down Expand Up @@ -69,11 +72,28 @@ const iconStyles =
'w-4 h-4 text-white group-disabled:text-gray-400 dark:text-slate-900 dark:group-disabled:text-slate-600 forced-colors:text-[HighlightText]';

export function Checkbox(props: CheckboxProps) {
const tvvalues = useContext(SevenContext);

return (
<AriaCheckbox
{...props}
className={composeRenderProps(props.className, (className, renderProps) =>
checkboxStyles({ ...renderProps, className }),
className={composeRenderProps(
props.className,
(className, renderProps) => {
const result = twMerge(
className,
checkboxStyles({
...renderProps,
}),
tvvalues.checkbox
? tv(tvvalues.checkbox as any)({
...renderProps,
})
: '',
);

return result;
},
)}
>
{({ isSelected, isIndeterminate, ...renderProps }) => (
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import React from 'react';
import { SevenContext } from './SevenContext';
import { Button } from '../Button/Button';
import type { Meta, StoryObj } from '@storybook/react';
import { Checkbox } from '../Checkbox/Checkbox';

const meta = {
title: 'Tailwind/SevenContext',
component: SevenContext,
parameters: {
layout: 'centered',
backgrounds: { disable: true },
},
tags: ['autodocs'],
argTypes: {},
args: {},
} satisfies Meta<typeof SevenContext>;

export default meta;
type Story = StoryObj<typeof meta>;

export const Custom: Story = {
render: (args) => (
<div className="flex gap-8">
<SevenContext.Provider value={args.value}>
<Button variant="primary" accent={true}>
Custom
</Button>
<Checkbox>Customized</Checkbox>
</SevenContext.Provider>
<Button variant="primary" accent={true}>
Pimary
</Button>
<Checkbox>Basic</Checkbox>
</div>
),
args: {
value: {
button: {
base: 'text-4xl',
variants: {
variant: {
primary: 'bg-red-600 text-white',
},
},
},
checkbox: {
base: 'bg-red-600 text-4xl text-white px-2',
},
},
},
};
15 changes: 15 additions & 0 deletions packages/components/src/tailwind/SevenContext/SevenContext.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { createContext } from 'react';
import { tv } from 'tailwind-variants'; // Import tv to infer its type

// Infer the type of the first argument to the 'tv' function
// This correctly captures the structure of the configuration object
type TvConfigType = Parameters<typeof tv>[0];

interface context {
button?: TvConfigType;
checkbox?: TvConfigType;
}
export const SevenContext = createContext<context>({
button: {},
checkbox: {},
});