diff --git a/app/src/App/DesktopAppFallback.tsx b/app/src/App/DesktopAppFallback.tsx index f1e1ce1e990..6b8a73cca1d 100644 --- a/app/src/App/DesktopAppFallback.tsx +++ b/app/src/App/DesktopAppFallback.tsx @@ -13,10 +13,10 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../atoms/text' import { LegacyModal } from '../molecules/LegacyModal' import { reloadUi } from '../redux/shell' diff --git a/app/src/App/Navbar.tsx b/app/src/App/Navbar.tsx index b3b36cf4678..8397927392f 100644 --- a/app/src/App/Navbar.tsx +++ b/app/src/App/Navbar.tsx @@ -16,6 +16,7 @@ import { Link, SIZE_2, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' @@ -23,7 +24,6 @@ import logoSvg from '../assets/images/logo_nav.svg' import logoSvgThree from '../assets/images/logo_nav_three.svg' import { NAV_BAR_WIDTH } from './constants' -import { StyledText } from '../atoms/text' import type { RouteProps } from './types' diff --git a/app/src/App/OnDeviceDisplayAppFallback.tsx b/app/src/App/OnDeviceDisplayAppFallback.tsx index 7f7a55208d6..6a345c1735e 100644 --- a/app/src/App/OnDeviceDisplayAppFallback.tsx +++ b/app/src/App/OnDeviceDisplayAppFallback.tsx @@ -9,14 +9,14 @@ import type { FallbackProps } from 'react-error-boundary' import { ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, Flex, JUSTIFY_CENTER, SPACING, - COLORS, + StyledText, } from '@opentrons/components' -import { StyledText } from '../atoms/text' import { MediumButton } from '../atoms/buttons' import { Modal } from '../molecules/Modal' import { appRestart, sendLog } from '../redux/shell' diff --git a/app/src/DesignTokens/BorderRadius/BorderRadius.stories.tsx b/app/src/DesignTokens/BorderRadius/BorderRadius.stories.tsx index ae72b4780b7..aa51e720834 100644 --- a/app/src/DesignTokens/BorderRadius/BorderRadius.stories.tsx +++ b/app/src/DesignTokens/BorderRadius/BorderRadius.stories.tsx @@ -7,13 +7,12 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import type { Story, Meta } from '@storybook/react' -import { StyledText } from '../../atoms/text' - export default { title: 'Design Tokens/BorderRadius', } as Meta diff --git a/app/src/DesignTokens/Colors/Colors.stories.tsx b/app/src/DesignTokens/Colors/Colors.stories.tsx index cb35bbea9ec..692a7c0887f 100644 --- a/app/src/DesignTokens/Colors/Colors.stories.tsx +++ b/app/src/DesignTokens/Colors/Colors.stories.tsx @@ -8,11 +8,10 @@ import { Flex, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - import type { Story, Meta } from '@storybook/react' export default { diff --git a/app/src/DesignTokens/Spacing/Spacing.stories.tsx b/app/src/DesignTokens/Spacing/Spacing.stories.tsx index 2a8c133eeff..88f055e39ea 100644 --- a/app/src/DesignTokens/Spacing/Spacing.stories.tsx +++ b/app/src/DesignTokens/Spacing/Spacing.stories.tsx @@ -1,18 +1,17 @@ import * as React from 'react' import { - Flex, + ALIGN_FLEX_START, + Box, COLORS, DIRECTION_COLUMN, + Flex, SPACING, + StyledText, TYPOGRAPHY, - Box, - ALIGN_FLEX_START, } from '@opentrons/components' import type { Story, Meta } from '@storybook/react' -import { StyledText } from '../../atoms/text' - export default { title: 'Design Tokens/Spacing', } as Meta diff --git a/app/src/atoms/Banner/Banner.stories.tsx b/app/src/atoms/Banner/Banner.stories.tsx index 3356b0edb98..deea5d236b4 100644 --- a/app/src/atoms/Banner/Banner.stories.tsx +++ b/app/src/atoms/Banner/Banner.stories.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { TYPOGRAPHY } from '@opentrons/components' -import { StyledText } from '../text' +import { StyledText, TYPOGRAPHY } from '@opentrons/components' import { Banner } from './index' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/Chip/index.tsx b/app/src/atoms/Chip/index.tsx index f00fade9758..cf291572c76 100644 --- a/app/src/atoms/Chip/index.tsx +++ b/app/src/atoms/Chip/index.tsx @@ -8,11 +8,10 @@ import { Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' - import type { IconName, StyleProps } from '@opentrons/components' export type ChipType = diff --git a/app/src/atoms/InlineNotification/index.tsx b/app/src/atoms/InlineNotification/index.tsx index 59bbbef4cb3..f491ced14ce 100644 --- a/app/src/atoms/InlineNotification/index.tsx +++ b/app/src/atoms/InlineNotification/index.tsx @@ -7,14 +7,13 @@ import { DIRECTION_ROW, Flex, Icon, - IconProps, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' -import type { StyleProps } from '@opentrons/components' +import type { IconProps, StyleProps } from '@opentrons/components' type InlineNotificationType = 'alert' | 'error' | 'neutral' | 'success' diff --git a/app/src/atoms/InputField/index.tsx b/app/src/atoms/InputField/index.tsx index a3f4d656133..c791414b77d 100644 --- a/app/src/atoms/InputField/index.tsx +++ b/app/src/atoms/InputField/index.tsx @@ -10,10 +10,10 @@ import { Flex, RESPONSIVENESS, SPACING, - TYPOGRAPHY, + StyledText, TEXT_ALIGN_RIGHT, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' export const INPUT_TYPE_NUMBER = 'number' as const export const INPUT_TYPE_TEXT = 'text' as const diff --git a/app/src/atoms/InstrumentContainer/index.tsx b/app/src/atoms/InstrumentContainer/index.tsx index 2536ea89647..075023a64e1 100644 --- a/app/src/atoms/InstrumentContainer/index.tsx +++ b/app/src/atoms/InstrumentContainer/index.tsx @@ -1,8 +1,12 @@ import * as React from 'react' -import { Flex, BORDERS, COLORS, SPACING } from '@opentrons/components' - -import { StyledText } from '../text' +import { + BORDERS, + COLORS, + Flex, + SPACING, + StyledText, +} from '@opentrons/components' interface InstrumentContainerProps { displayName: string diff --git a/app/src/atoms/Interstitial/InterstitiallTitleBar.tsx b/app/src/atoms/Interstitial/InterstitiallTitleBar.tsx index 38477ba6ed4..233fe67f8d1 100644 --- a/app/src/atoms/Interstitial/InterstitiallTitleBar.tsx +++ b/app/src/atoms/Interstitial/InterstitiallTitleBar.tsx @@ -2,17 +2,18 @@ import * as React from 'react' import { css } from 'styled-components' import { Btn, - ButtonProps, + COLORS, + DIRECTION_ROW, + Flex, Icon, + JUSTIFY_SPACE_BETWEEN, POSITION_ABSOLUTE, SPACING, + StyledText, TYPOGRAPHY, - Flex, - COLORS, - DIRECTION_ROW, - JUSTIFY_SPACE_BETWEEN, } from '@opentrons/components' -import { StyledText } from '../text' + +import type { ButtonProps } from '@opentrons/components' export interface InterstitialTitleBarProps { title: React.ReactNode diff --git a/app/src/atoms/ListItem/ListItem.stories.tsx b/app/src/atoms/ListItem/ListItem.stories.tsx index 28c6d1cca90..0380c5ddb13 100644 --- a/app/src/atoms/ListItem/ListItem.stories.tsx +++ b/app/src/atoms/ListItem/ListItem.stories.tsx @@ -1,7 +1,11 @@ import * as React from 'react' -import { DIRECTION_COLUMN, Flex, SPACING } from '@opentrons/components' +import { + DIRECTION_COLUMN, + Flex, + SPACING, + StyledText, +} from '@opentrons/components' import { touchScreenViewport } from '../../DesignTokens/constants' -import { StyledText } from '../text' import { ListItem } from '.' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/MenuList/DropdownMenu.tsx b/app/src/atoms/MenuList/DropdownMenu.tsx index cdd64634a13..7eafba80ecb 100644 --- a/app/src/atoms/MenuList/DropdownMenu.tsx +++ b/app/src/atoms/MenuList/DropdownMenu.tsx @@ -1,21 +1,21 @@ import * as React from 'react' import { css } from 'styled-components' import { - Flex, - SPACING, + ALIGN_CENTER, + BORDERS, COLORS, - TYPOGRAPHY, - POSITION_ABSOLUTE, DIRECTION_COLUMN, DIRECTION_ROW, - JUSTIFY_SPACE_BETWEEN, - ALIGN_CENTER, - BORDERS, + Flex, Icon, + JUSTIFY_SPACE_BETWEEN, + POSITION_ABSOLUTE, + SPACING, + StyledText, + TYPOGRAPHY, useOnClickOutside, POSITION_RELATIVE, } from '@opentrons/components' -import { StyledText } from '../text' import { MenuItem } from './MenuItem' export interface DropdownOption { diff --git a/app/src/atoms/ProgressBar/ProgressBar.stories.tsx b/app/src/atoms/ProgressBar/ProgressBar.stories.tsx index 8c3c0116ba0..c54b546f060 100644 --- a/app/src/atoms/ProgressBar/ProgressBar.stories.tsx +++ b/app/src/atoms/ProgressBar/ProgressBar.stories.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import { - Flex, - DIRECTION_COLUMN, - SPACING, COLORS, + DIRECTION_COLUMN, + Flex, SecondaryButton, + SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../text' import { ProgressBar } from './index' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/SelectField/index.tsx b/app/src/atoms/SelectField/index.tsx index c277432ec93..b0571cd4f02 100644 --- a/app/src/atoms/SelectField/index.tsx +++ b/app/src/atoms/SelectField/index.tsx @@ -5,11 +5,11 @@ import { COLORS, DIRECTION_COLUMN, Flex, - TYPOGRAPHY, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { css } from 'styled-components' -import { StyledText } from '../text' import type { SelectProps, SelectOption } from './Select' import type { ActionMeta, MultiValue, SingleValue } from 'react-select' diff --git a/app/src/atoms/Slideout/MultiSlideout.stories.tsx b/app/src/atoms/Slideout/MultiSlideout.stories.tsx index abe53b8f1bf..949a10c3374 100644 --- a/app/src/atoms/Slideout/MultiSlideout.stories.tsx +++ b/app/src/atoms/Slideout/MultiSlideout.stories.tsx @@ -1,7 +1,11 @@ import * as React from 'react' -import { TYPOGRAPHY, PrimaryBtn, COLORS } from '@opentrons/components' +import { + COLORS, + PrimaryBtn, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { MultiSlideout } from './MultiSlideout' -import { StyledText } from '../text' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/Slideout/Slideout.stories.tsx b/app/src/atoms/Slideout/Slideout.stories.tsx index 63cdf2adae4..3b2a9bfd9d4 100644 --- a/app/src/atoms/Slideout/Slideout.stories.tsx +++ b/app/src/atoms/Slideout/Slideout.stories.tsx @@ -1,7 +1,12 @@ import * as React from 'react' -import { TYPOGRAPHY, PrimaryBtn, COLORS, SPACING } from '@opentrons/components' +import { + COLORS, + PrimaryBtn, + SPACING, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { Slideout } from './index' -import { StyledText } from '../text' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/Slideout/index.tsx b/app/src/atoms/Slideout/index.tsx index a3940f73727..ccc4606fb69 100644 --- a/app/src/atoms/Slideout/index.tsx +++ b/app/src/atoms/Slideout/index.tsx @@ -1,5 +1,7 @@ import * as React from 'react' import { css } from 'styled-components' +import { useTranslation } from 'react-i18next' + import { ALIGN_CENTER, Box, @@ -14,12 +16,11 @@ import { Overlay, POSITION_FIXED, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Divider } from '../structure' -import { StyledText } from '../text' -import { useTranslation } from 'react-i18next' export interface MultiSlideoutSpecs { currentStep: number diff --git a/app/src/atoms/Snackbar/Snackbar.stories.tsx b/app/src/atoms/Snackbar/Snackbar.stories.tsx index f1bbb35048a..1d42d193d64 100644 --- a/app/src/atoms/Snackbar/Snackbar.stories.tsx +++ b/app/src/atoms/Snackbar/Snackbar.stories.tsx @@ -7,8 +7,8 @@ import { JUSTIFY_CENTER, PrimaryButton, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../text' import { touchScreenViewport } from '../../DesignTokens/constants' import { Snackbar } from './index' diff --git a/app/src/atoms/Snackbar/index.tsx b/app/src/atoms/Snackbar/index.tsx index c126c0a5e74..b616aabda5a 100644 --- a/app/src/atoms/Snackbar/index.tsx +++ b/app/src/atoms/Snackbar/index.tsx @@ -2,16 +2,15 @@ import * as React from 'react' import { css } from 'styled-components' import { - Flex, ALIGN_CENTER, BORDERS, COLORS, + Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' - import type { StyleProps } from '@opentrons/components' export interface SnackbarProps extends StyleProps { diff --git a/app/src/atoms/StatusLabel/index.tsx b/app/src/atoms/StatusLabel/index.tsx index 73f103080ee..3811827795e 100644 --- a/app/src/atoms/StatusLabel/index.tsx +++ b/app/src/atoms/StatusLabel/index.tsx @@ -2,16 +2,16 @@ import * as React from 'react' import capitalize from 'lodash/capitalize' import { - Flex, - Icon, ALIGN_CENTER, BORDERS, COLORS, + Flex, + Icon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' interface StatusLabelProps { status: string backgroundColor: string diff --git a/app/src/atoms/Toast/ODDToast.stories.tsx b/app/src/atoms/Toast/ODDToast.stories.tsx index 2f0e72fb0b7..e70500bc960 100644 --- a/app/src/atoms/Toast/ODDToast.stories.tsx +++ b/app/src/atoms/Toast/ODDToast.stories.tsx @@ -1,15 +1,15 @@ import * as React from 'react' import { - Flex, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, JUSTIFY_CENTER, POSITION_FIXED, PrimaryButton, SPACING, + StyledText, } from '@opentrons/components' import { touchScreenViewport } from '../../DesignTokens/constants' -import { StyledText } from '../text' import { Toast } from '.' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/Toast/Toast.stories.tsx b/app/src/atoms/Toast/Toast.stories.tsx index 6fcb2e604a0..a7e583387a4 100644 --- a/app/src/atoms/Toast/Toast.stories.tsx +++ b/app/src/atoms/Toast/Toast.stories.tsx @@ -1,12 +1,12 @@ import * as React from 'react' import { - Flex, DIRECTION_COLUMN, DIRECTION_ROW, - SPACING, + Flex, PrimaryButton, + SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../text' import { Toast } from './index' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/Toast/index.tsx b/app/src/atoms/Toast/index.tsx index d1512119a83..17cf83bad71 100644 --- a/app/src/atoms/Toast/index.tsx +++ b/app/src/atoms/Toast/index.tsx @@ -1,30 +1,29 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' -import { - DefaultTheme, - FlattenSimpleInterpolation, - ThemedCssFunction, - css, -} from 'styled-components' +import { css } from 'styled-components' import { - Btn, - Flex, - Icon, - Link, ALIGN_CENTER, BORDERS, + Btn, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + Icon, JUSTIFY_SPACE_BETWEEN, + Link, SPACING, + StyledText, truncateString, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' - +import type { + DefaultTheme, + FlattenSimpleInterpolation, + ThemedCssFunction, +} from 'styled-components' import type { IconName, IconProps, StyleProps } from '@opentrons/components' export const SUCCESS_TOAST: 'success' = 'success' diff --git a/app/src/atoms/buttons/FloatingActionButton.tsx b/app/src/atoms/buttons/FloatingActionButton.tsx index 413f1603c6b..18bc128a139 100644 --- a/app/src/atoms/buttons/FloatingActionButton.tsx +++ b/app/src/atoms/buttons/FloatingActionButton.tsx @@ -3,18 +3,18 @@ import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { - Btn, - Flex, - Icon, ALIGN_CENTER, BORDERS, + Btn, COLORS, DIRECTION_ROW, + Flex, + Icon, POSITION_FIXED, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' import type { IconName, StyleProps } from '@opentrons/components' diff --git a/app/src/atoms/buttons/LargeButton.tsx b/app/src/atoms/buttons/LargeButton.tsx index 902469da6b9..6bfcf857d84 100644 --- a/app/src/atoms/buttons/LargeButton.tsx +++ b/app/src/atoms/buttons/LargeButton.tsx @@ -1,17 +1,17 @@ import * as React from 'react' import { css } from 'styled-components' import { - TYPOGRAPHY, - COLORS, - SPACING, BORDERS, Btn, - Icon, + COLORS, DIRECTION_COLUMN, - JUSTIFY_SPACE_BETWEEN, DISPLAY_FLEX, + Icon, + JUSTIFY_SPACE_BETWEEN, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' import { ODD_FOCUS_VISIBLE } from './constants' import type { IconName, StyleProps } from '@opentrons/components' diff --git a/app/src/atoms/buttons/MediumButton.tsx b/app/src/atoms/buttons/MediumButton.tsx index ed9edc8dec2..0f478777f06 100644 --- a/app/src/atoms/buttons/MediumButton.tsx +++ b/app/src/atoms/buttons/MediumButton.tsx @@ -6,13 +6,13 @@ import { Btn, COLORS, DIRECTION_ROW, + DISPLAY_FLEX, Icon, + JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, - DISPLAY_FLEX, - JUSTIFY_CENTER, } from '@opentrons/components' -import { StyledText } from '../text' import { ODD_FOCUS_VISIBLE } from './constants' import type { IconName, StyleProps } from '@opentrons/components' diff --git a/app/src/atoms/buttons/RadioButton.tsx b/app/src/atoms/buttons/RadioButton.tsx index 07a66ee3953..07a5182244a 100644 --- a/app/src/atoms/buttons/RadioButton.tsx +++ b/app/src/atoms/buttons/RadioButton.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import styled, { css } from 'styled-components' import { - TYPOGRAPHY, - COLORS, - SPACING, BORDERS, + COLORS, Flex, RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' import type { StyleProps } from '@opentrons/components' diff --git a/app/src/atoms/buttons/SmallButton.tsx b/app/src/atoms/buttons/SmallButton.tsx index ee588d37ed0..0489f2b248f 100644 --- a/app/src/atoms/buttons/SmallButton.tsx +++ b/app/src/atoms/buttons/SmallButton.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { css } from 'styled-components' import { - TYPOGRAPHY, - COLORS, - SPACING, + ALIGN_CENTER, BORDERS, Btn, + COLORS, + DIRECTION_ROW, Flex, Icon, - DIRECTION_ROW, - ALIGN_CENTER, JUSTIFY_CENTER, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' import { ODD_FOCUS_VISIBLE } from './constants' import type { IconName, StyleProps } from '@opentrons/components' diff --git a/app/src/atoms/buttons/buttons.stories.tsx b/app/src/atoms/buttons/buttons.stories.tsx index a0321e31091..2932f7e9e82 100644 --- a/app/src/atoms/buttons/buttons.stories.tsx +++ b/app/src/atoms/buttons/buttons.stories.tsx @@ -1,11 +1,12 @@ import * as React from 'react' import { - Flex, - DIRECTION_ROW, DIRECTION_COLUMN, + DIRECTION_ROW, + Flex, + PrimaryButton, SPACING, + StyledText, useLongPress, - PrimaryButton, } from '@opentrons/components' import { TertiaryButton, @@ -13,7 +14,6 @@ import { SubmitPrimaryButton, ToggleButton, } from './index' -import { StyledText } from '../text' import type { Story, Meta } from '@storybook/react' export default { diff --git a/app/src/atoms/structure/Divider.stories.tsx b/app/src/atoms/structure/Divider.stories.tsx index 8aad1b33243..301e40debf9 100644 --- a/app/src/atoms/structure/Divider.stories.tsx +++ b/app/src/atoms/structure/Divider.stories.tsx @@ -5,9 +5,9 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' import { Divider } from './index' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/structure/Line.stories.tsx b/app/src/atoms/structure/Line.stories.tsx index a4b555c82bd..ed017ed95e1 100644 --- a/app/src/atoms/structure/Line.stories.tsx +++ b/app/src/atoms/structure/Line.stories.tsx @@ -5,9 +5,10 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../text' + import { Line } from './index' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/atoms/text/index.ts b/app/src/atoms/text/index.ts deleted file mode 100644 index a0909b7c0e2..00000000000 --- a/app/src/atoms/text/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './StyledText' diff --git a/app/src/molecules/BackgroundOverlay/BackgroundOverlay.stories.tsx b/app/src/molecules/BackgroundOverlay/BackgroundOverlay.stories.tsx index e0b8c9bee1c..38c9e62baf1 100644 --- a/app/src/molecules/BackgroundOverlay/BackgroundOverlay.stories.tsx +++ b/app/src/molecules/BackgroundOverlay/BackgroundOverlay.stories.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { Flex, PrimaryButton } from '@opentrons/components' +import { Flex, PrimaryButton, StyledText } from '@opentrons/components' import { touchScreenViewport } from '../../DesignTokens/constants' -import { StyledText } from '../../atoms/text' import { BackgroundOverlay } from './index' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/molecules/CardButton/index.tsx b/app/src/molecules/CardButton/index.tsx index 8a86d4de651..9d67595eb06 100644 --- a/app/src/molecules/CardButton/index.tsx +++ b/app/src/molecules/CardButton/index.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import { useHistory } from 'react-router-dom' import { css } from 'styled-components' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, - SPACING, + BORDERS, + Btn, COLORS, - TYPOGRAPHY, + DIRECTION_COLUMN, + Flex, Icon, - Btn, - BORDERS, JUSTIFY_CENTER, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ODD_FOCUS_VISIBLE } from '../../atoms/buttons/constants' import type { IconName } from '@opentrons/components' diff --git a/app/src/molecules/CollapsibleSection/index.tsx b/app/src/molecules/CollapsibleSection/index.tsx index 9210e81127d..c1417ebdc85 100644 --- a/app/src/molecules/CollapsibleSection/index.tsx +++ b/app/src/molecules/CollapsibleSection/index.tsx @@ -2,16 +2,16 @@ import * as React from 'react' import { css } from 'styled-components' import { + Btn, + COLORS, DIRECTION_COLUMN, Flex, - Btn, Icon, JUSTIFY_SPACE_BETWEEN, - StyleProps, - COLORS, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' +import type { StyleProps } from '@opentrons/components' const ACCORDION_STYLE = css` border-radius: 50%; diff --git a/app/src/molecules/GenericWizardTile/GenericWizardTile.stories.tsx b/app/src/molecules/GenericWizardTile/GenericWizardTile.stories.tsx index 15fe215347c..1cca001f585 100644 --- a/app/src/molecules/GenericWizardTile/GenericWizardTile.stories.tsx +++ b/app/src/molecules/GenericWizardTile/GenericWizardTile.stories.tsx @@ -4,10 +4,10 @@ import { createStore } from 'redux' import { DIRECTION_COLUMN, Flex, - SPACING, PrimaryButton, + SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Skeleton } from '../../atoms/Skeleton' import { LegacyModalShell } from '../LegacyModal' import { WizardHeader } from '../WizardHeader' diff --git a/app/src/molecules/GenericWizardTile/index.tsx b/app/src/molecules/GenericWizardTile/index.tsx index de4d904e948..f07a943a731 100644 --- a/app/src/molecules/GenericWizardTile/index.tsx +++ b/app/src/molecules/GenericWizardTile/index.tsx @@ -3,26 +3,26 @@ import { useSelector } from 'react-redux' import styled, { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { + ALIGN_CENTER, + ALIGN_FLEX_END, + Btn, + COLORS, DIRECTION_COLUMN, - Flex, - SPACING, - JUSTIFY_SPACE_BETWEEN, DIRECTION_ROW, - TYPOGRAPHY, - COLORS, - Btn, + DISPLAY_INLINE_BLOCK, + Flex, + JUSTIFY_CENTER, JUSTIFY_FLEX_END, + JUSTIFY_SPACE_BETWEEN, JUSTIFY_START, - JUSTIFY_CENTER, PrimaryButton, RESPONSIVENESS, - DISPLAY_INLINE_BLOCK, - ALIGN_CENTER, - ALIGN_FLEX_END, + SPACING, + StyledText, + TYPOGRAPHY, useHoverTooltip, } from '@opentrons/components' import { getIsOnDevice } from '../../redux/config' -import { StyledText } from '../../atoms/text' import { Tooltip } from '../../atoms/Tooltip' import { NeedHelpLink } from '../../organisms/CalibrationPanels' import { SmallButton } from '../../atoms/buttons' diff --git a/app/src/molecules/InProgressModal/InProgressModal.tsx b/app/src/molecules/InProgressModal/InProgressModal.tsx index 0cbc421f0bd..f5693edc50c 100644 --- a/app/src/molecules/InProgressModal/InProgressModal.tsx +++ b/app/src/molecules/InProgressModal/InProgressModal.tsx @@ -5,14 +5,14 @@ import { ALIGN_CENTER, COLORS, DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, Flex, Icon, - RESPONSIVENESS, JUSTIFY_CENTER, + RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { getIsOnDevice } from '../../redux/config' interface Props { @@ -46,7 +46,8 @@ const BODY_STYLE = css` @media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} { ${TYPOGRAPHY.level4HeaderRegular} color: ${COLORS.grey60} - ` + } +` const MODAL_STYLE = css` align-items: ${ALIGN_CENTER}; flex-direction: ${DIRECTION_COLUMN}; diff --git a/app/src/molecules/InfoMessage/index.tsx b/app/src/molecules/InfoMessage/index.tsx index 0d3c7174557..225cead216c 100644 --- a/app/src/molecules/InfoMessage/index.tsx +++ b/app/src/molecules/InfoMessage/index.tsx @@ -1,20 +1,19 @@ import * as React from 'react' import { - Flex, - Icon, ALIGN_CENTER, ALIGN_FLEX_START, BORDERS, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + Icon, SIZE_1, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - export interface InfoMessageProps { title: string body?: string diff --git a/app/src/molecules/InstrumentCard/index.tsx b/app/src/molecules/InstrumentCard/index.tsx index d0d4bef491a..6445033b283 100644 --- a/app/src/molecules/InstrumentCard/index.tsx +++ b/app/src/molecules/InstrumentCard/index.tsx @@ -1,24 +1,24 @@ import * as React from 'react' import { - Box, - Flex, - InstrumentDiagram, ALIGN_FLEX_START, BORDERS, + Box, COLORS, DIRECTION_COLUMN, + Flex, + InstrumentDiagram, JUSTIFY_CENTER, POSITION_ABSOLUTE, POSITION_RELATIVE, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import flexGripper from '../../assets/images/flex_gripper.png' import { useMenuHandleClickOutside } from '../../atoms/MenuList/hooks' import { OverflowBtn } from '../../atoms/MenuList/OverflowBtn' -import { StyledText } from '../../atoms/text' import { MenuOverlay } from './MenuOverlay' import type { InstrumentDiagramProps, StyleProps } from '@opentrons/components' diff --git a/app/src/molecules/JogControls/ControlContainer.tsx b/app/src/molecules/JogControls/ControlContainer.tsx index 05ba7e5e81a..090454f48bc 100644 --- a/app/src/molecules/JogControls/ControlContainer.tsx +++ b/app/src/molecules/JogControls/ControlContainer.tsx @@ -4,11 +4,11 @@ import { BORDERS, COLORS, DIRECTION_COLUMN, - JUSTIFY_CENTER, Flex, + JUSTIFY_CENTER, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import type { StyleProps } from '@opentrons/components' interface ControlContainerProps extends StyleProps { diff --git a/app/src/molecules/JogControls/DirectionControl.tsx b/app/src/molecules/JogControls/DirectionControl.tsx index 33674327462..54614276f7c 100644 --- a/app/src/molecules/JogControls/DirectionControl.tsx +++ b/app/src/molecules/JogControls/DirectionControl.tsx @@ -4,35 +4,35 @@ import { useTranslation } from 'react-i18next' import styled, { css } from 'styled-components' import { - Box, - Flex, - Icon, - HandleKeypress, ALIGN_CENTER, - JUSTIFY_CENTER, + ALIGN_FLEX_END, + ALIGN_FLEX_START, + ALIGN_STRETCH, BORDERS, + Box, COLORS, - SPACING, - TYPOGRAPHY, DIRECTION_COLUMN, - JUSTIFY_SPACE_BETWEEN, DIRECTION_ROW, - ALIGN_FLEX_START, - ALIGN_FLEX_END, - PrimaryButton, - TEXT_ALIGN_LEFT, + Flex, + HandleKeypress, + Icon, + JUSTIFY_CENTER, JUSTIFY_FLEX_START, - ALIGN_STRETCH, + JUSTIFY_SPACE_BETWEEN, + PrimaryButton, RESPONSIVENESS, + SPACING, + StyledText, + TEXT_ALIGN_LEFT, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ControlContainer } from './ControlContainer' import { HORIZONTAL_PLANE, VERTICAL_PLANE } from './constants' +import { TouchControlButton } from './TouchControlButton' import type { IconName } from '@opentrons/components' import type { CSSProperties } from 'styled-components' import type { Jog, Plane, Sign, Bearing, Axis, StepSize } from './types' -import { TouchControlButton } from './TouchControlButton' interface Control { bearing: Bearing diff --git a/app/src/molecules/JogControls/StepSizeControl.tsx b/app/src/molecules/JogControls/StepSizeControl.tsx index d53ae5de06d..b28582c9d32 100644 --- a/app/src/molecules/JogControls/StepSizeControl.tsx +++ b/app/src/molecules/JogControls/StepSizeControl.tsx @@ -2,26 +2,26 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import styled, { css } from 'styled-components' import { - HandleKeypress, - TYPOGRAPHY, + ALIGN_FLEX_START, + BORDERS, + Box, COLORS, - SPACING, - Icon, DIRECTION_COLUMN, - Flex, DIRECTION_ROW, - TEXT_TRANSFORM_CAPITALIZE, - Box, + Flex, + HandleKeypress, + Icon, PrimaryButton, - BORDERS, - ALIGN_FLEX_START, + SPACING, + StyledText, + TEXT_TRANSFORM_CAPITALIZE, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ControlContainer } from './ControlContainer' +import { TouchControlButton } from './TouchControlButton' import type { StepSize } from './types' -import { TouchControlButton } from './TouchControlButton' const JUMP_SIZE_SUBTITLE = '- / +' const JUMP_SIZE_ICON_STYLE = css` diff --git a/app/src/molecules/LegacyModal/LegacyModal.stories.tsx b/app/src/molecules/LegacyModal/LegacyModal.stories.tsx index 8f63710c94b..9f88b571ea9 100644 --- a/app/src/molecules/LegacyModal/LegacyModal.stories.tsx +++ b/app/src/molecules/LegacyModal/LegacyModal.stories.tsx @@ -1,10 +1,14 @@ import * as React from 'react' - +import { + COLORS, + PrimaryBtn, + SPACING, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { LegacyModal } from './index' -import { StyledText } from '../../atoms/text' import type { Story, Meta } from '@storybook/react' -import { COLORS, PrimaryBtn, SPACING, TYPOGRAPHY } from '@opentrons/components' export default { title: 'App/Molecules/LegacyModal', diff --git a/app/src/molecules/LegacyModal/LegacyModalHeader.tsx b/app/src/molecules/LegacyModal/LegacyModalHeader.tsx index 7269d33ed6e..9deb9178739 100644 --- a/app/src/molecules/LegacyModal/LegacyModalHeader.tsx +++ b/app/src/molecules/LegacyModal/LegacyModalHeader.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { css } from 'styled-components' import { + ALIGN_CENTER, Btn, - Icon, - TYPOGRAPHY, + COLORS, Flex, - ALIGN_CENTER, + Icon, + JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, SPACING, - JUSTIFY_CENTER, - COLORS, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Divider } from '../../atoms/structure' import type { IconProps } from '@opentrons/components' diff --git a/app/src/molecules/MiniCard/MiniCard.stories.tsx b/app/src/molecules/MiniCard/MiniCard.stories.tsx index e75c6ed097b..f85f6d64867 100644 --- a/app/src/molecules/MiniCard/MiniCard.stories.tsx +++ b/app/src/molecules/MiniCard/MiniCard.stories.tsx @@ -1,17 +1,17 @@ import * as React from 'react' import { - SPACING, + ALIGN_CENTER, Box, COLORS, - TYPOGRAPHY, - Flex, - ALIGN_CENTER, DIRECTION_COLUMN, + Flex, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import OT2_PNG from '../../assets/images/OT2-R_HERO.png' import { MiniCard } from './' import { Slideout } from '../../atoms/Slideout' -import { StyledText } from '../../atoms/text' import type { Story, Meta } from '@storybook/react' diff --git a/app/src/molecules/Modal/ModalHeader.tsx b/app/src/molecules/Modal/ModalHeader.tsx index 7d73adc3468..7bd33a186bf 100644 --- a/app/src/molecules/Modal/ModalHeader.tsx +++ b/app/src/molecules/Modal/ModalHeader.tsx @@ -8,9 +8,9 @@ import { Icon, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import type { ModalHeaderBaseProps } from '../Modal/types' export function ModalHeader(props: ModalHeaderBaseProps): JSX.Element { diff --git a/app/src/molecules/Modal/SmallModalChildren.tsx b/app/src/molecules/Modal/SmallModalChildren.tsx index 30b34e5c5bd..08f2cf2f63f 100644 --- a/app/src/molecules/Modal/SmallModalChildren.tsx +++ b/app/src/molecules/Modal/SmallModalChildren.tsx @@ -4,10 +4,10 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '.' diff --git a/app/src/molecules/ModuleIcon/ModuleIcon.stories.tsx b/app/src/molecules/ModuleIcon/ModuleIcon.stories.tsx index 44ee14810da..ecac2e087fa 100644 --- a/app/src/molecules/ModuleIcon/ModuleIcon.stories.tsx +++ b/app/src/molecules/ModuleIcon/ModuleIcon.stories.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import { + DIRECTION_COLUMN, + DIRECTION_ROW, Flex, SPACING, - DIRECTION_ROW, - DIRECTION_COLUMN, + StyledText, } from '@opentrons/components' import { ModuleIcon } from './index' -import { StyledText } from '../../atoms/text' import type { Story, Meta } from '@storybook/react' import type { AttachedModule } from '../../redux/modules/types' diff --git a/app/src/molecules/ODDBackButton/index.tsx b/app/src/molecules/ODDBackButton/index.tsx index f3c81ea9232..ca4cb21cc1c 100644 --- a/app/src/molecules/ODDBackButton/index.tsx +++ b/app/src/molecules/ODDBackButton/index.tsx @@ -1,17 +1,16 @@ import * as React from 'react' import { + ALIGN_CENTER, Btn, + COLORS, Flex, Icon, - ALIGN_CENTER, - COLORS, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - export function ODDBackButton( props: React.HTMLProps ): JSX.Element { diff --git a/app/src/molecules/OffsetVector/index.tsx b/app/src/molecules/OffsetVector/index.tsx index d6d348d22c4..8c15b5fb2f9 100644 --- a/app/src/molecules/OffsetVector/index.tsx +++ b/app/src/molecules/OffsetVector/index.tsx @@ -1,6 +1,5 @@ import * as React from 'react' -import { Flex, SPACING, TYPOGRAPHY } from '@opentrons/components' -import { StyledText } from '../../atoms/text' +import { Flex, SPACING, TYPOGRAPHY, StyledText } from '@opentrons/components' import type { StyleProps } from '@opentrons/components' diff --git a/app/src/molecules/ReleaseNotes/index.tsx b/app/src/molecules/ReleaseNotes/index.tsx index d4d049cf73f..57eb22b04c6 100644 --- a/app/src/molecules/ReleaseNotes/index.tsx +++ b/app/src/molecules/ReleaseNotes/index.tsx @@ -1,8 +1,8 @@ import * as React from 'react' import remark from 'remark' import reactRenderer from 'remark-react' +import { StyledText } from '@opentrons/components' import styles from './styles.module.css' -import { StyledText } from '../../atoms/text' export interface ReleaseNotesProps { source?: string | null } diff --git a/app/src/molecules/SimpleWizardBody/index.tsx b/app/src/molecules/SimpleWizardBody/index.tsx index 38cfc5cce1b..db901acb6b5 100644 --- a/app/src/molecules/SimpleWizardBody/index.tsx +++ b/app/src/molecules/SimpleWizardBody/index.tsx @@ -2,27 +2,27 @@ import * as React from 'react' import { useSelector } from 'react-redux' import { css } from 'styled-components' import { + ALIGN_CENTER, DIRECTION_COLUMN, Flex, Icon, - JUSTIFY_FLEX_END, JUSTIFY_CENTER, - SPACING, - TYPOGRAPHY, - RESPONSIVENESS, - ALIGN_CENTER, - StyleProps, + JUSTIFY_FLEX_END, + JUSTIFY_FLEX_START, JUSTIFY_SPACE_BETWEEN, POSITION_ABSOLUTE, - JUSTIFY_FLEX_START, + RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { FLEX_ROBOT_TYPE } from '@opentrons/shared-data' import SuccessIcon from '../../assets/images/icon_success.png' import { getIsOnDevice } from '../../redux/config' -import { StyledText } from '../../atoms/text' + import { Skeleton } from '../../atoms/Skeleton' import type { RobotType } from '@opentrons/shared-data' - +import type { StyleProps } from '@opentrons/components' interface Props extends StyleProps { iconColor: string header: string diff --git a/app/src/molecules/UnorderedList/index.tsx b/app/src/molecules/UnorderedList/index.tsx index 5cb04009a94..352cf05d3c1 100644 --- a/app/src/molecules/UnorderedList/index.tsx +++ b/app/src/molecules/UnorderedList/index.tsx @@ -1,7 +1,6 @@ import * as React from 'react' import { css } from 'styled-components' -import { SPACING } from '@opentrons/components' -import { StyledText } from '../../atoms/text' +import { SPACING, StyledText } from '@opentrons/components' interface UnorderedListProps { items: React.ReactNode[] diff --git a/app/src/molecules/UploadInput/index.tsx b/app/src/molecules/UploadInput/index.tsx index 68be10dc49c..ea98b4735f3 100644 --- a/app/src/molecules/UploadInput/index.tsx +++ b/app/src/molecules/UploadInput/index.tsx @@ -2,19 +2,19 @@ import * as React from 'react' import styled, { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { - Icon, - Flex, - SPACING, + ALIGN_CENTER, BORDERS, COLORS, - SIZE_3, DIRECTION_COLUMN, - ALIGN_CENTER, + Flex, + Icon, JUSTIFY_CENTER, - TYPOGRAPHY, PrimaryButton, + SIZE_3, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' const StyledLabel = styled.label` display: flex; diff --git a/app/src/molecules/WizardHeader/index.tsx b/app/src/molecules/WizardHeader/index.tsx index 867a1d2eda6..178bb5575ef 100644 --- a/app/src/molecules/WizardHeader/index.tsx +++ b/app/src/molecules/WizardHeader/index.tsx @@ -2,19 +2,19 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { + ALIGN_CENTER, + BORDERS, Box, Btn, + COLORS, DIRECTION_ROW, Flex, JUSTIFY_SPACE_BETWEEN, - TYPOGRAPHY, - COLORS, - SPACING, RESPONSIVENESS, - BORDERS, - ALIGN_CENTER, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { StepMeter } from '../../atoms/StepMeter' interface WizardHeaderProps { @@ -46,8 +46,8 @@ const EXIT_BUTTON_STYLE = css` } ` const BOX_STYLE = css` - background-color: ${COLORS.white} @media - ${RESPONSIVENESS.touchscreenMediaQuerySpecs} { + background-color: ${COLORS.white}; + @media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} { border-radius: ${BORDERS.borderRadius16}; } ` diff --git a/app/src/molecules/WizardRequiredEquipmentList/index.tsx b/app/src/molecules/WizardRequiredEquipmentList/index.tsx index fbf775b7c45..7aaa27e7035 100644 --- a/app/src/molecules/WizardRequiredEquipmentList/index.tsx +++ b/app/src/molecules/WizardRequiredEquipmentList/index.tsx @@ -14,11 +14,11 @@ import { JUSTIFY_SPACE_BETWEEN, OVERFLOW_WRAP_ANYWHERE, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { getIsOnDevice } from '../../redux/config' -import { StyledText } from '../../atoms/text' import { Divider } from '../../atoms/structure' import { labwareImages } from '../../organisms/CalibrationPanels/labwareImages' import { equipmentImages } from './equipmentImages' diff --git a/app/src/organisms/AddCustomLabwareSlideout/index.tsx b/app/src/organisms/AddCustomLabwareSlideout/index.tsx index 43778af840b..45cd71350b1 100644 --- a/app/src/organisms/AddCustomLabwareSlideout/index.tsx +++ b/app/src/organisms/AddCustomLabwareSlideout/index.tsx @@ -2,19 +2,19 @@ import * as React from 'react' import { useDispatch } from 'react-redux' import { useTranslation, Trans } from 'react-i18next' import { + ALIGN_CENTER, + COLORS, + DIRECTION_COLUMN, Flex, Link, - COLORS, SPACING, - DIRECTION_COLUMN, - ALIGN_CENTER, + StyledText, } from '@opentrons/components' import { addCustomLabwareFile, addCustomLabware, } from '../../redux/custom-labware' import { Slideout } from '../../atoms/Slideout' -import { StyledText } from '../../atoms/text' import { useTrackEvent, ANALYTICS_ADD_CUSTOM_LABWARE, diff --git a/app/src/organisms/AdvancedSettings/AdditionalCustomLabwareSourceFolder.tsx b/app/src/organisms/AdvancedSettings/AdditionalCustomLabwareSourceFolder.tsx index 332ded51a99..c04f9674d7e 100644 --- a/app/src/organisms/AdvancedSettings/AdditionalCustomLabwareSourceFolder.tsx +++ b/app/src/organisms/AdvancedSettings/AdditionalCustomLabwareSourceFolder.tsx @@ -12,10 +12,10 @@ import { Link, SPACING_AUTO, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { TertiaryButton } from '../../atoms/buttons' import { changeCustomLabwareDirectory, diff --git a/app/src/organisms/AdvancedSettings/ClearUnavailableRobots.tsx b/app/src/organisms/AdvancedSettings/ClearUnavailableRobots.tsx index 98ebe695c77..58872a6c497 100644 --- a/app/src/organisms/AdvancedSettings/ClearUnavailableRobots.tsx +++ b/app/src/organisms/AdvancedSettings/ClearUnavailableRobots.tsx @@ -15,11 +15,11 @@ import { JUSTIFY_SPACE_BETWEEN, SPACING_AUTO, SPACING, + StyledText, TYPOGRAPHY, useConditionalConfirm, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { TertiaryButton } from '../../atoms/buttons' import { ERROR_TOAST, SUCCESS_TOAST } from '../../atoms/Toast' import { useToaster } from '../../organisms/ToasterOven' diff --git a/app/src/organisms/AdvancedSettings/EnableDevTools.tsx b/app/src/organisms/AdvancedSettings/EnableDevTools.tsx index 7e395a5a789..e7c7534f7e2 100644 --- a/app/src/organisms/AdvancedSettings/EnableDevTools.tsx +++ b/app/src/organisms/AdvancedSettings/EnableDevTools.tsx @@ -8,10 +8,10 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ToggleButton } from '../../atoms/buttons' import { getDevtoolsEnabled, toggleDevtools } from '../../redux/config' diff --git a/app/src/organisms/AdvancedSettings/OT2AdvancedSettings.tsx b/app/src/organisms/AdvancedSettings/OT2AdvancedSettings.tsx index 633d4cd1035..0a5b9abc4f1 100644 --- a/app/src/organisms/AdvancedSettings/OT2AdvancedSettings.tsx +++ b/app/src/organisms/AdvancedSettings/OT2AdvancedSettings.tsx @@ -4,13 +4,13 @@ import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { + DIRECTION_COLUMN, Flex, - TYPOGRAPHY, - SPACING, RadioGroup, - DIRECTION_COLUMN, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { resetUseTrashSurfaceForTipCal, setUseTrashSurfaceForTipCal, diff --git a/app/src/organisms/AdvancedSettings/OverridePathToPython.tsx b/app/src/organisms/AdvancedSettings/OverridePathToPython.tsx index 31657b5ed62..0ca2d39579f 100644 --- a/app/src/organisms/AdvancedSettings/OverridePathToPython.tsx +++ b/app/src/organisms/AdvancedSettings/OverridePathToPython.tsx @@ -12,10 +12,10 @@ import { Link, SPACING_AUTO, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { TertiaryButton } from '../../atoms/buttons' import { getPathToPythonOverride, resetConfigValue } from '../../redux/config' import { diff --git a/app/src/organisms/AdvancedSettings/PreventRobotCaching.tsx b/app/src/organisms/AdvancedSettings/PreventRobotCaching.tsx index 244d2f6b893..e715985d751 100644 --- a/app/src/organisms/AdvancedSettings/PreventRobotCaching.tsx +++ b/app/src/organisms/AdvancedSettings/PreventRobotCaching.tsx @@ -8,10 +8,10 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ToggleButton } from '../../atoms/buttons' import { getConfig, toggleConfigValue } from '../../redux/config' diff --git a/app/src/organisms/AdvancedSettings/ShowHeaterShakerAttachmentModal.tsx b/app/src/organisms/AdvancedSettings/ShowHeaterShakerAttachmentModal.tsx index d4c139ebf83..f208d761afe 100644 --- a/app/src/organisms/AdvancedSettings/ShowHeaterShakerAttachmentModal.tsx +++ b/app/src/organisms/AdvancedSettings/ShowHeaterShakerAttachmentModal.tsx @@ -13,10 +13,10 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ToggleButton } from '../../atoms/buttons' import type { Dispatch } from '../../redux/types' diff --git a/app/src/organisms/AdvancedSettings/ShowLabwareOffsetSnippets.tsx b/app/src/organisms/AdvancedSettings/ShowLabwareOffsetSnippets.tsx index 7223ca39e31..6938a96f8b7 100644 --- a/app/src/organisms/AdvancedSettings/ShowLabwareOffsetSnippets.tsx +++ b/app/src/organisms/AdvancedSettings/ShowLabwareOffsetSnippets.tsx @@ -3,21 +3,22 @@ import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { - Flex, - Box, ALIGN_CENTER, + Box, + Flex, JUSTIFY_SPACE_BETWEEN, - TYPOGRAPHY, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ToggleButton } from '../../atoms/buttons' import { getIsLabwareOffsetCodeSnippetsOn, updateConfigValue, } from '../../redux/config' -import { Dispatch } from '../../redux/types' + +import type { Dispatch } from '../../redux/types' export function ShowLabwareOffsetSnippets(): JSX.Element { const { t } = useTranslation(['app_settings', 'shared']) diff --git a/app/src/organisms/AdvancedSettings/U2EInformation.tsx b/app/src/organisms/AdvancedSettings/U2EInformation.tsx index dde5019ff3e..a0214227339 100644 --- a/app/src/organisms/AdvancedSettings/U2EInformation.tsx +++ b/app/src/organisms/AdvancedSettings/U2EInformation.tsx @@ -11,11 +11,11 @@ import { JUSTIFY_SPACE_BETWEEN, Link, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Banner } from '../../atoms/Banner' -import { StyledText } from '../../atoms/text' import { getU2EAdapterDevice, getU2EWindowsDriverStatus, diff --git a/app/src/organisms/AdvancedSettings/UpdatedChannel.tsx b/app/src/organisms/AdvancedSettings/UpdatedChannel.tsx index 91742a6cff1..7ddefb3e9a4 100644 --- a/app/src/organisms/AdvancedSettings/UpdatedChannel.tsx +++ b/app/src/organisms/AdvancedSettings/UpdatedChannel.tsx @@ -3,15 +3,15 @@ import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' import { - Flex, ALIGN_CENTER, - JUSTIFY_SPACE_BETWEEN, DIRECTION_COLUMN, - TYPOGRAPHY, + Flex, + JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SelectField } from '../../atoms/SelectField' import { getUpdateChannel, diff --git a/app/src/organisms/AppSettings/ConnectRobotSlideout.tsx b/app/src/organisms/AppSettings/ConnectRobotSlideout.tsx index 671150cba2c..eaef9184985 100644 --- a/app/src/organisms/AppSettings/ConnectRobotSlideout.tsx +++ b/app/src/organisms/AppSettings/ConnectRobotSlideout.tsx @@ -3,16 +3,17 @@ import { useSelector, useDispatch } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_FLEX_END, + COLORS, DIRECTION_COLUMN, DIRECTION_ROW, - SPACING, - TYPOGRAPHY, - COLORS, + Flex, Icon, Link, PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { ManualIpHostnameForm } from './ManualIpHostnameForm' @@ -20,7 +21,6 @@ import { ManualIpHostnameList } from './ManualIpHostnameList' import { Slideout } from '../../atoms/Slideout' import { ExternalLink } from '../../atoms/Link/ExternalLink' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { getScanning, startDiscovery } from '../../redux/discovery' import type { Dispatch, State } from '../../redux/types' diff --git a/app/src/organisms/AppSettings/FeatureFlags.tsx b/app/src/organisms/AppSettings/FeatureFlags.tsx index 5affe71fd84..1b82a54563f 100644 --- a/app/src/organisms/AppSettings/FeatureFlags.tsx +++ b/app/src/organisms/AppSettings/FeatureFlags.tsx @@ -2,15 +2,15 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { - Flex, ALIGN_CENTER, DIRECTION_COLUMN, + Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { ToggleButton } from '../../atoms/buttons' import * as Config from '../../redux/config' diff --git a/app/src/organisms/AppSettings/ManualIpHostnameForm.tsx b/app/src/organisms/AppSettings/ManualIpHostnameForm.tsx index 3377ff3a8a5..4808c440846 100644 --- a/app/src/organisms/AppSettings/ManualIpHostnameForm.tsx +++ b/app/src/organisms/AppSettings/ManualIpHostnameForm.tsx @@ -5,17 +5,17 @@ import { useForm } from 'react-hook-form' import styled from 'styled-components' import { - Flex, - DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, + BORDERS, COLORS, + DIRECTION_COLUMN, + Flex, SIZE_2, - BORDERS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { TertiaryButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { addManualIp } from '../../redux/config' import { startDiscovery } from '../../redux/discovery' diff --git a/app/src/organisms/AppSettings/ManualIpHostnameItem.tsx b/app/src/organisms/AppSettings/ManualIpHostnameItem.tsx index f5e8f00b77f..2fa3bd47aab 100644 --- a/app/src/organisms/AppSettings/ManualIpHostnameItem.tsx +++ b/app/src/organisms/AppSettings/ManualIpHostnameItem.tsx @@ -4,17 +4,17 @@ import styled, { css } from 'styled-components' import { Btn, - Icon, COLORS, - TYPOGRAPHY, Flex, - JUSTIFY_FLEX_START, + Icon, JUSTIFY_CENTER, + JUSTIFY_FLEX_START, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' const IpItem = styled.div` flex: 1 1 auto; diff --git a/app/src/organisms/AppSettings/PreviousVersionModal.tsx b/app/src/organisms/AppSettings/PreviousVersionModal.tsx index bc53de825af..1f9e2266d5c 100644 --- a/app/src/organisms/AppSettings/PreviousVersionModal.tsx +++ b/app/src/organisms/AppSettings/PreviousVersionModal.tsx @@ -4,13 +4,13 @@ import { Box, Flex, JUSTIFY_FLEX_END, - SPACING, PrimaryButton, + SPACING, + StyledText, } from '@opentrons/components' import { LegacyModal } from '../../molecules/LegacyModal' import { ExternalLink } from '../../atoms/Link/ExternalLink' -import { StyledText } from '../../atoms/text' export const UNINSTALL_APP_URL = 'https://support.opentrons.com/s/article/Uninstall-the-Opentrons-App' diff --git a/app/src/organisms/ApplyHistoricOffsets/index.tsx b/app/src/organisms/ApplyHistoricOffsets/index.tsx index d65a8fc9194..d2367927e34 100644 --- a/app/src/organisms/ApplyHistoricOffsets/index.tsx +++ b/app/src/organisms/ApplyHistoricOffsets/index.tsx @@ -4,25 +4,26 @@ import { useSelector } from 'react-redux' import pick from 'lodash/pick' import { Trans, useTranslation } from 'react-i18next' import { + ALIGN_CENTER, + CheckboxField, + DIRECTION_COLUMN, Flex, - Link, Icon, - DIRECTION_COLUMN, + JUSTIFY_SPACE_BETWEEN, + Link, + SIZE_1, SPACING, + StyledText, TYPOGRAPHY, - SIZE_1, - ALIGN_CENTER, - JUSTIFY_SPACE_BETWEEN, - CheckboxField, } from '@opentrons/components' import { getTopPortalEl } from '../../App/portal' +import { ExternalLink } from '../../atoms/Link/ExternalLink' import { LegacyModalHeader, LegacyModalShell, } from '../../molecules/LegacyModal' import { PythonLabwareOffsetSnippet } from '../../molecules/PythonLabwareOffsetSnippet' import { LabwareOffsetTabs } from '../LabwareOffsetTabs' -import { StyledText } from '../../atoms/text' import { getLabwareDefinitionsFromCommands } from '../LabwarePositionCheck/utils/labware' import { LabwareOffsetTable } from './LabwareOffsetTable' import { getIsLabwareOffsetCodeSnippetsOn } from '../../redux/config' @@ -32,7 +33,6 @@ import type { LoadedModule, RunTimeCommand, } from '@opentrons/shared-data' -import { ExternalLink } from '../../atoms/Link/ExternalLink' const HOW_OFFSETS_WORK_SUPPORT_URL = 'https://support.opentrons.com/s/article/How-Labware-Offsets-work-on-the-OT-2' diff --git a/app/src/organisms/CalibrateTipLength/AskForCalibrationBlockModal.tsx b/app/src/organisms/CalibrateTipLength/AskForCalibrationBlockModal.tsx index e011e41e88b..41a21ff0cba 100644 --- a/app/src/organisms/CalibrateTipLength/AskForCalibrationBlockModal.tsx +++ b/app/src/organisms/CalibrateTipLength/AskForCalibrationBlockModal.tsx @@ -2,17 +2,18 @@ import * as React from 'react' import { createPortal } from 'react-dom' import { Trans, useTranslation } from 'react-i18next' import { - Flex, - Link, - SPACING, ALIGN_CENTER, + CheckboxField, DIRECTION_COLUMN, + Flex, JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, - TYPOGRAPHY, + Link, PrimaryButton, SecondaryButton, - CheckboxField, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { useDispatch } from 'react-redux' @@ -22,7 +23,6 @@ import { LegacyModalShell } from '../../molecules/LegacyModal' import { WizardHeader } from '../../molecules/WizardHeader' import { getTopPortalEl } from '../../App/portal' import { setUseTrashSurfaceForTipCal } from '../../redux/calibration' -import { StyledText } from '../../atoms/text' import type { Dispatch } from '../../redux/types' diff --git a/app/src/organisms/CalibrationPanels/ChooseTipRack.tsx b/app/src/organisms/CalibrationPanels/ChooseTipRack.tsx index ccc0751d41e..fed5ab02911 100644 --- a/app/src/organisms/CalibrationPanels/ChooseTipRack.tsx +++ b/app/src/organisms/CalibrationPanels/ChooseTipRack.tsx @@ -4,16 +4,17 @@ import { Trans, useTranslation } from 'react-i18next' import head from 'lodash/head' import isEqual from 'lodash/isEqual' import { - DIRECTION_COLUMN, - Flex, - JUSTIFY_SPACE_BETWEEN, ALIGN_CENTER, - SPACING, - TYPOGRAPHY, Box, COLORS, + DIRECTION_COLUMN, + Flex, + JUSTIFY_SPACE_BETWEEN, Link, PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { usePipettesQuery } from '@opentrons/react-api-client' import { getLabwareDefURI } from '@opentrons/shared-data' @@ -26,7 +27,6 @@ import { import { Select } from '../../atoms/SelectField/Select' import { Banner } from '../../atoms/Banner' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { NeedHelpLink } from './NeedHelpLink' import { ChosenTipRackRender } from './ChosenTipRackRender' diff --git a/app/src/organisms/CalibrationPanels/ChosenTipRackRender.tsx b/app/src/organisms/CalibrationPanels/ChosenTipRackRender.tsx index 263c9f94f90..a1e2a017c1a 100644 --- a/app/src/organisms/CalibrationPanels/ChosenTipRackRender.tsx +++ b/app/src/organisms/CalibrationPanels/ChosenTipRackRender.tsx @@ -1,13 +1,13 @@ import * as React from 'react' import { css } from 'styled-components' import { - Box, - Flex, ALIGN_CENTER, + Box, DIRECTION_ROW, + Flex, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { labwareImages } from './labwareImages' import type { SelectOption } from '@opentrons/components' diff --git a/app/src/organisms/CalibrationPanels/CompleteConfirmation.tsx b/app/src/organisms/CalibrationPanels/CompleteConfirmation.tsx index 6a8c6531ed0..903431f616d 100644 --- a/app/src/organisms/CalibrationPanels/CompleteConfirmation.tsx +++ b/app/src/organisms/CalibrationPanels/CompleteConfirmation.tsx @@ -1,22 +1,21 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - Icon, ALIGN_CENTER, - JUSTIFY_FLEX_END, + ALIGN_STRETCH, + COLORS, DIRECTION_COLUMN, - SPACING, - SIZE_3, + Flex, + Icon, JUSTIFY_CENTER, - COLORS, - ALIGN_STRETCH, + JUSTIFY_FLEX_END, PrimaryButton, + SIZE_3, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - interface CompleteConfirmationProps { proceed: React.MouseEventHandler flowName?: string diff --git a/app/src/organisms/CalibrationPanels/ConfirmCrashRecovery.tsx b/app/src/organisms/CalibrationPanels/ConfirmCrashRecovery.tsx index 542f44e9e51..a908b4147b0 100644 --- a/app/src/organisms/CalibrationPanels/ConfirmCrashRecovery.tsx +++ b/app/src/organisms/CalibrationPanels/ConfirmCrashRecovery.tsx @@ -2,17 +2,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { + AlertPrimaryButton, + ALIGN_CENTER, + DIRECTION_COLUMN, Flex, + JUSTIFY_FLEX_END, + JUSTIFY_SPACE_BETWEEN, Link, SPACING, - DIRECTION_COLUMN, - JUSTIFY_SPACE_BETWEEN, - JUSTIFY_FLEX_END, - AlertPrimaryButton, + StyledText, TYPOGRAPHY, - ALIGN_CENTER, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' export interface ConfirmCrashRecoveryProps { back: () => unknown diff --git a/app/src/organisms/CalibrationPanels/ConfirmExit.tsx b/app/src/organisms/CalibrationPanels/ConfirmExit.tsx index 700cb8b826a..4b5332d9a3b 100644 --- a/app/src/organisms/CalibrationPanels/ConfirmExit.tsx +++ b/app/src/organisms/CalibrationPanels/ConfirmExit.tsx @@ -1,19 +1,19 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Icon, - Flex, - SPACING, - JUSTIFY_CENTER, + AlertPrimaryButton, ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, + Flex, + Icon, + JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, - TYPOGRAPHY, - COLORS, - AlertPrimaryButton, SecondaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { NeedHelpLink } from './NeedHelpLink' diff --git a/app/src/organisms/CalibrationPanels/DeckSetup.tsx b/app/src/organisms/CalibrationPanels/DeckSetup.tsx index 379a9839c8c..d5757174164 100644 --- a/app/src/organisms/CalibrationPanels/DeckSetup.tsx +++ b/app/src/organisms/CalibrationPanels/DeckSetup.tsx @@ -3,14 +3,15 @@ import { useTranslation } from 'react-i18next' import map from 'lodash/map' import { - RobotWorkSpace, - Flex, - DIRECTION_COLUMN, - JUSTIFY_SPACE_BETWEEN, ALIGN_CENTER, ALIGN_STRETCH, - SPACING, + DIRECTION_COLUMN, + Flex, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, + RobotWorkSpace, + SPACING, + StyledText, } from '@opentrons/components' import { getDeckDefinitions, @@ -18,7 +19,6 @@ import { getPositionFromSlotId, } from '@opentrons/shared-data' import * as Sessions from '../../redux/sessions' -import { StyledText } from '../../atoms/text' import { NeedHelpLink } from './NeedHelpLink' import { CalibrationLabwareRender } from './CalibrationLabwareRender' diff --git a/app/src/organisms/CalibrationPanels/Introduction/Body.tsx b/app/src/organisms/CalibrationPanels/Introduction/Body.tsx index 0db1db6e485..df8ed6c8c17 100644 --- a/app/src/organisms/CalibrationPanels/Introduction/Body.tsx +++ b/app/src/organisms/CalibrationPanels/Introduction/Body.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { Trans, useTranslation } from 'react-i18next' +import { StyledText } from '@opentrons/components' import * as Sessions from '../../../redux/sessions' -import { StyledText } from '../../../atoms/text' import type { SessionType } from '../../../redux/sessions/types' diff --git a/app/src/organisms/CalibrationPanels/Introduction/InvalidationWarning.tsx b/app/src/organisms/CalibrationPanels/Introduction/InvalidationWarning.tsx index 404114141df..0f02a167188 100644 --- a/app/src/organisms/CalibrationPanels/Introduction/InvalidationWarning.tsx +++ b/app/src/organisms/CalibrationPanels/Introduction/InvalidationWarning.tsx @@ -1,8 +1,7 @@ -import { Flex, SPACING, TYPOGRAPHY } from '@opentrons/components' import * as React from 'react' +import { Flex, SPACING, TYPOGRAPHY, StyledText } from '@opentrons/components' import { useTranslation } from 'react-i18next' import { Banner } from '../../../atoms/Banner' -import { StyledText } from '../../../atoms/text' import * as Sessions from '../../../redux/sessions' interface InvalidationWarningProps { diff --git a/app/src/organisms/CalibrationPanels/Introduction/index.tsx b/app/src/organisms/CalibrationPanels/Introduction/index.tsx index 5bdc25ce51c..414e68111fb 100644 --- a/app/src/organisms/CalibrationPanels/Introduction/index.tsx +++ b/app/src/organisms/CalibrationPanels/Introduction/index.tsx @@ -9,10 +9,10 @@ import { ALIGN_CENTER, PrimaryButton, SecondaryButton, + StyledText, } from '@opentrons/components' import * as Sessions from '../../../redux/sessions' -import { StyledText } from '../../../atoms/text' import { NeedHelpLink } from '../NeedHelpLink' import { ChooseTipRack } from '../ChooseTipRack' diff --git a/app/src/organisms/CalibrationPanels/LoadingState.tsx b/app/src/organisms/CalibrationPanels/LoadingState.tsx index 0bc24a1e9be..a647cb52502 100644 --- a/app/src/organisms/CalibrationPanels/LoadingState.tsx +++ b/app/src/organisms/CalibrationPanels/LoadingState.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import { - Icon, - Flex, - COLORS, - SIZE_4, - JUSTIFY_CENTER, ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, + Flex, + Icon, + JUSTIFY_CENTER, + SIZE_4, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' interface LoadingStateProps { header?: string diff --git a/app/src/organisms/CalibrationPanels/MeasureNozzle.tsx b/app/src/organisms/CalibrationPanels/MeasureNozzle.tsx index 5e2c141ebd0..3f4d0e391f3 100644 --- a/app/src/organisms/CalibrationPanels/MeasureNozzle.tsx +++ b/app/src/organisms/CalibrationPanels/MeasureNozzle.tsx @@ -3,15 +3,15 @@ import * as React from 'react' import { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { + ALIGN_FLEX_END, + ALIGN_STRETCH, Box, + DIRECTION_COLUMN, Flex, - ALIGN_STRETCH, - ALIGN_FLEX_END, JUSTIFY_SPACE_BETWEEN, - DIRECTION_COLUMN, - SPACING, - Mount, PrimaryButton, + SPACING, + StyledText, } from '@opentrons/components' import { @@ -19,7 +19,6 @@ import { SMALL_STEP_SIZE_MM, MEDIUM_STEP_SIZE_MM, } from '../../molecules/JogControls' -import { StyledText } from '../../atoms/text' import * as Sessions from '../../redux/sessions' import type { Axis, Sign, StepSize } from '../../molecules/JogControls/types' import type { CalibrationPanelProps } from './types' @@ -39,6 +38,7 @@ import leftMultiBlockAssetHealth from '../../assets/videos/health-check/Left_Mul import rightMultiBlockAssetHealth from '../../assets/videos/health-check/Right_Multi_CalBlock_NO_TIP_(330x260)REV2.webm' import leftSingleBlockAssetHealth from '../../assets/videos/health-check/Left_Single_CalBlock_NO_TIP_(330x260)REV2.webm' import rightSingleBlockAssetHealth from '../../assets/videos/health-check/Right_Single_CalBlock_NO_TIP_(330x260)REV2.webm' +import type { Mount } from '@opentrons/components' const assetMapTrash = { left: { diff --git a/app/src/organisms/CalibrationPanels/MeasureTip.tsx b/app/src/organisms/CalibrationPanels/MeasureTip.tsx index c22781df03c..f2e5f59aefe 100644 --- a/app/src/organisms/CalibrationPanels/MeasureTip.tsx +++ b/app/src/organisms/CalibrationPanels/MeasureTip.tsx @@ -2,15 +2,15 @@ import * as React from 'react' import { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { + ALIGN_FLEX_END, + ALIGN_STRETCH, Box, + DIRECTION_COLUMN, Flex, - ALIGN_STRETCH, - ALIGN_FLEX_END, JUSTIFY_SPACE_BETWEEN, - DIRECTION_COLUMN, - SPACING, - Mount, PrimaryButton, + SPACING, + StyledText, } from '@opentrons/components' import * as Sessions from '../../redux/sessions' @@ -19,7 +19,6 @@ import { MEDIUM_STEP_SIZE_MM, SMALL_STEP_SIZE_MM, } from '../../molecules/JogControls' -import { StyledText } from '../../atoms/text' import { NeedHelpLink } from './NeedHelpLink' import { useConfirmCrashRecovery } from './useConfirmCrashRecovery' import { formatJogVector } from './utils' @@ -37,6 +36,7 @@ import rightMultiBlockAssetHealth from '../../assets/videos/health-check/Right_M import leftSingleBlockAssetHealth from '../../assets/videos/health-check/Left_Single_CalBlock_WITH_TIP_(330x260)REV2.webm' import rightSingleBlockAssetHealth from '../../assets/videos/health-check/Right_Single_CalBlock_WITH_TIP_(330x260)REV2.webm' +import type { Mount } from '@opentrons/components' import type { Axis, Sign, StepSize } from '../../molecules/JogControls/types' import type { CalibrationPanelProps } from './types' diff --git a/app/src/organisms/CalibrationPanels/SaveXYPoint.tsx b/app/src/organisms/CalibrationPanels/SaveXYPoint.tsx index 1cc3db78906..58d141dff0e 100644 --- a/app/src/organisms/CalibrationPanels/SaveXYPoint.tsx +++ b/app/src/organisms/CalibrationPanels/SaveXYPoint.tsx @@ -2,14 +2,15 @@ import * as React from 'react' import { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { + ALIGN_FLEX_END, + ALIGN_STRETCH, Box, - Flex, DIRECTION_COLUMN, - SPACING, + Flex, JUSTIFY_SPACE_BETWEEN, - ALIGN_STRETCH, - ALIGN_FLEX_END, PrimaryButton, + SPACING, + StyledText, } from '@opentrons/components' import { useLogger } from '../../logger' @@ -19,7 +20,6 @@ import { MEDIUM_STEP_SIZE_MM, SMALL_STEP_SIZE_MM, } from '../../molecules/JogControls' -import { StyledText } from '../../atoms/text' import { formatJogVector } from './utils' import { useConfirmCrashRecovery } from './useConfirmCrashRecovery' import { NeedHelpLink } from './NeedHelpLink' diff --git a/app/src/organisms/CalibrationPanels/SaveZPoint.tsx b/app/src/organisms/CalibrationPanels/SaveZPoint.tsx index 105c34c2d4e..777364afe7d 100644 --- a/app/src/organisms/CalibrationPanels/SaveZPoint.tsx +++ b/app/src/organisms/CalibrationPanels/SaveZPoint.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import { css } from 'styled-components' import { Trans, useTranslation } from 'react-i18next' import { - Box, - Flex, - SPACING, + ALIGN_FLEX_END, ALIGN_STRETCH, + Box, DIRECTION_COLUMN, + Flex, JUSTIFY_SPACE_BETWEEN, PrimaryButton, - ALIGN_FLEX_END, + SPACING, + StyledText, } from '@opentrons/components' import * as Sessions from '../../redux/sessions' -import { StyledText } from '../../atoms/text' import { JogControls, MEDIUM_STEP_SIZE_MM, diff --git a/app/src/organisms/CalibrationPanels/TipConfirmation.tsx b/app/src/organisms/CalibrationPanels/TipConfirmation.tsx index da370905d7d..07ee5f19649 100644 --- a/app/src/organisms/CalibrationPanels/TipConfirmation.tsx +++ b/app/src/organisms/CalibrationPanels/TipConfirmation.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { css } from 'styled-components' import { - Flex, DIRECTION_COLUMN, + Flex, JUSTIFY_SPACE_BETWEEN, - SPACING, PrimaryButton, SecondaryButton, + SPACING, + StyledText, } from '@opentrons/components' import { useTranslation } from 'react-i18next' import * as Sessions from '../../redux/sessions' import { NeedHelpLink } from './NeedHelpLink' -import { StyledText } from '../../atoms/text' import type { CalibrationPanelProps } from './types' import type { diff --git a/app/src/organisms/CalibrationPanels/TipPickUp.tsx b/app/src/organisms/CalibrationPanels/TipPickUp.tsx index 23a1024c06a..a1a8c5def99 100644 --- a/app/src/organisms/CalibrationPanels/TipPickUp.tsx +++ b/app/src/organisms/CalibrationPanels/TipPickUp.tsx @@ -10,11 +10,11 @@ import { ALIGN_STRETCH, ALIGN_FLEX_END, PrimaryButton, + StyledText, } from '@opentrons/components' import * as Sessions from '../../redux/sessions' import type { Axis, Sign, StepSize } from '../../molecules/JogControls/types' -import { StyledText } from '../../atoms/text' import { JogControls } from '../../molecules/JogControls' import type { CalibrationPanelProps } from './types' import { formatJogVector } from './utils' diff --git a/app/src/organisms/CalibrationPanels/useConfirmCrashRecovery.tsx b/app/src/organisms/CalibrationPanels/useConfirmCrashRecovery.tsx index cb8b825abae..cb7742be4e0 100644 --- a/app/src/organisms/CalibrationPanels/useConfirmCrashRecovery.tsx +++ b/app/src/organisms/CalibrationPanels/useConfirmCrashRecovery.tsx @@ -3,14 +3,14 @@ import { useTranslation } from 'react-i18next' import { Flex, - Link, JUSTIFY_CENTER, - TYPOGRAPHY, + Link, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import * as Sessions from '../../redux/sessions' -import { StyledText } from '../../atoms/text' import { ConfirmCrashRecovery } from './ConfirmCrashRecovery' import type { CalibrationPanelProps } from './types' diff --git a/app/src/organisms/CalibrationStatusCard/index.tsx b/app/src/organisms/CalibrationStatusCard/index.tsx index db2f2e36076..c57ab056bde 100644 --- a/app/src/organisms/CalibrationStatusCard/index.tsx +++ b/app/src/organisms/CalibrationStatusCard/index.tsx @@ -3,22 +3,22 @@ import { useTranslation } from 'react-i18next' import { Link as RouterLink } from 'react-router-dom' import { - Flex, - Link, - SPACING, - TYPOGRAPHY, + ALIGN_CENTER, + ALIGN_FLEX_START, BORDERS, COLORS, - JUSTIFY_SPACE_BETWEEN, DIRECTION_COLUMN, - ALIGN_CENTER, + Flex, JUSTIFY_CENTER, - ALIGN_FLEX_START, + JUSTIFY_SPACE_BETWEEN, + Link, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { TertiaryButton } from '../../atoms/buttons' import { StatusLabel } from '../../atoms/StatusLabel' -import { StyledText } from '../../atoms/text' import { useCalibrationTaskList } from '../Devices/hooks' diff --git a/app/src/organisms/CalibrationTaskList/index.tsx b/app/src/organisms/CalibrationTaskList/index.tsx index 0bc71ec01d7..2633f5ffd9c 100644 --- a/app/src/organisms/CalibrationTaskList/index.tsx +++ b/app/src/organisms/CalibrationTaskList/index.tsx @@ -10,13 +10,13 @@ import { Flex, Icon, JUSTIFY_CENTER, + PrimaryButton, SPACING, + StyledText, TYPOGRAPHY, - PrimaryButton, } from '@opentrons/components' import { StatusLabel } from '../../atoms/StatusLabel' -import { StyledText } from '../../atoms/text' import { LegacyModal } from '../../molecules/LegacyModal' import { TaskList } from '../TaskList' diff --git a/app/src/organisms/ChangePipette/CheckPipettesButton.tsx b/app/src/organisms/ChangePipette/CheckPipettesButton.tsx index d27342a2d0a..207ed4782cc 100644 --- a/app/src/organisms/ChangePipette/CheckPipettesButton.tsx +++ b/app/src/organisms/ChangePipette/CheckPipettesButton.tsx @@ -1,16 +1,16 @@ import * as React from 'react' -import { usePipettesQuery } from '@opentrons/react-api-client' import { useTranslation } from 'react-i18next' -import { StyledText } from '../../atoms/text' +import { usePipettesQuery } from '@opentrons/react-api-client' import { - Icon, + ALIGN_CENTER, + COLORS, DIRECTION_ROW, Flex, - COLORS, - ALIGN_CENTER, - SPACING, - SIZE_1, + Icon, PrimaryButton, + SIZE_1, + SPACING, + StyledText, } from '@opentrons/components' import { DETACH } from './constants' diff --git a/app/src/organisms/ChangePipette/ClearDeckModal.tsx b/app/src/organisms/ChangePipette/ClearDeckModal.tsx index 8fd4482b321..dbfdcc6fb7e 100644 --- a/app/src/organisms/ChangePipette/ClearDeckModal.tsx +++ b/app/src/organisms/ChangePipette/ClearDeckModal.tsx @@ -3,12 +3,12 @@ import { Trans, useTranslation } from 'react-i18next' import { DIRECTION_COLUMN, Flex, - SPACING, JUSTIFY_FLEX_END, - TYPOGRAPHY, PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' export interface ClearDeckModalProps { onContinueClick: () => void diff --git a/app/src/organisms/ChangePipette/Instructions.tsx b/app/src/organisms/ChangePipette/Instructions.tsx index 2536c1ca259..aabf54f121c 100644 --- a/app/src/organisms/ChangePipette/Instructions.tsx +++ b/app/src/organisms/ChangePipette/Instructions.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import { css } from 'styled-components' import { Trans, useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, - SPACING, - JUSTIFY_SPACE_BETWEEN, + ALIGN_FLEX_END, Btn, COLORS, - TYPOGRAPHY, + DIRECTION_COLUMN, DIRECTION_ROW, - ALIGN_FLEX_END, + Flex, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { CheckPipettesButton } from './CheckPipettesButton' import { InstructionStep } from './InstructionStep' import { PipetteSelection } from './PipetteSelection' diff --git a/app/src/organisms/ChangePipette/LevelPipette.tsx b/app/src/organisms/ChangePipette/LevelPipette.tsx index 9ccc51ca80d..402b6462cf9 100644 --- a/app/src/organisms/ChangePipette/LevelPipette.tsx +++ b/app/src/organisms/ChangePipette/LevelPipette.tsx @@ -8,11 +8,11 @@ import { Flex, JUSTIFY_FLEX_END, JUSTIFY_SPACE_BETWEEN, + PrimaryButton, SPACING, + StyledText, TYPOGRAPHY, - PrimaryButton, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import type { Mount } from '../../redux/pipettes/types' diff --git a/app/src/organisms/ChangePipette/PipetteSelection.tsx b/app/src/organisms/ChangePipette/PipetteSelection.tsx index 6b91650a0e0..af9f96c48e4 100644 --- a/app/src/organisms/ChangePipette/PipetteSelection.tsx +++ b/app/src/organisms/ChangePipette/PipetteSelection.tsx @@ -1,13 +1,13 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, DIRECTION_COLUMN, + Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { OT3_PIPETTES } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { PipetteSelect } from '../../molecules/PipetteSelect' export type PipetteSelectionProps = React.ComponentProps diff --git a/app/src/organisms/ChangePipette/index.tsx b/app/src/organisms/ChangePipette/index.tsx index 1eb031ee818..7d1b8568df8 100644 --- a/app/src/organisms/ChangePipette/index.tsx +++ b/app/src/organisms/ChangePipette/index.tsx @@ -3,8 +3,8 @@ import capitalize from 'lodash/capitalize' import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router-dom' import { useTranslation } from 'react-i18next' -import { getPipetteNameSpecs, PipetteNameSpecs } from '@opentrons/shared-data' -import { SPACING, TYPOGRAPHY } from '@opentrons/components' +import { getPipetteNameSpecs } from '@opentrons/shared-data' +import { SPACING, TYPOGRAPHY, StyledText } from '@opentrons/components' import { useDispatchApiRequests, @@ -27,7 +27,6 @@ import { import { LegacyModalShell } from '../../molecules/LegacyModal' import { WizardHeader } from '../../molecules/WizardHeader' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' -import { StyledText } from '../../atoms/text' import { useAttachedPipettes } from '../Devices/hooks' import { ExitModal } from './ExitModal' import { Instructions } from './Instructions' @@ -44,6 +43,7 @@ import { EIGHT_CHANNEL_STEPS, } from './constants' +import type { PipetteNameSpecs } from '@opentrons/shared-data' import type { State, Dispatch } from '../../redux/types' import type { Mount } from '../../redux/pipettes/types' import type { WizardStep } from './types' diff --git a/app/src/organisms/CheckCalibration/ResultsSummary/CalibrationHealthCheckResults.tsx b/app/src/organisms/CheckCalibration/ResultsSummary/CalibrationHealthCheckResults.tsx index 50e5e5b2a45..0f70e8017d6 100644 --- a/app/src/organisms/CheckCalibration/ResultsSummary/CalibrationHealthCheckResults.tsx +++ b/app/src/organisms/CheckCalibration/ResultsSummary/CalibrationHealthCheckResults.tsx @@ -2,14 +2,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + COLORS, DIRECTION_ROW, + Flex, JUSTIFY_SPACE_BETWEEN, + StyledText, TYPOGRAPHY, - COLORS, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { StatusLabel } from '../../../atoms/StatusLabel' interface CalibrationHealthCheckResultsProps { diff --git a/app/src/organisms/CheckCalibration/ResultsSummary/CalibrationResult.tsx b/app/src/organisms/CheckCalibration/ResultsSummary/CalibrationResult.tsx index a3f1922749e..c290780bd7d 100644 --- a/app/src/organisms/CheckCalibration/ResultsSummary/CalibrationResult.tsx +++ b/app/src/organisms/CheckCalibration/ResultsSummary/CalibrationResult.tsx @@ -10,9 +10,9 @@ import { COLORS, BORDERS, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { RenderResult } from './RenderResult' export const RESULT_SUMMARY_STYLE = css` diff --git a/app/src/organisms/CheckCalibration/ResultsSummary/RenderMountInformation.tsx b/app/src/organisms/CheckCalibration/ResultsSummary/RenderMountInformation.tsx index 55473d04003..f468e3f8db8 100644 --- a/app/src/organisms/CheckCalibration/ResultsSummary/RenderMountInformation.tsx +++ b/app/src/organisms/CheckCalibration/ResultsSummary/RenderMountInformation.tsx @@ -2,15 +2,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, COLORS, + DIRECTION_COLUMN, + Flex, TYPOGRAPHY, + StyledText, } from '@opentrons/components' import { getPipetteModelSpecs } from '@opentrons/shared-data' -import { StyledText } from '../../../atoms/text' - import type { Mount } from '../../../redux/pipettes/types' import type { CalibrationCheckInstrument } from '../../../redux/sessions/types' diff --git a/app/src/organisms/CheckCalibration/ResultsSummary/RenderResult.tsx b/app/src/organisms/CheckCalibration/ResultsSummary/RenderResult.tsx index b07545a25dd..b46dc21cf40 100644 --- a/app/src/organisms/CheckCalibration/ResultsSummary/RenderResult.tsx +++ b/app/src/organisms/CheckCalibration/ResultsSummary/RenderResult.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, - Icon, COLORS, - SPACING, + Flex, + Icon, SIZE_1, + SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' interface RenderResultProps { isBadCal: boolean diff --git a/app/src/organisms/CheckCalibration/ReturnTip.tsx b/app/src/organisms/CheckCalibration/ReturnTip.tsx index 870570f3fb7..b2130a44264 100644 --- a/app/src/organisms/CheckCalibration/ReturnTip.tsx +++ b/app/src/organisms/CheckCalibration/ReturnTip.tsx @@ -1,16 +1,16 @@ import * as React from 'react' import { - Flex, - PrimaryButton, + ALIGN_STRETCH, DIRECTION_COLUMN, + Flex, JUSTIFY_SPACE_BETWEEN, + PrimaryButton, SPACING, - ALIGN_STRETCH, + StyledText, } from '@opentrons/components' import uniq from 'lodash/uniq' import * as Sessions from '../../redux/sessions' -import { StyledText } from '../../atoms/text' import type { CalibrationPanelProps } from '../../organisms/CalibrationPanels/types' import type { SessionCommandString } from '../../redux/sessions/types' import { useTranslation } from 'react-i18next' diff --git a/app/src/organisms/ChildNavigation/index.tsx b/app/src/organisms/ChildNavigation/index.tsx index e50a4e8bbe7..afe3c1f7508 100644 --- a/app/src/organisms/ChildNavigation/index.tsx +++ b/app/src/organisms/ChildNavigation/index.tsx @@ -12,13 +12,13 @@ import { POSITION_FIXED, RESPONSIVENESS, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { ODD_FOCUS_VISIBLE } from '../../atoms/buttons/constants' import { SmallButton } from '../../atoms/buttons' import { InlineNotification } from '../../atoms/InlineNotification' -import { StyledText } from '../../atoms/text' import type { IconName } from '@opentrons/components' import type { InlineNotificationProps } from '../../atoms/InlineNotification' diff --git a/app/src/organisms/ChooseProtocolSlideout/index.tsx b/app/src/organisms/ChooseProtocolSlideout/index.tsx index 11279cf69b0..b6d1d2805ff 100644 --- a/app/src/organisms/ChooseProtocolSlideout/index.tsx +++ b/app/src/organisms/ChooseProtocolSlideout/index.tsx @@ -21,6 +21,7 @@ import { ProtocolDeck, SIZE_1, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' @@ -29,7 +30,6 @@ import { OPENTRONS_USB } from '../../redux/discovery' import { getStoredProtocols } from '../../redux/protocol-storage' import { appShellRequestor } from '../../redux/shell/remote' import { Slideout } from '../../atoms/Slideout' -import { StyledText } from '../../atoms/text' import { MiniCard } from '../../molecules/MiniCard' import { useTrackCreateProtocolRunEvent } from '../Devices/hooks' import { useCreateRunFromProtocol } from '../ChooseRobotToRunProtocolSlideout/useCreateRunFromProtocol' diff --git a/app/src/organisms/ChooseRobotSlideout/AvailableRobotOption.tsx b/app/src/organisms/ChooseRobotSlideout/AvailableRobotOption.tsx index cb277f6fb2a..c65e69ce163 100644 --- a/app/src/organisms/ChooseRobotSlideout/AvailableRobotOption.tsx +++ b/app/src/organisms/ChooseRobotSlideout/AvailableRobotOption.tsx @@ -5,17 +5,17 @@ import { Trans, useTranslation } from 'react-i18next' import { NavLink } from 'react-router-dom' import { - SPACING, - Icon, - Flex, Box, - DIRECTION_COLUMN, COLORS, - TYPOGRAPHY, + DIRECTION_COLUMN, + Flex, + Icon, SIZE_1, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { MiniCard } from '../../molecules/MiniCard' import { getRobotModelByName, OPENTRONS_USB } from '../../redux/discovery' import { getNetworkInterfaces, fetchStatus } from '../../redux/networking' diff --git a/app/src/organisms/ChooseRobotSlideout/index.tsx b/app/src/organisms/ChooseRobotSlideout/index.tsx index 80d9e8aeeee..b70ba7096bb 100644 --- a/app/src/organisms/ChooseRobotSlideout/index.tsx +++ b/app/src/organisms/ChooseRobotSlideout/index.tsx @@ -22,6 +22,7 @@ import { SIZE_1, SIZE_4, SPACING, + StyledText, TYPOGRAPHY, useHoverTooltip, } from '@opentrons/components' @@ -39,7 +40,6 @@ import { import { Banner } from '../../atoms/Banner' import { Slideout } from '../../atoms/Slideout' import { MultiSlideout } from '../../atoms/Slideout/MultiSlideout' -import { StyledText } from '../../atoms/text' import { ToggleButton } from '../../atoms/buttons' import { AvailableRobotOption } from './AvailableRobotOption' import { InputField } from '../../atoms/InputField' diff --git a/app/src/organisms/CommandText/index.tsx b/app/src/organisms/CommandText/index.tsx index 044084ef325..06eae754759 100644 --- a/app/src/organisms/CommandText/index.tsx +++ b/app/src/organisms/CommandText/index.tsx @@ -2,19 +2,19 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + ALIGN_CENTER, DIRECTION_COLUMN, + Flex, SPACING, - ALIGN_CENTER, + StyledText, } from '@opentrons/components' -import { getPipetteNameSpecs, RunTimeCommand } from '@opentrons/shared-data' +import { getPipetteNameSpecs } from '@opentrons/shared-data' import { getAddressableAreaDisplayName, getLabwareName, getLabwareDisplayLocation, getFinalLabwareLocation, } from './utils' -import { StyledText } from '../../atoms/text' import { LoadCommandText } from './LoadCommandText' import { PipettingCommandText } from './PipettingCommandText' import { TemperatureCommandText } from './TemperatureCommandText' @@ -23,6 +23,7 @@ import { MoveLabwareCommandText } from './MoveLabwareCommandText' import type { CompletedProtocolAnalysis, RobotType, + RunTimeCommand, } from '@opentrons/shared-data' import type { StyleProps } from '@opentrons/components' diff --git a/app/src/organisms/ConfigurePipette/ConfigFormGroup.tsx b/app/src/organisms/ConfigurePipette/ConfigFormGroup.tsx index 260bd8b75e6..fa03625780e 100644 --- a/app/src/organisms/ConfigurePipette/ConfigFormGroup.tsx +++ b/app/src/organisms/ConfigurePipette/ConfigFormGroup.tsx @@ -1,15 +1,15 @@ import * as React from 'react' import { Controller } from 'react-hook-form' import { - FormGroup, - Flex, + CheckboxField, DIRECTION_COLUMN, + Flex, + FormGroup, SPACING, + StyledText, TYPOGRAPHY, - CheckboxField, } from '@opentrons/components' import { InputField } from '../../atoms/InputField' -import { StyledText } from '../../atoms/text' import styles from './styles.module.css' import type { Control } from 'react-hook-form' diff --git a/app/src/organisms/ConfigurePipette/ConfigFormResetButton.tsx b/app/src/organisms/ConfigurePipette/ConfigFormResetButton.tsx index c1d710d3d61..d97524f1e59 100644 --- a/app/src/organisms/ConfigurePipette/ConfigFormResetButton.tsx +++ b/app/src/organisms/ConfigurePipette/ConfigFormResetButton.tsx @@ -3,12 +3,12 @@ import { Trans, useTranslation } from 'react-i18next' import { DIRECTION_COLUMN, Flex, + SecondaryButton, SPACING, + StyledText, TYPOGRAPHY, - SecondaryButton, } from '@opentrons/components' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' export interface ButtonProps { onClick?: () => unknown diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx index e1aa1b8c73d..e03306facbf 100644 --- a/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx +++ b/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx @@ -12,6 +12,7 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { @@ -28,7 +29,6 @@ import { WASTE_CHUTE_FIXTURES, } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { ODD_FOCUS_VISIBLE } from '../../atoms/buttons/constants' import { TertiaryButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/DeckConfigurationDiscardChangesModal.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/DeckConfigurationDiscardChangesModal.tsx index 1d956a507d9..4b0b88c446f 100644 --- a/app/src/organisms/DeviceDetailsDeckConfiguration/DeckConfigurationDiscardChangesModal.tsx +++ b/app/src/organisms/DeviceDetailsDeckConfiguration/DeckConfigurationDiscardChangesModal.tsx @@ -7,13 +7,13 @@ import { DIRECTION_ROW, Flex, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' -import { ModalHeaderBaseProps } from '../../molecules/Modal/types' +import type { ModalHeaderBaseProps } from '../../molecules/Modal/types' interface DeckConfigurationDiscardChangesModalProps { setShowConfirmationModal: (showConfirmationModal: boolean) => void diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/DeckFixtureSetupInstructionsModal.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/DeckFixtureSetupInstructionsModal.tsx index 6decd45012f..12d0f1d3967 100644 --- a/app/src/organisms/DeviceDetailsDeckConfiguration/DeckFixtureSetupInstructionsModal.tsx +++ b/app/src/organisms/DeviceDetailsDeckConfiguration/DeckFixtureSetupInstructionsModal.tsx @@ -8,8 +8,8 @@ import { Flex, PrimaryButton, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ExternalLink } from '../../atoms/Link/ExternalLink' import { Modal } from '../../molecules/Modal' import { LegacyModal } from '../../molecules/LegacyModal' diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/index.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/index.tsx index 7a67abc55ab..9c1d852253a 100644 --- a/app/src/organisms/DeviceDetailsDeckConfiguration/index.tsx +++ b/app/src/organisms/DeviceDetailsDeckConfiguration/index.tsx @@ -16,6 +16,7 @@ import { Link, SIZE_4, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { @@ -32,7 +33,6 @@ import { } from '@opentrons/shared-data' import { useNotifyCurrentMaintenanceRun } from '../../resources/maintenance_runs' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { DeckFixtureSetupInstructionsModal } from './DeckFixtureSetupInstructionsModal' import { AddFixtureModal } from './AddFixtureModal' diff --git a/app/src/organisms/Devices/CalibrationStatusBanner.tsx b/app/src/organisms/Devices/CalibrationStatusBanner.tsx index 9a31d25f1c5..4b03f8d2d22 100644 --- a/app/src/organisms/Devices/CalibrationStatusBanner.tsx +++ b/app/src/organisms/Devices/CalibrationStatusBanner.tsx @@ -3,18 +3,18 @@ import { useTranslation } from 'react-i18next' import { Link as RouterLink } from 'react-router-dom' import { - Flex, ALIGN_CENTER, COLORS, DIRECTION_ROW, + Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TEXT_ALIGN_RIGHT, TYPOGRAPHY, } from '@opentrons/components' import { Banner } from '../../atoms/Banner' -import { StyledText } from '../../atoms/text' import { useCalibrationTaskList } from './hooks' interface CalibrationStatusBannerProps { diff --git a/app/src/organisms/Devices/ConnectionTroubleshootingModal.tsx b/app/src/organisms/Devices/ConnectionTroubleshootingModal.tsx index c29599716a9..560eedb235b 100644 --- a/app/src/organisms/Devices/ConnectionTroubleshootingModal.tsx +++ b/app/src/organisms/Devices/ConnectionTroubleshootingModal.tsx @@ -3,16 +3,16 @@ import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { ALIGN_FLEX_END, + Box, DIRECTION_COLUMN, Flex, - Box, Link, - TYPOGRAPHY, - SPACING, PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { LegacyModal } from '../../molecules/LegacyModal' const NEW_ROBOT_SETUP_SUPPORT_ARTICLE_HREF = diff --git a/app/src/organisms/Devices/DevicesEmptyState.tsx b/app/src/organisms/Devices/DevicesEmptyState.tsx index 73e83c9ef45..5f422520f8c 100644 --- a/app/src/organisms/Devices/DevicesEmptyState.tsx +++ b/app/src/organisms/Devices/DevicesEmptyState.tsx @@ -3,24 +3,24 @@ import { useTranslation } from 'react-i18next' import { useDispatch } from 'react-redux' import { + ALIGN_CENTER, Box, + DIRECTION_COLUMN, + DISPLAY_FLEX, Flex, + FONT_WEIGHT_REGULAR, Icon, + JUSTIFY_SPACE_BETWEEN, Link, - ALIGN_CENTER, - DIRECTION_COLUMN, - FONT_WEIGHT_REGULAR, + POSITION_ABSOLUTE, + PrimaryButton, SPACING_5, - JUSTIFY_SPACE_BETWEEN, - TYPOGRAPHY, SPACING, - PrimaryButton, - POSITION_ABSOLUTE, - DISPLAY_FLEX, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { startDiscovery } from '../../redux/discovery' -import { StyledText } from '../../atoms/text' export const TROUBLESHOOTING_CONNECTION_PROBLEMS_URL = 'https://support.opentrons.com/s/article/Troubleshooting-connection-problems' diff --git a/app/src/organisms/Devices/EstopBanner.tsx b/app/src/organisms/Devices/EstopBanner.tsx index 9a5b5475939..a9d1d59d4d6 100644 --- a/app/src/organisms/Devices/EstopBanner.tsx +++ b/app/src/organisms/Devices/EstopBanner.tsx @@ -5,11 +5,11 @@ import { DIRECTION_ROW, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Banner } from '../../atoms/Banner' -import { StyledText } from '../../atoms/text' import { NOT_PRESENT, PHYSICALLY_ENGAGED, diff --git a/app/src/organisms/Devices/HeaterShakerIsRunningModal/index.tsx b/app/src/organisms/Devices/HeaterShakerIsRunningModal/index.tsx index 8c16b8b134f..19f2cf244a0 100644 --- a/app/src/organisms/Devices/HeaterShakerIsRunningModal/index.tsx +++ b/app/src/organisms/Devices/HeaterShakerIsRunningModal/index.tsx @@ -2,25 +2,25 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useCreateLiveCommandMutation } from '@opentrons/react-api-client' import { - Icon, - COLORS, - Flex, Box, + COLORS, DIRECTION_ROW, - SPACING, - TYPOGRAPHY, + Flex, + Icon, JUSTIFY_FLEX_END, PrimaryButton, SecondaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { useAttachedModules } from '../hooks' import { LegacyModal } from '../../../molecules/LegacyModal' -import { StyledText } from '../../../atoms/text' -import { HeaterShakerModule } from '../../../redux/modules/types' import { HeaterShakerModuleCard } from '../HeaterShakerWizard/HeaterShakerModuleCard' import { HEATERSHAKER_MODULE_TYPE } from '@opentrons/shared-data' import type { HeaterShakerDeactivateShakerCreateCommand } from '@opentrons/shared-data' +import type { HeaterShakerModule } from '../../../redux/modules/types' interface HeaterShakerIsRunningModalProps { closeModal: () => void diff --git a/app/src/organisms/Devices/HeaterShakerWizard/HeaterShakerModuleCard.tsx b/app/src/organisms/Devices/HeaterShakerWizard/HeaterShakerModuleCard.tsx index 43b7b40222f..49541a05454 100644 --- a/app/src/organisms/Devices/HeaterShakerWizard/HeaterShakerModuleCard.tsx +++ b/app/src/organisms/Devices/HeaterShakerWizard/HeaterShakerModuleCard.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { + ALIGN_FLEX_START, + COLORS, + DIRECTION_COLUMN, + DIRECTION_ROW, Flex, Icon, SIZE_1, - TYPOGRAPHY, - DIRECTION_ROW, - DIRECTION_COLUMN, SPACING, - ALIGN_FLEX_START, - COLORS, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getModuleDisplayName } from '@opentrons/shared-data' -import { StyledText } from '../../../atoms/text' import heaterShakerModule from '../../../assets/images/heater_shaker_module_transparent.png' import { HeaterShakerModuleData } from '../../ModuleCard/HeaterShakerModuleData' diff --git a/app/src/organisms/Devices/HistoricalProtocolRun.tsx b/app/src/organisms/Devices/HistoricalProtocolRun.tsx index 9cfda8a9caa..59deb8f6f2d 100644 --- a/app/src/organisms/Devices/HistoricalProtocolRun.tsx +++ b/app/src/organisms/Devices/HistoricalProtocolRun.tsx @@ -13,8 +13,8 @@ import { JUSTIFY_SPACE_AROUND, OVERFLOW_WRAP_ANYWHERE, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { getStoredProtocols } from '../../redux/protocol-storage' import { formatInterval } from '../RunTimeControl/utils' import { formatTimestamp } from './utils' diff --git a/app/src/organisms/Devices/HistoricalProtocolRunOffsetDrawer.tsx b/app/src/organisms/Devices/HistoricalProtocolRunOffsetDrawer.tsx index 57a27d95e3c..1be825a562b 100644 --- a/app/src/organisms/Devices/HistoricalProtocolRunOffsetDrawer.tsx +++ b/app/src/organisms/Devices/HistoricalProtocolRunOffsetDrawer.tsx @@ -2,14 +2,15 @@ import * as React from 'react' import isEqual from 'lodash/isEqual' import { useTranslation } from 'react-i18next' import { - Flex, - Box, BORDERS, - SPACING, + Box, COLORS, - TYPOGRAPHY, - JUSTIFY_FLEX_START, DIRECTION_COLUMN, + Flex, + JUSTIFY_FLEX_START, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getLabwareDefURI, @@ -17,7 +18,6 @@ import { getLoadedLabwareDefinitionsByUri, getModuleDisplayName, } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { useMostRecentCompletedAnalysis } from '../LabwarePositionCheck/useMostRecentCompletedAnalysis' import { useDeckCalibrationData } from './hooks' diff --git a/app/src/organisms/Devices/InstrumentsAndModules.tsx b/app/src/organisms/Devices/InstrumentsAndModules.tsx index be4251bb638..8b027fa460b 100644 --- a/app/src/organisms/Devices/InstrumentsAndModules.tsx +++ b/app/src/organisms/Devices/InstrumentsAndModules.tsx @@ -9,18 +9,18 @@ import { } from '@opentrons/react-api-client' import { - Flex, ALIGN_CENTER, ALIGN_FLEX_START, COLORS, DIRECTION_COLUMN, + Flex, JUSTIFY_CENTER, SIZE_3, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { PipetteRecalibrationWarning } from './PipetteCard/PipetteRecalibrationWarning' import { useCurrentRunId } from '../ProtocolUpload/hooks' diff --git a/app/src/organisms/Devices/ModuleInfo.tsx b/app/src/organisms/Devices/ModuleInfo.tsx index 8bfe68ef0cb..50b158dc0c1 100644 --- a/app/src/organisms/Devices/ModuleInfo.tsx +++ b/app/src/organisms/Devices/ModuleInfo.tsx @@ -1,26 +1,26 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - Icon, - RobotCoordsForeignObject, ALIGN_CENTER, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + Icon, JUSTIFY_CENTER, + RobotCoordsForeignObject, SPACING, TYPOGRAPHY, + StyledText, } from '@opentrons/components' import { - ModuleModel, getModuleDisplayName, getModuleDef2, MAGNETIC_BLOCK_V1, } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { useRunHasStarted } from './hooks' +import type { ModuleModel } from '@opentrons/shared-data' import type { PhysicalPort } from '../../redux/modules/api-types' export interface ModuleInfoProps { diff --git a/app/src/organisms/Devices/PipetteCard/AboutPipetteSlideout.tsx b/app/src/organisms/Devices/PipetteCard/AboutPipetteSlideout.tsx index 9c8fc7e0790..fd8684d6c83 100644 --- a/app/src/organisms/Devices/PipetteCard/AboutPipetteSlideout.tsx +++ b/app/src/organisms/Devices/PipetteCard/AboutPipetteSlideout.tsx @@ -1,15 +1,15 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + COLORS, DIRECTION_COLUMN, - SPACING, + Flex, PrimaryButton, + SPACING, + StyledText, TYPOGRAPHY, - COLORS, } from '@opentrons/components' import { useInstrumentsQuery } from '@opentrons/react-api-client' -import { StyledText } from '../../../atoms/text' import { Slideout } from '../../../atoms/Slideout' import type { AttachedPipette } from '../../../redux/pipettes/types' diff --git a/app/src/organisms/Devices/PipetteCard/PipetteRecalibrationWarning.tsx b/app/src/organisms/Devices/PipetteCard/PipetteRecalibrationWarning.tsx index 0ee79d620ff..5953fb74c0d 100644 --- a/app/src/organisms/Devices/PipetteCard/PipetteRecalibrationWarning.tsx +++ b/app/src/organisms/Devices/PipetteCard/PipetteRecalibrationWarning.tsx @@ -1,13 +1,13 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + Box, DIRECTION_COLUMN, - TYPOGRAPHY, + Flex, SPACING, - Box, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { Banner } from '../../../atoms/Banner' export const PipetteRecalibrationWarning = (): JSX.Element | null => { diff --git a/app/src/organisms/Devices/PipetteCard/index.tsx b/app/src/organisms/Devices/PipetteCard/index.tsx index 03cb1483cb2..06099901a26 100644 --- a/app/src/organisms/Devices/PipetteCard/index.tsx +++ b/app/src/organisms/Devices/PipetteCard/index.tsx @@ -3,18 +3,19 @@ import { Trans, useTranslation } from 'react-i18next' import { css } from 'styled-components' import { - Box, - Flex, - DIRECTION_ROW, + ALIGN_CENTER, ALIGN_START, + BORDERS, + Box, + COLORS, DIRECTION_COLUMN, + DIRECTION_ROW, + Flex, + InstrumentDiagram, SPACING, + StyledText, TYPOGRAPHY, - COLORS, useOnClickOutside, - InstrumentDiagram, - BORDERS, - ALIGN_CENTER, } from '@opentrons/components' import { FLEX_ROBOT_TYPE, @@ -31,7 +32,6 @@ import { import { LEFT } from '../../../redux/pipettes' import { OverflowBtn } from '../../../atoms/MenuList/OverflowBtn' -import { StyledText } from '../../../atoms/text' import { Banner } from '../../../atoms/Banner' import { useMenuHandleClickOutside } from '../../../atoms/MenuList/hooks' import { InstrumentCard } from '../../../molecules/InstrumentCard' diff --git a/app/src/organisms/Devices/ProtocolRun/EmptySetupStep.tsx b/app/src/organisms/Devices/ProtocolRun/EmptySetupStep.tsx index 59e22a5cce0..8c049d0661a 100644 --- a/app/src/organisms/Devices/ProtocolRun/EmptySetupStep.tsx +++ b/app/src/organisms/Devices/ProtocolRun/EmptySetupStep.tsx @@ -1,12 +1,12 @@ import * as React from 'react' import { - Flex, - DIRECTION_COLUMN, COLORS, + DIRECTION_COLUMN, + Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' interface EmptySetupStepProps { title: React.ReactNode diff --git a/app/src/organisms/Devices/ProtocolRun/LabwareInfoOverlay.tsx b/app/src/organisms/Devices/ProtocolRun/LabwareInfoOverlay.tsx index 41fd2d81c55..de838dcd720 100644 --- a/app/src/organisms/Devices/ProtocolRun/LabwareInfoOverlay.tsx +++ b/app/src/organisms/Devices/ProtocolRun/LabwareInfoOverlay.tsx @@ -3,21 +3,21 @@ import { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { getLabwareDisplayName } from '@opentrons/shared-data' import { + ALIGN_FLEX_START, Box, - Flex, - RobotCoordsForeignDiv, - SPACING, COLORS, - TYPOGRAPHY, - DISPLAY_FLEX, DIRECTION_COLUMN, - JUSTIFY_FLEX_END, - Icon, DIRECTION_ROW, - ALIGN_FLEX_START, + DISPLAY_FLEX, + Flex, + Icon, + JUSTIFY_FLEX_END, JUSTIFY_SPACE_BETWEEN, + RobotCoordsForeignDiv, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { OffsetVector } from '../../../molecules/OffsetVector' import type { LabwareDefinition2 } from '@opentrons/shared-data' diff --git a/app/src/organisms/Devices/ProtocolRun/ProtocolAnalysisErrorBanner.tsx b/app/src/organisms/Devices/ProtocolRun/ProtocolAnalysisErrorBanner.tsx index 397b0cf391b..7b2b87e123b 100644 --- a/app/src/organisms/Devices/ProtocolRun/ProtocolAnalysisErrorBanner.tsx +++ b/app/src/organisms/Devices/ProtocolRun/ProtocolAnalysisErrorBanner.tsx @@ -3,20 +3,20 @@ import { createPortal } from 'react-dom' import { Trans, useTranslation } from 'react-i18next' import { + ALIGN_CENTER, Btn, Flex, - ALIGN_CENTER, - JUSTIFY_SPACE_BETWEEN, JUSTIFY_FLEX_END, - SPACING, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../../App/portal' import { Banner } from '../../../atoms/Banner' import { LegacyModal } from '../../../molecules/LegacyModal' -import { StyledText } from '../../../atoms/text' import type { AnalysisError } from '@opentrons/shared-data' diff --git a/app/src/organisms/Devices/ProtocolRun/ProtocolAnalysisErrorModal.tsx b/app/src/organisms/Devices/ProtocolRun/ProtocolAnalysisErrorModal.tsx index cd74087a42d..62a2d19bd3d 100644 --- a/app/src/organisms/Devices/ProtocolRun/ProtocolAnalysisErrorModal.tsx +++ b/app/src/organisms/Devices/ProtocolRun/ProtocolAnalysisErrorModal.tsx @@ -8,11 +8,11 @@ import { OVERFLOW_WRAP_ANYWHERE, PrimaryButton, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../../App/portal' -import { StyledText } from '../../../atoms/text' import { LegacyModal } from '../../../molecules/LegacyModal' import type { AnalysisError } from '@opentrons/shared-data' diff --git a/app/src/organisms/Devices/ProtocolRun/ProtocolDropTipBanner.tsx b/app/src/organisms/Devices/ProtocolRun/ProtocolDropTipBanner.tsx index ff12d0dcf6c..751e8809ef2 100644 --- a/app/src/organisms/Devices/ProtocolRun/ProtocolDropTipBanner.tsx +++ b/app/src/organisms/Devices/ProtocolRun/ProtocolDropTipBanner.tsx @@ -2,17 +2,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - SPACING, - Btn, - TYPOGRAPHY, ALIGN_START, + Btn, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { Banner } from '../../../atoms/Banner' -import { StyledText } from '../../../atoms/text' export function ProtocolDropTipBanner(props: { onLaunchWizardClick: (setShowWizard: true) => void diff --git a/app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader.tsx b/app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader.tsx index cba77dbb461..8d65ef71417 100644 --- a/app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader.tsx +++ b/app/src/organisms/Devices/ProtocolRun/ProtocolRunHeader.tsx @@ -36,7 +36,6 @@ import { DISPLAY_FLEX, Flex, Icon, - IconName, JUSTIFY_CENTER, JUSTIFY_FLEX_END, JUSTIFY_SPACE_BETWEEN, @@ -45,6 +44,7 @@ import { SecondaryButton, SIZE_1, SPACING, + StyledText, TYPOGRAPHY, useConditionalConfirm, useHoverTooltip, @@ -68,7 +68,6 @@ import { ANALYTICS_PROTOCOL_RUN_RESUME, } from '../../../redux/analytics' import { getIsHeaterShakerAttached } from '../../../redux/config' -import { StyledText } from '../../../atoms/text' import { Tooltip } from '../../../atoms/Tooltip' import { useCloseCurrentRun, @@ -110,9 +109,10 @@ import { useMostRecentRunId } from '../../ProtocolUpload/hooks/useMostRecentRunI import { useNotifyRunQuery } from '../../../resources/runs' import type { Run, RunError, RunStatus } from '@opentrons/api-client' +import type { PipetteModelSpecs } from '@opentrons/shared-data' +import type { IconName } from '@opentrons/components' import type { State } from '../../../redux/types' import type { HeaterShakerModule } from '../../../redux/modules/types' -import type { PipetteModelSpecs } from '@opentrons/shared-data' interface PipettesWithTip { mount: 'left' | 'right' diff --git a/app/src/organisms/Devices/ProtocolRun/ProtocolRunModuleControls.tsx b/app/src/organisms/Devices/ProtocolRun/ProtocolRunModuleControls.tsx index ecf04ba81e1..690ae1b43d0 100644 --- a/app/src/organisms/Devices/ProtocolRun/ProtocolRunModuleControls.tsx +++ b/app/src/organisms/Devices/ProtocolRun/ProtocolRunModuleControls.tsx @@ -3,12 +3,12 @@ import { useTranslation } from 'react-i18next' import { useInstrumentsQuery } from '@opentrons/react-api-client' import { COLORS, + DIRECTION_COLUMN, Flex, - SPACING, JUSTIFY_CENTER, - DIRECTION_COLUMN, + SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { ModuleCard } from '../../ModuleCard' import { useModuleRenderInfoForProtocolById } from '../hooks' import type { BadPipette, PipetteData } from '@opentrons/api-client' diff --git a/app/src/organisms/Devices/ProtocolRun/ProtocolRunRunTimeParameters.tsx b/app/src/organisms/Devices/ProtocolRun/ProtocolRunRunTimeParameters.tsx index cc90f4d6311..7a6b07f9ae5 100644 --- a/app/src/organisms/Devices/ProtocolRun/ProtocolRunRunTimeParameters.tsx +++ b/app/src/organisms/Devices/ProtocolRun/ProtocolRunRunTimeParameters.tsx @@ -10,10 +10,10 @@ import { DIRECTION_ROW, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { Banner } from '../../../atoms/Banner' import { Divider } from '../../../atoms/structure' // import { Chip } from '../../../atoms/Chip' diff --git a/app/src/organisms/Devices/ProtocolRun/ProtocolRunSetup.tsx b/app/src/organisms/Devices/ProtocolRun/ProtocolRunSetup.tsx index 6b5d1a42fb4..f558f1df037 100644 --- a/app/src/organisms/Devices/ProtocolRun/ProtocolRunSetup.tsx +++ b/app/src/organisms/Devices/ProtocolRun/ProtocolRunSetup.tsx @@ -14,12 +14,12 @@ import { Icon, Link, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { FLEX_ROBOT_TYPE, OT2_ROBOT_TYPE } from '@opentrons/shared-data' import { Line } from '../../../atoms/structure' -import { StyledText } from '../../../atoms/text' import { InfoMessage } from '../../../molecules/InfoMessage' import { INCOMPATIBLE, INEXACT_MATCH } from '../../../redux/pipettes' import { diff --git a/app/src/organisms/Devices/ProtocolRun/RunFailedModal.tsx b/app/src/organisms/Devices/ProtocolRun/RunFailedModal.tsx index 3f8af34ca22..dbaeff488b8 100644 --- a/app/src/organisms/Devices/ProtocolRun/RunFailedModal.tsx +++ b/app/src/organisms/Devices/ProtocolRun/RunFailedModal.tsx @@ -16,10 +16,10 @@ import { OVERFLOW_WRAP_ANYWHERE, PrimaryButton, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { LegacyModal } from '../../../molecules/LegacyModal' import { useDownloadRunLog } from '../hooks' diff --git a/app/src/organisms/Devices/ProtocolRun/RunTimer.tsx b/app/src/organisms/Devices/ProtocolRun/RunTimer.tsx index 91c4c474e2c..42076cbf964 100644 --- a/app/src/organisms/Devices/ProtocolRun/RunTimer.tsx +++ b/app/src/organisms/Devices/ProtocolRun/RunTimer.tsx @@ -2,9 +2,8 @@ import * as React from 'react' import { CSSProp } from 'styled-components' import { RUN_STATUS_STOP_REQUESTED } from '@opentrons/api-client' -import { useInterval, TYPOGRAPHY } from '@opentrons/components' +import { useInterval, TYPOGRAPHY, StyledText } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { formatInterval } from '../../../organisms/RunTimeControl/utils' import { EMPTY_TIMESTAMP } from '../constants' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupCalibrationItem.tsx b/app/src/organisms/Devices/ProtocolRun/SetupCalibrationItem.tsx index 9ee7158802f..1dcd3a24395 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupCalibrationItem.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupCalibrationItem.tsx @@ -2,20 +2,20 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - Icon, ALIGN_CENTER, + BORDERS, + COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + Icon, JUSTIFY_SPACE_BETWEEN, SIZE_1, - BORDERS, - COLORS, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { useRunHasStarted } from '../hooks' import { formatTimestamp } from '../utils' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupDeckCalibration.tsx b/app/src/organisms/Devices/ProtocolRun/SetupDeckCalibration.tsx index 099312f6b4a..5a032080594 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupDeckCalibration.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupDeckCalibration.tsx @@ -3,18 +3,18 @@ import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' import { - Flex, ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, JUSTIFY_SPACE_BETWEEN, - COLORS, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { TertiaryButton } from '../../../atoms/buttons' -import { StyledText } from '../../../atoms/text' import { useDeckCalibrationData } from '../hooks' import { SetupCalibrationItem } from './SetupCalibrationItem' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupInstrumentCalibration.tsx b/app/src/organisms/Devices/ProtocolRun/SetupInstrumentCalibration.tsx index a55256627fc..29dbba91332 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupInstrumentCalibration.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupInstrumentCalibration.tsx @@ -2,13 +2,13 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, COLORS, + DIRECTION_COLUMN, + Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import * as PipetteConstants from '../../../redux/pipettes/constants' import { getShowPipetteCalibrationWarning } from '../utils' import { PipetteRecalibrationWarning } from '../PipetteCard/PipetteRecalibrationWarning' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabware/LabwareListItem.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabware/LabwareListItem.tsx index 612a54cf1ce..3b4d03e9d2a 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLabware/LabwareListItem.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLabware/LabwareListItem.tsx @@ -3,22 +3,23 @@ import { useTranslation } from 'react-i18next' import styled, { css } from 'styled-components' import { - Flex, - SPACING, - Icon, + ALIGN_CENTER, + BORDERS, + Btn, COLORS, - DIRECTION_ROW, DIRECTION_COLUMN, - TYPOGRAPHY, + DIRECTION_ROW, + DISPLAY_FLEX, + Flex, + Icon, JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, - ALIGN_CENTER, LabwareRender, - Btn, - BORDERS, - WELL_LABEL_OPTIONS, SIZE_AUTO, - DISPLAY_FLEX, + SPACING, + StyledText, + TYPOGRAPHY, + WELL_LABEL_OPTIONS, } from '@opentrons/components' import { useCreateLiveCommandMutation } from '@opentrons/react-api-client' import { @@ -34,7 +35,6 @@ import { } from '@opentrons/shared-data' import { ToggleButton } from '../../../../atoms/buttons' -import { StyledText } from '../../../../atoms/text' import { SecureLabwareModal } from './SecureLabwareModal' import type { diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabware/OffDeckLabwareList.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabware/OffDeckLabwareList.tsx index 1d55e12c76b..7bbf43ffc1b 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLabware/OffDeckLabwareList.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLabware/OffDeckLabwareList.tsx @@ -1,7 +1,6 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' -import { SPACING, TYPOGRAPHY } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' +import { SPACING, TYPOGRAPHY, StyledText } from '@opentrons/components' import { LabwareListItem } from './LabwareListItem' import type { RunTimeCommand } from '@opentrons/shared-data' import type { LabwareSetupItem } from '../../../../pages/Protocols/utils' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabware/SecureLabwareModal.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabware/SecureLabwareModal.tsx index 89ad4bdecc5..9b8b08aab3c 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLabware/SecureLabwareModal.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLabware/SecureLabwareModal.tsx @@ -3,17 +3,17 @@ import { createPortal } from 'react-dom' import snakeCase from 'lodash/snakeCase' import { Trans, useTranslation } from 'react-i18next' import { + ALIGN_FLEX_END, + DIRECTION_COLUMN, + DIRECTION_ROW, Flex, JUSTIFY_SPACE_BETWEEN, - TYPOGRAPHY, - DIRECTION_ROW, - SPACING, PrimaryButton, - ALIGN_FLEX_END, - DIRECTION_COLUMN, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../../../App/portal' -import { StyledText } from '../../../../atoms/text' import { LegacyModal } from '../../../../molecules/LegacyModal' import secureMagModBracketImage from '../../../../assets/images/secure_mag_mod_bracket.png' import secureTCLatchImage from '../../../../assets/images/secure_tc_latch.png' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabware/SetupLabwareList.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabware/SetupLabwareList.tsx index b45ed5ba84e..a0d3e9bd693 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLabware/SetupLabwareList.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLabware/SetupLabwareList.tsx @@ -2,25 +2,25 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { + DIRECTION_COLUMN, Flex, SPACING, - DIRECTION_COLUMN, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { RunTimeCommand } from '@opentrons/shared-data' -import { StyledText } from '../../../../atoms/text' import { getLabwareSetupItemGroups } from '../../../../pages/Protocols/utils' import { LabwareListItem } from './LabwareListItem' import { OffDeckLabwareList } from './OffDeckLabwareList' import { getNestedLabwareInfo } from './getNestedLabwareInfo' +import type { RunTimeCommand } from '@opentrons/shared-data' import type { ModuleRenderInfoForProtocol } from '../../hooks' import type { ModuleTypesThatRequireExtraAttention } from '../utils/getModuleTypesThatRequireExtraAttention' const HeaderRow = styled.div` display: grid; grid-template-columns: 1fr 5.2fr 5.3fr; - grip-gap: ${SPACING.spacing8}; + grid-gap: ${SPACING.spacing8}; padding: ${SPACING.spacing8}; ` interface SetupLabwareListProps { diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/CurrentOffsetsTable.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/CurrentOffsetsTable.tsx index 159543ec3e5..c27fe6e0445 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/CurrentOffsetsTable.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/CurrentOffsetsTable.tsx @@ -9,17 +9,17 @@ import { getLoadedLabwareDefinitionsByUri, } from '@opentrons/shared-data' import { - Flex, - DIRECTION_COLUMN, BORDERS, - SPACING, - TYPOGRAPHY, COLORS, + DIRECTION_COLUMN, + Flex, JUSTIFY_SPACE_BETWEEN, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getIsLabwareOffsetCodeSnippetsOn } from '../../../../redux/config' -import { StyledText } from '../../../../atoms/text' import { LabwareOffsetTabs } from '../../../LabwareOffsetTabs' import { OffsetVector } from '../../../../molecules/OffsetVector' import { PythonLabwareOffsetSnippet } from '../../../../molecules/PythonLabwareOffsetSnippet' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/HowLPCWorksModal.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/HowLPCWorksModal.tsx index 7e63ed11509..52f5d00c758 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/HowLPCWorksModal.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/HowLPCWorksModal.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import { createPortal } from 'react-dom' import { useTranslation } from 'react-i18next' import { + ALIGN_FLEX_END, + DIRECTION_COLUMN, Flex, Icon, Link, - TYPOGRAPHY, - DIRECTION_COLUMN, - ALIGN_FLEX_END, PrimaryButton, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../../../App/portal' import { LegacyModal } from '../../../../molecules/LegacyModal' -import { StyledText } from '../../../../atoms/text' const OFFSET_DATA_HELP_ARTICLE = 'https://support.opentrons.com/s/article/How-Labware-Offsets-work-on-the-OT-2' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/index.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/index.tsx index a6e2ce6da0d..45b7115d1fd 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/index.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/index.tsx @@ -1,18 +1,19 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + ALIGN_CENTER, BORDERS, - SPACING, - JUSTIFY_CENTER, + COLORS, DIRECTION_COLUMN, - ALIGN_CENTER, - TYPOGRAPHY, + Flex, + JUSTIFY_CENTER, + PrimaryButton, + SecondaryButton, + SPACING, + StyledText, TOOLTIP_LEFT, + TYPOGRAPHY, useHoverTooltip, - SecondaryButton, - PrimaryButton, - COLORS, } from '@opentrons/components' import { useProtocolQuery } from '@opentrons/react-api-client' import { useMostRecentCompletedAnalysis } from '../../../LabwarePositionCheck/useMostRecentCompletedAnalysis' @@ -25,7 +26,6 @@ import { } from '../../hooks' import { CurrentOffsetsTable } from './CurrentOffsetsTable' import { useLaunchLPC } from '../../../LabwarePositionCheck/useLaunchLPC' -import { StyledText } from '../../../../atoms/text' import { getLatestCurrentOffsets } from './utils' import { useNotifyRunQuery } from '../../../../resources/runs' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLiquids/LiquidDetailCard.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLiquids/LiquidDetailCard.tsx index 391ae829456..cc8fd255d2f 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLiquids/LiquidDetailCard.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLiquids/LiquidDetailCard.tsx @@ -15,11 +15,11 @@ import { JUSTIFY_SPACE_BETWEEN, SIZE_1, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { MICRO_LITERS } from '@opentrons/shared-data' import { Divider } from '../../../../atoms/structure' -import { StyledText } from '../../../../atoms/text' import { useTrackEvent, ANALYTICS_HIGHLIGHT_LIQUID_IN_DETAIL_MODAL, diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLiquids/LiquidsLabwareDetailsModal.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLiquids/LiquidsLabwareDetailsModal.tsx index 572735bc157..0c3e6beb7da 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLiquids/LiquidsLabwareDetailsModal.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLiquids/LiquidsLabwareDetailsModal.tsx @@ -8,19 +8,19 @@ import { } from '@opentrons/api-client' import { Box, - Flex, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + LabwareRender, SPACING, + StyledText, TYPOGRAPHY, - LabwareRender, } from '@opentrons/components' import { Modal } from '../../../../molecules/Modal' import { getIsOnDevice } from '../../../../redux/config' import { useMostRecentCompletedAnalysis } from '../../../LabwarePositionCheck/useMostRecentCompletedAnalysis' import { LegacyModal } from '../../../../molecules/LegacyModal' -import { StyledText } from '../../../../atoms/text' import { getLocationInfoNames } from '../utils/getLocationInfoNames' import { getSlotLabwareDefinition } from '../utils/getSlotLabwareDefinition' import { LiquidDetailCard } from './LiquidDetailCard' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx index 8e96bca7879..eafd8880b55 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupLiquids/SetupLiquidsList.tsx @@ -7,20 +7,21 @@ import { } from '@opentrons/api-client' import { - Flex, - SPACING, - Icon, + ALIGN_CENTER, + BORDERS, + Box, COLORS, - DIRECTION_ROW, DIRECTION_COLUMN, - TYPOGRAPHY, + DIRECTION_ROW, + Flex, + Icon, JUSTIFY_CENTER, + JUSTIFY_FLEX_START, SIZE_1, - BORDERS, - ALIGN_CENTER, SIZE_AUTO, - Box, - JUSTIFY_FLEX_START, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getModuleDisplayName, MICRO_LITERS } from '@opentrons/shared-data' import { @@ -29,7 +30,6 @@ import { ANALYTICS_OPEN_LIQUID_LABWARE_DETAIL_MODAL, } from '../../../../redux/analytics' import { useMostRecentCompletedAnalysis } from '../../../LabwarePositionCheck/useMostRecentCompletedAnalysis' -import { StyledText } from '../../../../atoms/text' import { getLocationInfoNames } from '../utils/getLocationInfoNames' import { LiquidsLabwareDetailsModal } from './LiquidsLabwareDetailsModal' import { diff --git a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal.tsx b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal.tsx index 0a8f8b599e4..b4a8e634b0d 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal.tsx @@ -6,19 +6,20 @@ import { useUpdateDeckConfigurationMutation, } from '@opentrons/react-api-client' import { - Flex, + ALIGN_CENTER, + BORDERS, + COLORS, DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, - PrimaryButton, - SecondaryButton, - Icon, DIRECTION_ROW, - COLORS, + Flex, + Icon, JUSTIFY_END, - ALIGN_CENTER, JUSTIFY_SPACE_BETWEEN, - BORDERS, + PrimaryButton, + SecondaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getCutoutDisplayName, @@ -32,7 +33,6 @@ import { } from '@opentrons/shared-data' import { getTopPortalEl } from '../../../../App/portal' import { LegacyModal } from '../../../../molecules/LegacyModal' -import { StyledText } from '../../../../atoms/text' import { Modal } from '../../../../molecules/Modal' import { SmallButton } from '../../../../atoms/buttons/SmallButton' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/MultipleModulesModal.tsx b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/MultipleModulesModal.tsx index 546d070bbe1..dab8226df9a 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/MultipleModulesModal.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/MultipleModulesModal.tsx @@ -3,21 +3,21 @@ import { createPortal } from 'react-dom' import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import { - Flex, - Link, - Icon, - DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, - PrimaryButton, ALIGN_FLEX_END, + ALIGN_STRETCH, + DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + Icon, JUSTIFY_SPACE_BETWEEN, - ALIGN_STRETCH, + Link, + PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../../../App/portal' import { LegacyModal } from '../../../../molecules/LegacyModal' -import { StyledText } from '../../../../atoms/text' import { getIsOnDevice } from '../../../../redux/config' import { Modal } from '../../../../molecules/Modal' import multipleModuleHelp from '../../../../assets/images/Moam_modal_image.png' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/NotConfiguredModal.tsx b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/NotConfiguredModal.tsx index ad011257454..3ef27d24baa 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/NotConfiguredModal.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/NotConfiguredModal.tsx @@ -6,20 +6,20 @@ import { useUpdateDeckConfigurationMutation, } from '@opentrons/react-api-client' import { - Flex, + ALIGN_CENTER, + BORDERS, + COLORS, DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, + Flex, JUSTIFY_SPACE_BETWEEN, - COLORS, - BORDERS, - ALIGN_CENTER, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getFixtureDisplayName } from '@opentrons/shared-data' import { TertiaryButton } from '../../../../atoms/buttons/TertiaryButton' import { getTopPortalEl } from '../../../../App/portal' import { LegacyModal } from '../../../../molecules/LegacyModal' -import { StyledText } from '../../../../atoms/text' import type { CutoutFixtureId, CutoutId } from '@opentrons/shared-data' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/SetupFixtureList.tsx b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/SetupFixtureList.tsx index 97e4460aae1..4e65fd3759d 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/SetupFixtureList.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/SetupFixtureList.tsx @@ -12,6 +12,7 @@ import { JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { @@ -19,7 +20,6 @@ import { getCutoutDisplayName, getFixtureDisplayName, } from '@opentrons/shared-data' -import { StyledText } from '../../../../atoms/text' import { StatusLabel } from '../../../../atoms/StatusLabel' import { TertiaryButton } from '../../../../atoms/buttons/TertiaryButton' import { LocationConflictModal } from './LocationConflictModal' diff --git a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/SetupModulesList.tsx b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/SetupModulesList.tsx index ea05e8d4550..8f0879e9609 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/SetupModulesList.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/SetupModulesList.tsx @@ -14,9 +14,10 @@ import { JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, + TOOLTIP_LEFT, TYPOGRAPHY, useHoverTooltip, - TOOLTIP_LEFT, } from '@opentrons/components' import { FLEX_ROBOT_TYPE, @@ -33,7 +34,6 @@ import { import { Banner } from '../../../../atoms/Banner' import { TertiaryButton } from '../../../../atoms/buttons' import { StatusLabel } from '../../../../atoms/StatusLabel' -import { StyledText } from '../../../../atoms/text' import { Tooltip } from '../../../../atoms/Tooltip' import { useChainLiveCommands } from '../../../../resources/runs' import { ModuleSetupModal } from '../../../ModuleCard/ModuleSetupModal' @@ -41,7 +41,6 @@ import { ModuleWizardFlows } from '../../../ModuleWizardFlows' import { getModulePrepCommands } from '../../getModulePrepCommands' import { getModuleTooHot } from '../../getModuleTooHot' import { - ModuleRenderInfoForProtocol, useIsFlex, useModuleRenderInfoForProtocolById, useRobot, @@ -59,7 +58,10 @@ import type { ModuleModel, } from '@opentrons/shared-data' import type { AttachedModule } from '../../../../redux/modules/types' -import type { ProtocolCalibrationStatus } from '../../hooks' +import type { + ModuleRenderInfoForProtocol, + ProtocolCalibrationStatus, +} from '../../hooks' interface SetupModulesListProps { robotName: string diff --git a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/UnMatchedModuleWarning.tsx b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/UnMatchedModuleWarning.tsx index 3baa5362a90..d5d263114d3 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/UnMatchedModuleWarning.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/UnMatchedModuleWarning.tsx @@ -1,13 +1,13 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + Box, DIRECTION_COLUMN, - TYPOGRAPHY, + Flex, SPACING, - Box, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { Banner } from '../../../../atoms/Banner' export const UnMatchedModuleWarning = (): JSX.Element | null => { diff --git a/app/src/organisms/Devices/ProtocolRun/SetupStep.tsx b/app/src/organisms/Devices/ProtocolRun/SetupStep.tsx index a2d9cee0353..cbfbde15443 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupStep.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupStep.tsx @@ -2,21 +2,20 @@ import * as React from 'react' import { css } from 'styled-components' import { + ALIGN_CENTER, Box, Btn, - Flex, - Icon, - ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + Icon, JUSTIFY_SPACE_BETWEEN, - COLORS, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' - interface SetupStepProps { /** whether or not to show the full contents of the step */ expanded: boolean diff --git a/app/src/organisms/Devices/ProtocolRun/SetupTipLengthCalibration.tsx b/app/src/organisms/Devices/ProtocolRun/SetupTipLengthCalibration.tsx index 0f53ea7652e..f1bda7a4265 100644 --- a/app/src/organisms/Devices/ProtocolRun/SetupTipLengthCalibration.tsx +++ b/app/src/organisms/Devices/ProtocolRun/SetupTipLengthCalibration.tsx @@ -2,14 +2,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, COLORS, + DIRECTION_COLUMN, + Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import * as PipetteConstants from '../../../redux/pipettes/constants' import { useRunPipetteInfoByMount } from '../hooks' import { SetupCalibrationItem } from './SetupCalibrationItem' diff --git a/app/src/organisms/Devices/RecentProtocolRuns.tsx b/app/src/organisms/Devices/RecentProtocolRuns.tsx index 245aa77f9a3..60ae2fdbcfb 100644 --- a/app/src/organisms/Devices/RecentProtocolRuns.tsx +++ b/app/src/organisms/Devices/RecentProtocolRuns.tsx @@ -2,20 +2,20 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useAllProtocolsQuery } from '@opentrons/react-api-client' import { - Flex, ALIGN_CENTER, ALIGN_FLEX_START, BORDERS, COLORS, DIRECTION_COLUMN, + DISPLAY_FLEX, + Flex, JUSTIFY_SPACE_AROUND, SIZE_4, SPACING, + StyledText, TYPOGRAPHY, - DISPLAY_FLEX, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { useCurrentRunId } from '../ProtocolUpload/hooks' import { HistoricalProtocolRun } from './HistoricalProtocolRun' import { useIsRobotViewable, useRunStatuses } from './hooks' diff --git a/app/src/organisms/Devices/RobotCard.tsx b/app/src/organisms/Devices/RobotCard.tsx index 9e244ee02ae..280cfaadf32 100644 --- a/app/src/organisms/Devices/RobotCard.tsx +++ b/app/src/organisms/Devices/RobotCard.tsx @@ -5,8 +5,8 @@ import { useHistory } from 'react-router-dom' import { ALIGN_START, - Box, BORDERS, + Box, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, @@ -16,11 +16,11 @@ import { POSITION_ABSOLUTE, POSITION_RELATIVE, SPACING, + StyledText, TYPOGRAPHY, WRAP, } from '@opentrons/components' import { - GripperModel, getGripperDisplayName, getModuleDisplayName, getPipetteModelSpecs, @@ -34,7 +34,6 @@ import { import OT2_PNG from '../../assets/images/OT2-R_HERO.png' import FLEX_PNG from '../../assets/images/FLEX.png' import { InstrumentContainer } from '../../atoms/InstrumentContainer' -import { StyledText } from '../../atoms/text' import { CONNECTABLE, getRobotModelByName } from '../../redux/discovery' import { ModuleIcon } from '../../molecules/ModuleIcon' import { UpdateRobotBanner } from '../UpdateRobotBanner' @@ -43,9 +42,10 @@ import { ReachableBanner } from './ReachableBanner' import { RobotOverflowMenu } from './RobotOverflowMenu' import { RobotStatusHeader } from './RobotStatusHeader' +import type { GripperData } from '@opentrons/api-client' +import type { GripperModel } from '@opentrons/shared-data' import type { DiscoveredRobot } from '../../redux/discovery/types' import type { State } from '../../redux/types' -import { GripperData } from '@opentrons/api-client' interface RobotCardProps { robot: DiscoveredRobot diff --git a/app/src/organisms/Devices/RobotOverview.tsx b/app/src/organisms/Devices/RobotOverview.tsx index 2e6db0444de..272a04aac81 100644 --- a/app/src/organisms/Devices/RobotOverview.tsx +++ b/app/src/organisms/Devices/RobotOverview.tsx @@ -3,18 +3,19 @@ import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Box, - Flex, ALIGN_CENTER, ALIGN_START, BORDERS, + Box, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, JUSTIFY_SPACE_BETWEEN, POSITION_ABSOLUTE, POSITION_RELATIVE, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useAuthorization } from '@opentrons/react-api-client' @@ -22,7 +23,6 @@ import { useAuthorization } from '@opentrons/react-api-client' import OT2_PNG from '../../assets/images/OT2-R_HERO.png' import FLEX_PNG from '../../assets/images/FLEX.png' import { ToggleButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { getConfig } from '../../redux/config' import { CONNECTABLE, diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/DeviceResetModal.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/DeviceResetModal.tsx index 4b3841d7eb4..aff5b580c54 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/DeviceResetModal.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/DeviceResetModal.tsx @@ -5,17 +5,17 @@ import last from 'lodash/last' import { useHistory } from 'react-router-dom' import { - Flex, + AlertPrimaryButton, + ALIGN_CENTER, DIRECTION_COLUMN, + Flex, JUSTIFY_FLEX_END, - AlertPrimaryButton, - SPACING, Link, - TYPOGRAPHY, - ALIGN_CENTER, PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../../atoms/text' import { LegacyModal } from '../../../../../molecules/LegacyModal' import { useDispatchApiRequest, diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/DeviceResetSlideout.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/DeviceResetSlideout.tsx index ad839244ceb..3b9b3a4c5e4 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/DeviceResetSlideout.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/DeviceResetSlideout.tsx @@ -17,11 +17,11 @@ import { Link, PrimaryButton, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Slideout } from '../../../../../atoms/Slideout' -import { StyledText } from '../../../../../atoms/text' import { Divider } from '../../../../../atoms/structure' import { UNREACHABLE } from '../../../../../redux/discovery' import { diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/RenameRobotSlideout.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/RenameRobotSlideout.tsx index e90fae77a86..81ebe7790b4 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/RenameRobotSlideout.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/AdvancedTabSlideouts/RenameRobotSlideout.tsx @@ -4,11 +4,12 @@ import { useHistory } from 'react-router-dom' import { useForm, Controller } from 'react-hook-form' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, - SPACING, COLORS, + DIRECTION_COLUMN, + Flex, PrimaryButton, + SPACING, + StyledText, } from '@opentrons/components' import { useUpdateRobotNameMutation } from '@opentrons/react-api-client' import { @@ -22,7 +23,6 @@ import { ANALYTICS_RENAME_ROBOT, } from '../../../../../redux/analytics' import { Slideout } from '../../../../../atoms/Slideout' -import { StyledText } from '../../../../../atoms/text' import { InputField } from '../../../../../atoms/InputField' import { Banner } from '../../../../../atoms/Banner' import { useIsFlex } from '../../../hooks' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/DeviceReset.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/DeviceReset.tsx index 7aebcce1ab3..2d67905c27c 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/DeviceReset.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/DeviceReset.tsx @@ -2,16 +2,16 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, + Box, + Flex, JUSTIFY_SPACE_BETWEEN, - SPACING, SPACING_AUTO, - Box, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { TertiaryButton } from '../../../../atoms/buttons' interface DeviceResetProps { diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/DisplayRobotName.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/DisplayRobotName.tsx index 8090ae6cb40..ce2d2dc46f2 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/DisplayRobotName.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/DisplayRobotName.tsx @@ -2,17 +2,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, + Box, COLORS, + Flex, JUSTIFY_SPACE_BETWEEN, - Box, - SPACING, SPACING_AUTO, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { TertiaryButton } from '../../../../atoms/buttons' interface DisplayRobotNameProps { robotName: string diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/EnableStatusLight.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/EnableStatusLight.tsx index 6a3d26f2af8..901f242d12d 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/EnableStatusLight.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/EnableStatusLight.tsx @@ -9,8 +9,8 @@ import { JUSTIFY_SPACE_BETWEEN, SPACING, TYPOGRAPHY, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { ToggleButton } from '../../../../atoms/buttons' import { useLEDLights } from '../../hooks' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/GantryHoming.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/GantryHoming.tsx index 01a669bcccd..3797195542e 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/GantryHoming.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/GantryHoming.tsx @@ -3,15 +3,15 @@ import { useDispatch } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, + Box, + Flex, JUSTIFY_SPACE_BETWEEN, - TYPOGRAPHY, SPACING, - Box, + TYPOGRAPHY, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { ToggleButton } from '../../../../atoms/buttons' import { updateSetting } from '../../../../redux/robot-settings' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/LegacySettings.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/LegacySettings.tsx index 440c3211182..1cfc341f394 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/LegacySettings.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/LegacySettings.tsx @@ -3,15 +3,15 @@ import { useDispatch } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, - JUSTIFY_SPACE_BETWEEN, Box, - TYPOGRAPHY, + Flex, + JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { ToggleButton } from '../../../../atoms/buttons' import { updateSetting } from '../../../../redux/robot-settings' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/OpenJupyterControl.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/OpenJupyterControl.tsx index 5b98b2af9a9..6d708376261 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/OpenJupyterControl.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/OpenJupyterControl.tsx @@ -6,13 +6,13 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useTrackEvent, ANALYTICS_JUPYTER_OPEN, } from '../../../../redux/analytics' -import { StyledText } from '../../../../atoms/text' import { TertiaryButton } from '../../../../atoms/buttons' import { ExternalLink } from '../../../../atoms/Link/ExternalLink' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/RobotInformation.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/RobotInformation.tsx index 5ed30b3a3e1..9d20db339c7 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/RobotInformation.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/RobotInformation.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, Box, + DIRECTION_COLUMN, + Flex, JUSTIFY_FLEX_START, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { useRobot } from '../../../../organisms/Devices/hooks' import { getRobotSerialNumber, diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/RobotServerVersion.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/RobotServerVersion.tsx index 800185b6117..193b0e140b9 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/RobotServerVersion.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/RobotServerVersion.tsx @@ -2,17 +2,17 @@ import * as React from 'react' import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, - JUSTIFY_SPACE_BETWEEN, Box, - SPACING, - TYPOGRAPHY, COLORS, - Link, + Flex, JUSTIFY_FLEX_END, + JUSTIFY_SPACE_BETWEEN, + Link, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { TertiaryButton } from '../../../../atoms/buttons' import { getRobotApiVersion } from '../../../../redux/discovery' import { getRobotUpdateDisplayInfo } from '../../../../redux/robot-update' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/ShortTrashBin.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/ShortTrashBin.tsx index 9a77445ea4d..d965c2f9c98 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/ShortTrashBin.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/ShortTrashBin.tsx @@ -3,15 +3,15 @@ import { useDispatch } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, - JUSTIFY_SPACE_BETWEEN, Box, + Flex, + JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { ToggleButton } from '../../../../atoms/buttons' import { updateSetting } from '../../../../redux/robot-settings' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/SoftwareUpdateModal.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/SoftwareUpdateModal.tsx index d8d8b0b548b..9884676e224 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/SoftwareUpdateModal.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/SoftwareUpdateModal.tsx @@ -2,19 +2,19 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import { - Flex, DIRECTION_COLUMN, + Flex, JUSTIFY_FLEX_END, - TYPOGRAPHY, - SPACING, PrimaryButton, SecondaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getShellUpdateState } from '../../../../redux/shell' import { useCurrentRunId } from '../../../../organisms/ProtocolUpload/hooks' // import { ReleaseNotes } from '../../../../molecules/ReleaseNotes' -import { StyledText } from '../../../../atoms/text' import { ExternalLink } from '../../../../atoms/Link/ExternalLink' import { Banner } from '../../../../atoms/Banner' import { LegacyModal } from '../../../../molecules/LegacyModal' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/Troubleshooting.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/Troubleshooting.tsx index c5476583d90..1c4ac70e889 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/Troubleshooting.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/Troubleshooting.tsx @@ -6,17 +6,17 @@ import last from 'lodash/last' import { GET, request } from '@opentrons/api-client' import { - Flex, ALIGN_CENTER, - JUSTIFY_SPACE_BETWEEN, Box, - SPACING, + Flex, + JUSTIFY_SPACE_BETWEEN, SPACING_AUTO, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useHost } from '@opentrons/react-api-client' -import { StyledText } from '../../../../atoms/text' import { TertiaryButton } from '../../../../atoms/buttons' import { ERROR_TOAST, INFO_TOAST } from '../../../../atoms/Toast' import { useToaster } from '../../../../organisms/ToasterOven' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/UpdateRobotSoftware.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/UpdateRobotSoftware.tsx index 81087ef6e1b..a8febac7092 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/UpdateRobotSoftware.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/UpdateRobotSoftware.tsx @@ -4,17 +4,17 @@ import { useSelector } from 'react-redux' import { css } from 'styled-components' import { - Flex, ALIGN_CENTER, + Box, + Flex, JUSTIFY_SPACE_BETWEEN, - SPACING, SPACING_AUTO, - Box, - useHoverTooltip, + SPACING, + StyledText, TYPOGRAPHY, + useHoverTooltip, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { ExternalLink } from '../../../../atoms/Link/ExternalLink' import { TertiaryButton } from '../../../../atoms/buttons' import { Tooltip } from '../../../../atoms/Tooltip' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/UsageSettings.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/UsageSettings.tsx index 744959d2d1e..8b08af3ae23 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/UsageSettings.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/UsageSettings.tsx @@ -3,15 +3,15 @@ import { useDispatch } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, + Box, + Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, - Box, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { ToggleButton } from '../../../../atoms/buttons' import { updateSetting } from '../../../../redux/robot-settings' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/UseOlderAspirateBehavior.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/UseOlderAspirateBehavior.tsx index caa70d1b2a5..9a41383a0ee 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/UseOlderAspirateBehavior.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/UseOlderAspirateBehavior.tsx @@ -3,15 +3,15 @@ import { useDispatch } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, + Box, + Flex, JUSTIFY_SPACE_BETWEEN, SPACING, - Box, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { ToggleButton } from '../../../../atoms/buttons' import { updateSetting } from '../../../../redux/robot-settings' diff --git a/app/src/organisms/Devices/RobotSettings/AdvancedTab/UseOlderProtocol.tsx b/app/src/organisms/Devices/RobotSettings/AdvancedTab/UseOlderProtocol.tsx index 3b897d9b193..70cb24c8693 100644 --- a/app/src/organisms/Devices/RobotSettings/AdvancedTab/UseOlderProtocol.tsx +++ b/app/src/organisms/Devices/RobotSettings/AdvancedTab/UseOlderProtocol.tsx @@ -3,15 +3,15 @@ import { useDispatch } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, + Box, + Flex, JUSTIFY_SPACE_BETWEEN, SPACING, - Box, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { ToggleButton } from '../../../../atoms/buttons' import { updateSetting } from '../../../../redux/robot-settings' diff --git a/app/src/organisms/Devices/RobotSettings/ConnectNetwork/DisconnectModal.tsx b/app/src/organisms/Devices/RobotSettings/ConnectNetwork/DisconnectModal.tsx index 662dbdce9b5..660e04a1519 100644 --- a/app/src/organisms/Devices/RobotSettings/ConnectNetwork/DisconnectModal.tsx +++ b/app/src/organisms/Devices/RobotSettings/ConnectNetwork/DisconnectModal.tsx @@ -4,20 +4,20 @@ import { useDispatch, useSelector } from 'react-redux' import last from 'lodash/last' import { - Flex, - Link, - Icon, + AlertPrimaryButton, ALIGN_CENTER, DIRECTION_COLUMN, + Flex, + Icon, + JUSTIFY_CENTER, JUSTIFY_FLEX_END, + Link, + PrimaryButton, SPACING, + StyledText, TYPOGRAPHY, - PrimaryButton, - AlertPrimaryButton, - JUSTIFY_CENTER, } from '@opentrons/components' -import { StyledText } from '../../../../atoms/text' import { LegacyModal } from '../../../../molecules/LegacyModal' import { useRobot } from '../../../../organisms/Devices/hooks' import { CONNECTABLE } from '../../../../redux/discovery' diff --git a/app/src/organisms/Devices/RobotSettings/RobotSettingsAdvanced.tsx b/app/src/organisms/Devices/RobotSettings/RobotSettingsAdvanced.tsx index be68b1bdfc2..8772f9a383a 100644 --- a/app/src/organisms/Devices/RobotSettings/RobotSettingsAdvanced.tsx +++ b/app/src/organisms/Devices/RobotSettings/RobotSettingsAdvanced.tsx @@ -3,16 +3,16 @@ import { createPortal } from 'react-dom' import { useSelector, useDispatch } from 'react-redux' import { + ALIGN_CENTER, Box, - SPACING, Flex, - ALIGN_CENTER, JUSTIFY_SPACE_BETWEEN, + SPACING, TYPOGRAPHY, + StyledText, } from '@opentrons/components' import { Divider } from '../../../atoms/structure' -import { StyledText } from '../../../atoms/text' import { ToggleButton } from '../../../atoms/buttons' import { useIsFlex, useIsRobotBusy, useRobot } from '../hooks' import { diff --git a/app/src/organisms/Devices/RobotSettings/RobotSettingsFeatureFlags.tsx b/app/src/organisms/Devices/RobotSettings/RobotSettingsFeatureFlags.tsx index e538b099559..80ed8a04f5b 100644 --- a/app/src/organisms/Devices/RobotSettings/RobotSettingsFeatureFlags.tsx +++ b/app/src/organisms/Devices/RobotSettings/RobotSettingsFeatureFlags.tsx @@ -2,15 +2,15 @@ import * as React from 'react' import { useSelector, useDispatch } from 'react-redux' import { + ALIGN_CENTER, Box, - SPACING, Flex, - ALIGN_CENTER, JUSTIFY_SPACE_BETWEEN, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { ToggleButton } from '../../../atoms/buttons' import { updateSetting, diff --git a/app/src/organisms/Devices/RobotSettings/RobotSettingsNetworking.tsx b/app/src/organisms/Devices/RobotSettings/RobotSettingsNetworking.tsx index 904ec216498..7297f0d73f5 100644 --- a/app/src/organisms/Devices/RobotSettings/RobotSettingsNetworking.tsx +++ b/app/src/organisms/Devices/RobotSettings/RobotSettingsNetworking.tsx @@ -5,16 +5,17 @@ import { useSelector, useDispatch } from 'react-redux' import { Link } from 'react-router-dom' import { - Box, - Flex, - Icon, - useInterval, ALIGN_CENTER, + Box, COLORS, DIRECTION_COLUMN, - SPACING, + Flex, + Icon, SecondaryButton, + SPACING, + StyledText, TYPOGRAPHY, + useInterval, } from '@opentrons/components' import { @@ -22,7 +23,6 @@ import { useWifiList, } from '../../../resources/networking/hooks' import { ExternalLink } from '../../../atoms/Link/ExternalLink' -import { StyledText } from '../../../atoms/text' import { Divider } from '../../../atoms/structure' import { diff --git a/app/src/organisms/Devices/RobotSettings/SettingToggle.tsx b/app/src/organisms/Devices/RobotSettings/SettingToggle.tsx index 6807b3489c1..ff738a0f713 100644 --- a/app/src/organisms/Devices/RobotSettings/SettingToggle.tsx +++ b/app/src/organisms/Devices/RobotSettings/SettingToggle.tsx @@ -2,15 +2,15 @@ import * as React from 'react' import { useDispatch } from 'react-redux' import { + ALIGN_CENTER, Box, - SPACING, Flex, - ALIGN_CENTER, JUSTIFY_SPACE_BETWEEN, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { ToggleButton } from '../../../atoms/buttons' import { updateSetting } from '../../../redux/robot-settings' import type { Dispatch } from '../../../redux/types' diff --git a/app/src/organisms/Devices/RobotSettings/UpdateBuildroot/RobotUpdateProgressModal.tsx b/app/src/organisms/Devices/RobotSettings/UpdateBuildroot/RobotUpdateProgressModal.tsx index 3e6f4641b14..52c1d4306b3 100644 --- a/app/src/organisms/Devices/RobotSettings/UpdateBuildroot/RobotUpdateProgressModal.tsx +++ b/app/src/organisms/Devices/RobotSettings/UpdateBuildroot/RobotUpdateProgressModal.tsx @@ -4,19 +4,19 @@ import { useDispatch, useSelector } from 'react-redux' import { css } from 'styled-components' import { - Flex, - Icon, - NewPrimaryBtn, - JUSTIFY_FLEX_END, ALIGN_CENTER, + BORDERS, COLORS, DIRECTION_COLUMN, + Flex, + Icon, + JUSTIFY_FLEX_END, + NewPrimaryBtn, SPACING, - BORDERS, + StyledText, } from '@opentrons/components' import { useCreateLiveCommandMutation } from '@opentrons/react-api-client' -import { StyledText } from '../../../../atoms/text' import { LegacyModal } from '../../../../molecules/LegacyModal' import { ProgressBar } from '../../../../atoms/ProgressBar' import { FOOTER_BUTTON_STYLE } from './UpdateRobotModal' diff --git a/app/src/organisms/Devices/RobotStatusHeader.tsx b/app/src/organisms/Devices/RobotStatusHeader.tsx index e9dd34568ea..d3640823d86 100644 --- a/app/src/organisms/Devices/RobotStatusHeader.tsx +++ b/app/src/organisms/Devices/RobotStatusHeader.tsx @@ -16,6 +16,7 @@ import { JUSTIFY_SPACE_BETWEEN, OVERFLOW_WRAP_ANYWHERE, SPACING, + StyledText, truncateString, TYPOGRAPHY, useHoverTooltip, @@ -23,7 +24,6 @@ import { } from '@opentrons/components' import { QuaternaryButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Tooltip } from '../../atoms/Tooltip' import { useIsFlex } from '../../organisms/Devices/hooks' import { useCurrentRunId } from '../../organisms/ProtocolUpload/hooks' diff --git a/app/src/organisms/DropTipWizard/BeforeBeginning.tsx b/app/src/organisms/DropTipWizard/BeforeBeginning.tsx index 7696c2ccb6f..69a8d7de694 100644 --- a/app/src/organisms/DropTipWizard/BeforeBeginning.tsx +++ b/app/src/organisms/DropTipWizard/BeforeBeginning.tsx @@ -3,25 +3,25 @@ import styled, { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { - Flex, - SPACING, + ALIGN_CENTER, + BORDERS, + COLORS, DIRECTION_COLUMN, - TYPOGRAPHY, DIRECTION_ROW, - COLORS, - BORDERS, + DISPLAY_INLINE_BLOCK, + Flex, JUSTIFY_CENTER, - ALIGN_CENTER, - RESPONSIVENESS, + JUSTIFY_FLEX_END, JUSTIFY_FLEX_START, - DISPLAY_INLINE_BLOCK, + JUSTIFY_SPACE_AROUND, JUSTIFY_SPACE_BETWEEN, PrimaryButton, - JUSTIFY_FLEX_END, - JUSTIFY_SPACE_AROUND, + RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SmallButton, MediumButton } from '../../atoms/buttons' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' // import { NeedHelpLink } from '../CalibrationPanels' diff --git a/app/src/organisms/DropTipWizard/ChooseLocation.tsx b/app/src/organisms/DropTipWizard/ChooseLocation.tsx index 566ce5d9040..8050c776698 100644 --- a/app/src/organisms/DropTipWizard/ChooseLocation.tsx +++ b/app/src/organisms/DropTipWizard/ChooseLocation.tsx @@ -3,25 +3,25 @@ import { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { + ALIGN_CENTER, + ALIGN_FLEX_END, Btn, - Flex, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, - RESPONSIVENESS, - JUSTIFY_SPACE_BETWEEN, + Flex, JUSTIFY_CENTER, - ALIGN_FLEX_END, - ALIGN_CENTER, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, - useDeckLocationSelect, + RESPONSIVENESS, SPACING, + StyledText, TYPOGRAPHY, + useDeckLocationSelect, } from '@opentrons/components' import { getDeckDefFromRobotType } from '@opentrons/shared-data' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' // import { NeedHelpLink } from '../CalibrationPanels' import { TwoUpTileLayout } from '../LabwarePositionCheck/TwoUpTileLayout' diff --git a/app/src/organisms/DropTipWizard/JogToPosition.tsx b/app/src/organisms/DropTipWizard/JogToPosition.tsx index 45f6628e934..1e3f7e525d9 100644 --- a/app/src/organisms/DropTipWizard/JogToPosition.tsx +++ b/app/src/organisms/DropTipWizard/JogToPosition.tsx @@ -3,28 +3,28 @@ import styled from 'styled-components' import { useTranslation } from 'react-i18next' import { POSITION_AND_BLOWOUT } from './constants' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, - RESPONSIVENESS, - JUSTIFY_SPACE_BETWEEN, + ALIGN_FLEX_END, + ALIGN_FLEX_START, + COLORS, + DIRECTION_COLUMN, + Flex, + Icon, JUSTIFY_CENTER, + JUSTIFY_FLEX_END, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, + RESPONSIVENESS, SecondaryButton, SPACING, - ALIGN_FLEX_START, - JUSTIFY_FLEX_END, - TYPOGRAPHY, - COLORS, + StyledText, TEXT_ALIGN_CENTER, - Icon, - ALIGN_FLEX_END, + TYPOGRAPHY, } from '@opentrons/components' // import { NeedHelpLink } from '../CalibrationPanels' import { SmallButton } from '../../atoms/buttons' import { Jog, JogControls } from '../../molecules/JogControls' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' -import { StyledText } from '../../atoms/text' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' // TODO: get help link article URL diff --git a/app/src/organisms/DropTipWizard/TipsAttachedModal.tsx b/app/src/organisms/DropTipWizard/TipsAttachedModal.tsx index a90244a9888..3f537dcf349 100644 --- a/app/src/organisms/DropTipWizard/TipsAttachedModal.tsx +++ b/app/src/organisms/DropTipWizard/TipsAttachedModal.tsx @@ -3,11 +3,16 @@ import { capitalize } from 'lodash' import NiceModal, { useModal } from '@ebay/nice-modal-react' import { Trans, useTranslation } from 'react-i18next' -import { Flex, COLORS, SPACING, DIRECTION_COLUMN } from '@opentrons/components' +import { + COLORS, + DIRECTION_COLUMN, + Flex, + SPACING, + StyledText, +} from '@opentrons/components' import { useCloseCurrentRun } from '../ProtocolUpload/hooks' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' import { DropTipWizard } from '.' diff --git a/app/src/organisms/DropTipWizard/index.tsx b/app/src/organisms/DropTipWizard/index.tsx index a8253dbbf8f..3d7896663d4 100644 --- a/app/src/organisms/DropTipWizard/index.tsx +++ b/app/src/organisms/DropTipWizard/index.tsx @@ -10,11 +10,11 @@ import { POSITION_ABSOLUTE, COLORS, BORDERS, + StyledText, } from '@opentrons/components' import { useCreateMaintenanceCommandMutation, useDeleteMaintenanceRunMutation, - CreateMaintenanceRunType, useDeckConfigurationQuery, } from '@opentrons/react-api-client' @@ -28,8 +28,6 @@ import { useChainMaintenanceCommands, useCreateTargetedMaintenanceRunMutation, } from '../../resources/runs' -import { StyledText } from '../../atoms/text' -import { Jog } from '../../molecules/JogControls' import { ExitConfirmation } from './ExitConfirmation' import { getAddressableAreaFromConfig } from './getAddressableAreaFromConfig' import { getDropTipWizardSteps } from './getDropTipWizardSteps' @@ -47,6 +45,7 @@ import { JogToPosition } from './JogToPosition' import { Success } from './Success' import type { PipetteData } from '@opentrons/api-client' +import type { CreateMaintenanceRunType } from '@opentrons/react-api-client' import type { PipetteModelSpecs, RobotType, @@ -54,6 +53,7 @@ import type { AddressableAreaName, } from '@opentrons/shared-data' import type { Axis, Sign, StepSize } from '../../molecules/JogControls/types' +import type { Jog } from '../../molecules/JogControls' const RUN_REFETCH_INTERVAL_MS = 5000 const JOG_COMMAND_TIMEOUT_MS = 10000 diff --git a/app/src/organisms/EmergencyStop/EstopMissingModal.tsx b/app/src/organisms/EmergencyStop/EstopMissingModal.tsx index e7a030be1cf..87cf876000f 100644 --- a/app/src/organisms/EmergencyStop/EstopMissingModal.tsx +++ b/app/src/organisms/EmergencyStop/EstopMissingModal.tsx @@ -8,11 +8,11 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../App/portal' -import { StyledText } from '../../atoms/text' import { LegacyModal } from '../../molecules/LegacyModal' import { Modal } from '../../molecules/Modal' import { getIsOnDevice } from '../../redux/config' diff --git a/app/src/organisms/EmergencyStop/EstopPressedModal.tsx b/app/src/organisms/EmergencyStop/EstopPressedModal.tsx index 3773a58bac8..dfec8424ed0 100644 --- a/app/src/organisms/EmergencyStop/EstopPressedModal.tsx +++ b/app/src/organisms/EmergencyStop/EstopPressedModal.tsx @@ -14,6 +14,7 @@ import { JUSTIFY_SPACE_BETWEEN, PrimaryButton, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' @@ -24,7 +25,6 @@ import { Banner } from '../../atoms/Banner' import { Chip } from '../../atoms/Chip' import { ListItem } from '../../atoms/ListItem' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { LegacyModal } from '../../molecules/LegacyModal' import { Modal } from '../../molecules/Modal' import { getIsOnDevice } from '../../redux/config' diff --git a/app/src/organisms/FirmwareUpdateModal/UpdateInProgressModal.tsx b/app/src/organisms/FirmwareUpdateModal/UpdateInProgressModal.tsx index 8aa9eb8bef0..fde0aaa27e4 100644 --- a/app/src/organisms/FirmwareUpdateModal/UpdateInProgressModal.tsx +++ b/app/src/organisms/FirmwareUpdateModal/UpdateInProgressModal.tsx @@ -6,13 +6,13 @@ import { BORDERS, COLORS, DIRECTION_COLUMN, - Icon, Flex, + Icon, + RESPONSIVENESS, SPACING, + StyledText, TYPOGRAPHY, - RESPONSIVENESS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' import type { Subsystem } from '@opentrons/api-client' diff --git a/app/src/organisms/FirmwareUpdateModal/UpdateNeededModal.tsx b/app/src/organisms/FirmwareUpdateModal/UpdateNeededModal.tsx index 503ef5e4adb..4b78dba5632 100644 --- a/app/src/organisms/FirmwareUpdateModal/UpdateNeededModal.tsx +++ b/app/src/organisms/FirmwareUpdateModal/UpdateNeededModal.tsx @@ -2,7 +2,13 @@ import * as React from 'react' import { createPortal } from 'react-dom' import { useTranslation, Trans } from 'react-i18next' import capitalize from 'lodash/capitalize' -import { COLORS, DIRECTION_COLUMN, Flex, SPACING } from '@opentrons/components' +import { + COLORS, + DIRECTION_COLUMN, + Flex, + SPACING, + StyledText, +} from '@opentrons/components' import { useInstrumentsQuery, useSubsystemUpdateQuery, @@ -11,7 +17,6 @@ import { import { LEFT, RIGHT } from '@opentrons/shared-data' import { getTopPortalEl } from '../../App/portal' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' import { UpdateInProgressModal } from './UpdateInProgressModal' import { UpdateResultsModal } from './UpdateResultsModal' diff --git a/app/src/organisms/FirmwareUpdateModal/UpdateResultsModal.tsx b/app/src/organisms/FirmwareUpdateModal/UpdateResultsModal.tsx index 0a16da311e3..614f3384419 100644 --- a/app/src/organisms/FirmwareUpdateModal/UpdateResultsModal.tsx +++ b/app/src/organisms/FirmwareUpdateModal/UpdateResultsModal.tsx @@ -9,10 +9,10 @@ import { Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' import type { InstrumentData } from '@opentrons/api-client' diff --git a/app/src/organisms/FirmwareUpdateModal/index.tsx b/app/src/organisms/FirmwareUpdateModal/index.tsx index f669b871445..87c9d826b07 100644 --- a/app/src/organisms/FirmwareUpdateModal/index.tsx +++ b/app/src/organisms/FirmwareUpdateModal/index.tsx @@ -2,22 +2,22 @@ import * as React from 'react' import { css } from 'styled-components' import { ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, Flex, Icon, - RESPONSIVENESS, JUSTIFY_CENTER, - COLORS, + RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { useInstrumentsQuery, useSubsystemUpdateQuery, useUpdateSubsystemMutation, } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' -import { BadGripper, BadPipette, Subsystem } from '@opentrons/api-client' +import type { BadGripper, BadPipette, Subsystem } from '@opentrons/api-client' interface FirmwareUpdateModalProps { description: string diff --git a/app/src/organisms/GripperCard/AboutGripperSlideout.tsx b/app/src/organisms/GripperCard/AboutGripperSlideout.tsx index 675af6fd40c..9bd6f8f6706 100644 --- a/app/src/organisms/GripperCard/AboutGripperSlideout.tsx +++ b/app/src/organisms/GripperCard/AboutGripperSlideout.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + COLORS, DIRECTION_COLUMN, - SPACING, + Flex, PrimaryButton, + SPACING, + StyledText, TYPOGRAPHY, - COLORS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Slideout } from '../../atoms/Slideout' interface AboutGripperSlideoutProps { diff --git a/app/src/organisms/GripperCard/index.tsx b/app/src/organisms/GripperCard/index.tsx index 0ee99f447f4..2826eb647a0 100644 --- a/app/src/organisms/GripperCard/index.tsx +++ b/app/src/organisms/GripperCard/index.tsx @@ -1,17 +1,17 @@ import * as React from 'react' import { Trans, useTranslation } from 'react-i18next' import { css } from 'styled-components' -import { SPACING, TYPOGRAPHY } from '@opentrons/components' -import { getGripperDisplayName, GripperModel } from '@opentrons/shared-data' +import { SPACING, TYPOGRAPHY, StyledText } from '@opentrons/components' +import { getGripperDisplayName } from '@opentrons/shared-data' import { useCurrentSubsystemUpdateQuery } from '@opentrons/react-api-client' import { Banner } from '../../atoms/Banner' -import { StyledText } from '../../atoms/text' import { InstrumentCard } from '../../molecules/InstrumentCard' import { GripperWizardFlows } from '../GripperWizardFlows' import { AboutGripperSlideout } from './AboutGripperSlideout' import { GRIPPER_FLOW_TYPES } from '../GripperWizardFlows/constants' import type { BadGripper, GripperData } from '@opentrons/api-client' +import type { GripperModel } from '@opentrons/shared-data' import type { GripperWizardFlowType } from '../GripperWizardFlows/types' interface GripperCardProps { diff --git a/app/src/organisms/GripperWizardFlows/BeforeBeginning.tsx b/app/src/organisms/GripperWizardFlows/BeforeBeginning.tsx index 5ed2300c8d5..0f2e08e0e26 100644 --- a/app/src/organisms/GripperWizardFlows/BeforeBeginning.tsx +++ b/app/src/organisms/GripperWizardFlows/BeforeBeginning.tsx @@ -1,9 +1,7 @@ import * as React from 'react' -import { UseMutateFunction } from 'react-query' import { Trans, useTranslation } from 'react-i18next' -import { COLORS } from '@opentrons/components' +import { COLORS, StyledText } from '@opentrons/components' import { EXTENSION } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' @@ -14,12 +12,14 @@ import { GRIPPER_LOADNAME, CAL_PIN_LOADNAME, } from './constants' + +import type { UseMutateFunction } from 'react-query' +import type { AxiosError } from 'axios' +import type { CreateCommand } from '@opentrons/shared-data' import type { CreateMaintenanceRunData, MaintenanceRun, } from '@opentrons/api-client' -import type { AxiosError } from 'axios' -import type { CreateCommand } from '@opentrons/shared-data' import type { GripperWizardFlowType, GripperWizardStepProps } from './types' interface BeforeBeginningInfo { diff --git a/app/src/organisms/GripperWizardFlows/MountGripper.tsx b/app/src/organisms/GripperWizardFlows/MountGripper.tsx index 077751a444c..7e1636f6d05 100644 --- a/app/src/organisms/GripperWizardFlows/MountGripper.tsx +++ b/app/src/organisms/GripperWizardFlows/MountGripper.tsx @@ -1,22 +1,22 @@ import { useSelector } from 'react-redux' import { - Flex, + ALIGN_CENTER, + ALIGN_FLEX_END, Btn, - TYPOGRAPHY, - JUSTIFY_SPACE_BETWEEN, - SPACING, COLORS, - RESPONSIVENESS, + Flex, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, - ALIGN_FLEX_END, - ALIGN_CENTER, + RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { useInstrumentsQuery } from '@opentrons/react-api-client' import { css } from 'styled-components' import * as React from 'react' import { useTranslation } from 'react-i18next' import { getIsOnDevice } from '../../redux/config' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' diff --git a/app/src/organisms/GripperWizardFlows/MovePin.tsx b/app/src/organisms/GripperWizardFlows/MovePin.tsx index 61c156b43de..ddc0566b510 100644 --- a/app/src/organisms/GripperWizardFlows/MovePin.tsx +++ b/app/src/organisms/GripperWizardFlows/MovePin.tsx @@ -1,9 +1,14 @@ import * as React from 'react' import { useTranslation, Trans } from 'react-i18next' import { EXTENSION } from '@opentrons/shared-data' -import { COLORS, TYPOGRAPHY, SPACING, Flex } from '@opentrons/components' +import { + COLORS, + TYPOGRAPHY, + SPACING, + Flex, + StyledText, +} from '@opentrons/components' import { css } from 'styled-components' -import { StyledText } from '../../atoms/text' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' diff --git a/app/src/organisms/GripperWizardFlows/UnmountGripper.tsx b/app/src/organisms/GripperWizardFlows/UnmountGripper.tsx index 2c4b2b6920a..c8e25bc0228 100644 --- a/app/src/organisms/GripperWizardFlows/UnmountGripper.tsx +++ b/app/src/organisms/GripperWizardFlows/UnmountGripper.tsx @@ -2,21 +2,21 @@ import * as React from 'react' import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' import { + ALIGN_CENTER, + ALIGN_FLEX_END, + Btn, COLORS, Flex, - Btn, JUSTIFY_SPACE_BETWEEN, - ALIGN_FLEX_END, - ALIGN_CENTER, + PrimaryButton, + RESPONSIVENESS, SPACING, + StyledText, TYPOGRAPHY, - RESPONSIVENESS, - PrimaryButton, } from '@opentrons/components' import { useInstrumentsQuery } from '@opentrons/react-api-client' import { css } from 'styled-components' import { getIsOnDevice } from '../../redux/config' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' diff --git a/app/src/organisms/HowCalibrationWorksModal/index.tsx b/app/src/organisms/HowCalibrationWorksModal/index.tsx index 734581b818a..42fceb41dd3 100644 --- a/app/src/organisms/HowCalibrationWorksModal/index.tsx +++ b/app/src/organisms/HowCalibrationWorksModal/index.tsx @@ -4,22 +4,22 @@ import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { - Box, - Flex, ALIGN_CENTER, ALIGN_FLEX_END, + Box, DIRECTION_COLUMN, + Flex, + PrimaryButton, SPACING, TEXT_TRANSFORM_CAPITALIZE, TYPOGRAPHY, - PrimaryButton, + StyledText, } from '@opentrons/components' import { getTopPortalEl } from '../../App/portal' import RobotCalHelpImage from '../../assets/images/robot_calibration_help.png' import { ExternalLink } from '../../atoms/Link/ExternalLink' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { LegacyModal } from '../../molecules/LegacyModal' const ROBOT_CAL_HELP_ARTICLE = diff --git a/app/src/organisms/InstrumentInfo/index.tsx b/app/src/organisms/InstrumentInfo/index.tsx index 4b15ff0e15a..85bbe7cd3fa 100644 --- a/app/src/organisms/InstrumentInfo/index.tsx +++ b/app/src/organisms/InstrumentInfo/index.tsx @@ -2,14 +2,15 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useHistory } from 'react-router-dom' import { - DIRECTION_COLUMN, - Flex, BORDERS, COLORS, + DIRECTION_COLUMN, + Flex, + JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, - JUSTIFY_CENTER, } from '@opentrons/components' import { SINGLE_MOUNT_PIPETTES, @@ -17,7 +18,6 @@ import { } from '@opentrons/shared-data' import { PipetteWizardFlows } from '../PipetteWizardFlows' import { GripperWizardFlows } from '../GripperWizardFlows' -import { StyledText } from '../../atoms/text' import { MediumButton } from '../../atoms/buttons' import { FLOWS } from '../PipetteWizardFlows/constants' import { GRIPPER_FLOW_TYPES } from '../GripperWizardFlows/constants' diff --git a/app/src/organisms/InstrumentMountItem/LabeledMount.tsx b/app/src/organisms/InstrumentMountItem/LabeledMount.tsx index 66b3b00be76..ae69c9331b3 100644 --- a/app/src/organisms/InstrumentMountItem/LabeledMount.tsx +++ b/app/src/organisms/InstrumentMountItem/LabeledMount.tsx @@ -3,18 +3,18 @@ import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { ALIGN_CENTER, + ALIGN_FLEX_START, + BORDERS, + COLORS, + DIRECTION_COLUMN, Flex, + Icon, + JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TEXT_TRANSFORM_CAPITALIZE, TYPOGRAPHY, - COLORS, - JUSTIFY_SPACE_BETWEEN, - Icon, - DIRECTION_COLUMN, - ALIGN_FLEX_START, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import type { Mount } from '../../redux/pipettes/types' const MountButton = styled.button<{ isAttached: boolean }>` diff --git a/app/src/organisms/InterventionModal/InterventionCommandMessage.tsx b/app/src/organisms/InterventionModal/InterventionCommandMessage.tsx index adcffe20860..90025d8a663 100644 --- a/app/src/organisms/InterventionModal/InterventionCommandMessage.tsx +++ b/app/src/organisms/InterventionModal/InterventionCommandMessage.tsx @@ -8,11 +8,11 @@ import { Flex, RESPONSIVENESS, SPACING, + StyledText, TEXT_TRANSFORM_CAPITALIZE, TEXT_TRANSFORM_UPPERCASE, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' const INTERVENTION_COMMAND_STYLE = css` flex-direction: ${DIRECTION_COLUMN}; diff --git a/app/src/organisms/InterventionModal/MoveLabwareInterventionContent.tsx b/app/src/organisms/InterventionModal/MoveLabwareInterventionContent.tsx index b49162d25df..e6ae7740ffb 100644 --- a/app/src/organisms/InterventionModal/MoveLabwareInterventionContent.tsx +++ b/app/src/organisms/InterventionModal/MoveLabwareInterventionContent.tsx @@ -3,22 +3,23 @@ import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { - Flex, ALIGN_CENTER, - Icon, - SPACING, - COLORS, - DIRECTION_COLUMN, - TYPOGRAPHY, BORDERS, Box, - MoveLabwareOnDeck, - Module, + COLORS, + DIRECTION_COLUMN, + DISPLAY_NONE, + Flex, + Icon, LabwareRender, LocationIcon, - DISPLAY_NONE, + Module, + MoveLabwareOnDeck, RESPONSIVENESS, + SPACING, + StyledText, TEXT_TRANSFORM_UPPERCASE, + TYPOGRAPHY, } from '@opentrons/components' import { CompletedProtocolAnalysis, @@ -41,7 +42,6 @@ import { getModuleModelFromRunData, getModuleDisplayLocationFromRunData, } from './utils' -import { StyledText } from '../../atoms/text' import { Divider } from '../../atoms/structure' import { getLoadedLabware, diff --git a/app/src/organisms/InterventionModal/PauseInterventionContent.tsx b/app/src/organisms/InterventionModal/PauseInterventionContent.tsx index b1d2c51f600..5f714a66e6c 100644 --- a/app/src/organisms/InterventionModal/PauseInterventionContent.tsx +++ b/app/src/organisms/InterventionModal/PauseInterventionContent.tsx @@ -12,9 +12,9 @@ import { SPACING, TYPOGRAPHY, useInterval, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { EMPTY_TIMESTAMP } from '../Devices/constants' import { formatInterval } from '../RunTimeControl/utils' import { InterventionCommandMessage } from './InterventionCommandMessage' diff --git a/app/src/organisms/InterventionModal/index.tsx b/app/src/organisms/InterventionModal/index.tsx index a7f9a1365c8..4498ab54c16 100644 --- a/app/src/organisms/InterventionModal/index.tsx +++ b/app/src/organisms/InterventionModal/index.tsx @@ -3,30 +3,30 @@ import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import { + ALIGN_CENTER, + ALIGN_FLEX_START, + BORDERS, Box, - Flex, COLORS, - SPACING, - POSITION_FIXED, - POSITION_ABSOLUTE, - ALIGN_CENTER, + DIRECTION_COLUMN, + DISPLAY_FLEX, + Flex, + Icon, JUSTIFY_CENTER, - POSITION_RELATIVE, + JUSTIFY_SPACE_BETWEEN, + Link, OVERFLOW_AUTO, + POSITION_ABSOLUTE, + POSITION_FIXED, + POSITION_RELATIVE, POSITION_STICKY, - BORDERS, - DISPLAY_FLEX, - DIRECTION_COLUMN, - ALIGN_FLEX_START, - Icon, PrimaryButton, - JUSTIFY_SPACE_BETWEEN, + SPACING, TYPOGRAPHY, - Link, + StyledText, } from '@opentrons/components' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' import { getIsOnDevice } from '../../redux/config' import { PauseInterventionContent } from './PauseInterventionContent' diff --git a/app/src/organisms/LabwareCard/CustomLabwareOverflowMenu.tsx b/app/src/organisms/LabwareCard/CustomLabwareOverflowMenu.tsx index 1879291ecb3..8a5764ebc8b 100644 --- a/app/src/organisms/LabwareCard/CustomLabwareOverflowMenu.tsx +++ b/app/src/organisms/LabwareCard/CustomLabwareOverflowMenu.tsx @@ -19,6 +19,7 @@ import { POSITION_ABSOLUTE, POSITION_RELATIVE, SPACING, + StyledText, TYPOGRAPHY, useConditionalConfirm, useOnClickOutside, @@ -26,7 +27,6 @@ import { import { OverflowBtn } from '../../atoms/MenuList/OverflowBtn' import { MenuItem } from '../../atoms/MenuList/MenuItem' -import { StyledText } from '../../atoms/text' import { Divider } from '../../atoms/structure' import { LegacyModal } from '../../molecules/LegacyModal' import { getTopPortalEl } from '../../App/portal' diff --git a/app/src/organisms/LabwareCard/index.tsx b/app/src/organisms/LabwareCard/index.tsx index 3bd18289606..708639711b2 100644 --- a/app/src/organisms/LabwareCard/index.tsx +++ b/app/src/organisms/LabwareCard/index.tsx @@ -16,10 +16,10 @@ import { OVERFLOW_WRAP_ANYWHERE, RobotWorkSpace, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { UNIVERSAL_FLAT_ADAPTER_X_DIMENSION } from '../LabwareDetails/Gallery' import { CustomLabwareOverflowMenu } from './CustomLabwareOverflowMenu' import type { LabwareDefAndDate } from '../../pages/Labware/hooks' diff --git a/app/src/organisms/LabwareDetails/InsertDetails.tsx b/app/src/organisms/LabwareDetails/InsertDetails.tsx index 42687c07971..f1eacc69b8e 100644 --- a/app/src/organisms/LabwareDetails/InsertDetails.tsx +++ b/app/src/organisms/LabwareDetails/InsertDetails.tsx @@ -1,7 +1,12 @@ import * as React from 'react' -import { Box, SPACING, BORDERS, TYPOGRAPHY } from '@opentrons/components' +import { + BORDERS, + Box, + SPACING, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { getUniqueWellProperties } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { getWellLabel } from './helpers/labels' import { WellProperties } from './WellProperties' import { WellDimensions } from './WellDimensions' diff --git a/app/src/organisms/LabwareDetails/ManufacturerDetails.tsx b/app/src/organisms/LabwareDetails/ManufacturerDetails.tsx index 8744448a2e0..0ebeaee3097 100644 --- a/app/src/organisms/LabwareDetails/ManufacturerDetails.tsx +++ b/app/src/organisms/LabwareDetails/ManufacturerDetails.tsx @@ -1,17 +1,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, Box, - Icon, - Link, COLORS, - SPACING, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + Icon, JUSTIFY_SPACE_BETWEEN, + Link, + SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import type { LabwareBrand } from '../../pages/Labware/types' export interface ManufacturerDetailsProps { diff --git a/app/src/organisms/LabwareDetails/StyledComponents/ExpandingTitle.tsx b/app/src/organisms/LabwareDetails/StyledComponents/ExpandingTitle.tsx index 8594eee3e56..dacd79cc549 100644 --- a/app/src/organisms/LabwareDetails/StyledComponents/ExpandingTitle.tsx +++ b/app/src/organisms/LabwareDetails/StyledComponents/ExpandingTitle.tsx @@ -1,16 +1,16 @@ import * as React from 'react' import { - Flex, - Icon, - Link, + ALIGN_CENTER, Box, DIRECTION_ROW, + Flex, + Icon, JUSTIFY_SPACE_BETWEEN, - ALIGN_CENTER, - TYPOGRAPHY, + Link, SIZE_1, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { Divider } from '../../../atoms/structure' interface ExpandingTitleProps { diff --git a/app/src/organisms/LabwareDetails/StyledComponents/LabeledValue.tsx b/app/src/organisms/LabwareDetails/StyledComponents/LabeledValue.tsx index 2a9f3025365..98e5f4d4152 100644 --- a/app/src/organisms/LabwareDetails/StyledComponents/LabeledValue.tsx +++ b/app/src/organisms/LabwareDetails/StyledComponents/LabeledValue.tsx @@ -1,13 +1,13 @@ import * as React from 'react' import { ALIGN_CENTER, + COLORS, DIRECTION_ROW, Flex, JUSTIFY_SPACE_BETWEEN, - COLORS, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' export interface LabeledValueProps { label: string diff --git a/app/src/organisms/LabwareDetails/WellCount.tsx b/app/src/organisms/LabwareDetails/WellCount.tsx index fe1305c7528..bcb1b7b9389 100644 --- a/app/src/organisms/LabwareDetails/WellCount.tsx +++ b/app/src/organisms/LabwareDetails/WellCount.tsx @@ -3,12 +3,12 @@ import { useTranslation } from 'react-i18next' import { ALIGN_CENTER, DIRECTION_ROW, - TYPOGRAPHY, - SPACING, Flex, JUSTIFY_SPACE_BETWEEN, + SPACING, + TYPOGRAPHY, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' export interface WellCountProps { count: number diff --git a/app/src/organisms/LabwareDetails/WellProperties.tsx b/app/src/organisms/LabwareDetails/WellProperties.tsx index 8ea27b34703..c08ee5a61d7 100644 --- a/app/src/organisms/LabwareDetails/WellProperties.tsx +++ b/app/src/organisms/LabwareDetails/WellProperties.tsx @@ -9,9 +9,9 @@ import { DIRECTION_ROW, JUSTIFY_SPACE_BETWEEN, DIRECTION_COLUMN, + StyledText, } from '@opentrons/components' import { getDisplayVolume } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import type { LabwareDefinition, diff --git a/app/src/organisms/LabwareDetails/index.tsx b/app/src/organisms/LabwareDetails/index.tsx index 6b888a5045a..4f0cc83b3a4 100644 --- a/app/src/organisms/LabwareDetails/index.tsx +++ b/app/src/organisms/LabwareDetails/index.tsx @@ -17,12 +17,12 @@ import { OVERFLOW_WRAP_ANYWHERE, SIZE_1, SPACING, + StyledText, TOOLTIP_TOP_START, TYPOGRAPHY, useHoverTooltip, } from '@opentrons/components' import { getUniqueWellProperties } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { Slideout } from '../../atoms/Slideout' import { Tooltip } from '../../atoms/Tooltip' import { getWellLabel } from './helpers/labels' diff --git a/app/src/organisms/LabwareOffsetTabs/index.tsx b/app/src/organisms/LabwareOffsetTabs/index.tsx index f133ad52beb..82c1fb0741d 100644 --- a/app/src/organisms/LabwareOffsetTabs/index.tsx +++ b/app/src/organisms/LabwareOffsetTabs/index.tsx @@ -1,17 +1,16 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, - SPACING, + BORDERS, Box, COLORS, - BORDERS, + DIRECTION_COLUMN, + Flex, RoundTab, + SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - import type { StyleProps } from '@opentrons/components' type TabOptions = 'table' | 'jupyter' | 'cli' diff --git a/app/src/organisms/LabwarePositionCheck/AttachProbe.tsx b/app/src/organisms/LabwarePositionCheck/AttachProbe.tsx index de632137f09..5f66b98a8cf 100644 --- a/app/src/organisms/LabwarePositionCheck/AttachProbe.tsx +++ b/app/src/organisms/LabwarePositionCheck/AttachProbe.tsx @@ -1,13 +1,17 @@ import * as React from 'react' import { Trans, useTranslation } from 'react-i18next' -import { RESPONSIVENESS, SPACING, TYPOGRAPHY } from '@opentrons/components' +import { + RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { CompletedProtocolAnalysis, getPipetteNameSpecs, CreateCommand, } from '@opentrons/shared-data' import { css } from 'styled-components' -import { StyledText } from '../../atoms/text' import { ProbeNotAttached } from '../PipetteWizardFlows/ProbeNotAttached' import { RobotMotionLoader } from './RobotMotionLoader' import attachProbe1 from '../../assets/videos/pipette-wizard-flows/Pipette_Attach_Probe_1.webm' diff --git a/app/src/organisms/LabwarePositionCheck/CheckItem.tsx b/app/src/organisms/LabwarePositionCheck/CheckItem.tsx index dac9cbf3301..06239a0d4e0 100644 --- a/app/src/organisms/LabwarePositionCheck/CheckItem.tsx +++ b/app/src/organisms/LabwarePositionCheck/CheckItem.tsx @@ -2,8 +2,12 @@ import * as React from 'react' import omit from 'lodash/omit' import isEqual from 'lodash/isEqual' import { Trans, useTranslation } from 'react-i18next' -import { DIRECTION_COLUMN, Flex, TYPOGRAPHY } from '@opentrons/components' -import { StyledText } from '../../atoms/text' +import { + DIRECTION_COLUMN, + Flex, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { RobotMotionLoader } from './RobotMotionLoader' import { PrepareSpace } from './PrepareSpace' import { JogToWell } from './JogToWell' diff --git a/app/src/organisms/LabwarePositionCheck/DetachProbe.tsx b/app/src/organisms/LabwarePositionCheck/DetachProbe.tsx index a1278cd5673..202cf78d57a 100644 --- a/app/src/organisms/LabwarePositionCheck/DetachProbe.tsx +++ b/app/src/organisms/LabwarePositionCheck/DetachProbe.tsx @@ -1,8 +1,12 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' -import { RESPONSIVENESS, SPACING, TYPOGRAPHY } from '@opentrons/components' import { css } from 'styled-components' -import { StyledText } from '../../atoms/text' +import { + RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { RobotMotionLoader } from './RobotMotionLoader' import { CompletedProtocolAnalysis, diff --git a/app/src/organisms/LabwarePositionCheck/ExitConfirmation.tsx b/app/src/organisms/LabwarePositionCheck/ExitConfirmation.tsx index 2f336b66a62..4ee467d742b 100644 --- a/app/src/organisms/LabwarePositionCheck/ExitConfirmation.tsx +++ b/app/src/organisms/LabwarePositionCheck/ExitConfirmation.tsx @@ -2,22 +2,22 @@ import * as React from 'react' import styled from 'styled-components' import { useTranslation } from 'react-i18next' import { - Flex, - Icon, + AlertPrimaryButton, ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, - SPACING, - SIZE_3, - AlertPrimaryButton, + Flex, + Icon, JUSTIFY_CENTER, - COLORS, - TYPOGRAPHY, + JUSTIFY_FLEX_END, RESPONSIVENESS, SecondaryButton, - JUSTIFY_FLEX_END, + SIZE_3, + SPACING, + StyledText, TEXT_ALIGN_CENTER, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { useSelector } from 'react-redux' import { getIsOnDevice } from '../../redux/config' import { SmallButton } from '../../atoms/buttons' diff --git a/app/src/organisms/LabwarePositionCheck/FatalErrorModal.tsx b/app/src/organisms/LabwarePositionCheck/FatalErrorModal.tsx index 110b7430799..699d4512298 100644 --- a/app/src/organisms/LabwarePositionCheck/FatalErrorModal.tsx +++ b/app/src/organisms/LabwarePositionCheck/FatalErrorModal.tsx @@ -3,25 +3,25 @@ import { createPortal } from 'react-dom' import styled from 'styled-components' import { useTranslation } from 'react-i18next' import { - Icon, + ALIGN_CENTER, + ALIGN_FLEX_END, + BORDERS, COLORS, DIRECTION_COLUMN, Flex, - PrimaryButton, - SPACING, + Icon, JUSTIFY_SPACE_BETWEEN, - BORDERS, - TYPOGRAPHY, + PrimaryButton, RESPONSIVENESS, + SPACING, + StyledText, TEXT_ALIGN_CENTER, - ALIGN_CENTER, - ALIGN_FLEX_END, TEXT_TRANSFORM_CAPITALIZE, + TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../App/portal' import { LegacyModalShell } from '../../molecules/LegacyModal' import { WizardHeader } from '../../molecules/WizardHeader' -import { StyledText } from '../../atoms/text' import { i18n } from '../../i18n' const SUPPORT_EMAIL = 'support@opentrons.com' diff --git a/app/src/organisms/LabwarePositionCheck/IntroScreen/index.tsx b/app/src/organisms/LabwarePositionCheck/IntroScreen/index.tsx index 3a12db38c51..5fdfb0af52f 100644 --- a/app/src/organisms/LabwarePositionCheck/IntroScreen/index.tsx +++ b/app/src/organisms/LabwarePositionCheck/IntroScreen/index.tsx @@ -1,22 +1,8 @@ import * as React from 'react' import { createPortal } from 'react-dom' import { Trans, useTranslation } from 'react-i18next' -import { - CompletedProtocolAnalysis, - LabwareDefinition2, -} from '@opentrons/shared-data' -import { StyledText } from '../../../atoms/text' -import { RobotMotionLoader } from '../RobotMotionLoader' -import { getPrepCommands } from './getPrepCommands' -import { useChainRunCommands } from '../../../resources/runs' -import type { RegisterPositionAction } from '../types' -import type { Jog } from '../../../molecules/JogControls' -import { WizardRequiredEquipmentList } from '../../../molecules/WizardRequiredEquipmentList' -import { getLatestCurrentOffsets } from '../../Devices/ProtocolRun/SetupLabwarePositionCheck/utils' -import { getIsOnDevice } from '../../../redux/config' -import { NeedHelpLink } from '../../CalibrationPanels' -import { useSelector } from 'react-redux' -import { TwoUpTileLayout } from '../TwoUpTileLayout' +import { css } from 'styled-components' + import { ALIGN_CENTER, Box, @@ -28,10 +14,20 @@ import { JUSTIFY_SPACE_BETWEEN, PrimaryButton, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { LabwareOffset } from '@opentrons/api-client' -import { css } from 'styled-components' +import { RobotMotionLoader } from '../RobotMotionLoader' +import { getPrepCommands } from './getPrepCommands' +import { useChainRunCommands } from '../../../resources/runs' +import type { RegisterPositionAction } from '../types' +import type { Jog } from '../../../molecules/JogControls' +import { WizardRequiredEquipmentList } from '../../../molecules/WizardRequiredEquipmentList' +import { getLatestCurrentOffsets } from '../../Devices/ProtocolRun/SetupLabwarePositionCheck/utils' +import { getIsOnDevice } from '../../../redux/config' +import { NeedHelpLink } from '../../CalibrationPanels' +import { useSelector } from 'react-redux' +import { TwoUpTileLayout } from '../TwoUpTileLayout' import { getTopPortalEl } from '../../../App/portal' import { LegacyModalShell } from '../../../molecules/LegacyModal' import { SmallButton } from '../../../atoms/buttons' @@ -39,6 +35,12 @@ import { CALIBRATION_PROBE } from '../../PipetteWizardFlows/constants' import { TerseOffsetTable } from '../ResultsSummary' import { getLabwareDefinitionsFromCommands } from '../utils/labware' +import type { LabwareOffset } from '@opentrons/api-client' +import type { + CompletedProtocolAnalysis, + LabwareDefinition2, +} from '@opentrons/shared-data' + export const INTERVAL_MS = 3000 // TODO(BC, 09/01/23): replace updated support article link for LPC on OT-2/Flex diff --git a/app/src/organisms/LabwarePositionCheck/JogToWell.tsx b/app/src/organisms/LabwarePositionCheck/JogToWell.tsx index b1ccf97fdb8..828264b0218 100644 --- a/app/src/organisms/LabwarePositionCheck/JogToWell.tsx +++ b/app/src/organisms/LabwarePositionCheck/JogToWell.tsx @@ -4,21 +4,22 @@ import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import styled, { css } from 'styled-components' import { + ALIGN_CENTER, + ALIGN_FLEX_START, + COLORS, + DIRECTION_COLUMN, Flex, - RobotWorkSpace, + JUSTIFY_SPACE_BETWEEN, LabwareRender, PipetteRender, - JUSTIFY_SPACE_BETWEEN, - ALIGN_CENTER, - DIRECTION_COLUMN, - SPACING, - COLORS, - WELL_LABEL_OPTIONS, - ALIGN_FLEX_START, PrimaryButton, + RESPONSIVENESS, + RobotWorkSpace, SecondaryButton, + SPACING, + StyledText, TYPOGRAPHY, - RESPONSIVENESS, + WELL_LABEL_OPTIONS, } from '@opentrons/components' import { getIsTiprack, @@ -35,7 +36,6 @@ import levelProbeWithLabware from '../../assets/images/lpc_level_probe_with_labw import { getIsOnDevice } from '../../redux/config' import { getTopPortalEl } from '../../App/portal' import { LegacyModalShell } from '../../molecules/LegacyModal' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { NeedHelpLink } from '../CalibrationPanels' import { JogControls } from '../../molecules/JogControls' diff --git a/app/src/organisms/LabwarePositionCheck/LiveOffsetValue.tsx b/app/src/organisms/LabwarePositionCheck/LiveOffsetValue.tsx index d2f994af258..e709b76a0f7 100644 --- a/app/src/organisms/LabwarePositionCheck/LiveOffsetValue.tsx +++ b/app/src/organisms/LabwarePositionCheck/LiveOffsetValue.tsx @@ -1,22 +1,23 @@ import * as React from 'react' import { - Flex, - Icon, - SPACING, ALIGN_CENTER, - TYPOGRAPHY, BORDERS, COLORS, DIRECTION_COLUMN, + Flex, + Icon, SIZE_1, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' -import type { StyleProps } from '@opentrons/components' import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import { getIsOnDevice } from '../../redux/config' +import type { StyleProps } from '@opentrons/components' + interface OffsetVectorProps extends StyleProps { x: number y: number diff --git a/app/src/organisms/LabwarePositionCheck/PickUpTip.tsx b/app/src/organisms/LabwarePositionCheck/PickUpTip.tsx index 5f1f8692f8c..f9fb114c789 100644 --- a/app/src/organisms/LabwarePositionCheck/PickUpTip.tsx +++ b/app/src/organisms/LabwarePositionCheck/PickUpTip.tsx @@ -1,11 +1,12 @@ import * as React from 'react' import { Trans, useTranslation } from 'react-i18next' import isEqual from 'lodash/isEqual' -import { DIRECTION_COLUMN, Flex, TYPOGRAPHY } from '@opentrons/components' -import { StyledText } from '../../atoms/text' -import { RobotMotionLoader } from './RobotMotionLoader' -import { PrepareSpace } from './PrepareSpace' -import { JogToWell } from './JogToWell' +import { + DIRECTION_COLUMN, + Flex, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { CompletedProtocolAnalysis, CreateCommand, @@ -18,6 +19,9 @@ import { MoveLabwareCreateCommand, RobotType, } from '@opentrons/shared-data' +import { RobotMotionLoader } from './RobotMotionLoader' +import { PrepareSpace } from './PrepareSpace' +import { JogToWell } from './JogToWell' import { useChainRunCommands } from '../../resources/runs' import { UnorderedList } from '../../molecules/UnorderedList' import { getCurrentOffsetForLabwareInLocation } from '../Devices/ProtocolRun/utils/getCurrentOffsetForLabwareInLocation' diff --git a/app/src/organisms/LabwarePositionCheck/ResultsSummary.tsx b/app/src/organisms/LabwarePositionCheck/ResultsSummary.tsx index 22cf2b484a5..0dd1bf38e8a 100644 --- a/app/src/organisms/LabwarePositionCheck/ResultsSummary.tsx +++ b/app/src/organisms/LabwarePositionCheck/ResultsSummary.tsx @@ -3,7 +3,6 @@ import styled from 'styled-components' import { useSelector } from 'react-redux' import isEqual from 'lodash/isEqual' import { useTranslation } from 'react-i18next' -import { StyledText } from '../../atoms/text' import { CompletedProtocolAnalysis, getLabwareDefURI, @@ -16,20 +15,21 @@ import { } from '@opentrons/shared-data' import { NeedHelpLink } from '../CalibrationPanels' import { + ALIGN_CENTER, + ALIGN_FLEX_END, + BORDERS, + COLORS, DIRECTION_COLUMN, Flex, - SPACING, + Icon, JUSTIFY_SPACE_BETWEEN, - ALIGN_CENTER, - TYPOGRAPHY, - COLORS, + LocationIcon, + MODULE_ICON_NAME_BY_TYPE, PrimaryButton, RESPONSIVENESS, - MODULE_ICON_NAME_BY_TYPE, - BORDERS, - ALIGN_FLEX_END, - Icon, - LocationIcon, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { PythonLabwareOffsetSnippet } from '../../molecules/PythonLabwareOffsetSnippet' import { diff --git a/app/src/organisms/LabwarePositionCheck/ReturnTip.tsx b/app/src/organisms/LabwarePositionCheck/ReturnTip.tsx index f4ecdf58154..fe32fa4c5b1 100644 --- a/app/src/organisms/LabwarePositionCheck/ReturnTip.tsx +++ b/app/src/organisms/LabwarePositionCheck/ReturnTip.tsx @@ -1,6 +1,11 @@ import * as React from 'react' import { Trans, useTranslation } from 'react-i18next' -import { DIRECTION_COLUMN, Flex, TYPOGRAPHY } from '@opentrons/components' +import { + DIRECTION_COLUMN, + Flex, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { CompletedProtocolAnalysis, CreateCommand, @@ -10,7 +15,6 @@ import { MoveLabwareCreateCommand, RobotType, } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { UnorderedList } from '../../molecules/UnorderedList' import { useChainRunCommands } from '../../resources/runs' import { diff --git a/app/src/organisms/LabwarePositionCheck/RobotMotionLoader.tsx b/app/src/organisms/LabwarePositionCheck/RobotMotionLoader.tsx index 9a3baa57b59..d3d0d237f27 100644 --- a/app/src/organisms/LabwarePositionCheck/RobotMotionLoader.tsx +++ b/app/src/organisms/LabwarePositionCheck/RobotMotionLoader.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import styled from 'styled-components' import { - Icon, - Flex, + ALIGN_CENTER, COLORS, + DIRECTION_COLUMN, + Flex, + Icon, + JUSTIFY_CENTER, RESPONSIVENESS, - TYPOGRAPHY, SIZE_4, - JUSTIFY_CENTER, - ALIGN_CENTER, - DIRECTION_COLUMN, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' interface RobotMotionLoaderProps { header?: string diff --git a/app/src/organisms/LabwarePositionCheck/TipConfirmation.tsx b/app/src/organisms/LabwarePositionCheck/TipConfirmation.tsx index 68bd7c66e1e..4b10e779567 100644 --- a/app/src/organisms/LabwarePositionCheck/TipConfirmation.tsx +++ b/app/src/organisms/LabwarePositionCheck/TipConfirmation.tsx @@ -1,19 +1,19 @@ import * as React from 'react' import { - Flex, + ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, + Flex, + JUSTIFY_FLEX_END, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, SecondaryButton, - JUSTIFY_SPACE_BETWEEN, SPACING, - ALIGN_CENTER, - COLORS, - JUSTIFY_FLEX_END, + StyledText, } from '@opentrons/components' import { useTranslation } from 'react-i18next' import { NeedHelpLink } from '../CalibrationPanels' -import { StyledText } from '../../atoms/text' import { useSelector } from 'react-redux' import { getIsOnDevice } from '../../redux/config' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' diff --git a/app/src/organisms/ModuleCard/AboutModuleSlideout.tsx b/app/src/organisms/ModuleCard/AboutModuleSlideout.tsx index e2af4be3c59..a1fe8b1fc9f 100644 --- a/app/src/organisms/ModuleCard/AboutModuleSlideout.tsx +++ b/app/src/organisms/ModuleCard/AboutModuleSlideout.tsx @@ -3,20 +3,20 @@ import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { RUN_STATUS_RUNNING, RUN_STATUS_FINISHING } from '@opentrons/api-client' import { - Flex, + ALIGN_START, + Btn, + COLORS, DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, + Flex, JUSTIFY_SPACE_BETWEEN, - Btn, - ALIGN_START, PrimaryButton, - COLORS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getModuleDisplayName } from '@opentrons/shared-data' import { Slideout } from '../../atoms/Slideout' import { Banner } from '../../atoms/Banner' -import { StyledText } from '../../atoms/text' import { useCurrentRunStatus } from '../RunTimeControl/hooks' import type { AttachedModule } from '../../redux/modules/types' diff --git a/app/src/organisms/ModuleCard/Collapsible.tsx b/app/src/organisms/ModuleCard/Collapsible.tsx index f62e1f7a3d6..d307a4789f9 100644 --- a/app/src/organisms/ModuleCard/Collapsible.tsx +++ b/app/src/organisms/ModuleCard/Collapsible.tsx @@ -1,17 +1,17 @@ import * as React from 'react' import { css } from 'styled-components' import { - Icon, - Flex, + ALIGN_CENTER, Box, DIRECTION_COLUMN, + Flex, + Icon, JUSTIFY_SPACE_BETWEEN, SIZE_1, - ALIGN_CENTER, - IconName, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' +import type { IconName } from '@opentrons/components' interface CollapsibleProps { expanded: boolean diff --git a/app/src/organisms/ModuleCard/ConfirmAttachmentModal.tsx b/app/src/organisms/ModuleCard/ConfirmAttachmentModal.tsx index 6386538f10a..e130da10144 100644 --- a/app/src/organisms/ModuleCard/ConfirmAttachmentModal.tsx +++ b/app/src/organisms/ModuleCard/ConfirmAttachmentModal.tsx @@ -2,23 +2,23 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useDispatch } from 'react-redux' import { + ALIGN_CENTER, + CheckboxField, + DIRECTION_COLUMN, DIRECTION_ROW, Flex, JUSTIFY_FLEX_END, - TEXT_ALIGN_CENTER, - SPACING, - TYPOGRAPHY, - DIRECTION_COLUMN, Link, PrimaryButton, - CheckboxField, - ALIGN_CENTER, + SPACING, + StyledText, + TEXT_ALIGN_CENTER, + TYPOGRAPHY, } from '@opentrons/components' import { LegacyModal } from '../../molecules/LegacyModal' -import { StyledText } from '../../atoms/text' -import { Dispatch } from '../../redux/types' -import { UpdateConfigValueAction } from '../../redux/config/types' import { updateConfigValue } from '../../redux/config' +import type { Dispatch } from '../../redux/types' +import type { UpdateConfigValueAction } from '../../redux/config/types' export function setHeaterShakerAttached( heaterShakerAttached: boolean diff --git a/app/src/organisms/ModuleCard/ErrorInfo.tsx b/app/src/organisms/ModuleCard/ErrorInfo.tsx index 266bbc8fa24..75158e7010f 100644 --- a/app/src/organisms/ModuleCard/ErrorInfo.tsx +++ b/app/src/organisms/ModuleCard/ErrorInfo.tsx @@ -7,17 +7,17 @@ import { THERMOCYCLER_MODULE_TYPE, } from '@opentrons/shared-data' import { - Flex, - SPACING, - Btn, - JUSTIFY_FLEX_END, - TYPOGRAPHY, ALIGN_START, - PrimaryButton, + Btn, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, + JUSTIFY_FLEX_END, + PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { getTopPortalEl } from '../../App/portal' import { LegacyModal } from '../../molecules/LegacyModal' diff --git a/app/src/organisms/ModuleCard/FirmwareUpdateFailedModal.tsx b/app/src/organisms/ModuleCard/FirmwareUpdateFailedModal.tsx index 646cf6cbc6e..c93b188088d 100644 --- a/app/src/organisms/ModuleCard/FirmwareUpdateFailedModal.tsx +++ b/app/src/organisms/ModuleCard/FirmwareUpdateFailedModal.tsx @@ -2,17 +2,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { getModuleDisplayName } from '@opentrons/shared-data' import { + COLORS, + DIRECTION_COLUMN, DIRECTION_ROW, Flex, + Icon, JUSTIFY_FLEX_END, + PrimaryButton, SPACING, - DIRECTION_COLUMN, - Icon, - COLORS, + StyledText, TYPOGRAPHY, - PrimaryButton, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { LegacyModal } from '../../molecules/LegacyModal' import type { AttachedModule } from '../../redux/modules/types' diff --git a/app/src/organisms/ModuleCard/HeaterShakerModuleData.tsx b/app/src/organisms/ModuleCard/HeaterShakerModuleData.tsx index 7593630a9ff..0778d44477e 100644 --- a/app/src/organisms/ModuleCard/HeaterShakerModuleData.tsx +++ b/app/src/organisms/ModuleCard/HeaterShakerModuleData.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, COLORS, DIRECTION_COLUMN, - SPACING, - Icon, DIRECTION_ROW, - TYPOGRAPHY, + Flex, + Icon, SIZE_1, + SPACING, + StyledText, + TYPOGRAPHY, WRAP, } from '@opentrons/components' import { StatusLabel } from '../../atoms/StatusLabel' -import { StyledText } from '../../atoms/text' import type { LatchStatus, SpeedStatus, diff --git a/app/src/organisms/ModuleCard/HeaterShakerSlideout.tsx b/app/src/organisms/ModuleCard/HeaterShakerSlideout.tsx index a476bf592a9..f3d06b1106d 100644 --- a/app/src/organisms/ModuleCard/HeaterShakerSlideout.tsx +++ b/app/src/organisms/ModuleCard/HeaterShakerSlideout.tsx @@ -12,12 +12,12 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Slideout } from '../../atoms/Slideout' import { InputField } from '../../atoms/InputField' import { SubmitPrimaryButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import type { HeaterShakerModule } from '../../redux/modules/types' import type { HeaterShakerSetTargetTemperatureCreateCommand } from '@opentrons/shared-data' diff --git a/app/src/organisms/ModuleCard/MagneticModuleData.tsx b/app/src/organisms/ModuleCard/MagneticModuleData.tsx index 3ea07a3d654..6cd6c2284ab 100644 --- a/app/src/organisms/ModuleCard/MagneticModuleData.tsx +++ b/app/src/organisms/ModuleCard/MagneticModuleData.tsx @@ -1,9 +1,8 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' -import { COLORS, TYPOGRAPHY } from '@opentrons/components' +import { COLORS, TYPOGRAPHY, StyledText } from '@opentrons/components' import { MAGNETIC_MODULE_V1, MAGNETIC_MODULE_V2 } from '@opentrons/shared-data' import { StatusLabel } from '../../atoms/StatusLabel' -import { StyledText } from '../../atoms/text' import type { MagneticStatus } from '../../redux/modules/api-types' interface MagModuleProps { diff --git a/app/src/organisms/ModuleCard/MagneticModuleSlideout.tsx b/app/src/organisms/ModuleCard/MagneticModuleSlideout.tsx index 9e8e38d144a..347b7871a7c 100644 --- a/app/src/organisms/ModuleCard/MagneticModuleSlideout.tsx +++ b/app/src/organisms/ModuleCard/MagneticModuleSlideout.tsx @@ -2,15 +2,16 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useCreateLiveCommandMutation } from '@opentrons/react-api-client' import { - Flex, - DIRECTION_ROW, + BORDERS, + COLORS, DIRECTION_COLUMN, + DIRECTION_ROW, + Flex, + JUSTIFY_END, JUSTIFY_SPACE_BETWEEN, - COLORS, - BORDERS, - TYPOGRAPHY, SPACING, - JUSTIFY_END, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getModuleDisplayName, @@ -22,7 +23,6 @@ import { MM, } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { Slideout } from '../../atoms/Slideout' import { InputField } from '../../atoms/InputField' import { SubmitPrimaryButton } from '../../atoms/buttons' diff --git a/app/src/organisms/ModuleCard/ModuleSetupModal.tsx b/app/src/organisms/ModuleCard/ModuleSetupModal.tsx index 9c579a1684e..8af56a5bcf4 100644 --- a/app/src/organisms/ModuleCard/ModuleSetupModal.tsx +++ b/app/src/organisms/ModuleCard/ModuleSetupModal.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { createPortal } from 'react-dom' -import { StyledText } from '../../atoms/text' import code from '../../assets/images/module_instruction_code.png' import { ALIGN_FLEX_END, - Flex, DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, - PrimaryButton, - Icon, DIRECTION_ROW, + Flex, + Icon, Link, + PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { LegacyModal } from '../../molecules/LegacyModal' import { getTopPortalEl } from '../../App/portal' diff --git a/app/src/organisms/ModuleCard/TemperatureModuleData.tsx b/app/src/organisms/ModuleCard/TemperatureModuleData.tsx index fe228dce0e1..b6b70c3ae48 100644 --- a/app/src/organisms/ModuleCard/TemperatureModuleData.tsx +++ b/app/src/organisms/ModuleCard/TemperatureModuleData.tsx @@ -1,14 +1,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { + COLORS, DIRECTION_COLUMN, Flex, SPACING, - COLORS, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { StatusLabel } from '../../atoms/StatusLabel' -import { StyledText } from '../../atoms/text' import type { TemperatureStatus } from '../../redux/modules/api-types' interface TemperatureModuleProps { diff --git a/app/src/organisms/ModuleCard/TemperatureModuleSlideout.tsx b/app/src/organisms/ModuleCard/TemperatureModuleSlideout.tsx index 0764a84bec0..55b205ee3a4 100644 --- a/app/src/organisms/ModuleCard/TemperatureModuleSlideout.tsx +++ b/app/src/organisms/ModuleCard/TemperatureModuleSlideout.tsx @@ -2,11 +2,12 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useCreateLiveCommandMutation } from '@opentrons/react-api-client' import { - Flex, - TYPOGRAPHY, - SPACING, COLORS, DIRECTION_COLUMN, + Flex, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { CELSIUS, @@ -17,7 +18,6 @@ import { import { Slideout } from '../../atoms/Slideout' import { SubmitPrimaryButton } from '../../atoms/buttons' import { InputField } from '../../atoms/InputField' -import { StyledText } from '../../atoms/text' import type { TemperatureModuleSetTargetTemperatureCreateCommand } from '@opentrons/shared-data' import type { TemperatureModule } from '../../redux/modules/types' diff --git a/app/src/organisms/ModuleCard/TestShakeSlideout.tsx b/app/src/organisms/ModuleCard/TestShakeSlideout.tsx index 55a2d3de4e5..81023ffd337 100644 --- a/app/src/organisms/ModuleCard/TestShakeSlideout.tsx +++ b/app/src/organisms/ModuleCard/TestShakeSlideout.tsx @@ -4,21 +4,22 @@ import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import { useCreateLiveCommandMutation } from '@opentrons/react-api-client' import { - Flex, - TYPOGRAPHY, - SPACING, + ALIGN_CENTER, + ALIGN_FLEX_START, + BORDERS, COLORS, DIRECTION_COLUMN, - Icon, DIRECTION_ROW, - SIZE_AUTO, - ALIGN_FLEX_START, + Flex, + Icon, Link, - useHoverTooltip, - ALIGN_CENTER, - useConditionalConfirm, PrimaryButton, - BORDERS, + SIZE_AUTO, + SPACING, + StyledText, + TYPOGRAPHY, + useConditionalConfirm, + useHoverTooltip, } from '@opentrons/components' import { getIsHeaterShakerAttached } from '../../redux/config' import { @@ -34,7 +35,6 @@ import { TertiaryButton } from '../../atoms/buttons' import { Divider } from '../../atoms/structure' import { InputField } from '../../atoms/InputField' import { Tooltip } from '../../atoms/Tooltip' -import { StyledText } from '../../atoms/text' import { ConfirmAttachmentModal } from './ConfirmAttachmentModal' import { useLatchControls } from './hooks' import { ModuleSetupModal } from './ModuleSetupModal' diff --git a/app/src/organisms/ModuleCard/ThermocyclerModuleData.tsx b/app/src/organisms/ModuleCard/ThermocyclerModuleData.tsx index d9af26babb4..0da4e5eeb8c 100644 --- a/app/src/organisms/ModuleCard/ThermocyclerModuleData.tsx +++ b/app/src/organisms/ModuleCard/ThermocyclerModuleData.tsx @@ -2,17 +2,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { StatusLabel } from '../../atoms/StatusLabel' import { + Box, + COLORS, + DIRECTION_COLUMN, + DIRECTION_ROW, Flex, - TYPOGRAPHY, FONT_WEIGHT_REGULAR, - DIRECTION_COLUMN, - COLORS, SPACING, + StyledText, + TYPOGRAPHY, WRAP, - Box, - DIRECTION_ROW, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import type { ThermocyclerData } from '../../redux/modules/api-types' diff --git a/app/src/organisms/ModuleCard/ThermocyclerModuleSlideout.tsx b/app/src/organisms/ModuleCard/ThermocyclerModuleSlideout.tsx index 1b2a8befcaf..8ec9b9fec9f 100644 --- a/app/src/organisms/ModuleCard/ThermocyclerModuleSlideout.tsx +++ b/app/src/organisms/ModuleCard/ThermocyclerModuleSlideout.tsx @@ -14,11 +14,11 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Slideout } from '../../atoms/Slideout' import { InputField } from '../../atoms/InputField' -import { StyledText } from '../../atoms/text' import { SubmitPrimaryButton } from '../../atoms/buttons' import type { ThermocyclerModule } from '../../redux/modules/types' diff --git a/app/src/organisms/ModuleCard/index.tsx b/app/src/organisms/ModuleCard/index.tsx index feeac976e8a..c2c42151eda 100644 --- a/app/src/organisms/ModuleCard/index.tsx +++ b/app/src/organisms/ModuleCard/index.tsx @@ -13,9 +13,9 @@ import { DIRECTION_ROW, Flex, Icon, - IconProps, ModuleIcon, SPACING, + StyledText, TYPOGRAPHY, useHoverTooltip, useOnClickOutside, @@ -46,7 +46,6 @@ import { UpdateBanner } from '../../molecules/UpdateBanner' import { SUCCESS_TOAST } from '../../atoms/Toast' import { useMenuHandleClickOutside } from '../../atoms/MenuList/hooks' import { Tooltip } from '../../atoms/Tooltip' -import { StyledText } from '../../atoms/text' import { useChainLiveCommands } from '../../resources/runs' import { useCurrentRunStatus } from '../RunTimeControl/hooks' import { useIsFlex } from '../../organisms/Devices/hooks' @@ -71,6 +70,7 @@ import { ErrorInfo } from './ErrorInfo' import { ModuleSetupModal } from './ModuleSetupModal' import { useIsEstopNotDisengaged } from '../../resources/devices/hooks/useIsEstopNotDisengaged' +import type { IconProps } from '@opentrons/components' import type { AttachedModule, HeaterShakerModule, diff --git a/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx b/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx index 05f8f2a01c5..a4a324dc933 100644 --- a/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx +++ b/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx @@ -11,11 +11,11 @@ import { Flex, RESPONSIVENESS, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Banner } from '../../atoms/Banner' -import { StyledText } from '../../atoms/text' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import type { ModuleCalibrationWizardStepProps } from './types' diff --git a/app/src/organisms/ModuleWizardFlows/BeforeBeginning.tsx b/app/src/organisms/ModuleWizardFlows/BeforeBeginning.tsx index 98d5b024696..e8013272a10 100644 --- a/app/src/organisms/ModuleWizardFlows/BeforeBeginning.tsx +++ b/app/src/organisms/ModuleWizardFlows/BeforeBeginning.tsx @@ -8,8 +8,7 @@ import { THERMOCYCLER_MODULE_MODELS, getModuleDisplayName, } from '@opentrons/shared-data' - -import { StyledText } from '../../atoms/text' +import { StyledText } from '@opentrons/components' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { WizardRequiredEquipmentList } from '../../molecules/WizardRequiredEquipmentList' diff --git a/app/src/organisms/ModuleWizardFlows/DetachProbe.tsx b/app/src/organisms/ModuleWizardFlows/DetachProbe.tsx index 75de79e84f4..6d43d7b7b96 100644 --- a/app/src/organisms/ModuleWizardFlows/DetachProbe.tsx +++ b/app/src/organisms/ModuleWizardFlows/DetachProbe.tsx @@ -8,10 +8,9 @@ import { Flex, RESPONSIVENESS, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' - -import { StyledText } from '../../atoms/text' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import type { ModuleCalibrationWizardStepProps } from './types' diff --git a/app/src/organisms/ModuleWizardFlows/PlaceAdapter.tsx b/app/src/organisms/ModuleWizardFlows/PlaceAdapter.tsx index 1ab35baf151..cd5c949d8ba 100644 --- a/app/src/organisms/ModuleWizardFlows/PlaceAdapter.tsx +++ b/app/src/organisms/ModuleWizardFlows/PlaceAdapter.tsx @@ -10,9 +10,10 @@ import Thermocycler_PlaceAdapter from '../../assets/videos/module_wizard_flows/T import { Flex, - TYPOGRAPHY, - SPACING, RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { CreateCommand, @@ -25,7 +26,6 @@ import { THERMOCYCLER_MODULE_MODELS, } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { LEFT_SLOTS } from './constants' diff --git a/app/src/organisms/ModuleWizardFlows/SelectLocation.tsx b/app/src/organisms/ModuleWizardFlows/SelectLocation.tsx index ea801c48f4c..6a694959079 100644 --- a/app/src/organisms/ModuleWizardFlows/SelectLocation.tsx +++ b/app/src/organisms/ModuleWizardFlows/SelectLocation.tsx @@ -9,14 +9,14 @@ import { CutoutConfig, } from '@opentrons/shared-data' import { + DeckLocationSelect, RESPONSIVENESS, - TYPOGRAPHY, - SPACING, SIZE_1, - DeckLocationSelect, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { Banner } from '../../atoms/Banner' -import { StyledText } from '../../atoms/text' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import type { ModuleCalibrationWizardStepProps } from './types' diff --git a/app/src/organisms/ModuleWizardFlows/index.tsx b/app/src/organisms/ModuleWizardFlows/index.tsx index 944e9bd27e3..39c235bd782 100644 --- a/app/src/organisms/ModuleWizardFlows/index.tsx +++ b/app/src/organisms/ModuleWizardFlows/index.tsx @@ -7,7 +7,7 @@ import { useCurrentMaintenanceRun, useDeckConfigurationQuery, } from '@opentrons/react-api-client' -import { COLORS } from '@opentrons/components' +import { COLORS, StyledText } from '@opentrons/components' import { getModuleType, getModuleDisplayName, @@ -16,7 +16,6 @@ import { } from '@opentrons/shared-data' import { LegacyModalShell } from '../../molecules/LegacyModal' import { getTopPortalEl } from '../../App/portal' -import { StyledText } from '../../atoms/text' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' import { WizardHeader } from '../../molecules/WizardHeader' import { useAttachedPipettesFromInstrumentsQuery } from '../../organisms/Devices/hooks' diff --git a/app/src/organisms/Navigation/NavigationMenu.tsx b/app/src/organisms/Navigation/NavigationMenu.tsx index c95de6dfdad..898acbedbbf 100644 --- a/app/src/organisms/Navigation/NavigationMenu.tsx +++ b/app/src/organisms/Navigation/NavigationMenu.tsx @@ -9,10 +9,10 @@ import { Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { MenuList } from '../../atoms/MenuList' import { MenuItem } from '../../atoms/MenuList/MenuItem' import { home, ROBOT } from '../../redux/robot-controls' diff --git a/app/src/organisms/Navigation/RestartRobotConfirmationModal.tsx b/app/src/organisms/Navigation/RestartRobotConfirmationModal.tsx index 1340d4d9bab..40884546868 100644 --- a/app/src/organisms/Navigation/RestartRobotConfirmationModal.tsx +++ b/app/src/organisms/Navigation/RestartRobotConfirmationModal.tsx @@ -8,15 +8,15 @@ import { DIRECTION_ROW, Flex, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' import { restartRobot } from '../../redux/robot-admin' -import { Dispatch } from '../../redux/types' -import { ModalHeaderBaseProps } from '../../molecules/Modal/types' +import type { Dispatch } from '../../redux/types' +import type { ModalHeaderBaseProps } from '../../molecules/Modal/types' interface RestartRobotConfirmationModalProps { robotName: string diff --git a/app/src/organisms/NetworkSettings/AlternativeSecurityTypeModal.tsx b/app/src/organisms/NetworkSettings/AlternativeSecurityTypeModal.tsx index 027a233c8b1..b0e365d08fc 100644 --- a/app/src/organisms/NetworkSettings/AlternativeSecurityTypeModal.tsx +++ b/app/src/organisms/NetworkSettings/AlternativeSecurityTypeModal.tsx @@ -8,10 +8,10 @@ import { Flex, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' diff --git a/app/src/organisms/NetworkSettings/ConnectingNetwork.tsx b/app/src/organisms/NetworkSettings/ConnectingNetwork.tsx index 5a3e77ad2c6..6a84ced2ee9 100644 --- a/app/src/organisms/NetworkSettings/ConnectingNetwork.tsx +++ b/app/src/organisms/NetworkSettings/ConnectingNetwork.tsx @@ -2,19 +2,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, - JUSTIFY_CENTER, + BORDERS, COLORS, + DIRECTION_COLUMN, + Flex, + Icon, + JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, - Icon, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - interface ConnectingNetworkProps { ssid: string } diff --git a/app/src/organisms/NetworkSettings/DisplaySearchNetwork.tsx b/app/src/organisms/NetworkSettings/DisplaySearchNetwork.tsx index 1ddbad43037..68b6528f69c 100644 --- a/app/src/organisms/NetworkSettings/DisplaySearchNetwork.tsx +++ b/app/src/organisms/NetworkSettings/DisplaySearchNetwork.tsx @@ -2,18 +2,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, + BORDERS, + COLORS, + DIRECTION_COLUMN, + Flex, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, - COLORS, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - export function DisplaySearchNetwork(): JSX.Element { const { t } = useTranslation(['device_settings', 'shared']) return ( diff --git a/app/src/organisms/NetworkSettings/DisplayWifiList.tsx b/app/src/organisms/NetworkSettings/DisplayWifiList.tsx index 8105f77c940..b98927d0d55 100644 --- a/app/src/organisms/NetworkSettings/DisplayWifiList.tsx +++ b/app/src/organisms/NetworkSettings/DisplayWifiList.tsx @@ -14,9 +14,9 @@ import { Flex, Icon, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ODD_FOCUS_VISIBLE } from '../../atoms/buttons/constants' import { RobotSetupHeader } from '../../organisms/RobotSetupHeader' import { DisplaySearchNetwork } from './DisplaySearchNetwork' diff --git a/app/src/organisms/NetworkSettings/FailedToConnect.tsx b/app/src/organisms/NetworkSettings/FailedToConnect.tsx index b6c0a628bc8..fe0c7ca1261 100644 --- a/app/src/organisms/NetworkSettings/FailedToConnect.tsx +++ b/app/src/organisms/NetworkSettings/FailedToConnect.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, - JUSTIFY_CENTER, + BORDERS, COLORS, + DIRECTION_COLUMN, + Flex, + Icon, + JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, - Icon, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { MediumButton } from '../../atoms/buttons' import type { RequestState } from '../../redux/robot-api/types' diff --git a/app/src/organisms/NetworkSettings/SelectAuthenticationType.tsx b/app/src/organisms/NetworkSettings/SelectAuthenticationType.tsx index e14a4a3b410..9314f174bc0 100644 --- a/app/src/organisms/NetworkSettings/SelectAuthenticationType.tsx +++ b/app/src/organisms/NetworkSettings/SelectAuthenticationType.tsx @@ -3,18 +3,18 @@ import { useDispatch, useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, - COLORS, - SPACING, Btn, + COLORS, + DIRECTION_COLUMN, + DISPLAY_FLEX, + Flex, JUSTIFY_CENTER, + SPACING, + StyledText, TYPOGRAPHY, - DISPLAY_FLEX, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { RadioButton } from '../../atoms/buttons' import { getLocalRobot } from '../../redux/discovery' import { getNetworkInterfaces, fetchStatus } from '../../redux/networking' diff --git a/app/src/organisms/NetworkSettings/SetWifiCred.tsx b/app/src/organisms/NetworkSettings/SetWifiCred.tsx index 6c64ceed9bf..876e10e0334 100644 --- a/app/src/organisms/NetworkSettings/SetWifiCred.tsx +++ b/app/src/organisms/NetworkSettings/SetWifiCred.tsx @@ -12,10 +12,10 @@ import { JUSTIFY_SPACE_BETWEEN, POSITION_FIXED, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { InputField } from '../../atoms/InputField' import { NormalKeyboard } from '../../atoms/SoftwareKeyboard' import { useIsUnboxingFlowOngoing } from '../RobotSettingsDashboard/NetworkSettings/hooks' diff --git a/app/src/organisms/NetworkSettings/SetWifiSsid.tsx b/app/src/organisms/NetworkSettings/SetWifiSsid.tsx index f954cb9c7f2..f9b2fdc8fff 100644 --- a/app/src/organisms/NetworkSettings/SetWifiSsid.tsx +++ b/app/src/organisms/NetworkSettings/SetWifiSsid.tsx @@ -8,9 +8,9 @@ import { POSITION_FIXED, SPACING, TYPOGRAPHY, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { InputField } from '../../atoms/InputField' import { NormalKeyboard } from '../../atoms/SoftwareKeyboard' import { useIsUnboxingFlowOngoing } from '../RobotSettingsDashboard/NetworkSettings/hooks' diff --git a/app/src/organisms/NetworkSettings/WifiConnectionDetails.tsx b/app/src/organisms/NetworkSettings/WifiConnectionDetails.tsx index b0a4bb2d2a4..28fd4caab75 100644 --- a/app/src/organisms/NetworkSettings/WifiConnectionDetails.tsx +++ b/app/src/organisms/NetworkSettings/WifiConnectionDetails.tsx @@ -4,19 +4,19 @@ import { useDispatch, useSelector } from 'react-redux' import { useHistory } from 'react-router-dom' import { - Flex, + ALIGN_CENTER, + BORDERS, + COLORS, DIRECTION_COLUMN, DIRECTION_ROW, - SPACING, + Flex, Icon, - COLORS, - TYPOGRAPHY, - ALIGN_CENTER, JUSTIFY_CENTER, - BORDERS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { MediumButton } from '../../atoms/buttons' import { RobotSetupHeader } from '../../organisms/RobotSetupHeader' import { getLocalRobot } from '../../redux/discovery' diff --git a/app/src/organisms/OnDeviceDisplay/NameRobot/ConfirmRobotName.tsx b/app/src/organisms/OnDeviceDisplay/NameRobot/ConfirmRobotName.tsx index b8a7123603f..80974a53d59 100644 --- a/app/src/organisms/OnDeviceDisplay/NameRobot/ConfirmRobotName.tsx +++ b/app/src/organisms/OnDeviceDisplay/NameRobot/ConfirmRobotName.tsx @@ -3,16 +3,16 @@ import { useHistory } from 'react-router-dom' import { useTranslation } from 'react-i18next' import { - Flex, + ALIGN_CENTER, + COLORS, DIRECTION_COLUMN, + Flex, JUSTIFY_CENTER, - ALIGN_CENTER, SPACING, + StyledText, TYPOGRAPHY, - COLORS, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { StepMeter } from '../../../atoms/StepMeter' import { MediumButton } from '../../../atoms/buttons' import screenImage from '../../../assets/images/on-device-display/odd_abstract@x2.png' diff --git a/app/src/organisms/OnDeviceDisplay/RobotDashboard/EmptyRecentRun.tsx b/app/src/organisms/OnDeviceDisplay/RobotDashboard/EmptyRecentRun.tsx index 94531c26476..92ab6690e14 100644 --- a/app/src/organisms/OnDeviceDisplay/RobotDashboard/EmptyRecentRun.tsx +++ b/app/src/organisms/OnDeviceDisplay/RobotDashboard/EmptyRecentRun.tsx @@ -2,18 +2,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, + BORDERS, COLORS, + DIRECTION_COLUMN, + Flex, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' - import abstractImage from '../../../assets/images/on-device-display/empty_protocol_dashboard.png' export function EmptyRecentRun(): JSX.Element { diff --git a/app/src/organisms/OnDeviceDisplay/RobotDashboard/RecentRunProtocolCard.tsx b/app/src/organisms/OnDeviceDisplay/RobotDashboard/RecentRunProtocolCard.tsx index 083a1b6d121..ac8ecf347c2 100644 --- a/app/src/organisms/OnDeviceDisplay/RobotDashboard/RecentRunProtocolCard.tsx +++ b/app/src/organisms/OnDeviceDisplay/RobotDashboard/RecentRunProtocolCard.tsx @@ -13,6 +13,7 @@ import { JUSTIFY_SPACE_BETWEEN, OVERFLOW_WRAP_BREAK_WORD, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useProtocolQuery } from '@opentrons/react-api-client' @@ -25,7 +26,6 @@ import { RunStatus, } from '@opentrons/api-client' -import { StyledText } from '../../../atoms/text' import { Chip } from '../../../atoms/Chip' import { ODD_FOCUS_VISIBLE } from '../../../atoms/buttons//constants' import { useTrackEvent } from '../../../redux/analytics' diff --git a/app/src/organisms/OnDeviceDisplay/RobotDashboard/ServerInitializing.tsx b/app/src/organisms/OnDeviceDisplay/RobotDashboard/ServerInitializing.tsx index 0d3f8cabf61..bc2333b25d0 100644 --- a/app/src/organisms/OnDeviceDisplay/RobotDashboard/ServerInitializing.tsx +++ b/app/src/organisms/OnDeviceDisplay/RobotDashboard/ServerInitializing.tsx @@ -2,19 +2,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, - COLORS, - JUSTIFY_CENTER, - TYPOGRAPHY, BORDERS, + COLORS, + DIRECTION_COLUMN, + Flex, Icon, + JUSTIFY_CENTER, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' - export function ServerInitializing(): JSX.Element { const { t } = useTranslation('device_details') return ( diff --git a/app/src/organisms/OnDeviceDisplay/RunningProtocol/CancelingRunModal.tsx b/app/src/organisms/OnDeviceDisplay/RunningProtocol/CancelingRunModal.tsx index d424bb96b1a..f414c7b7d01 100644 --- a/app/src/organisms/OnDeviceDisplay/RunningProtocol/CancelingRunModal.tsx +++ b/app/src/organisms/OnDeviceDisplay/RunningProtocol/CancelingRunModal.tsx @@ -10,10 +10,10 @@ import { Icon, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Modal } from '../../../molecules/Modal' -import { StyledText } from '../../../atoms/text' export function CancelingRunModal(): JSX.Element { const { t, i18n } = useTranslation('run_details') diff --git a/app/src/organisms/OnDeviceDisplay/RunningProtocol/ConfirmCancelRunModal.tsx b/app/src/organisms/OnDeviceDisplay/RunningProtocol/ConfirmCancelRunModal.tsx index 21f48b59843..c2841101133 100644 --- a/app/src/organisms/OnDeviceDisplay/RunningProtocol/ConfirmCancelRunModal.tsx +++ b/app/src/organisms/OnDeviceDisplay/RunningProtocol/ConfirmCancelRunModal.tsx @@ -10,13 +10,13 @@ import { DIRECTION_ROW, Flex, SPACING, + StyledText, } from '@opentrons/components' import { useStopRunMutation, useDismissCurrentRunMutation, } from '@opentrons/react-api-client' -import { StyledText } from '../../../atoms/text' import { SmallButton } from '../../../atoms/buttons' import { Modal } from '../../../molecules/Modal' import { useTrackProtocolRunEvent } from '../../../organisms/Devices/hooks' diff --git a/app/src/organisms/OnDeviceDisplay/RunningProtocol/CurrentRunningProtocolCommand.tsx b/app/src/organisms/OnDeviceDisplay/RunningProtocol/CurrentRunningProtocolCommand.tsx index 14a25e0d3f5..93895a9bc54 100644 --- a/app/src/organisms/OnDeviceDisplay/RunningProtocol/CurrentRunningProtocolCommand.tsx +++ b/app/src/organisms/OnDeviceDisplay/RunningProtocol/CurrentRunningProtocolCommand.tsx @@ -14,11 +14,11 @@ import { JUSTIFY_SPACE_BETWEEN, OVERFLOW_WRAP_ANYWHERE, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { RUN_STATUS_RUNNING, RUN_STATUS_IDLE } from '@opentrons/api-client' -import { StyledText } from '../../../atoms/text' import { CommandText } from '../../CommandText' import { RunTimer } from '../../Devices/ProtocolRun/RunTimer' import { PlayPauseButton } from './PlayPauseButton' diff --git a/app/src/organisms/OnDeviceDisplay/RunningProtocol/RunFailedModal.tsx b/app/src/organisms/OnDeviceDisplay/RunningProtocol/RunFailedModal.tsx index 141c4d01488..072180008da 100644 --- a/app/src/organisms/OnDeviceDisplay/RunningProtocol/RunFailedModal.tsx +++ b/app/src/organisms/OnDeviceDisplay/RunningProtocol/RunFailedModal.tsx @@ -11,11 +11,11 @@ import { Flex, OVERFLOW_AUTO, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useStopRunMutation } from '@opentrons/react-api-client' -import { StyledText } from '../../../atoms/text' import { SmallButton } from '../../../atoms/buttons' import { Modal } from '../../../molecules/Modal' diff --git a/app/src/organisms/OnDeviceDisplay/RunningProtocol/RunningProtocolCommandList.tsx b/app/src/organisms/OnDeviceDisplay/RunningProtocol/RunningProtocolCommandList.tsx index a19fabcb8a8..0c2f00ef2ea 100644 --- a/app/src/organisms/OnDeviceDisplay/RunningProtocol/RunningProtocolCommandList.tsx +++ b/app/src/organisms/OnDeviceDisplay/RunningProtocol/RunningProtocolCommandList.tsx @@ -16,11 +16,11 @@ import { OVERFLOW_WRAP_ANYWHERE, POSITION_RELATIVE, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { RUN_STATUS_RUNNING, RUN_STATUS_IDLE } from '@opentrons/api-client' -import { StyledText } from '../../../atoms/text' import { CommandText } from '../../CommandText' import { CommandIcon } from '../../RunPreview/CommandIcon' import { PlayPauseButton } from './PlayPauseButton' diff --git a/app/src/organisms/OpenDoorAlertModal/index.tsx b/app/src/organisms/OpenDoorAlertModal/index.tsx index 4a4d141911b..78db7539a19 100644 --- a/app/src/organisms/OpenDoorAlertModal/index.tsx +++ b/app/src/organisms/OpenDoorAlertModal/index.tsx @@ -10,10 +10,10 @@ import { Icon, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../App/portal' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' export function OpenDoorAlertModal(): JSX.Element { diff --git a/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx b/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx index 68ddb3098d0..74e910758f7 100644 --- a/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx +++ b/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx @@ -2,11 +2,12 @@ import * as React from 'react' import { css } from 'styled-components' import { Trans, useTranslation } from 'react-i18next' import { - Flex, - TYPOGRAPHY, COLORS, - SPACING, + Flex, RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { LEFT, @@ -15,7 +16,6 @@ import { CreateCommand, } from '@opentrons/shared-data' import { useDeckConfigurationQuery } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' diff --git a/app/src/organisms/PipetteWizardFlows/BeforeBeginning.tsx b/app/src/organisms/PipetteWizardFlows/BeforeBeginning.tsx index b1f1668bf39..b20b1bfe4e0 100644 --- a/app/src/organisms/PipetteWizardFlows/BeforeBeginning.tsx +++ b/app/src/organisms/PipetteWizardFlows/BeforeBeginning.tsx @@ -1,7 +1,13 @@ import * as React from 'react' import { Trans, useTranslation } from 'react-i18next' import { UseMutateFunction } from 'react-query' -import { COLORS, DIRECTION_COLUMN, Flex, SPACING } from '@opentrons/components' +import { + COLORS, + DIRECTION_COLUMN, + Flex, + SPACING, + StyledText, +} from '@opentrons/components' import { NINETY_SIX_CHANNEL, RIGHT, @@ -12,7 +18,6 @@ import { WASTE_CHUTE_CUTOUT, } from '@opentrons/shared-data' import { useDeckConfigurationQuery } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' import { GenericWizardTile } from '../../molecules/GenericWizardTile' diff --git a/app/src/organisms/PipetteWizardFlows/Carriage.tsx b/app/src/organisms/PipetteWizardFlows/Carriage.tsx index 618f6ff0f8b..a4c26f0fa6e 100644 --- a/app/src/organisms/PipetteWizardFlows/Carriage.tsx +++ b/app/src/organisms/PipetteWizardFlows/Carriage.tsx @@ -1,8 +1,12 @@ import * as React from 'react' import { Trans, useTranslation } from 'react-i18next' import capitalize from 'lodash/capitalize' -import { COLORS, SPACING, PrimaryButton } from '@opentrons/components' -import { StyledText } from '../../atoms/text' +import { + COLORS, + PrimaryButton, + SPACING, + StyledText, +} from '@opentrons/components' import { SmallButton } from '../../atoms/buttons' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' diff --git a/app/src/organisms/PipetteWizardFlows/ChoosePipette.tsx b/app/src/organisms/PipetteWizardFlows/ChoosePipette.tsx index 13417991891..8d9330315c7 100644 --- a/app/src/organisms/PipetteWizardFlows/ChoosePipette.tsx +++ b/app/src/organisms/PipetteWizardFlows/ChoosePipette.tsx @@ -5,23 +5,24 @@ import { css } from 'styled-components' import { useTranslation } from 'react-i18next' import startCase from 'lodash/startCase' import { + ALIGN_CENTER, + ALIGN_FLEX_END, BORDERS, COLORS, - Flex, - SPACING, - TYPOGRAPHY, DIRECTION_COLUMN, + DIRECTION_ROW, + Flex, JUSTIFY_CENTER, - POSITION_ABSOLUTE, JUSTIFY_FLEX_END, - JUSTIFY_SPACE_BETWEEN, - RESPONSIVENESS, - DIRECTION_ROW, JUSTIFY_FLEX_START, - PrimaryButton, - ALIGN_FLEX_END, - ALIGN_CENTER, JUSTIFY_SPACE_AROUND, + JUSTIFY_SPACE_BETWEEN, + POSITION_ABSOLUTE, + PrimaryButton, + RESPONSIVENESS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { EIGHT_CHANNEL, @@ -32,7 +33,6 @@ import { } from '@opentrons/shared-data' import { i18n } from '../../i18n' import { getIsOnDevice } from '../../redux/config' -import { StyledText } from '../../atoms/text' import { getTopPortalEl } from '../../App/portal' import { SmallButton } from '../../atoms/buttons' import { LegacyModalShell } from '../../molecules/LegacyModal' diff --git a/app/src/organisms/PipetteWizardFlows/DetachPipette.tsx b/app/src/organisms/PipetteWizardFlows/DetachPipette.tsx index d2a59d4ae89..3dc2e23a1a1 100644 --- a/app/src/organisms/PipetteWizardFlows/DetachPipette.tsx +++ b/app/src/organisms/PipetteWizardFlows/DetachPipette.tsx @@ -4,19 +4,19 @@ import { css } from 'styled-components' import { RIGHT, WEIGHT_OF_96_CHANNEL } from '@opentrons/shared-data' import { useInstrumentsQuery } from '@opentrons/react-api-client' import { + ALIGN_CENTER, + ALIGN_FLEX_END, Btn, - PrimaryButton, - Flex, - TYPOGRAPHY, COLORS, + Flex, JUSTIFY_SPACE_BETWEEN, - ALIGN_FLEX_END, - ALIGN_CENTER, - SPACING, - SIZE_1, + PrimaryButton, RESPONSIVENESS, + SIZE_1, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' diff --git a/app/src/organisms/PipetteWizardFlows/DetachProbe.tsx b/app/src/organisms/PipetteWizardFlows/DetachProbe.tsx index 4963f69f069..4ca07d42b57 100644 --- a/app/src/organisms/PipetteWizardFlows/DetachProbe.tsx +++ b/app/src/organisms/PipetteWizardFlows/DetachProbe.tsx @@ -1,6 +1,6 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' -import { StyledText } from '../../atoms/text' +import { StyledText } from '@opentrons/components' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' import { BODY_STYLE, SECTIONS } from './constants' diff --git a/app/src/organisms/PipetteWizardFlows/MountPipette.tsx b/app/src/organisms/PipetteWizardFlows/MountPipette.tsx index fe006a25737..fcedfedfa1f 100644 --- a/app/src/organisms/PipetteWizardFlows/MountPipette.tsx +++ b/app/src/organisms/PipetteWizardFlows/MountPipette.tsx @@ -4,8 +4,13 @@ import { SINGLE_MOUNT_PIPETTES, WEIGHT_OF_96_CHANNEL, } from '@opentrons/shared-data' -import { Flex, JUSTIFY_CENTER, SPACING, SIZE_1 } from '@opentrons/components' -import { StyledText } from '../../atoms/text' +import { + Flex, + JUSTIFY_CENTER, + SIZE_1, + SPACING, + StyledText, +} from '@opentrons/components' import { Banner } from '../../atoms/Banner' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { Skeleton } from '../../atoms/Skeleton' diff --git a/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx b/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx index 51347bd18f4..b2a1f3f197d 100644 --- a/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx +++ b/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx @@ -1,8 +1,7 @@ import * as React from 'react' import { Trans, useTranslation } from 'react-i18next' import { LEFT } from '@opentrons/shared-data' -import { COLORS, SPACING } from '@opentrons/components' -import { StyledText } from '../../atoms/text' +import { COLORS, SPACING, StyledText } from '@opentrons/components' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' import { GenericWizardTile } from '../../molecules/GenericWizardTile' import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' diff --git a/app/src/organisms/PipetteWizardFlows/ProbeNotAttached.tsx b/app/src/organisms/PipetteWizardFlows/ProbeNotAttached.tsx index 2d2047d9aa8..1056cf9831b 100644 --- a/app/src/organisms/PipetteWizardFlows/ProbeNotAttached.tsx +++ b/app/src/organisms/PipetteWizardFlows/ProbeNotAttached.tsx @@ -1,20 +1,20 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + ALIGN_CENTER, + ALIGN_FLEX_END, Btn, + COLORS, + Flex, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, RESPONSIVENESS, SPACING, + StyledText, TYPOGRAPHY, - COLORS, - JUSTIFY_SPACE_BETWEEN, - ALIGN_FLEX_END, - ALIGN_CENTER, } from '@opentrons/components' import { css } from 'styled-components' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' interface ProbeNotAttachedProps { diff --git a/app/src/organisms/PipetteWizardFlows/Results.tsx b/app/src/organisms/PipetteWizardFlows/Results.tsx index 67a7e2bb2f6..04549e686df 100644 --- a/app/src/organisms/PipetteWizardFlows/Results.tsx +++ b/app/src/organisms/PipetteWizardFlows/Results.tsx @@ -2,14 +2,15 @@ import * as React from 'react' import { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { + ALIGN_FLEX_END, Btn, COLORS, - RESPONSIVENESS, - TYPOGRAPHY, - SPACING, PrimaryButton, + RESPONSIVENESS, SecondaryButton, - ALIGN_FLEX_END, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getPipetteNameSpecs, @@ -22,7 +23,6 @@ import { import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal' import { SimpleWizardBody } from '../../molecules/SimpleWizardBody' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { CheckPipetteButton } from './CheckPipetteButton' import { FLOWS } from './constants' import type { PipetteWizardStepProps } from './types' diff --git a/app/src/organisms/ProtocolAnalysisFailure/ProtocolAnalysisStale.tsx b/app/src/organisms/ProtocolAnalysisFailure/ProtocolAnalysisStale.tsx index 07f18d734d3..9cf33b6c776 100644 --- a/app/src/organisms/ProtocolAnalysisFailure/ProtocolAnalysisStale.tsx +++ b/app/src/organisms/ProtocolAnalysisFailure/ProtocolAnalysisStale.tsx @@ -3,16 +3,16 @@ import { useDispatch } from 'react-redux' import { useTranslation, Trans } from 'react-i18next' import { - Flex, - SPACING, - JUSTIFY_SPACE_BETWEEN, ALIGN_CENTER, Btn, + Flex, + JUSTIFY_SPACE_BETWEEN, + SPACING, + StyledText, TYPOGRAPHY, WRAP_REVERSE, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import type { Dispatch } from '../../redux/types' diff --git a/app/src/organisms/ProtocolAnalysisFailure/index.tsx b/app/src/organisms/ProtocolAnalysisFailure/index.tsx index 906616c25ea..f1b438094c9 100644 --- a/app/src/organisms/ProtocolAnalysisFailure/index.tsx +++ b/app/src/organisms/ProtocolAnalysisFailure/index.tsx @@ -4,19 +4,19 @@ import { useDispatch } from 'react-redux' import { useTranslation, Trans } from 'react-i18next' import { - Flex, - SPACING, - JUSTIFY_SPACE_BETWEEN, ALIGN_CENTER, Btn, + Flex, JUSTIFY_FLEX_END, - TYPOGRAPHY, + JUSTIFY_SPACE_BETWEEN, PrimaryButton, + SPACING, + StyledText, + TYPOGRAPHY, WRAP_REVERSE, } from '@opentrons/components' import { analyzeProtocol } from '../../redux/protocol-storage' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { getTopPortalEl } from '../../App/portal' import { LegacyModal } from '../../molecules/LegacyModal' diff --git a/app/src/organisms/ProtocolDetails/ProtocolLabwareDetails.tsx b/app/src/organisms/ProtocolDetails/ProtocolLabwareDetails.tsx index 2a4694fa6af..7410fd9b2cf 100644 --- a/app/src/organisms/ProtocolDetails/ProtocolLabwareDetails.tsx +++ b/app/src/organisms/ProtocolDetails/ProtocolLabwareDetails.tsx @@ -11,10 +11,10 @@ import { POSITION_ABSOLUTE, POSITION_RELATIVE, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { getLabwareDefURI } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { Divider } from '../../atoms/structure' import { OverflowBtn } from '../../atoms/MenuList/OverflowBtn' import { MenuItem } from '../../atoms/MenuList/MenuItem' diff --git a/app/src/organisms/ProtocolDetails/ProtocolLiquidsDetails.tsx b/app/src/organisms/ProtocolDetails/ProtocolLiquidsDetails.tsx index d444613346c..5aff2a28ea4 100644 --- a/app/src/organisms/ProtocolDetails/ProtocolLiquidsDetails.tsx +++ b/app/src/organisms/ProtocolDetails/ProtocolLiquidsDetails.tsx @@ -13,10 +13,10 @@ import { Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { LiquidsListItemDetails } from '../Devices/ProtocolRun/SetupLiquids/SetupLiquidsList' import type { Liquid, RunTimeCommand } from '@opentrons/shared-data' diff --git a/app/src/organisms/ProtocolDetails/ProtocolParameters/NoParameter.tsx b/app/src/organisms/ProtocolDetails/ProtocolParameters/NoParameter.tsx index 98a5d888e34..2dd3f2d1441 100644 --- a/app/src/organisms/ProtocolDetails/ProtocolParameters/NoParameter.tsx +++ b/app/src/organisms/ProtocolDetails/ProtocolParameters/NoParameter.tsx @@ -9,9 +9,9 @@ import { Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' export function NoParameter(): JSX.Element { const { t } = useTranslation('protocol_details') diff --git a/app/src/organisms/ProtocolDetails/ProtocolParameters/index.tsx b/app/src/organisms/ProtocolDetails/ProtocolParameters/index.tsx index 5211e99cc73..00dc73793d4 100644 --- a/app/src/organisms/ProtocolDetails/ProtocolParameters/index.tsx +++ b/app/src/organisms/ProtocolDetails/ProtocolParameters/index.tsx @@ -7,9 +7,9 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { Banner } from '../../../atoms/Banner' import { NoParameter } from './NoParameter' import { formatRunTimeParameterValue } from './utils' diff --git a/app/src/organisms/ProtocolDetails/ProtocolStats.tsx b/app/src/organisms/ProtocolDetails/ProtocolStats.tsx index 357182a4e11..feef03553a4 100644 --- a/app/src/organisms/ProtocolDetails/ProtocolStats.tsx +++ b/app/src/organisms/ProtocolDetails/ProtocolStats.tsx @@ -11,10 +11,10 @@ import { JUSTIFY_CENTER, SIZE_AUTO, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { getPipetteNameSpecs } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import type { ProtocolAnalysisOutput } from '@opentrons/shared-data' interface ProtocolStatsProps { diff --git a/app/src/organisms/ProtocolDetails/RobotConfigurationDetails.tsx b/app/src/organisms/ProtocolDetails/RobotConfigurationDetails.tsx index c0476f8e6d3..4d8c32680d6 100644 --- a/app/src/organisms/ProtocolDetails/RobotConfigurationDetails.tsx +++ b/app/src/organisms/ProtocolDetails/RobotConfigurationDetails.tsx @@ -10,6 +10,7 @@ import { ModuleIcon, SIZE_1, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { @@ -24,7 +25,6 @@ import { import { InstrumentContainer } from '../../atoms/InstrumentContainer' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { getRobotTypeDisplayName } from '../ProtocolsLanding/utils' import { getSlotsForThermocycler } from './utils' diff --git a/app/src/organisms/ProtocolDetails/index.tsx b/app/src/organisms/ProtocolDetails/index.tsx index 8c5feb33ec9..9329b6329b3 100644 --- a/app/src/organisms/ProtocolDetails/index.tsx +++ b/app/src/organisms/ProtocolDetails/index.tsx @@ -32,6 +32,7 @@ import { SIZE_1, SIZE_5, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { @@ -48,7 +49,6 @@ import { import { getTopPortalEl } from '../../App/portal' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { LegacyModal } from '../../molecules/LegacyModal' import { useTrackEvent, diff --git a/app/src/organisms/ProtocolSetupLabware/index.tsx b/app/src/organisms/ProtocolSetupLabware/index.tsx index 50836cbcce1..bdb68944a67 100644 --- a/app/src/organisms/ProtocolSetupLabware/index.tsx +++ b/app/src/organisms/ProtocolSetupLabware/index.tsx @@ -19,6 +19,7 @@ import { LocationIcon, MODULE_ICON_NAME_BY_TYPE, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { @@ -37,7 +38,6 @@ import { } from '@opentrons/react-api-client' import { FloatingActionButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { ODDBackButton } from '../../molecules/ODDBackButton' import { getTopPortalEl } from '../../App/portal' import { Modal } from '../../molecules/Modal' diff --git a/app/src/organisms/ProtocolSetupLiquids/LiquidDetails.tsx b/app/src/organisms/ProtocolSetupLiquids/LiquidDetails.tsx index 19f1b13f153..05e2378f772 100644 --- a/app/src/organisms/ProtocolSetupLiquids/LiquidDetails.tsx +++ b/app/src/organisms/ProtocolSetupLiquids/LiquidDetails.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import styled from 'styled-components' import { useTranslation } from 'react-i18next' import { + BORDERS, COLORS, + DIRECTION_ROW, Flex, + Icon, + LocationIcon, SPACING, + StyledText, TYPOGRAPHY, - BORDERS, WRAP, - Icon, - DIRECTION_ROW, - LocationIcon, } from '@opentrons/components' import { MICRO_LITERS } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { LiquidsLabwareDetailsModal } from '../Devices/ProtocolRun/SetupLiquids/LiquidsLabwareDetailsModal' import { getLocationInfoNames } from '../Devices/ProtocolRun/utils/getLocationInfoNames' import { getTotalVolumePerLiquidId } from '../Devices/ProtocolRun/SetupLiquids/utils' diff --git a/app/src/organisms/ProtocolSetupLiquids/index.tsx b/app/src/organisms/ProtocolSetupLiquids/index.tsx index a8d8d6ba47e..2e705d279b2 100644 --- a/app/src/organisms/ProtocolSetupLiquids/index.tsx +++ b/app/src/organisms/ProtocolSetupLiquids/index.tsx @@ -7,16 +7,16 @@ import { DIRECTION_COLUMN, Flex, Icon, + JUSTIFY_FLEX_END, SPACING, + StyledText, TYPOGRAPHY, - JUSTIFY_FLEX_END, } from '@opentrons/components' import { parseLiquidsInLoadOrder, parseLabwareInfoByLiquidId, } from '@opentrons/api-client' import { MICRO_LITERS, RunTimeCommand } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { ODDBackButton } from '../../molecules/ODDBackButton' import { useMostRecentCompletedAnalysis } from '../LabwarePositionCheck/useMostRecentCompletedAnalysis' import { getTotalVolumePerLiquidId } from '../Devices/ProtocolRun/SetupLiquids/utils' diff --git a/app/src/organisms/ProtocolSetupModulesAndDeck/FixtureTable.tsx b/app/src/organisms/ProtocolSetupModulesAndDeck/FixtureTable.tsx index 8a8435ea788..46d774f3857 100644 --- a/app/src/organisms/ProtocolSetupModulesAndDeck/FixtureTable.tsx +++ b/app/src/organisms/ProtocolSetupModulesAndDeck/FixtureTable.tsx @@ -10,6 +10,7 @@ import { JUSTIFY_SPACE_BETWEEN, LocationIcon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { @@ -21,7 +22,6 @@ import { import { SmallButton } from '../../atoms/buttons' import { Chip } from '../../atoms/Chip' -import { StyledText } from '../../atoms/text' import { useDeckConfigurationCompatibility } from '../../resources/deck_configuration/hooks' import { getRequiredDeckConfig } from '../../resources/deck_configuration/utils' import { LocationConflictModal } from '../Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal' diff --git a/app/src/organisms/ProtocolSetupModulesAndDeck/ModuleTable.tsx b/app/src/organisms/ProtocolSetupModulesAndDeck/ModuleTable.tsx index ae7d75206b0..15116f33518 100644 --- a/app/src/organisms/ProtocolSetupModulesAndDeck/ModuleTable.tsx +++ b/app/src/organisms/ProtocolSetupModulesAndDeck/ModuleTable.tsx @@ -12,6 +12,7 @@ import { JUSTIFY_SPACE_BETWEEN, LocationIcon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useDeckConfigurationQuery } from '@opentrons/react-api-client' @@ -29,7 +30,6 @@ import { import { SmallButton } from '../../atoms/buttons' import { Chip } from '../../atoms/Chip' -import { StyledText } from '../../atoms/text' import { getModulePrepCommands } from '../../organisms/Devices/getModulePrepCommands' import { getModuleTooHot } from '../../organisms/Devices/getModuleTooHot' import { useRunCalibrationStatus } from '../../organisms/Devices/hooks' diff --git a/app/src/organisms/ProtocolSetupModulesAndDeck/SetupInstructionsModal.tsx b/app/src/organisms/ProtocolSetupModulesAndDeck/SetupInstructionsModal.tsx index f2393f51cd8..7fbbf4f048e 100644 --- a/app/src/organisms/ProtocolSetupModulesAndDeck/SetupInstructionsModal.tsx +++ b/app/src/organisms/ProtocolSetupModulesAndDeck/SetupInstructionsModal.tsx @@ -9,9 +9,9 @@ import { DIRECTION_ROW, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' import type { ModalHeaderBaseProps } from '../../molecules/Modal/types' diff --git a/app/src/organisms/ProtocolSetupParameters/AnalysisFailedModal.tsx b/app/src/organisms/ProtocolSetupParameters/AnalysisFailedModal.tsx index 269238e87aa..9c38db307dc 100644 --- a/app/src/organisms/ProtocolSetupParameters/AnalysisFailedModal.tsx +++ b/app/src/organisms/ProtocolSetupParameters/AnalysisFailedModal.tsx @@ -7,9 +7,9 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' diff --git a/app/src/organisms/ProtocolSetupParameters/ResetValuesModal.tsx b/app/src/organisms/ProtocolSetupParameters/ResetValuesModal.tsx index d32cb8929ca..458b1172f3a 100644 --- a/app/src/organisms/ProtocolSetupParameters/ResetValuesModal.tsx +++ b/app/src/organisms/ProtocolSetupParameters/ResetValuesModal.tsx @@ -8,9 +8,9 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' diff --git a/app/src/organisms/ProtocolSetupParameters/ViewOnlyParameters.tsx b/app/src/organisms/ProtocolSetupParameters/ViewOnlyParameters.tsx index 43ff3c21b43..9fac5f99c56 100644 --- a/app/src/organisms/ProtocolSetupParameters/ViewOnlyParameters.tsx +++ b/app/src/organisms/ProtocolSetupParameters/ViewOnlyParameters.tsx @@ -8,11 +8,11 @@ import { DIRECTION_ROW, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useMostRecentCompletedAnalysis } from '../LabwarePositionCheck/useMostRecentCompletedAnalysis' import { ChildNavigation } from '../ChildNavigation' -import { StyledText } from '../../atoms/text' import { Chip } from '../../atoms/Chip' import { useToaster } from '../ToasterOven' import { mockData } from './index' diff --git a/app/src/organisms/ProtocolsLanding/ConfirmDeleteProtocolModal.tsx b/app/src/organisms/ProtocolsLanding/ConfirmDeleteProtocolModal.tsx index b0c02649fad..d41690ca3b1 100644 --- a/app/src/organisms/ProtocolsLanding/ConfirmDeleteProtocolModal.tsx +++ b/app/src/organisms/ProtocolsLanding/ConfirmDeleteProtocolModal.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + AlertPrimaryButton, + ALIGN_CENTER, COLORS, DIRECTION_COLUMN, - TYPOGRAPHY, - SPACING, + Flex, JUSTIFY_FLEX_END, - AlertPrimaryButton, Link, - ALIGN_CENTER, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { LegacyModal } from '../../molecules/LegacyModal' -import { StyledText } from '../../atoms/text' interface ConfirmDeleteProtocolModalProps { cancelDeleteProtocol: React.MouseEventHandler | undefined diff --git a/app/src/organisms/ProtocolsLanding/EmptyStateLinks.tsx b/app/src/organisms/ProtocolsLanding/EmptyStateLinks.tsx index ee7d94c58f5..a2bf580980f 100644 --- a/app/src/organisms/ProtocolsLanding/EmptyStateLinks.tsx +++ b/app/src/organisms/ProtocolsLanding/EmptyStateLinks.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - TYPOGRAPHY, - Icon, - Flex, - SPACING, - Link, - DIRECTION_ROW, - DIRECTION_COLUMN, ALIGN_CENTER, + DIRECTION_COLUMN, + DIRECTION_ROW, + Flex, + Icon, JUSTIFY_CENTER, + Link, + SPACING, + StyledText, + TYPOGRAPHY, WRAP, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' const PROTOCOL_LIBRARY_URL = 'https://library.opentrons.com' const PROTOCOL_DESIGNER_URL = 'https://designer.opentrons.com' diff --git a/app/src/organisms/ProtocolsLanding/ProtocolCard.tsx b/app/src/organisms/ProtocolsLanding/ProtocolCard.tsx index 8dffbac17ec..932e7e0086c 100644 --- a/app/src/organisms/ProtocolsLanding/ProtocolCard.tsx +++ b/app/src/organisms/ProtocolsLanding/ProtocolCard.tsx @@ -28,6 +28,7 @@ import { SIZE_2, SIZE_3, SPACING, + StyledText, TYPOGRAPHY, WRAP, } from '@opentrons/components' @@ -39,7 +40,6 @@ import { import { getIsProtocolAnalysisInProgress } from '../../redux/protocol-storage' import { InstrumentContainer } from '../../atoms/InstrumentContainer' -import { StyledText } from '../../atoms/text' import { ProtocolOverflowMenu } from './ProtocolOverflowMenu' import { ProtocolAnalysisFailure } from '../ProtocolAnalysisFailure' import { ProtocolAnalysisStale } from '../ProtocolAnalysisFailure/ProtocolAnalysisStale' diff --git a/app/src/organisms/ProtocolsLanding/ProtocolList.tsx b/app/src/organisms/ProtocolsLanding/ProtocolList.tsx index 8394d839f86..d2010840066 100644 --- a/app/src/organisms/ProtocolsLanding/ProtocolList.tsx +++ b/app/src/organisms/ProtocolsLanding/ProtocolList.tsx @@ -4,20 +4,21 @@ import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { - Box, - Flex, ALIGN_CENTER, - JUSTIFY_SPACE_BETWEEN, - SPACING, - DIRECTION_ROW, - Icon, - TYPOGRAPHY, BORDERS, - POSITION_ABSOLUTE, + Box, COLORS, - SecondaryButton, DIRECTION_COLUMN, + DIRECTION_ROW, + Flex, + Icon, + JUSTIFY_SPACE_BETWEEN, Overlay, + POSITION_ABSOLUTE, + SecondaryButton, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { @@ -25,7 +26,6 @@ import { updateConfigValue, } from '../../redux/config' import { useSortedProtocols } from './hooks' -import { StyledText } from '../../atoms/text' import { Slideout } from '../../atoms/Slideout' import { ChooseRobotToRunProtocolSlideout } from '../ChooseRobotToRunProtocolSlideout' import { SendProtocolToFlexSlideout } from '../SendProtocolToFlexSlideout' diff --git a/app/src/organisms/ProtocolsLanding/ProtocolUploadInput.tsx b/app/src/organisms/ProtocolsLanding/ProtocolUploadInput.tsx index 1d9288b5fe1..5523cd18681 100644 --- a/app/src/organisms/ProtocolsLanding/ProtocolUploadInput.tsx +++ b/app/src/organisms/ProtocolsLanding/ProtocolUploadInput.tsx @@ -2,14 +2,14 @@ import * as React from 'react' import { useTranslation, Trans } from 'react-i18next' import { useDispatch } from 'react-redux' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, - Link, COLORS, + DIRECTION_COLUMN, + Flex, + Link, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { UploadInput } from '../../molecules/UploadInput' import { addProtocol } from '../../redux/protocol-storage' import { diff --git a/app/src/organisms/ProtocolsLanding/ProtocolsEmptyState.tsx b/app/src/organisms/ProtocolsLanding/ProtocolsEmptyState.tsx index a6238653e6e..d0daed07cd4 100644 --- a/app/src/organisms/ProtocolsLanding/ProtocolsEmptyState.tsx +++ b/app/src/organisms/ProtocolsLanding/ProtocolsEmptyState.tsx @@ -2,13 +2,13 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, ALIGN_CENTER, + DIRECTION_COLUMN, + Flex, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ProtocolUploadInput } from './ProtocolUploadInput' import { EmptyStateLinks } from './EmptyStateLinks' export function ProtocolsEmptyState(): JSX.Element | null { diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDataDownload.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDataDownload.tsx index ea36847d6f8..d24a71d0857 100644 --- a/app/src/organisms/RobotSettingsCalibration/CalibrationDataDownload.tsx +++ b/app/src/organisms/RobotSettingsCalibration/CalibrationDataDownload.tsx @@ -3,21 +3,21 @@ import { saveAs } from 'file-saver' import { useTranslation, Trans } from 'react-i18next' import { + ALIGN_CENTER, + DIRECTION_COLUMN, Flex, Icon, - Link, - ALIGN_CENTER, JUSTIFY_SPACE_BETWEEN, + Link, SPACING, + StyledText, TYPOGRAPHY, - DIRECTION_COLUMN, } from '@opentrons/components' import { useInstrumentsQuery, useModulesQuery, } from '@opentrons/react-api-client' import { TertiaryButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { useDeckCalibrationData, useIsFlex, diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/ModuleCalibrationItems.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/ModuleCalibrationItems.tsx index 7bb5c326cd2..184953f9109 100644 --- a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/ModuleCalibrationItems.tsx +++ b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/ModuleCalibrationItems.tsx @@ -2,10 +2,15 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import styled, { css } from 'styled-components' -import { BORDERS, COLORS, SPACING, TYPOGRAPHY } from '@opentrons/components' +import { + BORDERS, + COLORS, + SPACING, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' import { getModuleDisplayName } from '@opentrons/shared-data' -import { StyledText } from '../../../atoms/text' import { formatLastCalibrated } from './utils' import { ModuleCalibrationOverflowMenu } from './ModuleCalibrationOverflowMenu' diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx index db4f321230a..be5c7be48de 100644 --- a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx +++ b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx @@ -4,15 +4,15 @@ import { useTranslation } from 'react-i18next' import styled, { css } from 'styled-components' import { - Flex, ALIGN_CENTER, - SPACING, + BORDERS, COLORS, + Flex, + SPACING, + StyledText, TYPOGRAPHY, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { OverflowMenu } from './OverflowMenu' import { formatLastCalibrated, getDisplayNameForTipRack } from './utils' import { getCustomLabwareDefinitions } from '../../../redux/custom-labware' diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/TipLengthCalibrationItems.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/TipLengthCalibrationItems.tsx index 3fd19e8cb29..2157aa76bd7 100644 --- a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/TipLengthCalibrationItems.tsx +++ b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/TipLengthCalibrationItems.tsx @@ -3,9 +3,14 @@ import { useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import styled, { css } from 'styled-components' -import { BORDERS, COLORS, SPACING, TYPOGRAPHY } from '@opentrons/components' +import { + BORDERS, + COLORS, + SPACING, + StyledText, + TYPOGRAPHY, +} from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { useAttachedPipettes } from '../../../organisms/Devices/hooks' import { getCustomLabwareDefinitions } from '../../../redux/custom-labware' import { OverflowMenu } from './OverflowMenu' diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationHealthCheck.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationHealthCheck.tsx index 0ba48434f7c..f5a92e89ca7 100644 --- a/app/src/organisms/RobotSettingsCalibration/CalibrationHealthCheck.tsx +++ b/app/src/organisms/RobotSettingsCalibration/CalibrationHealthCheck.tsx @@ -4,19 +4,19 @@ import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, ALIGN_CENTER, + DIRECTION_COLUMN, + Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, + TOOLTIP_LEFT, TYPOGRAPHY, useHoverTooltip, - TOOLTIP_LEFT, - DIRECTION_COLUMN, } from '@opentrons/components' import { getTopPortalEl } from '../../App/portal' import { TertiaryButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Tooltip } from '../../atoms/Tooltip' import { AskForCalibrationBlockModal } from '../../organisms/CalibrateTipLength/AskForCalibrationBlockModal' import { diff --git a/app/src/organisms/RobotSettingsCalibration/DeckCalibrationConfirmModal.tsx b/app/src/organisms/RobotSettingsCalibration/DeckCalibrationConfirmModal.tsx index baf84d0302c..ff0a1b3fbef 100644 --- a/app/src/organisms/RobotSettingsCalibration/DeckCalibrationConfirmModal.tsx +++ b/app/src/organisms/RobotSettingsCalibration/DeckCalibrationConfirmModal.tsx @@ -1,18 +1,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, - JUSTIFY_FLEX_END, ALIGN_CENTER, COLORS, - TYPOGRAPHY, + DIRECTION_COLUMN, + Flex, + JUSTIFY_FLEX_END, + Link, PrimaryButton, SPACING, - Link, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { LegacyModal } from '../../molecules/LegacyModal' -import { StyledText } from '../../atoms/text' interface DeckCalibrationConfirmModalProps { confirm: () => unknown diff --git a/app/src/organisms/RobotSettingsCalibration/RobotSettingsDeckCalibration.tsx b/app/src/organisms/RobotSettingsCalibration/RobotSettingsDeckCalibration.tsx index e8cbd89c5af..8c66a6db2c7 100644 --- a/app/src/organisms/RobotSettingsCalibration/RobotSettingsDeckCalibration.tsx +++ b/app/src/organisms/RobotSettingsCalibration/RobotSettingsDeckCalibration.tsx @@ -3,14 +3,14 @@ import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' import { - Flex, COLORS, - SPACING, DIRECTION_COLUMN, + Flex, + SPACING, TYPOGRAPHY, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { formatLastModified } from '../../organisms/CalibrationPanels/utils' import { useDeckCalibrationData, useRobot } from '../../organisms/Devices/hooks' import * as RobotApi from '../../redux/robot-api' diff --git a/app/src/organisms/RobotSettingsCalibration/RobotSettingsGripperCalibration.tsx b/app/src/organisms/RobotSettingsCalibration/RobotSettingsGripperCalibration.tsx index be804d38dd5..f485371fc2d 100644 --- a/app/src/organisms/RobotSettingsCalibration/RobotSettingsGripperCalibration.tsx +++ b/app/src/organisms/RobotSettingsCalibration/RobotSettingsGripperCalibration.tsx @@ -11,13 +11,13 @@ import { POSITION_ABSOLUTE, POSITION_RELATIVE, SPACING, + StyledText, TYPOGRAPHY, useOnClickOutside, } from '@opentrons/components' import { useMenuHandleClickOutside } from '../../atoms/MenuList/hooks' import { OverflowBtn } from '../../atoms/MenuList/OverflowBtn' import { MenuItem } from '../../atoms/MenuList/MenuItem' -import { StyledText } from '../../atoms/text' import { GripperWizardFlows } from '../../organisms/GripperWizardFlows' import { formatLastCalibrated } from './CalibrationDetails/utils' import { useIsEstopNotDisengaged } from '../../resources/devices/hooks/useIsEstopNotDisengaged' diff --git a/app/src/organisms/RobotSettingsCalibration/RobotSettingsModuleCalibration.tsx b/app/src/organisms/RobotSettingsCalibration/RobotSettingsModuleCalibration.tsx index 60cb7cdcc0e..53060b105e4 100644 --- a/app/src/organisms/RobotSettingsCalibration/RobotSettingsModuleCalibration.tsx +++ b/app/src/organisms/RobotSettingsCalibration/RobotSettingsModuleCalibration.tsx @@ -5,10 +5,10 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ModuleCalibrationItems } from './CalibrationDetails/ModuleCalibrationItems' import type { AttachedModule } from '@opentrons/api-client' diff --git a/app/src/organisms/RobotSettingsCalibration/RobotSettingsPipetteOffsetCalibration.tsx b/app/src/organisms/RobotSettingsCalibration/RobotSettingsPipetteOffsetCalibration.tsx index 38f91a4741c..5f5cc493eb5 100644 --- a/app/src/organisms/RobotSettingsCalibration/RobotSettingsPipetteOffsetCalibration.tsx +++ b/app/src/organisms/RobotSettingsCalibration/RobotSettingsPipetteOffsetCalibration.tsx @@ -2,14 +2,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, DIRECTION_COLUMN, + Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useInstrumentsQuery } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' import { useAttachedPipettesFromInstrumentsQuery, useIsFlex, diff --git a/app/src/organisms/RobotSettingsCalibration/RobotSettingsTipLengthCalibration.tsx b/app/src/organisms/RobotSettingsCalibration/RobotSettingsTipLengthCalibration.tsx index bba192c393e..00983365695 100644 --- a/app/src/organisms/RobotSettingsCalibration/RobotSettingsTipLengthCalibration.tsx +++ b/app/src/organisms/RobotSettingsCalibration/RobotSettingsTipLengthCalibration.tsx @@ -2,14 +2,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, DIRECTION_COLUMN, + Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useAllTipLengthCalibrationsQuery } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' import { useAttachedPipettes } from '../../organisms/Devices/hooks' import { TipLengthCalibrationItems } from './CalibrationDetails/TipLengthCalibrationItems' diff --git a/app/src/organisms/RobotSettingsCalibration/index.tsx b/app/src/organisms/RobotSettingsCalibration/index.tsx index 349f00ba821..bedce1c3c9e 100644 --- a/app/src/organisms/RobotSettingsCalibration/index.tsx +++ b/app/src/organisms/RobotSettingsCalibration/index.tsx @@ -2,7 +2,12 @@ import * as React from 'react' import { createPortal } from 'react-dom' import { useSelector, useDispatch } from 'react-redux' import { useTranslation } from 'react-i18next' -import { SpinnerModalPage, AlertModal, SPACING } from '@opentrons/components' +import { + AlertModal, + SPACING, + SpinnerModalPage, + StyledText, +} from '@opentrons/components' import { useAllPipetteOffsetCalibrationsQuery, useAllTipLengthCalibrationsQuery, @@ -13,7 +18,6 @@ import { import { getTopPortalEl } from '../../App/portal' import { Line } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { CalibrateDeck } from '../../organisms/CalibrateDeck' import { CalibrationStatusCard } from '../../organisms/CalibrationStatusCard' import { CheckCalibration } from '../../organisms/CheckCalibration' diff --git a/app/src/organisms/RobotSettingsDashboard/DeviceReset.tsx b/app/src/organisms/RobotSettingsDashboard/DeviceReset.tsx index 6f361a15b48..9f0dc5bc6cb 100644 --- a/app/src/organisms/RobotSettingsDashboard/DeviceReset.tsx +++ b/app/src/organisms/RobotSettingsDashboard/DeviceReset.tsx @@ -4,17 +4,17 @@ import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { - Flex, - DIRECTION_COLUMN, - TYPOGRAPHY, + BORDERS, COLORS, + DIRECTION_COLUMN, + DIRECTION_ROW, + Flex, SPACING, - BORDERS, + StyledText, + TYPOGRAPHY, useConditionalConfirm, - DIRECTION_ROW, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { MediumButton, SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' import { ChildNavigation } from '../../organisms/ChildNavigation' diff --git a/app/src/organisms/RobotSettingsDashboard/NetworkSettings/EthernetConnectionDetails.tsx b/app/src/organisms/RobotSettingsDashboard/NetworkSettings/EthernetConnectionDetails.tsx index 2e78cfe2a46..2f870d2b346 100644 --- a/app/src/organisms/RobotSettingsDashboard/NetworkSettings/EthernetConnectionDetails.tsx +++ b/app/src/organisms/RobotSettingsDashboard/NetworkSettings/EthernetConnectionDetails.tsx @@ -4,17 +4,17 @@ import { useSelector } from 'react-redux' import { css } from 'styled-components' import { - Flex, + BORDERS, + COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, JUSTIFY_SPACE_BETWEEN, SPACING, - COLORS, + StyledText, TYPOGRAPHY, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { ChildNavigation } from '../../../organisms/ChildNavigation' import { getNetworkInterfaces } from '../../../redux/networking' import { getLocalRobot } from '../../../redux/discovery' diff --git a/app/src/organisms/RobotSettingsDashboard/NetworkSettings/NetworkDetailsModal.tsx b/app/src/organisms/RobotSettingsDashboard/NetworkSettings/NetworkDetailsModal.tsx index 5657f30e674..da0eea92188 100644 --- a/app/src/organisms/RobotSettingsDashboard/NetworkSettings/NetworkDetailsModal.tsx +++ b/app/src/organisms/RobotSettingsDashboard/NetworkSettings/NetworkDetailsModal.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - SPACING, - TYPOGRAPHY, + ALIGN_CENTER, + BORDERS, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, - ALIGN_CENTER, + Flex, JUSTIFY_SPACE_BETWEEN, - BORDERS, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { Modal } from '../../../molecules/Modal' import type { ModalHeaderBaseProps } from '../../../molecules/Modal/types' diff --git a/app/src/organisms/RobotSettingsDashboard/NetworkSettings/WifiConnectionDetails.tsx b/app/src/organisms/RobotSettingsDashboard/NetworkSettings/WifiConnectionDetails.tsx index 852f0f65862..2f0a288912c 100644 --- a/app/src/organisms/RobotSettingsDashboard/NetworkSettings/WifiConnectionDetails.tsx +++ b/app/src/organisms/RobotSettingsDashboard/NetworkSettings/WifiConnectionDetails.tsx @@ -14,10 +14,10 @@ import { Icon, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { NetworkDetailsModal } from './NetworkDetailsModal' import { DisplayWifiList } from '../../NetworkSettings' import { getLocalRobot } from '../../../redux/discovery' diff --git a/app/src/organisms/RobotSettingsDashboard/NetworkSettings/index.tsx b/app/src/organisms/RobotSettingsDashboard/NetworkSettings/index.tsx index 3aadf02256d..9fdd651eb5d 100644 --- a/app/src/organisms/RobotSettingsDashboard/NetworkSettings/index.tsx +++ b/app/src/organisms/RobotSettingsDashboard/NetworkSettings/index.tsx @@ -3,19 +3,19 @@ import { css } from 'styled-components' import { useTranslation } from 'react-i18next' import { - Flex, - SPACING, - COLORS, - Icon, + ALIGN_CENTER, + BORDERS, Btn, - DIRECTION_ROW, + COLORS, DIRECTION_COLUMN, - ALIGN_CENTER, + DIRECTION_ROW, + Flex, + Icon, + SPACING, + StyledText, TYPOGRAPHY, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { Chip } from '../../../atoms/Chip' import { ChildNavigation } from '../../../organisms/ChildNavigation' diff --git a/app/src/organisms/RobotSettingsDashboard/Privacy.tsx b/app/src/organisms/RobotSettingsDashboard/Privacy.tsx index b3b056d0b26..ceca1dea718 100644 --- a/app/src/organisms/RobotSettingsDashboard/Privacy.tsx +++ b/app/src/organisms/RobotSettingsDashboard/Privacy.tsx @@ -3,13 +3,13 @@ import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' import { + DIRECTION_COLUMN, Flex, SPACING, - DIRECTION_COLUMN, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ChildNavigation } from '../../organisms/ChildNavigation' import { ROBOT_ANALYTICS_SETTING_ID } from '../../pages/RobotDashboard/AnalyticsOptInModal' import { RobotSettingButton } from '../../pages/RobotSettingsDashboard/RobotSettingButton' diff --git a/app/src/organisms/RobotSettingsDashboard/RobotName.tsx b/app/src/organisms/RobotSettingsDashboard/RobotName.tsx index c6a25d1877f..b4029255103 100644 --- a/app/src/organisms/RobotSettingsDashboard/RobotName.tsx +++ b/app/src/organisms/RobotSettingsDashboard/RobotName.tsx @@ -2,15 +2,14 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, Btn, DIRECTION_COLUMN, - JUSTIFY_FLEX_START, + Flex, Icon, + JUSTIFY_FLEX_START, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - import type { SetSettingOption } from '../../pages/RobotSettingsDashboard' interface RobotNameProps { diff --git a/app/src/organisms/RobotSettingsDashboard/RobotSystemVersion.tsx b/app/src/organisms/RobotSettingsDashboard/RobotSystemVersion.tsx index 3b708fa3253..f5f6aeb7391 100644 --- a/app/src/organisms/RobotSettingsDashboard/RobotSystemVersion.tsx +++ b/app/src/organisms/RobotSettingsDashboard/RobotSystemVersion.tsx @@ -9,10 +9,10 @@ import { Flex, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { MediumButton } from '../../atoms/buttons' import { ChildNavigation } from '../../organisms/ChildNavigation' import { RobotSystemVersionModal } from './RobotSystemVersionModal' diff --git a/app/src/organisms/RobotSettingsDashboard/TextSize.tsx b/app/src/organisms/RobotSettingsDashboard/TextSize.tsx index ea1a004394e..cb33eeb1404 100644 --- a/app/src/organisms/RobotSettingsDashboard/TextSize.tsx +++ b/app/src/organisms/RobotSettingsDashboard/TextSize.tsx @@ -3,22 +3,21 @@ import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { - Flex, + ALIGN_CENTER, + BORDERS, + Box, Btn, + COLORS, DIRECTION_COLUMN, DIRECTION_ROW, - JUSTIFY_FLEX_START, - ALIGN_CENTER, - JUSTIFY_CENTER, + Flex, Icon, - Box, + JUSTIFY_CENTER, + JUSTIFY_FLEX_START, + StyledText, TYPOGRAPHY, - COLORS, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - import type { SetSettingOption } from '../../pages/RobotSettingsDashboard' interface RectProps { diff --git a/app/src/organisms/RobotSettingsDashboard/UpdateChannel.tsx b/app/src/organisms/RobotSettingsDashboard/UpdateChannel.tsx index 180486f76a8..46af031d056 100644 --- a/app/src/organisms/RobotSettingsDashboard/UpdateChannel.tsx +++ b/app/src/organisms/RobotSettingsDashboard/UpdateChannel.tsx @@ -4,15 +4,15 @@ import { useDispatch, useSelector } from 'react-redux' import styled from 'styled-components' import { + BORDERS, + COLORS, + DIRECTION_COLUMN, Flex, SPACING, - DIRECTION_COLUMN, + StyledText, TYPOGRAPHY, - COLORS, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ChildNavigation } from '../../organisms/ChildNavigation' import { getDevtoolsEnabled, diff --git a/app/src/organisms/RobotSetupHeader/index.tsx b/app/src/organisms/RobotSetupHeader/index.tsx index 82961b953a8..b4cd57166a8 100644 --- a/app/src/organisms/RobotSetupHeader/index.tsx +++ b/app/src/organisms/RobotSetupHeader/index.tsx @@ -10,12 +10,12 @@ import { POSITION_ABSOLUTE, POSITION_RELATIVE, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { SmallButton } from '../../atoms/buttons' import { InlineNotification } from '../../atoms/InlineNotification' -import { StyledText } from '../../atoms/text' import type { InlineNotificationProps } from '../../atoms/InlineNotification' diff --git a/app/src/organisms/RunDetails/ConfirmCancelModal.tsx b/app/src/organisms/RunDetails/ConfirmCancelModal.tsx index da115c5434a..172d8b15394 100644 --- a/app/src/organisms/RunDetails/ConfirmCancelModal.tsx +++ b/app/src/organisms/RunDetails/ConfirmCancelModal.tsx @@ -11,6 +11,7 @@ import { JUSTIFY_FLEX_END, Link, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { @@ -20,7 +21,6 @@ import { import { useStopRunMutation } from '@opentrons/react-api-client' import { getModalPortalEl } from '../../App/portal' -import { StyledText } from '../../atoms/text' import { LegacyModal } from '../../molecules/LegacyModal' import { useTrackProtocolRunEvent } from '../Devices/hooks' import { useRunStatus } from '../RunTimeControl/hooks' diff --git a/app/src/organisms/RunPreview/index.tsx b/app/src/organisms/RunPreview/index.tsx index b7dd195cc96..a75257c1952 100644 --- a/app/src/organisms/RunPreview/index.tsx +++ b/app/src/organisms/RunPreview/index.tsx @@ -4,20 +4,20 @@ import { useTranslation } from 'react-i18next' import { ViewportList, ViewportListRef } from 'react-viewport-list' import { - Flex, ALIGN_CENTER, + BORDERS, + COLORS, DIRECTION_COLUMN, DISPLAY_FLEX, DISPLAY_NONE, - SPACING, + Flex, + POSITION_FIXED, PrimaryButton, + SPACING, + StyledText, TYPOGRAPHY, - BORDERS, - COLORS, - POSITION_FIXED, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { useMostRecentCompletedAnalysis } from '../LabwarePositionCheck/useMostRecentCompletedAnalysis' import { useNotifyLastRunCommandKey } from '../../resources/runs' import { CommandText } from '../CommandText' diff --git a/app/src/organisms/RunProgressMeter/Tick.tsx b/app/src/organisms/RunProgressMeter/Tick.tsx index cb3dace2a54..ade1f3c877f 100644 --- a/app/src/organisms/RunProgressMeter/Tick.tsx +++ b/app/src/organisms/RunProgressMeter/Tick.tsx @@ -1,22 +1,23 @@ import * as React from 'react' +import { useTranslation } from 'react-i18next' import { createPortal } from 'react-dom' -import { RunTimeCommand } from '@opentrons/shared-data' import { + ALIGN_CENTER, + COLORS, + DIRECTION_COLUMN, Flex, Icon, - useHoverTooltip, - ALIGN_CENTER, JUSTIFY_CENTER, - COLORS, SPACING, - DIRECTION_COLUMN, + StyledText, + useHoverTooltip, } from '@opentrons/components' import { Tooltip } from '../../atoms/Tooltip' import { getModalPortalEl } from '../../App/portal' -import { StyledText } from '../../atoms/text' -import { useTranslation } from 'react-i18next' + import type { IconName } from '@opentrons/components' +import type { RunTimeCommand } from '@opentrons/shared-data' interface TickProps { index: number diff --git a/app/src/organisms/RunProgressMeter/index.tsx b/app/src/organisms/RunProgressMeter/index.tsx index 0b5d2ae5424..4c7c92f5bd8 100644 --- a/app/src/organisms/RunProgressMeter/index.tsx +++ b/app/src/organisms/RunProgressMeter/index.tsx @@ -3,19 +3,20 @@ import { createPortal } from 'react-dom' import { useTranslation } from 'react-i18next' import { css } from 'styled-components' import { - COLORS, + ALIGN_CENTER, BORDERS, - Flex, + COLORS, DIRECTION_COLUMN, - JUSTIFY_SPACE_BETWEEN, - TYPOGRAPHY, - SPACING, + Flex, Icon, - SIZE_1, + JUSTIFY_SPACE_BETWEEN, Link, - ALIGN_CENTER, - useHoverTooltip, + SIZE_1, + SPACING, + StyledText, TOOLTIP_LEFT, + TYPOGRAPHY, + useHoverTooltip, } from '@opentrons/components' import { RUN_STATUS_IDLE, @@ -33,7 +34,6 @@ import { import { useMostRecentCompletedAnalysis } from '../LabwarePositionCheck/useMostRecentCompletedAnalysis' import { getTopPortalEl } from '../../App/portal' -import { StyledText } from '../../atoms/text' import { Tooltip } from '../../atoms/Tooltip' import { CommandText } from '../CommandText' import { useRunStatus } from '../RunTimeControl/hooks' @@ -222,13 +222,12 @@ export function RunProgressMeter(props: RunProgressMeterProps): JSX.Element { {...targetProps} role="button" css={css` - ${TYPOGRAPHY.darkLinkH4SemiBold} - &:hover { - color: ${downloadIsDisabled ? COLORS.grey40 : COLORS.black90}; - } - cursor: ${downloadIsDisabled ? 'default' : 'pointer'}; - } - `} + ${TYPOGRAPHY.darkLinkH4SemiBold} + &:hover { + color: ${downloadIsDisabled ? COLORS.grey40 : COLORS.black90}; + } + cursor: ${downloadIsDisabled ? 'default' : 'pointer'}; + `} textTransform={TYPOGRAPHY.textTransformCapitalize} onClick={onDownloadClick} > diff --git a/app/src/organisms/TakeoverModal/TakeoverModal.tsx b/app/src/organisms/TakeoverModal/TakeoverModal.tsx index 38c6196e0b9..3dab071bdec 100644 --- a/app/src/organisms/TakeoverModal/TakeoverModal.tsx +++ b/app/src/organisms/TakeoverModal/TakeoverModal.tsx @@ -9,11 +9,11 @@ import { Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { getTopPortalEl } from '../../App/portal' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' import type { ModalHeaderBaseProps } from '../../molecules/Modal/types' diff --git a/app/src/organisms/TaskList/index.tsx b/app/src/organisms/TaskList/index.tsx index 1f9bff0383b..7675845b15b 100644 --- a/app/src/organisms/TaskList/index.tsx +++ b/app/src/organisms/TaskList/index.tsx @@ -1,9 +1,6 @@ import * as React from 'react' import { - Flex, - Icon, - Link, ALIGN_CENTER, ALIGN_FLEX_START, BORDERS, @@ -11,15 +8,18 @@ import { DIRECTION_COLUMN, DIRECTION_ROW, FLEX_NONE, + Flex, + Icon, JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, + Link, SPACING, + StyledText, TYPOGRAPHY, useHoverTooltip, } from '@opentrons/components' import { TertiaryButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Tooltip } from '../../atoms/Tooltip' import type { SubTaskProps, TaskListProps, TaskProps } from './types' diff --git a/app/src/organisms/UpdateAppModal/index.tsx b/app/src/organisms/UpdateAppModal/index.tsx index 524f57f9ec7..3968c5b93ea 100644 --- a/app/src/organisms/UpdateAppModal/index.tsx +++ b/app/src/organisms/UpdateAppModal/index.tsx @@ -6,15 +6,16 @@ import { useTranslation } from 'react-i18next' import { ALIGN_CENTER, + BORDERS, COLORS, DIRECTION_COLUMN, - SPACING, Flex, + JUSTIFY_SPACE_AROUND, + JUSTIFY_SPACE_BETWEEN, NewPrimaryBtn, NewSecondaryBtn, - BORDERS, - JUSTIFY_SPACE_BETWEEN, - JUSTIFY_SPACE_AROUND, + SPACING, + StyledText, } from '@opentrons/components' import { @@ -32,7 +33,6 @@ import { ProgressBar } from '../../atoms/ProgressBar' import { useRemoveActiveAppUpdateToast } from '../Alerts' import type { Dispatch } from '../../redux/types' -import { StyledText } from '../../atoms/text' interface PlaceHolderErrorProps { errorMessage?: string diff --git a/app/src/organisms/UpdateRobotBanner/index.tsx b/app/src/organisms/UpdateRobotBanner/index.tsx index b4ee476104b..ced443a2018 100644 --- a/app/src/organisms/UpdateRobotBanner/index.tsx +++ b/app/src/organisms/UpdateRobotBanner/index.tsx @@ -2,13 +2,13 @@ import * as React from 'react' import { useSelector } from 'react-redux' import { useTranslation } from 'react-i18next' import { + Btn, + DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, - Btn, - DIRECTION_COLUMN, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { getRobotUpdateDisplayInfo } from '../../redux/robot-update' import { handleUpdateBuildroot } from '../Devices/RobotSettings/UpdateBuildroot' diff --git a/app/src/organisms/UpdateRobotSoftware/CheckUpdates.tsx b/app/src/organisms/UpdateRobotSoftware/CheckUpdates.tsx index 65496bea6b6..f04540897da 100644 --- a/app/src/organisms/UpdateRobotSoftware/CheckUpdates.tsx +++ b/app/src/organisms/UpdateRobotSoftware/CheckUpdates.tsx @@ -2,19 +2,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, + ALIGN_CENTER, + BORDERS, COLORS, - SPACING, DIRECTION_COLUMN, - ALIGN_CENTER, - JUSTIFY_CENTER, + Flex, Icon, + JUSTIFY_CENTER, + SPACING, + StyledText, TYPOGRAPHY, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - export function CheckUpdates(): JSX.Element { const { t } = useTranslation('device_settings') return ( diff --git a/app/src/organisms/UpdateRobotSoftware/CompleteUpdateSoftware.tsx b/app/src/organisms/UpdateRobotSoftware/CompleteUpdateSoftware.tsx index 0f083ea5f26..af6fecf7ae0 100644 --- a/app/src/organisms/UpdateRobotSoftware/CompleteUpdateSoftware.tsx +++ b/app/src/organisms/UpdateRobotSoftware/CompleteUpdateSoftware.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - DIRECTION_COLUMN, - SPACING, - COLORS, ALIGN_CENTER, - JUSTIFY_CENTER, - Box, BORDERS, + Box, + COLORS, + DIRECTION_COLUMN, + Flex, + JUSTIFY_CENTER, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ProgressBar } from '../../atoms/ProgressBar' interface CompleteUpdateSoftwareProps { diff --git a/app/src/organisms/UpdateRobotSoftware/ErrorUpdateSoftware.tsx b/app/src/organisms/UpdateRobotSoftware/ErrorUpdateSoftware.tsx index 0d9315ce17c..bb42701b701 100644 --- a/app/src/organisms/UpdateRobotSoftware/ErrorUpdateSoftware.tsx +++ b/app/src/organisms/UpdateRobotSoftware/ErrorUpdateSoftware.tsx @@ -2,19 +2,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - SPACING, + ALIGN_CENTER, + BORDERS, COLORS, - Icon, DIRECTION_COLUMN, - ALIGN_CENTER, + Flex, + Icon, JUSTIFY_CENTER, + SPACING, + StyledText, TYPOGRAPHY, - BORDERS, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - interface ErrorUpdateSoftwareProps { errorMessage: string children: React.ReactNode diff --git a/app/src/organisms/UpdateRobotSoftware/NoUpdateFound.tsx b/app/src/organisms/UpdateRobotSoftware/NoUpdateFound.tsx index 5c2884fa6cd..e81f2330c32 100644 --- a/app/src/organisms/UpdateRobotSoftware/NoUpdateFound.tsx +++ b/app/src/organisms/UpdateRobotSoftware/NoUpdateFound.tsx @@ -2,18 +2,18 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - SPACING, + ALIGN_CENTER, + BORDERS, COLORS, - Icon, DIRECTION_COLUMN, - ALIGN_CENTER, + Flex, + Icon, JUSTIFY_CENTER, - BORDERS, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { MediumButton } from '../../atoms/buttons' export interface NoUpdateFoundProps { diff --git a/app/src/organisms/UpdateRobotSoftware/UpdateSoftware.tsx b/app/src/organisms/UpdateRobotSoftware/UpdateSoftware.tsx index e4a29e51b03..60ff6cc18de 100644 --- a/app/src/organisms/UpdateRobotSoftware/UpdateSoftware.tsx +++ b/app/src/organisms/UpdateRobotSoftware/UpdateSoftware.tsx @@ -10,10 +10,10 @@ import { Flex, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ProgressBar } from '../../atoms/ProgressBar' interface UpdateSoftwareProps { diff --git a/app/src/pages/AppSettings/GeneralSettings.tsx b/app/src/pages/AppSettings/GeneralSettings.tsx index 422aeb00aa1..99bdf464d04 100644 --- a/app/src/pages/AppSettings/GeneralSettings.tsx +++ b/app/src/pages/AppSettings/GeneralSettings.tsx @@ -16,6 +16,7 @@ import { Link, SPACING_AUTO, SPACING, + StyledText, TYPOGRAPHY, useMountEffect, } from '@opentrons/components' @@ -23,7 +24,6 @@ import { import { TertiaryButton, ToggleButton } from '../../atoms/buttons' import { ExternalLink } from '../../atoms/Link/ExternalLink' import { Divider } from '../../atoms/structure' -import { StyledText } from '../../atoms/text' import { Banner } from '../../atoms/Banner' import { CURRENT_VERSION, diff --git a/app/src/pages/AppSettings/PrivacySettings.tsx b/app/src/pages/AppSettings/PrivacySettings.tsx index ed8869c5efb..f079a832b95 100644 --- a/app/src/pages/AppSettings/PrivacySettings.tsx +++ b/app/src/pages/AppSettings/PrivacySettings.tsx @@ -3,12 +3,13 @@ import { useTranslation } from 'react-i18next' import { useSelector, useDispatch } from 'react-redux' import { - Flex, Box, - SIZE_2, - TYPOGRAPHY, + Flex, JUSTIFY_SPACE_BETWEEN, + SIZE_2, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { @@ -16,7 +17,6 @@ import { getAnalyticsOptedIn, } from '../../redux/analytics' import { ToggleButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import type { Dispatch, State } from '../../redux/types' diff --git a/app/src/pages/AppSettings/index.tsx b/app/src/pages/AppSettings/index.tsx index 9b96db260a0..af3c2d08e26 100644 --- a/app/src/pages/AppSettings/index.tsx +++ b/app/src/pages/AppSettings/index.tsx @@ -11,6 +11,7 @@ import { DIRECTION_ROW, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' @@ -20,7 +21,6 @@ import { PrivacySettings } from './PrivacySettings' import { AdvancedSettings } from './AdvancedSettings' import { FeatureFlags } from '../../organisms/AppSettings/FeatureFlags' import { NavTab } from '../../molecules/NavTab' -import { StyledText } from '../../atoms/text' import { Line } from '../../atoms/structure' import type { DesktopRouteParams, AppSettingsTab } from '../../App/types' diff --git a/app/src/pages/ConnectViaEthernet/DisplayConnectionStatus.tsx b/app/src/pages/ConnectViaEthernet/DisplayConnectionStatus.tsx index 2791d9af36e..0c968ad25a4 100644 --- a/app/src/pages/ConnectViaEthernet/DisplayConnectionStatus.tsx +++ b/app/src/pages/ConnectViaEthernet/DisplayConnectionStatus.tsx @@ -12,10 +12,10 @@ import { Icon, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { MediumButton } from '../../atoms/buttons' interface DisplayConnectionStatusProps { diff --git a/app/src/pages/ConnectViaEthernet/TitleHeader.tsx b/app/src/pages/ConnectViaEthernet/TitleHeader.tsx index b5e40cd0498..1b7782ae81b 100644 --- a/app/src/pages/ConnectViaEthernet/TitleHeader.tsx +++ b/app/src/pages/ConnectViaEthernet/TitleHeader.tsx @@ -2,20 +2,19 @@ import * as React from 'react' import { useHistory } from 'react-router-dom' import { - Flex, + ALIGN_CENTER, Btn, - Icon, DIRECTION_ROW, + Flex, + Icon, JUSTIFY_CENTER, - ALIGN_CENTER, - POSITION_RELATIVE, POSITION_ABSOLUTE, - TYPOGRAPHY, + POSITION_RELATIVE, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - interface TitleHeaderProps { title: string } diff --git a/app/src/pages/ConnectViaUSB/index.tsx b/app/src/pages/ConnectViaUSB/index.tsx index 542b70f206f..961da9b6092 100644 --- a/app/src/pages/ConnectViaUSB/index.tsx +++ b/app/src/pages/ConnectViaUSB/index.tsx @@ -2,22 +2,22 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useHistory } from 'react-router-dom' import { - Flex, - SPACING, - COLORS, - DIRECTION_ROW, - JUSTIFY_CENTER, ALIGN_CENTER, + BORDERS, Btn, + COLORS, DIRECTION_COLUMN, - TYPOGRAPHY, + DIRECTION_ROW, + Flex, Icon, - POSITION_RELATIVE, + JUSTIFY_CENTER, POSITION_ABSOLUTE, - BORDERS, + POSITION_RELATIVE, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { useConnectionsQuery } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' import { StepMeter } from '../../atoms/StepMeter' import { MediumButton } from '../../atoms/buttons' diff --git a/app/src/pages/Devices/DevicesLanding/NewRobotSetupHelp.tsx b/app/src/pages/Devices/DevicesLanding/NewRobotSetupHelp.tsx index dbd348e57a2..c0632154baf 100644 --- a/app/src/pages/Devices/DevicesLanding/NewRobotSetupHelp.tsx +++ b/app/src/pages/Devices/DevicesLanding/NewRobotSetupHelp.tsx @@ -6,12 +6,12 @@ import { DIRECTION_COLUMN, Flex, Link, - TYPOGRAPHY, PrimaryButton, SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../../atoms/text' import { getTopPortalEl } from '../../../App/portal' import { LegacyModal } from '../../../molecules/LegacyModal' import { ExternalLink } from '../../../atoms/Link/ExternalLink' diff --git a/app/src/pages/Devices/DevicesLanding/index.tsx b/app/src/pages/Devices/DevicesLanding/index.tsx index 6701fa4c0bb..700a18a631f 100644 --- a/app/src/pages/Devices/DevicesLanding/index.tsx +++ b/app/src/pages/Devices/DevicesLanding/index.tsx @@ -4,19 +4,20 @@ import { useSelector } from 'react-redux' import partition from 'lodash/partition' import { + ALIGN_CENTER, Box, + COLORS, + DIRECTION_COLUMN, + DISPLAY_FLEX, Flex, Icon, JUSTIFY_SPACE_BETWEEN, - ALIGN_CENTER, - DIRECTION_COLUMN, + Link, + POSITION_ABSOLUTE, SIZE_6, SPACING, - COLORS, - Link, + StyledText, TYPOGRAPHY, - POSITION_ABSOLUTE, - DISPLAY_FLEX, } from '@opentrons/components' import { ApiHostProvider } from '@opentrons/react-api-client' import { @@ -32,7 +33,6 @@ import { DevicesEmptyState } from '../../../organisms/Devices/DevicesEmptyState' import { CollapsibleSection } from '../../../molecules/CollapsibleSection' import { Divider } from '../../../atoms/structure' -import { StyledText } from '../../../atoms/text' import { NewRobotSetupHelp } from './NewRobotSetupHelp' import type { State } from '../../../redux/types' diff --git a/app/src/pages/Devices/ProtocolRunDetails/index.tsx b/app/src/pages/Devices/ProtocolRunDetails/index.tsx index 00a1f495991..8c36199315f 100644 --- a/app/src/pages/Devices/ProtocolRunDetails/index.tsx +++ b/app/src/pages/Devices/ProtocolRunDetails/index.tsx @@ -6,20 +6,20 @@ import { NavLink, Redirect, useParams } from 'react-router-dom' import styled, { css } from 'styled-components' import { + BORDERS, Box, - Flex, - useHoverTooltip, + COLORS, DIRECTION_COLUMN, - POSITION_RELATIVE, + Flex, OVERFLOW_SCROLL, + POSITION_RELATIVE, SIZE_6, - BORDERS, - COLORS, SPACING, + StyledText, TYPOGRAPHY, + useHoverTooltip, } from '@opentrons/components' import { ApiHostProvider } from '@opentrons/react-api-client' -import { StyledText } from '../../../atoms/text' import { Tooltip } from '../../../atoms/Tooltip' import { useModuleRenderInfoForProtocolById, diff --git a/app/src/pages/Devices/RobotSettings/index.tsx b/app/src/pages/Devices/RobotSettings/index.tsx index 04a3aea1606..e18854fc65d 100644 --- a/app/src/pages/Devices/RobotSettings/index.tsx +++ b/app/src/pages/Devices/RobotSettings/index.tsx @@ -3,13 +3,14 @@ import { useTranslation } from 'react-i18next' import { Redirect, useParams } from 'react-router-dom' import { + BORDERS, Box, - Flex, + COLORS, DIRECTION_COLUMN, + Flex, SIZE_6, - BORDERS, - COLORS, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { ApiHostProvider } from '@opentrons/react-api-client' @@ -24,7 +25,6 @@ import { import { appShellRequestor } from '../../../redux/shell/remote' import { getRobotUpdateSession } from '../../../redux/robot-update' import { getDevtoolsEnabled } from '../../../redux/config' -import { StyledText } from '../../../atoms/text' import { Banner } from '../../../atoms/Banner' import { useRobot } from '../../../organisms/Devices/hooks' import { Line } from '../../../atoms/structure' diff --git a/app/src/pages/EmergencyStop/index.tsx b/app/src/pages/EmergencyStop/index.tsx index d48d77e0f3f..30e77967b42 100644 --- a/app/src/pages/EmergencyStop/index.tsx +++ b/app/src/pages/EmergencyStop/index.tsx @@ -3,19 +3,19 @@ import { useTranslation } from 'react-i18next' import { useHistory } from 'react-router-dom' import { - Icon, - Flex, - SPACING, - COLORS, + ALIGN_CENTER, BORDERS, + COLORS, DIRECTION_COLUMN, + Flex, + Icon, JUSTIFY_CENTER, - ALIGN_CENTER, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useEstopQuery } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' import { MediumButton } from '../../atoms/buttons' import { StepMeter } from '../../atoms/StepMeter' diff --git a/app/src/pages/InstrumentDetail/InstrumentDetailOverflowMenu.tsx b/app/src/pages/InstrumentDetail/InstrumentDetailOverflowMenu.tsx index ea1fc4a5a55..5be7034e8fb 100644 --- a/app/src/pages/InstrumentDetail/InstrumentDetailOverflowMenu.tsx +++ b/app/src/pages/InstrumentDetail/InstrumentDetailOverflowMenu.tsx @@ -3,11 +3,12 @@ import NiceModal, { useModal } from '@ebay/nice-modal-react' import { useTranslation } from 'react-i18next' import { ALIGN_CENTER, + COLORS, Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, - COLORS, } from '@opentrons/components' import { SINGLE_MOUNT_PIPETTES, @@ -17,7 +18,6 @@ import { } from '@opentrons/shared-data' import { ApiHostProvider } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' import { MenuList } from '../../atoms/MenuList' import { MenuItem } from '../../atoms/MenuList/MenuItem' import { PipetteWizardFlows } from '../../organisms/PipetteWizardFlows' diff --git a/app/src/pages/InstrumentsDashboard/PipetteRecalibrationODDWarning.tsx b/app/src/pages/InstrumentsDashboard/PipetteRecalibrationODDWarning.tsx index c85a176c1e2..87e0ed99a2a 100644 --- a/app/src/pages/InstrumentsDashboard/PipetteRecalibrationODDWarning.tsx +++ b/app/src/pages/InstrumentsDashboard/PipetteRecalibrationODDWarning.tsx @@ -10,8 +10,8 @@ import { JUSTIFY_FLEX_START, JUSTIFY_SPACE_BETWEEN, SPACING, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' export const PipetteRecalibrationODDWarning = (): JSX.Element | null => { const { t } = useTranslation('instruments_dashboard') diff --git a/app/src/pages/Labware/index.tsx b/app/src/pages/Labware/index.tsx index 8985f88c2f6..c5ba42a5dd8 100644 --- a/app/src/pages/Labware/index.tsx +++ b/app/src/pages/Labware/index.tsx @@ -4,25 +4,25 @@ import startCase from 'lodash/startCase' import { css } from 'styled-components' import { + ALIGN_CENTER, + ALIGN_FLEX_END, + BORDERS, Box, - Flex, - Link, - SPACING, COLORS, - BORDERS, - TYPOGRAPHY, - POSITION_ABSOLUTE, DIRECTION_COLUMN, - SecondaryButton, DIRECTION_ROW, - JUSTIFY_SPACE_BETWEEN, - ALIGN_CENTER, + Flex, Icon, - ALIGN_FLEX_END, + JUSTIFY_SPACE_BETWEEN, + Link, + POSITION_ABSOLUTE, + SecondaryButton, + SPACING, + StyledText, + TYPOGRAPHY, useOnClickOutside, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { ERROR_TOAST, SUCCESS_TOAST } from '../../atoms/Toast' import { MenuItem } from '../../atoms/MenuList/MenuItem' import { @@ -73,7 +73,6 @@ const SORT_BY_BUTTON_STYLE = css` &:focus { background-color: ${COLORS.grey40}; } - } ` export function Labware(): JSX.Element { diff --git a/app/src/pages/NameRobot/index.tsx b/app/src/pages/NameRobot/index.tsx index 63bfc89c916..16a868dddb8 100644 --- a/app/src/pages/NameRobot/index.tsx +++ b/app/src/pages/NameRobot/index.tsx @@ -5,20 +5,21 @@ import { useSelector, useDispatch } from 'react-redux' import { useHistory } from 'react-router-dom' import { - Flex, + ALIGN_CENTER, + Btn, + COLORS, DIRECTION_COLUMN, DIRECTION_ROW, - ALIGN_CENTER, + Flex, + Icon, + JUSTIFY_CENTER, JUSTIFY_SPACE_BETWEEN, - SPACING, + POSITION_ABSOLUTE, POSITION_FIXED, - JUSTIFY_CENTER, POSITION_RELATIVE, - POSITION_ABSOLUTE, - COLORS, + SPACING, TYPOGRAPHY, - Icon, - Btn, + StyledText, } from '@opentrons/components' import { useUpdateRobotNameMutation } from '@opentrons/react-api-client' @@ -30,7 +31,6 @@ import { getLocalRobot, } from '../../redux/discovery' import { useTrackEvent, ANALYTICS_RENAME_ROBOT } from '../../redux/analytics' -import { StyledText } from '../../atoms/text' import { InputField } from '../../atoms/InputField' import { CustomKeyboard } from '../../atoms/SoftwareKeyboard' import { SmallButton } from '../../atoms/buttons' diff --git a/app/src/pages/NetworkSetupMenu/index.tsx b/app/src/pages/NetworkSetupMenu/index.tsx index fe245bf22f5..7250eaa3dda 100644 --- a/app/src/pages/NetworkSetupMenu/index.tsx +++ b/app/src/pages/NetworkSetupMenu/index.tsx @@ -2,17 +2,17 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { - Flex, - SPACING, + ALIGN_CENTER, COLORS, DIRECTION_COLUMN, - JUSTIFY_CENTER, - ALIGN_CENTER, DIRECTION_ROW, + Flex, + JUSTIFY_CENTER, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { StepMeter } from '../../atoms/StepMeter' import { CardButton } from '../../molecules/CardButton' diff --git a/app/src/pages/ProtocolDashboard/LongPressModal.tsx b/app/src/pages/ProtocolDashboard/LongPressModal.tsx index 329a71c41ff..d80826a7037 100644 --- a/app/src/pages/ProtocolDashboard/LongPressModal.tsx +++ b/app/src/pages/ProtocolDashboard/LongPressModal.tsx @@ -2,11 +2,10 @@ import * as React from 'react' import { useDispatch, useSelector } from 'react-redux' import { useHistory } from 'react-router-dom' import { useTranslation } from 'react-i18next' -import { Flex, Icon, SPACING } from '@opentrons/components' +import { Flex, Icon, SPACING, StyledText } from '@opentrons/components' import { useCreateRunMutation } from '@opentrons/react-api-client' import { MAXIMUM_PINNED_PROTOCOLS } from '../../App/constants' -import { StyledText } from '../../atoms/text' import { MenuList } from '../../atoms/MenuList' import { MenuItem } from '../../atoms/MenuList/MenuItem' import { SmallModalChildren } from '../../molecules/Modal' diff --git a/app/src/pages/ProtocolDashboard/NoProtocols.tsx b/app/src/pages/ProtocolDashboard/NoProtocols.tsx index 22b740ead48..09ba1d671cf 100644 --- a/app/src/pages/ProtocolDashboard/NoProtocols.tsx +++ b/app/src/pages/ProtocolDashboard/NoProtocols.tsx @@ -9,11 +9,10 @@ import { Flex, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - import imgSrc from '../../assets/images/on-device-display/empty_protocol_dashboard.png' export function NoProtocols(): JSX.Element { diff --git a/app/src/pages/ProtocolDashboard/PinnedProtocol.tsx b/app/src/pages/ProtocolDashboard/PinnedProtocol.tsx index 06d1a945e35..749d0c70fbc 100644 --- a/app/src/pages/ProtocolDashboard/PinnedProtocol.tsx +++ b/app/src/pages/ProtocolDashboard/PinnedProtocol.tsx @@ -16,9 +16,9 @@ import { SPACING, TYPOGRAPHY, useLongPress, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { LongPressModal } from './LongPressModal' import { formatTimeWithUtcLabel } from '../../resources/runs' diff --git a/app/src/pages/ProtocolDashboard/ProtocolCard.tsx b/app/src/pages/ProtocolDashboard/ProtocolCard.tsx index faa1eed8d29..1ed35b8632f 100644 --- a/app/src/pages/ProtocolDashboard/ProtocolCard.tsx +++ b/app/src/pages/ProtocolDashboard/ProtocolCard.tsx @@ -19,6 +19,7 @@ import { OVERFLOW_WRAP_BREAK_WORD, SIZE_2, SPACING, + StyledText, TYPOGRAPHY, useLongPress, } from '@opentrons/components' @@ -28,7 +29,6 @@ import { } from '@opentrons/react-api-client' import { deleteProtocol, deleteRun, getProtocol } from '@opentrons/api-client' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' import { LongPressModal } from './LongPressModal' diff --git a/app/src/pages/ProtocolDashboard/index.tsx b/app/src/pages/ProtocolDashboard/index.tsx index 2fce4e5b988..85d3fe154c0 100644 --- a/app/src/pages/ProtocolDashboard/index.tsx +++ b/app/src/pages/ProtocolDashboard/index.tsx @@ -4,19 +4,19 @@ import { useTranslation } from 'react-i18next' import { ALIGN_CENTER, + Box, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, Flex, - SPACING, - POSITION_STICKY, POSITION_STATIC, - Box, + POSITION_STICKY, + SPACING, + StyledText, } from '@opentrons/components' import { useAllProtocolsQuery } from '@opentrons/react-api-client' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Navigation } from '../../organisms/Navigation' import { getPinnedProtocolIds, diff --git a/app/src/pages/ProtocolDetails/EmptySection.tsx b/app/src/pages/ProtocolDetails/EmptySection.tsx index 29dbc6ecc6a..8b8c274b4a8 100644 --- a/app/src/pages/ProtocolDetails/EmptySection.tsx +++ b/app/src/pages/ProtocolDetails/EmptySection.tsx @@ -1,17 +1,17 @@ import * as React from 'react' import { - JUSTIFY_CENTER, + ALIGN_CENTER, + BORDERS, COLORS, DIRECTION_COLUMN, Flex, Icon, + JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, - BORDERS, - ALIGN_CENTER, } from '@opentrons/components' import { useTranslation } from 'react-i18next' -import { StyledText } from '../../atoms/text' interface EmptySectionProps { section: 'hardware' | 'labware' | 'liquids' | 'parameters' diff --git a/app/src/pages/ProtocolDetails/Hardware.tsx b/app/src/pages/ProtocolDetails/Hardware.tsx index 030990e848a..da6d1f2633c 100644 --- a/app/src/pages/ProtocolDetails/Hardware.tsx +++ b/app/src/pages/ProtocolDetails/Hardware.tsx @@ -9,6 +9,7 @@ import { LocationIcon, ModuleIcon, SPACING, + StyledText, TYPOGRAPHY, WRAP, } from '@opentrons/components' @@ -21,7 +22,6 @@ import { getPipetteNameSpecs, getFixtureDisplayName, } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { useRequiredProtocolHardware } from '../Protocols/hooks' import { EmptySection } from './EmptySection' diff --git a/app/src/pages/ProtocolDetails/Labware.tsx b/app/src/pages/ProtocolDetails/Labware.tsx index 9f495136c0e..43682b0ab20 100644 --- a/app/src/pages/ProtocolDetails/Labware.tsx +++ b/app/src/pages/ProtocolDetails/Labware.tsx @@ -9,12 +9,12 @@ import { Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, WRAP, } from '@opentrons/components' import { getLabwareDisplayName } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { useRequiredProtocolLabware } from '../Protocols/hooks' import { EmptySection } from './EmptySection' diff --git a/app/src/pages/ProtocolDetails/Liquids.tsx b/app/src/pages/ProtocolDetails/Liquids.tsx index 8c91b644743..d0509177e6f 100644 --- a/app/src/pages/ProtocolDetails/Liquids.tsx +++ b/app/src/pages/ProtocolDetails/Liquids.tsx @@ -11,6 +11,7 @@ import { Flex, Icon, SPACING, + StyledText, TYPOGRAPHY, WRAP, } from '@opentrons/components' @@ -19,7 +20,6 @@ import { parseLiquidsInLoadOrder, } from '@opentrons/api-client' import { getTotalVolumePerLiquidId } from '../../organisms/Devices/ProtocolRun/SetupLiquids/utils' -import { StyledText } from '../../atoms/text' import { EmptySection } from './EmptySection' import { diff --git a/app/src/pages/ProtocolDetails/Parameters.tsx b/app/src/pages/ProtocolDetails/Parameters.tsx index 8a32bb6fa09..f2304893374 100644 --- a/app/src/pages/ProtocolDetails/Parameters.tsx +++ b/app/src/pages/ProtocolDetails/Parameters.tsx @@ -6,10 +6,10 @@ import { COLORS, Flex, SPACING, + StyledText, TYPOGRAPHY, WRAP, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { useToaster } from '../../organisms/ToasterOven' import { useRunTimeParameters } from '../Protocols/hooks' import { EmptySection } from './EmptySection' diff --git a/app/src/pages/ProtocolDetails/index.tsx b/app/src/pages/ProtocolDetails/index.tsx index b55a45b512a..a919df19e9d 100644 --- a/app/src/pages/ProtocolDetails/index.tsx +++ b/app/src/pages/ProtocolDetails/index.tsx @@ -19,6 +19,7 @@ import { OVERFLOW_WRAP_ANYWHERE, POSITION_STICKY, SPACING, + StyledText, truncateString, TYPOGRAPHY, } from '@opentrons/components' @@ -31,7 +32,6 @@ import { import { MAXIMUM_PINNED_PROTOCOLS } from '../../App/constants' import { MediumButton, SmallButton, TabbedButton } from '../../atoms/buttons' import { Chip } from '../../atoms/Chip' -import { StyledText } from '../../atoms/text' import { ProtocolDetailsHeaderChipSkeleton, ProcotolDetailsHeaderTitleSkeleton, diff --git a/app/src/pages/ProtocolSetup/ConfirmAttachedModal.tsx b/app/src/pages/ProtocolSetup/ConfirmAttachedModal.tsx index 6297c53209d..8c4ca73769a 100644 --- a/app/src/pages/ProtocolSetup/ConfirmAttachedModal.tsx +++ b/app/src/pages/ProtocolSetup/ConfirmAttachedModal.tsx @@ -1,9 +1,13 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' -import { Flex, SPACING, DIRECTION_COLUMN } from '@opentrons/components' +import { + DIRECTION_COLUMN, + Flex, + SPACING, + StyledText, +} from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' diff --git a/app/src/pages/ProtocolSetup/index.tsx b/app/src/pages/ProtocolSetup/index.tsx index 1ae8e9bf099..be90fcfa80e 100644 --- a/app/src/pages/ProtocolSetup/index.tsx +++ b/app/src/pages/ProtocolSetup/index.tsx @@ -20,6 +20,7 @@ import { OVERFLOW_WRAP_ANYWHERE, POSITION_STICKY, SPACING, + StyledText, TEXT_ALIGN_RIGHT, truncateString, TYPOGRAPHY, @@ -38,7 +39,6 @@ import { SINGLE_SLOT_FIXTURES, } from '@opentrons/shared-data' -import { StyledText } from '../../atoms/text' import { ProtocolSetupTitleSkeleton, ProtocolSetupStepSkeleton, diff --git a/app/src/pages/RobotDashboard/AnalyticsOptInModal.tsx b/app/src/pages/RobotDashboard/AnalyticsOptInModal.tsx index ae3d6a112f5..e7772654a38 100644 --- a/app/src/pages/RobotDashboard/AnalyticsOptInModal.tsx +++ b/app/src/pages/RobotDashboard/AnalyticsOptInModal.tsx @@ -3,15 +3,15 @@ import { useTranslation } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' import { - Flex, COLORS, DIRECTION_COLUMN, DIRECTION_ROW, + Flex, SPACING, + StyledText, } from '@opentrons/components' import { SmallButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import { Modal } from '../../molecules/Modal' import { updateConfigValue } from '../../redux/config' import { getLocalRobot } from '../../redux/discovery' diff --git a/app/src/pages/RobotDashboard/WelcomeModal.tsx b/app/src/pages/RobotDashboard/WelcomeModal.tsx index 23777645a81..548c17fb5b8 100644 --- a/app/src/pages/RobotDashboard/WelcomeModal.tsx +++ b/app/src/pages/RobotDashboard/WelcomeModal.tsx @@ -7,11 +7,11 @@ import { Flex, JUSTIFY_CENTER, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { useCreateLiveCommandMutation } from '@opentrons/react-api-client' -import { StyledText } from '../../atoms/text' import { SmallButton } from '../../atoms/buttons' import { Modal } from '../../molecules/Modal' diff --git a/app/src/pages/RobotDashboard/index.tsx b/app/src/pages/RobotDashboard/index.tsx index e0b699dea4b..2b4606d3812 100644 --- a/app/src/pages/RobotDashboard/index.tsx +++ b/app/src/pages/RobotDashboard/index.tsx @@ -7,10 +7,10 @@ import { DIRECTION_COLUMN, Flex, SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' import { Navigation } from '../../organisms/Navigation' import { EmptyRecentRun, diff --git a/app/src/pages/RobotSettingsDashboard/RobotSettingButton.tsx b/app/src/pages/RobotSettingsDashboard/RobotSettingButton.tsx index 6f431f7aa14..6e035af67d5 100644 --- a/app/src/pages/RobotSettingsDashboard/RobotSettingButton.tsx +++ b/app/src/pages/RobotSettingsDashboard/RobotSettingButton.tsx @@ -16,10 +16,9 @@ import { JUSTIFY_SPACE_BETWEEN, SPACING, TYPOGRAPHY, + StyledText, } from '@opentrons/components' -import { StyledText } from '../../atoms/text' - import type { IconName } from '@opentrons/components' const SETTING_BUTTON_STYLE = css` diff --git a/app/src/pages/RobotSettingsDashboard/RobotSettingsList.tsx b/app/src/pages/RobotSettingsDashboard/RobotSettingsList.tsx index 34bd5084e00..a53f41804ad 100644 --- a/app/src/pages/RobotSettingsDashboard/RobotSettingsList.tsx +++ b/app/src/pages/RobotSettingsDashboard/RobotSettingsList.tsx @@ -4,20 +4,21 @@ import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' import { - Flex, - DIRECTION_COLUMN, - SPACING, + ALIGN_CENTER, + ALIGN_FLEX_START, + BORDERS, Btn, COLORS, - BORDERS, - DISPLAY_FLEX, + DIRECTION_COLUMN, DIRECTION_ROW, - JUSTIFY_SPACE_BETWEEN, - ALIGN_CENTER, - TYPOGRAPHY, + DISPLAY_FLEX, + Flex, Icon, - ALIGN_FLEX_START, JUSTIFY_CENTER, + JUSTIFY_SPACE_BETWEEN, + SPACING, + StyledText, + TYPOGRAPHY, } from '@opentrons/components' import { getLocalRobot, getRobotApiVersion } from '../../redux/discovery' @@ -31,7 +32,6 @@ import { toggleDevtools, toggleHistoricOffsets, } from '../../redux/config' -import { StyledText } from '../../atoms/text' import { InlineNotification } from '../../atoms/InlineNotification' import { getRobotSettings, updateSetting } from '../../redux/robot-settings' import { UNREACHABLE } from '../../redux/discovery/constants' diff --git a/app/src/pages/Welcome/index.tsx b/app/src/pages/Welcome/index.tsx index dd374bd1a97..47bb9cbcb50 100644 --- a/app/src/pages/Welcome/index.tsx +++ b/app/src/pages/Welcome/index.tsx @@ -2,15 +2,15 @@ import * as React from 'react' import { useTranslation } from 'react-i18next' import { useHistory } from 'react-router-dom' import { - Flex, - SPACING, COLORS, DIRECTION_COLUMN, + Flex, JUSTIFY_CENTER, + SPACING, + StyledText, TYPOGRAPHY, } from '@opentrons/components' import { MediumButton } from '../../atoms/buttons' -import { StyledText } from '../../atoms/text' import screenImage from '../../assets/images/on-device-display/welcome_background.png' diff --git a/app/src/atoms/text/StyledText.stories.tsx b/components/src/atoms/StyledText/StyledText.stories.tsx similarity index 93% rename from app/src/atoms/text/StyledText.stories.tsx rename to components/src/atoms/StyledText/StyledText.stories.tsx index 2de30910087..12f8ab8c16a 100644 --- a/app/src/atoms/text/StyledText.stories.tsx +++ b/components/src/atoms/StyledText/StyledText.stories.tsx @@ -1,10 +1,10 @@ import * as React from 'react' -import { StyledText } from './index' +import { StyledText } from './' +import { TYPOGRAPHY } from '../../ui-style-constants' import type { Story, Meta } from '@storybook/react' -import { TYPOGRAPHY } from '@opentrons/components' export default { - title: 'App/Atoms/StyledText', + title: 'Library/Atoms/StyledText', component: StyledText, } as Meta diff --git a/app/src/atoms/text/__tests__/StyledText.test.tsx b/components/src/atoms/StyledText/__tests__/StyledText.test.tsx similarity index 98% rename from app/src/atoms/text/__tests__/StyledText.test.tsx rename to components/src/atoms/StyledText/__tests__/StyledText.test.tsx index 5a13de49145..3bf459da6a6 100644 --- a/app/src/atoms/text/__tests__/StyledText.test.tsx +++ b/components/src/atoms/StyledText/__tests__/StyledText.test.tsx @@ -2,9 +2,9 @@ import * as React from 'react' import { describe, it, expect } from 'vitest' import '@testing-library/jest-dom/vitest' import { screen } from '@testing-library/react' -import { TYPOGRAPHY } from '@opentrons/components' -import { StyledText } from '../' -import { renderWithProviders } from '../../../__testing-utils__' +import { TYPOGRAPHY } from '../../../ui-style-constants' +import { renderWithProviders } from '../../../testing/utils' +import { StyledText } from '..' const render = (props: React.ComponentProps) => { return renderWithProviders()[0] diff --git a/app/src/atoms/text/StyledText.tsx b/components/src/atoms/StyledText/index.tsx similarity index 91% rename from app/src/atoms/text/StyledText.tsx rename to components/src/atoms/StyledText/index.tsx index 202e88c7c11..64acb9c8174 100644 --- a/app/src/atoms/text/StyledText.tsx +++ b/components/src/atoms/StyledText/index.tsx @@ -1,6 +1,9 @@ import * as React from 'react' -import styled, { FlattenSimpleInterpolation, css } from 'styled-components' -import { Text, TYPOGRAPHY, RESPONSIVENESS } from '@opentrons/components' +import styled, { css } from 'styled-components' +import { Text } from '../../primitives' +import { TYPOGRAPHY, RESPONSIVENESS } from '../../ui-style-constants' + +import type { FlattenSimpleInterpolation } from 'styled-components' export interface Props extends React.ComponentProps { children?: React.ReactNode diff --git a/components/src/atoms/index.ts b/components/src/atoms/index.ts index 7fd589ac7bb..345d50ac38c 100644 --- a/components/src/atoms/index.ts +++ b/components/src/atoms/index.ts @@ -1,3 +1,4 @@ +export * from './buttons' export * from './CheckboxField' export * from './StepMeter' -export * from './buttons' +export * from './StyledText'