From ac687f4b368953a95eca7ddb2c00dbc5aa290a89 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Mon, 25 Oct 2021 10:40:16 +0200
Subject: [PATCH] fix(ecogestures): fix default displayed text + broken display
---
src/components/Ecogesture/EcogestureList.tsx | 6 ++++--
src/components/Ecogesture/ecogestureList.scss | 1 +
src/locales/fr.json | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/components/Ecogesture/EcogestureList.tsx b/src/components/Ecogesture/EcogestureList.tsx
index acffd3b07..b328cf5b4 100644
--- a/src/components/Ecogesture/EcogestureList.tsx
+++ b/src/components/Ecogesture/EcogestureList.tsx
@@ -136,7 +136,7 @@ const EcogestureList: React.FC<EcogestureListProps> = ({
}}
aria-controls="simple-menu"
aria-haspopup="true"
- aria-label={t(`ecogesture.${activeFilter}`)}
+ aria-label={t(`ecogesture.MENU_TITLE`)}
onClick={toggleMenu}
variant="contained"
>
@@ -146,7 +146,9 @@ const EcogestureList: React.FC<EcogestureListProps> = ({
openDropDown ? 'ecogestures opened' : 'ecogestures'
}
>
- {t(`ecogesture.${activeFilter}`)}
+ {activeFilter === 'ALL'
+ ? t(`ecogesture.MENU_TITLE`)
+ : t(`ecogesture.${activeFilter}`)}
</span>
</Button>
<Menu
diff --git a/src/components/Ecogesture/ecogestureList.scss b/src/components/Ecogesture/ecogestureList.scss
index be3467853..64944bf56 100644
--- a/src/components/Ecogesture/ecogestureList.scss
+++ b/src/components/Ecogesture/ecogestureList.scss
@@ -173,4 +173,5 @@ div.filter-menu {
}
.filter-menu-icon {
margin-left: auto;
+ min-width: 0;
}
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 4c7acb75e..5d1023f4e 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -286,7 +286,8 @@
"ecogesture": {
"title_tab_1": "Tous les écogestes",
"title_tab_2": "Écogestes adaptés à votre profil",
- "ALL": "Filtrer",
+ "MENU_TITLE": "Filtrer",
+ "ALL": "Tous les usages",
"HEATING": "Chauffage",
"AIR_CONDITIONING": "Climatisation",
"ECS": "Eau chaude",
--
GitLab