Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toggle styles #180

Merged
merged 2 commits into from
May 17, 2024
Merged

Toggle styles #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
695298b
Toggle styles
May 14, 2024
d816727
Update token
May 17, 2024
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
13 changes: 9 additions & 4 deletions src/form/Toggle/Toggle.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ export const Simple = () => {
return <Toggle checked={state} onChange={setState} />;
};

export const Disabled = () => {
const [state, setState] = useState(true);
return <Toggle disabled checked={state} onChange={setState} />;
};
export const Disabled = () => (
<div
className="bg-panel p-20"
style={{ display: 'flex', gap: '1rem', flexDirection: 'column' }}
>
<Toggle disabled checked />
<Toggle disabled checked={false} />
</div>
);

export const Sizes = () => {
const [stateSmall, setStateSmall] = useState(true);
Expand Down
17 changes: 11 additions & 6 deletions src/form/Toggle/Toggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, { FC, forwardRef, LegacyRef } from 'react';
import { motion } from 'framer-motion';
import { twMerge } from 'tailwind-merge';
import { ToggleTheme } from './ToggleTheme';
import { useComponentTheme } from '@/utils';
import { cn, useComponentTheme } from '@/utils';

export interface ToggleProps {
/**
Expand Down Expand Up @@ -66,11 +65,14 @@ export const Toggle: FC<ToggleProps & ToggleRef> = forwardRef(
{...rest}
ref={ref}
tabIndex={0}
className={twMerge(
className={cn(
theme.base,
disabled && theme.disabled,
checked && theme.checked,
theme.sizes[size],
{
[theme.checked]: checked,
[theme.disabled]: disabled,
[theme.disabledAndChecked]: disabled && checked
},
className
)}
onClick={() => {
Expand All @@ -86,7 +88,10 @@ export const Toggle: FC<ToggleProps & ToggleRef> = forwardRef(
}}
>
<motion.div
className={twMerge(theme.handle.base, theme.handle.sizes[size])}
className={cn(theme.handle.base, theme.handle.sizes[size], {
[theme.handle.disabled]: disabled,
[theme.handle.disabledAndChecked]: disabled && checked
})}
layout
transition={{
type: 'spring',
Expand Down
13 changes: 10 additions & 3 deletions src/form/Toggle/ToggleTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ export interface ToggleTheme {
base: string;
disabled: string;
checked: string;
disabledAndChecked: string;
handle: {
base: string;
sizes: {
small: string;
medium: string;
large: string;
};
disabled: string;
disabledAndChecked: string;
};
sizes: {
small: string;
Expand All @@ -18,16 +21,20 @@ export interface ToggleTheme {
}

const baseTheme: ToggleTheme = {
base: 'flex items-center justify-start cursor-pointer bg-surface box-border border border-panel-accent rounded-full',
disabled: 'cursor-not-allowed opacity-60',
base: 'flex items-center justify-start cursor-pointer bg-surface box-border border border-panel-accent rounded-full hover:bg-primary-hover transition-[background-color] ease-in-out duration-300',
disabled: 'cursor-not-allowed bg-transparent hover:bg-transparent',
checked: 'justify-end bg-primary',
disabledAndChecked:
evgenoid marked this conversation as resolved.
Show resolved Hide resolved
'bg-secondary-inactive hover:bg-secondary-inactive light:bg-gray-400 light:hover:bg-gray-400',
handle: {
base: 'rounded-full bg-panel',
sizes: {
small: 'w-3 h-full',
medium: 'w-5 h-full',
large: 'w-6 h-full'
}
},
disabled: 'bg-secondary-inactive light:bg-gray-400',
disabledAndChecked: 'bg-black light:bg-white'
},
sizes: {
small: 'w-8 h-4 p-px',
Expand Down
Loading