Skip to content

Commit

Permalink
[Refactor] Remove <Tabs> and <Toggle> and move to Palette
Browse files Browse the repository at this point in the history
  • Loading branch information
damassi committed Jan 16, 2019
1 parent b2ba7a4 commit b13249e
Show file tree
Hide file tree
Showing 19 changed files with 34 additions and 754 deletions.
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -7,7 +7,7 @@
"author": "Art.sy Inc <it@artsymail.com>",
"license": "MIT",
"peerDependencies": {
"@artsy/palette": "^2.25.10",
"@artsy/palette": "^2.26.2",
"dd-trace": "^0.6.0",
"react": "^16.5.0",
"react-dom": "^16.5.0",
Expand Down Expand Up @@ -51,7 +51,7 @@
"react-relay": "https://github.com/alloy/relay/releases/download/v1.5.0-artsy.3/react-relay-1.5.0-artsy.3.tgz"
},
"devDependencies": {
"@artsy/palette": "2.25.12",
"@artsy/palette": "2.26.2",
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
Expand Down
@@ -1,9 +1,8 @@
import { FilterIcon } from "@artsy/palette"
import { FilterIcon, Toggle } from "@artsy/palette"
import { ArtworkFilter_artist } from "__generated__/ArtworkFilter_artist.graphql"
import { FilterState } from "Apps/Artist/Routes/Overview/state"
import { ContextConsumer } from "Artsy/SystemContext"
import { FollowArtistButtonFragmentContainer as FollowArtistButton } from "Components/FollowButton/FollowArtistButton"
import { Toggle } from "Components/v2"
import React, { Component } from "react"
import { createFragmentContainer, graphql } from "react-relay"
import { data as sd } from "sharify"
Expand Down
3 changes: 1 addition & 2 deletions src/Apps/Artwork/Components/ArtworkDetails/index.tsx
@@ -1,7 +1,6 @@
import { Box } from "@artsy/palette"
import { Box, Tab, Tabs } from "@artsy/palette"
import { renderWithLoadProgress } from "Artsy/Relay/renderWithLoadProgress"
import { ContextConsumer } from "Artsy/Router"
import { Tab, Tabs } from "Components/v2"
import React, { Component } from "react"
import { createFragmentContainer, graphql, QueryRenderer } from "react-relay"
import styled from "styled-components"
Expand Down
@@ -1,4 +1,4 @@
import { Spinner } from "@artsy/palette"
import { Spinner, Tab, Tabs } from "@artsy/palette"
import { RelatedWorksArtworkGrid_artwork } from "__generated__/RelatedWorksArtworkGrid_artwork.graphql"
import { RelatedWorksArtworkGridQuery } from "__generated__/RelatedWorksArtworkGridQuery.graphql"
import { hideGrid } from "Apps/Artwork/Components/OtherWorks/ArtworkContexts/ArtworkGrids"
Expand All @@ -9,7 +9,6 @@ import * as Schema from "Artsy/Analytics/Schema"
import { renderWithLoadProgress } from "Artsy/Relay/renderWithLoadProgress"
import { Mediator, withContext } from "Artsy/SystemContext"
import ArtworkGrid from "Components/ArtworkGrid"
import { Tab, Tabs } from "Components/v2"
import { take } from "lodash"
import React from "react"
import styled from "styled-components"
Expand Down
3 changes: 1 addition & 2 deletions src/Apps/Collect/Components/Filters/FilterContainer.tsx
Expand Up @@ -10,8 +10,7 @@ import { SortFilter } from "./SortFilter"
import { TimePeriodFilter } from "./TimePeriodFilter"
import { WaysToBuyFilter } from "./WaysToBuyFilter"

import { Box, Flex, Separator, Spacer } from "@artsy/palette"
import { Toggle } from "Components/v2"
import { Box, Flex, Separator, Spacer, Toggle } from "@artsy/palette"
import { Media } from "Utils/Responsive"

export interface FilterContainerProps {
Expand Down
3 changes: 1 addition & 2 deletions src/Apps/Comparables/Filter.tsx
@@ -1,4 +1,4 @@
import { Box, Flex, Spacer } from "@artsy/palette"
import { Box, Flex, Spacer, Toggle } from "@artsy/palette"
import { Filter_viewer } from "__generated__/Filter_viewer.graphql"
import { CollectRefetchContainer } from "Apps/Collect/Components/Base/CollectRefetch"
import { PriceRangeFilter as PriceRange } from "Apps/Collect/Components/Filters/PriceRangeFilter"
Expand All @@ -7,7 +7,6 @@ import { AttributionClassFilter } from "Apps/Comparables/Filter/AttributionClass
import { MediumFilter } from "Apps/Comparables/Filter/MediumFilter"
import { ContextProps } from "Artsy"
import { SystemProps } from "Artsy/SystemContext"
import { Toggle } from "Components/v2/Toggle"
import React, { Component } from "react"
import { createFragmentContainer, graphql } from "react-relay"
import { Subscribe } from "unstated"
Expand Down
9 changes: 7 additions & 2 deletions src/Apps/Order/Routes/__tests__/Payment.test.tsx
@@ -1,4 +1,9 @@
import { Button, Checkbox, CheckboxProps } from "@artsy/palette"
import {
ActiveTabContainer,
Button,
Checkbox,
CheckboxProps,
} from "@artsy/palette"
import { mount } from "enzyme"
import React from "react"

Expand All @@ -13,7 +18,7 @@ import {
fillIn,
validAddress,
} from "Apps/Order/Routes/__tests__/Utils/addressForm"
import { ActiveTabContainer, CheckMarkWrapper, Stepper } from "Components/v2"
import { CheckMarkWrapper, Stepper } from "Components/v2"
import { Input } from "../../../../Components/Input"
import {
creatingCreditCardFailed,
Expand Down
4 changes: 2 additions & 2 deletions src/Apps/Order/Routes/__tests__/Review.test.tsx
@@ -1,7 +1,7 @@
import { mount } from "enzyme"
import React from "react"

import { Button } from "@artsy/palette"
import { ActiveTabContainer, Button } from "@artsy/palette"
import {
BuyOrderWithShippingDetails,
OfferOrderWithShippingDetails,
Expand All @@ -11,7 +11,7 @@ import { ShippingSummaryItemFragmentContainer } from "Apps/Order/Components/Ship
import { ConnectedModalDialog } from "Apps/Order/Dialogs"
import { trackPageView } from "Apps/Order/Utils/trackPageView"
import { ModalButton, ModalDialog } from "Components/Modal/ModalDialog"
import { ActiveTabContainer, CheckMarkWrapper, Stepper } from "Components/v2"
import { CheckMarkWrapper, Stepper } from "Components/v2"
import { StepSummaryItem } from "Components/v2/StepSummaryItem"
import { MockBoot } from "DevTools"
import { commitMutation } from "react-relay"
Expand Down
9 changes: 2 additions & 7 deletions src/Apps/Order/Routes/__tests__/Shipping.test.tsx
Expand Up @@ -2,7 +2,7 @@ import { mount } from "enzyme"
import { cloneDeep } from "lodash"
import React from "react"

import { Button, RadioGroup } from "@artsy/palette"
import { ActiveTabContainer, Button, RadioGroup } from "@artsy/palette"
import {
UntouchedBuyOrder,
UntouchedOfferOrder,
Expand All @@ -17,12 +17,7 @@ import {
import { trackPageView } from "Apps/Order/Utils/trackPageView"
import Input, { InputProps } from "Components/Input"
import { ModalButton, ModalDialog } from "Components/Modal/ModalDialog"
import {
ActiveTabContainer,
CheckMarkWrapper,
CountrySelect,
Stepper,
} from "Components/v2"
import { CheckMarkWrapper, CountrySelect, Stepper } from "Components/v2"
import { MockBoot } from "DevTools"
import { commitMutation as _commitMutation, RelayProp } from "react-relay"
import { flushPromiseQueue } from "Utils/flushPromiseQueue"
Expand Down
14 changes: 10 additions & 4 deletions src/Components/v2/RouteTabs.tsx
@@ -1,12 +1,18 @@
import { color, Sans, space } from "@artsy/palette"
import {
color,
Sans,
sharedTabStyles,
space,
TabsContainer,
} from "@artsy/palette"
import { PreloadLink, PreloadLinkProps } from "Artsy/Router"
import React from "react"
import styled from "styled-components"
import { styles, TabsContainer } from "./Tabs"

export const RouteTabs = styled(TabsContainer)`
a {
${styles.tabContainer};
${sharedTabStyles.tabContainer};
:not(:last-child) {
margin-right: ${space(3)}px;
}
Expand All @@ -15,7 +21,7 @@ export const RouteTabs = styled(TabsContainer)`
&.active {
color: ${color("black100")};
${styles.activeTabContainer};
${sharedTabStyles.activeTabContainer};
}
}
`
Expand Down
5 changes: 2 additions & 3 deletions src/Components/v2/Stepper.tsx
@@ -1,7 +1,6 @@
import { Tab, Tabs, TabsProps } from "Components/v2"
import { sharedTabStyles, Tab, Tabs, TabsProps } from "@artsy/palette"
import React from "react"
import styled from "styled-components"
import { styles } from "./Tabs"

import {
CheckIcon,
Expand Down Expand Up @@ -101,7 +100,7 @@ export const CheckMarkWrapper = styled.span`
`

const DisabledStepContainer = styled.div`
${styles.tabContainer};
${sharedTabStyles.tabContainer};
cursor: default;
`

Expand Down

0 comments on commit b13249e

Please sign in to comment.