diff --git a/src/components/dialog-full-screen/components.test-pw.tsx b/src/components/dialog-full-screen/components.test-pw.tsx index 48db86f939..0884f18b7d 100644 --- a/src/components/dialog-full-screen/components.test-pw.tsx +++ b/src/components/dialog-full-screen/components.test-pw.tsx @@ -54,12 +54,8 @@ export const DialogFullScreenComponent = ({ ); }; -export const DefaultStory = ({ - children = "This is an example", - ...props -}: Partial) => { - const [isDialogFullScreenOpen, setIsDialogFullScreenOpen] = useState(false); - +export const DefaultStory = ({ open = false }: { open?: boolean }) => { + const [isDialogFullScreenOpen, setIsDialogFullScreenOpen] = useState(open); return ( <> - setIsDialogFullScreenOpen(false)} - {...props} - > - {children} - - - ); -}; - -export const DefaultNestedStory = ({ - children = "This is an example", - ...props -}: Partial) => { +export const DefaultNestedStory = () => { const [isFirstDialogOpen, setIsFirstDialogOpen] = useState(false); const [isNestedDialogOpen, setIsNestedDialogOpen] = useState(false); return ( @@ -121,7 +88,6 @@ export const DefaultNestedStory = ({ title="First Dialog Full Screen" aria-label="aria-label" onCancel={() => setIsFirstDialogOpen(false)} - {...props} > - setIsOpen(false)} - title="Title" - subtitle="Subtitle" - > -
setIsOpen(false)}>Cancel - } - saveButton={ - - } - > - - This is an example of a dialog with a Form as content - - - - - - - - - - - - - - -
- - ); -}; - -export const DefaultOpenStory = () => { - const [isOpen, setIsOpen] = useState(true); +export const DefaultStory = ({ open }: { open?: boolean }) => { + const [isOpen, setIsOpen] = useState(open || defaultOpenState); return ( <> diff --git a/src/components/dialog/dialog.pw.tsx b/src/components/dialog/dialog.pw.tsx index b11a69afd2..1fbfc2303f 100644 --- a/src/components/dialog/dialog.pw.tsx +++ b/src/components/dialog/dialog.pw.tsx @@ -11,7 +11,6 @@ import { DialogWithAutoFocusSelect, DialogComponentFocusableSelectors, DefaultStory, - DefaultOpenStory, DefaultNestedStory, Editable, WithHelp, @@ -274,7 +273,7 @@ test.describe("Testing Dialog component properties", () => { mount, page, }) => { - await mount(); + await mount(); const dialog = page.getByRole("dialog"); await expect(dialog).toBeVisible(); diff --git a/src/components/menu/component.test-pw.tsx b/src/components/menu/component.test-pw.tsx index 60ab42fbd8..15f27577e9 100644 --- a/src/components/menu/component.test-pw.tsx +++ b/src/components/menu/component.test-pw.tsx @@ -304,9 +304,7 @@ export const MenuComponentFullScreen = ( ); }; -export const MenuComponentFullScreenOpen = ( - props: Partial -) => { +export const MenuComponentFullScreenOpen = () => { const [menuOpen, setMenuOpen] = useState({ light: true, dark: false, @@ -331,7 +329,6 @@ export const MenuComponentFullScreenOpen = ( startPosition={startPosition} isOpen={menuOpen[menu]} onClose={() => setMenuOpen((state) => ({ ...state, [menu]: false }))} - {...props} > Menu Item One {}} submenu="Menu Item Two"> diff --git a/src/components/sidebar/components.test-pw.tsx b/src/components/sidebar/components.test-pw.tsx index 6a7f0724f9..ce0d49ff17 100644 --- a/src/components/sidebar/components.test-pw.tsx +++ b/src/components/sidebar/components.test-pw.tsx @@ -8,36 +8,15 @@ import Toast from "../toast"; import Textbox from "../textbox"; import Dialog from "../dialog"; -export const Default = (args: Partial) => { - const [isOpen, setIsOpen] = useState(true); - const onCancel = () => { - setIsOpen(false); - }; - return ( - <> - - - - - - - Main content - - - ); -}; - -export const DefaultClosed = (args: Partial) => { - const [isOpen, setIsOpen] = useState(false); +export const Default = ({ open = true }: { open?: boolean }) => { + const [isOpen, setIsOpen] = useState(open); const onCancel = () => { setIsOpen(false); }; return ( <> - + diff --git a/src/components/sidebar/sidebar.pw.tsx b/src/components/sidebar/sidebar.pw.tsx index 32e7f1ab55..b514af4267 100644 --- a/src/components/sidebar/sidebar.pw.tsx +++ b/src/components/sidebar/sidebar.pw.tsx @@ -21,7 +21,6 @@ import { } from "../../../playwright/support/helper"; import { Default, - DefaultClosed, DefaultNested, SidebarBackgroundScrollTestComponent, SidebarBackgroundScrollWithOtherFocusableContainers, @@ -277,7 +276,7 @@ test.describe("Prop tests for Sidebar component", () => { mount, page, }) => { - await mount(); + await mount(); const button = page.getByRole("button").filter({ hasText: "Open sidebar" }); const sidebar = sidebarPreview(page);