fix(advancedMap): correctly pass data values

Author: feildmaster

changelog.md

@@ -1,5 +1,8 @@
 # UnderScript Changelog
 
+## Version 0.62.4 (2025-04-14)
+1. Fixed bug with advanced map
+
 ## Version 0.62.3 (2025-04-09)
 1. Fixed bugs with game sounds (including April fools)
 

src/utils/settings/types/map2.js

@@ -34,10 +34,12 @@ export default class AdvancedMap extends Setting {
    * @param {Map<any, any>} val
    */
   element(val, update, {
-    container, data: { keyData, valueData, leftData, rightData } = {}, disabled, key, name, untilClose,
+    container, data: mapData = {}, disabled, key, name, untilClose,
   } = {}) {
     // TODO: validate that disabled propagates properly
     const data = [...val.entries()];
+    const dataKey = getData(mapData);
+    const dataValue = getData(mapData, true);
     let entries = data.length;
     const add = (lineValue, id) => {
       function save(remove) {
@@ -47,7 +49,6 @@ export default class AdvancedMap extends Setting {
       }
       const line = $('<div class="item">');
       const options = { container: $('<div>'), name, disabled, remove: false, removeSetting() {}, key: `${key}.${id}`, child: true };
-      const dataKey = keyData || leftData;
       const left = $(this.#keyType.element(this.#keyValue(lineValue[0], dataKey), (newValue) => {
         // TODO: validate this is how it's supposed to work
         const isInvalid = newValue !== lineValue[0] && data.some(([keyValue]) => keyValue === newValue);
@@ -59,7 +60,6 @@ export default class AdvancedMap extends Setting {
         ...options,
         data: dataKey,
       }));
-      const dataValue = valueData || rightData;
       const right = $(this.#valueType.element(this.#value(lineValue[1], dataValue), (newValue) => {
         if (newValue === lineValue[1]) return;
         lineValue[1] = newValue;
@@ -88,8 +88,8 @@ export default class AdvancedMap extends Setting {
     data.forEach(add);
     return $('<button class="btn btn-success glyphicon glyphicon-plus">').on('click', () => {
       const item = [
-        this.#keyType.default(keyData) ?? '',
-        this.#valueType.default(valueData) ?? '',
+        this.#keyType.default(dataKey) ?? '',
+        this.#valueType.default(dataValue) ?? '',
       ];
       data.push(item);
       add(item, entries);
@@ -136,3 +136,10 @@ export default class AdvancedMap extends Setting {
     return registered;
   }
 }
+
+function getData({ key, keyData, leftData, value, valueData, rightData } = {}, secondary = false) {
+  if (secondary) {
+    return value || valueData || rightData;
+  }
+  return key || keyData || leftData;
+}