diff --git a/src/channels/ChannelsWithVariantsAvailabilityCard/ChannelWithVariantAvailabilityItemWrapper.tsx b/src/channels/ChannelsWithVariantsAvailabilityCard/ChannelWithVariantAvailabilityItemWrapper.tsx index 0f9c93444..6c07b60c0 100644 --- a/src/channels/ChannelsWithVariantsAvailabilityCard/ChannelWithVariantAvailabilityItemWrapper.tsx +++ b/src/channels/ChannelsWithVariantsAvailabilityCard/ChannelWithVariantAvailabilityItemWrapper.tsx @@ -1,8 +1,4 @@ -import { - ExpansionPanel, - ExpansionPanelSummary, - Typography -} from "@material-ui/core"; +import { Accordion, AccordionSummary, Typography } from "@material-ui/core"; import { ChannelData } from "@saleor/channels/utils"; import { Messages } from "@saleor/components/ChannelsAvailabilityCard/types"; import IconChevronDown from "@saleor/icons/ChevronDown"; @@ -119,8 +115,8 @@ const ChannelWithVariantsAvailabilityItemWrapper: React.FC - + } classes={summaryClasses} > @@ -129,9 +125,9 @@ const ChannelWithVariantsAvailabilityItemWrapper: React.FC + {children} - + ); }; diff --git a/src/channels/components/ChannelsWithVariantsAvailabilityDialog/ChannelsWithVariantsAvailabilityDialogContent.tsx b/src/channels/components/ChannelsWithVariantsAvailabilityDialog/ChannelsWithVariantsAvailabilityDialogContent.tsx index e5171f61b..79bb51a9d 100644 --- a/src/channels/components/ChannelsWithVariantsAvailabilityDialog/ChannelsWithVariantsAvailabilityDialogContent.tsx +++ b/src/channels/components/ChannelsWithVariantsAvailabilityDialog/ChannelsWithVariantsAvailabilityDialogContent.tsx @@ -1,8 +1,8 @@ import placeholderImage from "@assets/images/placeholder60x60.png"; import { + Accordion, + AccordionSummary, Divider, - ExpansionPanel, - ExpansionPanelSummary, Typography } from "@material-ui/core"; import { ChannelData } from "@saleor/channels/utils"; @@ -155,12 +155,12 @@ const ChannelsWithVariantsAvailabilityDialogContent: React.FC - } classes={summaryClasses} > @@ -192,7 +192,7 @@ const ChannelsWithVariantsAvailabilityDialogContent: React.FC - + {allVariants.map(({ id: variantId, name }) => (
))} - + ); })} diff --git a/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx b/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx index 090e050f2..eb299b99a 100644 --- a/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx +++ b/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx @@ -1,8 +1,8 @@ import { + Accordion, Card, CardContent, Divider, - ExpansionPanel, Typography } from "@material-ui/core"; import CardTitle from "@saleor/components/CardTitle"; @@ -67,7 +67,7 @@ const ShippingZonesCard: React.FC = props => { {intl.formatMessage(messages.subtitle)} - + {shippingZones.map(zone => ( @@ -76,7 +76,7 @@ const ShippingZonesCard: React.FC = props => { {hasMoreZonesToBeSelected ? ( ) : null} - + ); }; diff --git a/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx b/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx index effe91434..81e49f71b 100644 --- a/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx +++ b/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx @@ -1,4 +1,4 @@ -import { ExpansionPanelSummary, Typography } from "@material-ui/core"; +import { AccordionSummary, Typography } from "@material-ui/core"; import HorizontalSpacer from "@saleor/apps/components/HorizontalSpacer"; import { ChannelShippingZones } from "@saleor/channels/pages/ChannelDetailsPage/types"; import IconChevronDown from "@saleor/icons/ChevronDown"; @@ -58,13 +58,13 @@ const ShippingZonesListHeader: React.FC = ({ return (
- } classes={classes}> + } classes={classes}> {intl.formatMessage(messages.title, { zonesCount: shippingZones.length })} - +
); diff --git a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx index 74980abe3..f9c9f71da 100644 --- a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx +++ b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemWrapper.tsx @@ -1,8 +1,4 @@ -import { - ExpansionPanel, - ExpansionPanelSummary, - Typography -} from "@material-ui/core"; +import { Accordion, AccordionSummary, Typography } from "@material-ui/core"; import { ChannelData } from "@saleor/channels/utils"; import IconChevronDown from "@saleor/icons/ChevronDown"; import { makeStyles } from "@saleor/macaw-ui"; @@ -76,19 +72,16 @@ const ChannelContentWrapper: React.FC = ({ const { name } = data; return ( - - + } classes={summaryClasses} > {name} {messages.availableDateText} - + {children} - + ); }; diff --git a/src/components/Filter/FilterContent/FilterContent.tsx b/src/components/Filter/FilterContent/FilterContent.tsx index f42d5b97a..f4523b8fb 100644 --- a/src/components/Filter/FilterContent/FilterContent.tsx +++ b/src/components/Filter/FilterContent/FilterContent.tsx @@ -1,6 +1,6 @@ import { - ExpansionPanel, - ExpansionPanelSummary, + Accordion, + AccordionSummary, makeStyles, Paper, Typography @@ -208,14 +208,14 @@ const FilterContent: React.FC = ({ const currentFilter = getFilterFromCurrentData(filter); return ( - - } classes={summaryClasses} onClick={() => handleFilterOpen(filter)} @@ -226,7 +226,7 @@ const FilterContent: React.FC = ({ handleFilterPropertyGroupChange(action, filter) } /> - + {currentFilter?.active && ( = ({ filter={currentFilter} /> )} - + ); })} diff --git a/src/components/Timeline/TimelineEvent.tsx b/src/components/Timeline/TimelineEvent.tsx index 92321f155..b6ff03e06 100644 --- a/src/components/Timeline/TimelineEvent.tsx +++ b/src/components/Timeline/TimelineEvent.tsx @@ -1,7 +1,7 @@ import { - ExpansionPanel, - ExpansionPanelDetails, - ExpansionPanelSummary, + Accordion, + AccordionDetails, + AccordionSummary, Typography } from "@material-ui/core"; import ExpandMoreIcon from "@material-ui/icons/ExpandMore"; @@ -93,8 +93,8 @@ export const TimelineEvent: React.FC = props => {
{children ? ( - - + } > @@ -103,11 +103,11 @@ export const TimelineEvent: React.FC = props => { date={date} titleElements={titleElements} /> - - + + {children} - - + + ) : ( - - + } classes={summaryClasses} data-test-id="channels-variant-availability-summary" @@ -150,7 +150,7 @@ const VariantDetailsChannelsAvailabilityCard: React.FC - + {channelListings.map(({ channel }) => ( @@ -170,7 +170,7 @@ const VariantDetailsChannelsAvailabilityCard: React.FC ))} - + ); }; diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index aa7a0c907..529fab307 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -2477,17 +2477,17 @@ exports[`Storyshots Channels / Channels with variants availability card default class="Hr-root-id ChannelsAvailabilityCard-hr-id" />