refactor: simplify any/all isNA checks

rstudio · Dec 5, 2023 · 22e7147 · 22e7147
1 parent b7f100e
commit 22e7147
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git a/inst/components/dist/web-components.js b/inst/components/dist/web-components.js
diff --git a/inst/components/dist/web-components.js.map b/inst/components/dist/web-components.js.map
diff --git a/inst/components/dist/web-components.min.js b/inst/components/dist/web-components.min.js
diff --git a/inst/components/dist/web-components.min.js.map b/inst/components/dist/web-components.min.js.map
diff --git a/srcts/src/components/webcomponents/layoutColumns.ts b/srcts/src/components/webcomponents/layoutColumns.ts
@@ -158,20 +158,18 @@ export class BslibLayoutColumns extends HTMLElement {
    * @returns The resolved column width specification.
    */
   private _resolveColWidthsSpec(): BreakpointColumnSpec {
-    const allResolved = Array.from(this.colWidths.values()).every(
-      (val) => !isNA(val)
-    );
+    const colValuesNA = Array.from(this.colWidths.values()).map(isNA);
 
-    if (allResolved) {
+    const all = (x: boolean[]) => x.every((val: boolean) => val === true);
+    const any = (x: boolean[]) => x.some((val: boolean) => val === true);
+
+    if (!any(colValuesNA)) {
       return newBreakpointColumnSpec(this.colWidths as BreakpointMapResolved);
     }
 
     const resolved = new Map() as BreakpointMapResolved;
 
-    const allAutoFit = Array.from(this.colWidths.values()).every((val) =>
-      isNA(val)
-    );
-
+    const allAutoFit = all(colValuesNA);
     const units = allAutoFit ? null : 12;
     const nChildren = this.children.length;