From 738c0177b639edf07e901e2659e18637a23629cb Mon Sep 17 00:00:00 2001
From: juhomakkonen <juho.makkonen@turku.fi>
Date: Tue, 30 Jan 2024 12:45:16 +0200
Subject: [PATCH] Use type value for aria-labelledby in switch component

---
 .../MobilitySettingsView/MobilitySettingsView.js   |  1 +
 .../MobilityToggleButton/MobilityToggleButton.js   | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/MobilitySettingsView/MobilitySettingsView.js b/src/views/MobilitySettingsView/MobilitySettingsView.js
index d8cb862b0..9791b852b 100644
--- a/src/views/MobilitySettingsView/MobilitySettingsView.js
+++ b/src/views/MobilitySettingsView/MobilitySettingsView.js
@@ -1399,6 +1399,7 @@ const MobilitySettingsView = ({ classes, intl, navigator }) => {
         <div key={item.type} className={classes.checkBoxContainer}>
           <MobilityToggleButton
             msgId={item.msgId}
+            type={item.type}
             checkedValue={item.checkedValue}
             onChangeValue={item.onChangeValue}
             selectionSize={settingsData.length}
diff --git a/src/views/MobilitySettingsView/components/MobilityToggleButton/MobilityToggleButton.js b/src/views/MobilitySettingsView/components/MobilityToggleButton/MobilityToggleButton.js
index 42c651943..77e4618bd 100644
--- a/src/views/MobilitySettingsView/components/MobilityToggleButton/MobilityToggleButton.js
+++ b/src/views/MobilitySettingsView/components/MobilityToggleButton/MobilityToggleButton.js
@@ -15,7 +15,7 @@ import { SMSwitch } from '../../../../components';
  */
 
 const MobilityToggleButton = ({
-  classes, intl, msgId, checkedValue, onChangeValue, selectionSize, inputProps, ...rest
+  classes, intl, msgId, type, checkedValue, onChangeValue, selectionSize, inputProps, ...rest
 }) => (
   <div className={classes.mobilityMapSwitch}>
     <SMSwitch
@@ -29,9 +29,9 @@ const MobilityToggleButton = ({
         role: 'button',
         'aria-setsize': selectionSize ? selectionSize.toString() : null,
         'aria-pressed': checkedValue,
-        'aria-labelledby': msgId,
+        'aria-labelledby': type,
       }}
-      onChange={(e) => onChangeValue(e)}
+      onChange={e => onChangeValue(e)}
       checked={checkedValue}
       {...rest}
     />
@@ -51,9 +51,12 @@ const MobilityToggleButton = ({
 );
 
 MobilityToggleButton.propTypes = {
-  classes: PropTypes.objectOf(PropTypes.any).isRequired,
-  intl: PropTypes.objectOf(PropTypes.any).isRequired,
+  classes: PropTypes.objectOf(PropTypes.string).isRequired,
+  intl: PropTypes.shape({
+    formatMessage: PropTypes.func,
+  }).isRequired,
   msgId: PropTypes.string,
+  type: PropTypes.string,
   checkedValue: PropTypes.bool,
   onChangeValue: PropTypes.func.isRequired,
   selectionSize: PropTypes.number,
@@ -64,6 +67,7 @@ MobilityToggleButton.propTypes = {
 
 MobilityToggleButton.defaultProps = {
   msgId: '',
+  type: '',
   checkedValue: false,
   selectionSize: null,
   inputProps: {},