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

feat(components, app): update Chip component for unification #14708

Merged
merged 15 commits into from
Mar 29, 2024
+613 −337
Merged

feat(components, app): update Chip component for unification #14708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
563ee5d
feat(components, app): update Chip component for unification
koji Mar 20, 2024
718be9f
fix import path issues in Chip component
koji Mar 20, 2024
81e1303
Merge branch 'edge' into feat_chip-component-unification
koji Mar 26, 2024
75446bc
fix import errors
koji Mar 26, 2024
20b66bd
fix import
koji Mar 26, 2024
687ad9b
feat(components,app): add chip component for desktop
koji Mar 26, 2024
13b24dd
Update index.tsx
koji Mar 27, 2024
4d1ab37
Merge branch 'edge' into feat_chip-component-unification
koji Mar 27, 2024
ecf9af7
Update CustomKeyboard.stories.tsx
koji Mar 28, 2024
35e5dbf
Merge branch 'edge' into feat_chip-component-unification
koji Mar 28, 2024
3a863a7
update test for Chip Desktop
koji Mar 28, 2024
fbbc214
fix build error
koji Mar 28, 2024
04d390e
address feedback
koji Mar 29, 2024
f3433a6
Update ProtocolRunRunTimeParameters.tsx
koji Mar 29, 2024
bff4aeb
fix lint-error
koji Mar 29, 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
224 changes: 0 additions & 224 deletions app/src/atoms/Chip/__tests__/Chip.test.tsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/atoms/InlineNotification/InlineNotification.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { touchScreenViewport } from '../../DesignTokens/constants'
import { VIEWPORT } from '@opentrons/components'
import { InlineNotification } from '.'
import type { Story, Meta } from '@storybook/react'

Expand All @@ -26,7 +26,7 @@ export default {
defaultValue: true,
},
},
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const Template: Story<
Expand Down
4 changes: 2 additions & 2 deletions app/src/atoms/ListItem/ListItem.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import {
DIRECTION_COLUMN,
Flex,
SPACING,
VIEWPORT,
StyledText,
} from '@opentrons/components'
import { touchScreenViewport } from '../../DesignTokens/constants'
import { ListItem } from '.'
import type { Story, Meta } from '@storybook/react'

Expand All @@ -19,7 +19,7 @@ export default {
},
},
},
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const ListItemTemplate: Story<React.ComponentProps<typeof ListItem>> = args => (
Expand Down
4 changes: 2 additions & 2 deletions app/src/atoms/Snackbar/Snackbar.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import {
PrimaryButton,
SPACING,
StyledText,
VIEWPORT,
} from '@opentrons/components'
import { touchScreenViewport } from '../../DesignTokens/constants'

import { Snackbar } from './index'
import type { Story, Meta } from '@storybook/react'

export default {
title: 'ODD/Atoms/Snackbar',
component: Snackbar,
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const DefaultTemplate: Story<React.ComponentProps<typeof Snackbar>> = args => {
Expand Down
4 changes: 2 additions & 2 deletions app/src/atoms/SoftwareKeyboard/CustomKeyboard/CustomKeyboard.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
DIRECTION_COLUMN,
POSITION_ABSOLUTE,
SPACING,
VIEWPORT,
} from '@opentrons/components'
import { touchScreenViewport } from '../../../DesignTokens/constants'
import { InputField } from '../../InputField'
import { CustomKeyboard } from './'
import '../index.css'
Expand All @@ -16,7 +16,7 @@ import type { Story, Meta } from '@storybook/react'
export default {
title: 'ODD/Atoms/SoftwareKeyboard/CustomKeyboard',
component: CustomKeyboard,
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const Template: Story<React.ComponentProps<typeof CustomKeyboard>> = args => {
Expand Down
6 changes: 3 additions & 3 deletions app/src/atoms/SoftwareKeyboard/NormalKeyboard/NormalKeyboard.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from 'react'
import {
Flex,
DIRECTION_COLUMN,
Flex,
POSITION_ABSOLUTE,
SPACING,
VIEWPORT,
} from '@opentrons/components'
import { touchScreenViewport } from '../../../DesignTokens/constants'
import { InputField } from '../../InputField'
import { NormalKeyboard } from '.'

Expand All @@ -17,7 +17,7 @@ import type { Story, Meta } from '@storybook/react'
export default {
title: 'ODD/Atoms/SoftwareKeyboard/NormalKeyboard',
component: NormalKeyboard,
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const Template: Story<React.ComponentProps<typeof NormalKeyboard>> = args => {
Expand Down
4 changes: 2 additions & 2 deletions app/src/atoms/SoftwareKeyboard/Numpad/Numpad.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
DIRECTION_COLUMN,
POSITION_ABSOLUTE,
SPACING,
VIEWPORT,
} from '@opentrons/components'
import { touchScreenViewport } from '../../../DesignTokens/constants'
import { InputField } from '../../InputField'
import { Numpad } from './'
import '../index.css'
Expand All @@ -16,7 +16,7 @@ import type { Story, Meta } from '@storybook/react'
export default {
title: 'ODD/Atoms/SoftwareKeyboard/Numpad',
component: Numpad,
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const Template: Story<React.ComponentProps<typeof Numpad>> = args => {
Expand Down
4 changes: 2 additions & 2 deletions app/src/atoms/Toast/ODDToast.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import {
PrimaryButton,
SPACING,
StyledText,
VIEWPORT,
} from '@opentrons/components'
import { touchScreenViewport } from '../../DesignTokens/constants'
import { Toast } from '.'
import type { Story, Meta } from '@storybook/react'

export default {
title: 'ODD/Atoms/Toast',
component: Toast,
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const Template: Story<React.ComponentProps<typeof Toast>> = args => {
Expand Down
5 changes: 2 additions & 3 deletions app/src/atoms/buttons/FloatingActionButton.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react'
import { ICON_DATA_BY_NAME } from '@opentrons/components'
import { touchScreenViewport } from '../../DesignTokens/constants'
import { ICON_DATA_BY_NAME, VIEWPORT } from '@opentrons/components'
import { FloatingActionButton } from './'

import type { Story, Meta } from '@storybook/react'
Expand All @@ -17,7 +16,7 @@ export default {
},
onClick: { action: 'clicked' },
},
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const FloatingActionButtonTemplate: Story<
Expand Down
4 changes: 2 additions & 2 deletions app/src/atoms/buttons/LargeButton.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as React from 'react'
import { touchScreenViewport } from '../../DesignTokens/constants'
import { VIEWPORT } from '@opentrons/components'
import { LargeButton } from './'
import type { Story, Meta } from '@storybook/react'

export default {
title: 'ODD/Atoms/Buttons/LargeButton',
argTypes: { onClick: { action: 'clicked' } },
parameters: touchScreenViewport,
parameters: VIEWPORT.touchScreenViewport,
} as Meta

const LargeButtonTemplate: Story<
Expand Down
Loading
Loading