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.

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

tech: Move Switch component to ui package #4730

Merged
merged 1 commit into from
Sep 19, 2024
Merged
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
3 changes: 1 addition & 2 deletions apps/store/src/components/ShopBreakdown/DiscountField.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { useTranslation } from 'next-i18next'
import { useState } from 'react'
import { sprinkles, Text, xStack } from 'ui'
import { sprinkles, Switch, Text, xStack } from 'ui'
import Collapsible from '@/components/Collapsible/Collapsible'
import { Switch } from '@/components/Switch'
import { AddCampaignForm } from './AddCampaignForm/AddCampaignForm'
import { AddedCampaignForm } from './AddedCampaignForm'

Expand Down
55 changes: 0 additions & 55 deletions apps/store/src/components/Switch.tsx

This file was deleted.

7 changes: 3 additions & 4 deletions apps/store/src/components/ToggleCard/ToggleCard.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import type { ReactNode } from 'react'
import type { ComponentProps, ReactNode } from 'react'
import { useId } from 'react'
import { Space, useHighlightAnimation } from 'ui'
import { Space, Switch, useHighlightAnimation } from 'ui'
import { SpaceFlex } from '@/components/SpaceFlex/SpaceFlex'
import { Switch, type SwitchProps } from '@/components/Switch'
import { wrapper, checkboxHeader, labelText } from './ToggleCard.css'

type Props = SwitchProps & {
type Props = ComponentProps<typeof Switch> & {
label: string
Icon?: ReactNode
}
Expand Down
2 changes: 2 additions & 0 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@
"@emotion/styled": "11.13.0",
"@radix-ui/react-dialog": "1.1.1",
"@radix-ui/react-slot": "1.1.0",
"@radix-ui/react-switch": "1.1.0",
"@radix-ui/react-tabs": "1.1.0",
"@radix-ui/react-tooltip": "1.1.2",
"@storybook/addon-actions": "8.3.1",
"@vanilla-extract/css": "1.15.5",
"@vanilla-extract/dynamic": "2.1.2",
"@vanilla-extract/recipes": "0.5.5",
Expand Down
48 changes: 48 additions & 0 deletions packages/ui/src/components/Switch/Switch.css.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { style } from '@vanilla-extract/css'
import { tokens } from '../../theme'

export const switchStyles = style({
boxSizing: 'border-box',
width: '1.75rem',
borderRadius: 9999,
display: 'flex',
alignItems: 'center',
justifyContent: 'flex-start',

backgroundColor: tokens.colors.opaque3,
borderWidth: 1,
borderStyle: 'solid',
borderColor: 'transparent',

':focus-visible': {
borderColor: tokens.colors.gray1000,
},

selectors: {
'&[data-state=checked], &[data-state=open]': {
backgroundColor: tokens.colors.signalGreenElement,
},

'&[disabled]': {
backgroundColor: tokens.colors.opaque3,
cursor: 'not-allowed',
},
},
})

export const thumbStyles = style({
width: '1rem',
height: '1rem',
borderRadius: '100%',
backgroundColor: tokens.colors.textNegative,

transition: 'transform 100ms',
transform: 'translateX(0)',
willChange: 'transform',

selectors: {
'&[data-state=checked]': {
transform: 'translateX(0.6rem)',
},
},
})
41 changes: 41 additions & 0 deletions packages/ui/src/components/Switch/Switch.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { action } from '@storybook/addon-actions'
import type { Meta, StoryObj } from '@storybook/react'
import { useState, type ComponentProps } from 'react'
import { Switch } from './Switch'

type Controls = ComponentProps<typeof Switch>

const meta: Meta<Controls> = {
title: 'Switch',
component: Switch,
}
export default meta

type Story = StoryObj<Controls>

export const Controlled: Story = {
render: () => {
const [checked, setIsChecked] = useState(true)

const toggle = () => setIsChecked((isChecked) => !isChecked)

return (
<div style={{ maxWidth: '400px' }}>
<Switch checked={checked} onCheckedChange={toggle} />
</div>
)
},
}

export const Uncontrolled: Story = {
render: (args: Controls) => {
return (
<div style={{ maxWidth: '400px' }}>
<Switch defaultChecked onCheckedChange={args.onCheckedChange} />
</div>
)
},
args: {
onCheckedChange: action('onCheckedChange'),
},
}
13 changes: 13 additions & 0 deletions packages/ui/src/components/Switch/Switch.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import * as RadixSwitch from '@radix-ui/react-switch'
import clsx from 'clsx'
import { switchStyles, thumbStyles } from './Switch.css'

export type SwitchProps = RadixSwitch.SwitchProps

export const Switch = ({ className, ...props }: SwitchProps) => {
return (
<RadixSwitch.Root className={clsx(switchStyles, className)} {...props}>
<RadixSwitch.Thumb className={thumbStyles} />
</RadixSwitch.Root>
)
}
1 change: 1 addition & 0 deletions packages/ui/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export { IconButton } from './components/Button/IconButton'
export { Tooltip } from './components/Tooltip/Tooltip'
export { Card } from './components/Card/Card'
export { InputBase } from './components/InputBase'
export { Switch } from './components/Switch/Switch'
export type { InputBaseProps } from './components/InputBase'
export { Heading } from './components/Heading/Heading'
export type { HeadingProps, PossibleHeadingVariant } from './components/Heading/Heading'
Expand Down
17 changes: 17 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8563,6 +8563,21 @@ __metadata:
languageName: node
linkType: hard

"@storybook/addon-actions@npm:8.3.1":
version: 8.3.1
resolution: "@storybook/addon-actions@npm:8.3.1"
dependencies:
"@storybook/global": "npm:^5.0.0"
"@types/uuid": "npm:^9.0.1"
dequal: "npm:^2.0.2"
polished: "npm:^4.2.2"
uuid: "npm:^9.0.0"
peerDependencies:
storybook: ^8.3.1
checksum: 10c0/f8b763e5133e9f01be41f351d69b5638b9f62be58ac51c100c753bd9b66d0d42242672fd062bcf5924b9186192b6e2c7f8dfd2dd5b36799d18dcc0a1ba52ef40
languageName: node
linkType: hard

"@storybook/addon-backgrounds@npm:8.2.9":
version: 8.2.9
resolution: "@storybook/addon-backgrounds@npm:8.2.9"
Expand Down Expand Up @@ -24336,8 +24351,10 @@ __metadata:
"@emotion/styled": "npm:11.13.0"
"@radix-ui/react-dialog": "npm:1.1.1"
"@radix-ui/react-slot": "npm:1.1.0"
"@radix-ui/react-switch": "npm:1.1.0"
"@radix-ui/react-tabs": "npm:1.1.0"
"@radix-ui/react-tooltip": "npm:1.1.2"
"@storybook/addon-actions": "npm:8.3.1"
"@storybook/react": "npm:8.2.9"
"@testing-library/dom": "npm:10.4.0"
"@testing-library/jest-dom": "npm:6.5.0"
Expand Down