Skip to content

Commit 8b479d8

Browse files
committed
feat(apollo,look&feel): commit concernant les retours sur aria labels
1 parent 3091ce1 commit 8b479d8

File tree

4 files changed

+25
-13
lines changed

4 files changed

+25
-13
lines changed

client/apollo/react/src/Form/ItemFile/ItemFileApollo.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ export { itemFileVariants } from "./ItemFileCommon";
1313
export const ItemFile = ({
1414
onDeleteClick,
1515
onVisibilityClick,
16-
ariaLabel,
16+
ariaLabelVisibility,
17+
ariaLabelDelete,
18+
filename,
1719
...props
1820
}: ItemFileProps) => (
1921
<ItemFileCommon
@@ -24,14 +26,14 @@ export const ItemFile = ({
2426
<ClickIcon
2527
src={deleteIcon}
2628
onClick={onDeleteClick}
27-
aria-label={ariaLabel}
29+
aria-label={ariaLabelDelete || `Suppression du fichier ${filename}`}
2830
/>
2931
}
3032
visibilityIcon={
3133
<ClickIcon
3234
src={visibilityIcon}
3335
onClick={onVisibilityClick}
34-
aria-label={ariaLabel}
36+
aria-label={ariaLabelVisibility || `Observer le fichier ${filename}`}
3537
/>
3638
}
3739
{...props}

client/apollo/react/src/Form/ItemFile/ItemFileCommon.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ type ItemFileState = keyof typeof itemFileVariants;
2121

2222
export type ItemFileCommonProps = {
2323
state: ItemFileState;
24-
ariaLabel?: string;
24+
ariaLabelVisibility?: string;
25+
ariaLabelDelete?: string;
26+
filename?: string;
2527
title: string;
2628
subTitle: string;
2729
errorMessage?: string;

client/apollo/react/src/Form/ItemFile/ItemFileLF.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ export { itemFileVariants } from "./ItemFileCommon";
1313
export const ItemFile = ({
1414
onDeleteClick,
1515
onVisibilityClick,
16-
ariaLabel,
16+
ariaLabelVisibility,
17+
ariaLabelDelete,
18+
filename,
1719
...props
1820
}: ItemFileProps) => (
1921
<ItemFileCommon
@@ -24,14 +26,14 @@ export const ItemFile = ({
2426
<ClickIcon
2527
src={deleteIconFilled}
2628
onClick={onDeleteClick}
27-
aria-label={ariaLabel}
29+
aria-label={ariaLabelDelete || `Suppression du fichier ${filename}`}
2830
/>
2931
}
3032
visibilityIcon={
3133
<ClickIcon
3234
src={visibilityIcon}
3335
onClick={onVisibilityClick}
34-
aria-label={ariaLabel}
36+
aria-label={ariaLabelVisibility || `Observer le fichier ${filename}`}
3537
/>
3638
}
3739
{...props}

client/apollo/react/src/Form/ItemFile/__tests__/ItemFile.test.tsx

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe("<ItemFile />", () => {
2929
title="IMG_879687880"
3030
subTitle="0.12"
3131
state={itemFileVariants.error}
32-
ariaLabel="Item File error"
32+
ariaLabelDelete="Item File error"
3333
/>,
3434
);
3535
const itemFileClickIcon = screen.getAllByRole("button", {
@@ -46,13 +46,18 @@ describe("<ItemFile />", () => {
4646
title="IMG_879687880"
4747
subTitle="0.12"
4848
state={itemFileVariants.success}
49-
ariaLabel="Item file success"
49+
ariaLabelVisibility="Observer le fichier"
50+
ariaLabelDelete="Suppression du fichier"
5051
/>,
5152
);
52-
const itemFileClickIcon = screen.getAllByRole("button", {
53-
name: "Item file success",
53+
const itemFileVisibility = screen.getAllByRole("button", {
54+
name: "Observer le fichier",
5455
});
55-
expect(itemFileClickIcon[0]).toBeInTheDocument();
56+
const itemFileDelete = screen.getAllByRole("button", {
57+
name: "Suppression du fichier",
58+
});
59+
expect(itemFileVisibility[0]).toBeInTheDocument();
60+
expect(itemFileDelete[0]).toBeInTheDocument();
5661
expect(container.querySelector("svg")).toHaveClass("af-icon__success");
5762
});
5863

@@ -62,7 +67,8 @@ describe("<ItemFile />", () => {
6267
state={itemFileVariants.success}
6368
subTitle="0.12"
6469
title="IMG_879687880"
65-
ariaLabel="Item file success"
70+
ariaLabelVisibility="Observer le fichier"
71+
ariaLabelDelete="Suppression du fichier"
6672
/>,
6773
);
6874
expect(await axe(container)).toHaveNoViolations();

0 commit comments

Comments
 (0)