js: Updated code to Array.prototype.flat() and flatMap()

baraverkstad · Dec 19, 2024 · be0f933 · be0f933
1 parent 6715fab
commit be0f933
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/plugin/system/files/js/RapidContext_Widget.js b/src/plugin/system/files/js/RapidContext_Widget.js
@@ -75,8 +75,7 @@ RapidContext.Widget.isWidget = function (obj, className) {
  */
 RapidContext.Widget._toCssClass = function (val) {
     if (Array.isArray(val)) {
-        // FIXME: Use Array.prototype.flatMap(...) here
-        return val.map(RapidContext.Widget._toCssClass);
+        return val.flatMap(RapidContext.Widget._toCssClass);
     } else if (val) {
         return String(val).split(/\s+/g).filter(Boolean);
     } else {
@@ -317,8 +316,7 @@ RapidContext.Widget.prototype.hasClass = function (/* ... */) {
         }
     }
     let elem = this._styleNode();
-    // FIXME: Use Array.prototype.flatMap(...) here
-    return Array.from(arguments).map(RapidContext.Widget._toCssClass).every(isMatch);
+    return Array.from(arguments).flatMap(RapidContext.Widget._toCssClass).every(isMatch);
 };
 
 /**
@@ -335,8 +333,7 @@ RapidContext.Widget.prototype.addClass = function (/* ... */) {
         }
     }
     let elem = this._styleNode();
-    // FIXME: Use Array.prototype.flatMap(...) here
-    Array.from(arguments).map(RapidContext.Widget._toCssClass).forEach(add);
+    Array.from(arguments).flatMap(RapidContext.Widget._toCssClass).forEach(add);
 };
 
 /**
@@ -355,8 +352,7 @@ RapidContext.Widget.prototype.removeClass = function (/* ... */) {
         }
     }
     let elem = this._styleNode();
-    // FIXME: Use Array.prototype.flatMap(...) here
-    Array.from(arguments).map(RapidContext.Widget._toCssClass).forEach(remove);
+    Array.from(arguments).flatMap(RapidContext.Widget._toCssClass).forEach(remove);
 };
 
 /**

diff --git a/src/plugin/system/files/js/rapidcontext/data.mjs b/src/plugin/system/files/js/rapidcontext/data.mjs
@@ -181,7 +181,7 @@ export function get(key, val) {
             let el = path.shift();
             if (el === '*' || el === '[]') {
                 let arrs = (el === '*') ? ctx.map(Object.values) : ctx.filter(Array.isArray);
-                ctx = Array.prototype.concat.apply([], arrs); // FIXME: arrs.flat()
+                ctx = arrs.flat();
             } else {
                 let k = /^\[\d+\]$/.test(el) ? parseInt(el.substr(1), 10) : el;
                 ctx = ctx.filter(hasProperty(k)).map((o) => o[k]);