From 3ac718073e0f5c6b0f8a15784bfa3fbf50ffbf00 Mon Sep 17 00:00:00 2001 From: Tarun Samanta Date: Thu, 15 Jun 2023 10:54:09 +0530 Subject: [PATCH 1/8] fix: changed the button lable from Upload to Browse --- .../components/MultipleFileUpload/MultipleFileUploadButton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx index ce623864cac..68f36dc70bd 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx @@ -21,7 +21,7 @@ export const MultipleFileUploadButton: React.FunctionComponent ); From 2d2917d4dc1456ca8539ad7238176db62f51640d Mon Sep 17 00:00:00 2001 From: Tarun Samanta Date: Fri, 16 Jun 2023 00:59:01 +0530 Subject: [PATCH 2/8] change button label from hardcoded text to props element --- .../MultipleFileUpload/MultipleFileUploadButton.tsx | 4 +++- .../__tests__/MultipleFileUploadButton.test.tsx | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx index 68f36dc70bd..b30915fb3dd 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx @@ -9,11 +9,13 @@ export interface MultipleFileUploadButtonProps extends React.HTMLProps = ({ className, 'aria-label': ariaLabel, + label, ...props }: MultipleFileUploadButtonProps) => { const { open } = React.useContext(MultipleFileUploadContext); @@ -21,7 +23,7 @@ export const MultipleFileUploadButton: React.FunctionComponent ); diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx index 8da9c11ec60..3908ba84698 100644 --- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx @@ -17,4 +17,9 @@ describe('MultipleFileUploadButton', () => { const { asFragment } = render(Foo); expect(asFragment()).toMatchSnapshot(); }); + + test('renders with label applied to the button', () => { + const { asFragment } = render(Foo); + expect(asFragment()).toMatchSnapshot(); + }); }); From f6fe7b8892c919d9ffa9e47af7e407eb1167b321 Mon Sep 17 00:00:00 2001 From: Tarun Samanta Date: Fri, 16 Jun 2023 01:20:55 +0530 Subject: [PATCH 3/8] passes label as Browse --- .../components/MultipleFileUpload/MultipleFileUploadMain.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx index 3a0ed196dae..20026ae6a5f 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx @@ -37,7 +37,7 @@ export const MultipleFileUploadMain: React.FunctionComponent {showTitle && } - {isUploadButtonHidden || } + {isUploadButtonHidden || } {!!infoText && {infoText}} ); From 1b1b6bacfa32b41234488e919ccdb2d107545f34 Mon Sep 17 00:00:00 2001 From: Tarun Samanta Date: Fri, 16 Jun 2023 23:01:31 +0530 Subject: [PATCH 4/8] Update MultipleFileUploadMain.tsx --- .../components/MultipleFileUpload/MultipleFileUploadMain.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx index 20026ae6a5f..3a0ed196dae 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx @@ -37,7 +37,7 @@ export const MultipleFileUploadMain: React.FunctionComponent {showTitle && } - {isUploadButtonHidden || } + {isUploadButtonHidden || } {!!infoText && {infoText}} ); From 6f506c069d7c2b4971b2acc18ca31252ca90c806 Mon Sep 17 00:00:00 2001 From: Tarun Samanta Date: Sat, 17 Jun 2023 01:49:29 +0530 Subject: [PATCH 5/8] made changes as per your requirements --- .../MultipleFileUpload/MultipleFileUploadButton.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx index b30915fb3dd..c7e0f8f51a7 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx @@ -9,15 +9,20 @@ export interface MultipleFileUploadButtonProps extends React.HTMLProps = ({ className, 'aria-label': ariaLabel, - label, + label = "Upload", ...props }: MultipleFileUploadButtonProps) => { + if (!ariaLabel && !label) { + // eslint-disable-next-line no-console + console.warn("For accessibility reasons an aria-label should be specified on MultipleFileUploadButton if a label isn't"); + } const { open } = React.useContext(MultipleFileUploadContext); return ( From 19a24904ba7ff3ef80df1c3d722cdb37bf7fb276 Mon Sep 17 00:00:00 2001 From: Tarun Samanta Date: Wed, 21 Jun 2023 00:37:31 +0530 Subject: [PATCH 6/8] follow-up --- .../MultipleFileUpload/MultipleFileUploadButton.tsx | 10 +++++----- .../MultipleFileUpload/MultipleFileUploadMain.tsx | 5 ++++- .../__tests__/MultipleFileUploadButton.test.tsx | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx index c7e0f8f51a7..24de44aee0a 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx @@ -10,25 +10,25 @@ export interface MultipleFileUploadButtonProps extends React.HTMLProps = ({ className, 'aria-label': ariaLabel, - label = "Upload", + browseButtonText = "Upload", ...props }: MultipleFileUploadButtonProps) => { - if (!ariaLabel && !label) { + if (!ariaLabel && !browseButtonText) { // eslint-disable-next-line no-console - console.warn("For accessibility reasons an aria-label should be specified on MultipleFileUploadButton if a label isn't"); + console.warn("For accessibility reasons an aria-label should be specified on MultipleFileUploadButton if a browseButtonText isn't"); } const { open } = React.useContext(MultipleFileUploadContext); return (
); diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx index 3a0ed196dae..980efd8e836 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx @@ -21,6 +21,8 @@ export interface MultipleFileUploadMainProps extends React.HTMLProps = ({ @@ -30,6 +32,7 @@ export const MultipleFileUploadMain: React.FunctionComponent { const showTitle = !!titleIcon || !!titleText || !!titleTextSeparator; @@ -37,7 +40,7 @@ export const MultipleFileUploadMain: React.FunctionComponent {showTitle && } - {isUploadButtonHidden || } + {isUploadButtonHidden || } {!!infoText && {infoText}} ); diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx index 3908ba84698..86f5138fcd5 100644 --- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx @@ -19,7 +19,7 @@ describe('MultipleFileUploadButton', () => { }); test('renders with label applied to the button', () => { - const { asFragment } = render(Foo); + const { asFragment } = render(Foo); expect(asFragment()).toMatchSnapshot(); }); }); From 2f54901d2220b6efe0ca73455fde35e70cc3666d Mon Sep 17 00:00:00 2001 From: Tarun Samanta Date: Wed, 21 Jun 2023 21:43:28 +0530 Subject: [PATCH 7/8] follow-up --- .../components/MultipleFileUpload/MultipleFileUploadMain.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx index 980efd8e836..773db9e2877 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx @@ -22,7 +22,7 @@ export interface MultipleFileUploadMainProps extends React.HTMLProps = ({ From 84ac13325dd73ab387643ac8e39f73c5e3f00c2f Mon Sep 17 00:00:00 2001 From: Tarun Samanta Date: Wed, 21 Jun 2023 21:51:36 +0530 Subject: [PATCH 8/8] follow-up --- .../MultipleFileUpload/MultipleFileUploadMain.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx index 773db9e2877..daae1aec256 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx @@ -21,8 +21,8 @@ export interface MultipleFileUploadMainProps extends React.HTMLProps = ({ @@ -40,7 +40,7 @@ export const MultipleFileUploadMain: React.FunctionComponent {showTitle && } - {isUploadButtonHidden || } + {isUploadButtonHidden || } {!!infoText && {infoText}} );