From 8a799a2cb7edc31760f5c019a44c9f8877ee4df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pet=C5=99=C3=ADk?= Date: Fri, 16 Jun 2023 15:11:33 +0200 Subject: [PATCH 1/4] fix(AlertActionLink) support ReactNode as child --- packages/react-core/src/components/Alert/AlertActionLink.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-core/src/components/Alert/AlertActionLink.tsx b/packages/react-core/src/components/Alert/AlertActionLink.tsx index f4a54d124f0..f3c98eb1330 100644 --- a/packages/react-core/src/components/Alert/AlertActionLink.tsx +++ b/packages/react-core/src/components/Alert/AlertActionLink.tsx @@ -7,7 +7,7 @@ import { Button, ButtonVariant, ButtonProps } from '../Button'; export interface AlertActionLinkProps extends ButtonProps { /** Content rendered inside the alert action link. */ - children?: string; + children?: string | React.ReactNode; /** Additional classes added to the alert action link. */ className?: string; } From 6e61618c93b75c0a97bda07d0031043205d43287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pet=C5=99=C3=ADk?= Date: Mon, 19 Jun 2023 16:41:13 +0200 Subject: [PATCH 2/4] add test --- .../Alert/__tests__/AlertActionLink.test.tsx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx index 49f06bd1cce..4d9dda7737f 100644 --- a/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx +++ b/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx @@ -20,6 +20,18 @@ test('Renders children', () => { expect(screen.getByRole('button')).toBeVisible(); }); +test('Renders ReactNode as children', () => { + render( + + + Learn more + + + ); + + expect(screen.getByRole('link')).toBeVisible(); +}); + test('Renders with custom class names provided via prop', () => { render(Test); From 408cf4b3071b49d7826552877ee0c6452d573e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pet=C5=99=C3=ADk?= Date: Fri, 7 Jul 2023 13:51:31 +0200 Subject: [PATCH 3/4] update prop type and description --- packages/react-core/src/components/Alert/AlertActionLink.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-core/src/components/Alert/AlertActionLink.tsx b/packages/react-core/src/components/Alert/AlertActionLink.tsx index f3c98eb1330..b881e861fd9 100644 --- a/packages/react-core/src/components/Alert/AlertActionLink.tsx +++ b/packages/react-core/src/components/Alert/AlertActionLink.tsx @@ -6,8 +6,8 @@ import { Button, ButtonVariant, ButtonProps } from '../Button'; */ export interface AlertActionLinkProps extends ButtonProps { - /** Content rendered inside the alert action link. */ - children?: string | React.ReactNode; + /** Content rendered inside the alert action link. Interactive content such as anchor elements should not be passed in. */ + children?: React.ReactNode; /** Additional classes added to the alert action link. */ className?: string; } From 184e4caa485239ed11c4e24c439a57df24b3d472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pet=C5=99=C3=ADk?= Date: Tue, 11 Jul 2023 12:50:58 +0200 Subject: [PATCH 4/4] update test --- .../components/Alert/__tests__/AlertActionLink.test.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx index 4d9dda7737f..3e22ee03c5e 100644 --- a/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx +++ b/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx @@ -23,13 +23,13 @@ test('Renders children', () => { test('Renders ReactNode as children', () => { render( - - Learn more - +
+ Learn More +
); - expect(screen.getByRole('link')).toBeVisible(); + expect(screen.getByText('Learn More')).toBeVisible(); }); test('Renders with custom class names provided via prop', () => {