Fix mutation of baseButtonMappings values that is being used in setti…

…ngs page
OpenStickCommunity · Apr 7, 2024 · f4f0b88 · f4f0b88
1 parent 6308ccd
commit f4f0b88
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/www/src/Services/WebApi.js b/www/src/Services/WebApi.js
@@ -438,11 +438,13 @@ async function getAddonsOptions(setLoading) {
 		const data = response.data;
 		setLoading(false);
 
-		let mappings = { ...baseButtonMappings };
-		for (let prop of Object.keys(data.keyboardHostMap))
-			mappings[prop].key = parseInt(data.keyboardHostMap[prop]);
-		data.keyboardHostMap = mappings;
-		return data;
+		// Merge saved keyMappings with defaults
+		const keyboardHostMap = Object.entries(data.keyboardHostMap).reduce(
+			(acc, [key, value]) => ({ ...acc, [key]: { ...acc[key], key: value } }),
+			baseButtonMappings,
+		);
+
+		return { ...data, keyboardHostMap };
 	} catch (error) {
 		setLoading(false);
 		console.error(error);