diff --git a/src/components/Accordion/Accordion-v2.tsx b/src/components/Accordion/Accordion-v2.tsx index 352ffaa09..37bd0d132 100644 --- a/src/components/Accordion/Accordion-v2.tsx +++ b/src/components/Accordion/Accordion-v2.tsx @@ -6,7 +6,7 @@ import { ENTER_KEYCODE, SPACEBAR_KEYCODE } from '../../util/keycodes'; import type { Size } from '../../util/variant-types'; import Heading, { type HeadingElement } from '../Heading'; -import Icon, { type IconName } from '../Icon'; +import { type IconNameV2 as IconName, IconV2 as Icon } from '../Icon'; import Text from '../Text'; import styles from './Accordion-v2.module.css'; @@ -77,7 +77,7 @@ type AccordionButtonProps = { * * **Default is `"expand-more"`**. */ - trailingIcon?: Extract; + trailingIcon?: Extract; }; type AccordionPanelProps = { @@ -159,7 +159,7 @@ const AccordionButton = ({ headingAs, leadingIcon, title, - trailingIcon = 'expand-more', + trailingIcon = 'chevron-down', subtitle, onClose, onOpen, diff --git a/src/components/Accordion/index.ts b/src/components/Accordion/index.ts index eeb8641b0..764793ddf 100644 --- a/src/components/Accordion/index.ts +++ b/src/components/Accordion/index.ts @@ -1,2 +1,2 @@ export { Accordion as default } from './Accordion'; -export { Accordion as AccordionV2 } from './Accordion'; +export { Accordion as AccordionV2 } from './Accordion-v2'; diff --git a/src/components/BannerNotification/BannerNotification.tsx b/src/components/BannerNotification/BannerNotification.tsx index 468a9f86d..fd7b6775b 100644 --- a/src/components/BannerNotification/BannerNotification.tsx +++ b/src/components/BannerNotification/BannerNotification.tsx @@ -1,10 +1,10 @@ import clsx from 'clsx'; import React, { type ReactNode } from 'react'; -import getIconNameFromStatus from '../../util/getIconNameFromStatus'; +import getIconNameFromStatus from '../../util/getIconNameFromStatus-v2'; import type { Status } from '../../util/variant-types'; import Heading from '../Heading'; -import Icon from '../Icon'; +import { IconV2 as Icon } from '../Icon'; import Text from '../Text'; import styles from './BannerNotification.module.css'; diff --git a/src/components/BannerNotification/__snapshots__/BannerNotification.test.ts.snap b/src/components/BannerNotification/__snapshots__/BannerNotification.test.ts.snap index e3c8761a9..f75c34664 100644 --- a/src/components/BannerNotification/__snapshots__/BannerNotification.test.ts.snap +++ b/src/components/BannerNotification/__snapshots__/BannerNotification.test.ts.snap @@ -121,7 +121,7 @@ exports[` Default story renders snapshot 1`] = ` xmlns="http://www.w3.org/2000/svg" >
Dismissable story renders snapshot 1`] = ` xmlns="http://www.w3.org/2000/svg" >
Warning story renders snapshot 1`] = ` xmlns="http://www.w3.org/2000/svg" >
( children, className, context, - icon = 'empty-circle', + icon = 'circle', iconLayout = 'none', isDisabled, isFullWidth, diff --git a/src/components/Button/__snapshots__/Button-v2.test.tsx.snap b/src/components/Button/__snapshots__/Button-v2.test.tsx.snap index 9cb12fd72..78b76c7cc 100644 --- a/src/components/Button/__snapshots__/Button-v2.test.tsx.snap +++ b/src/components/Button/__snapshots__/Button-v2.test.tsx.snap @@ -185,16 +185,8 @@ exports[`