cx 25.10.1 → 25.11.1

package/src/ui/adapter/GroupAdapter.js

@@ -1,140 +1,143 @@
-import { ArrayAdapter } from "./ArrayAdapter";
-import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
-import { Grouper } from "../../data/Grouper";
-import { isArray } from "../../util/isArray";
-import { isDefined } from "../../util/isDefined";
-import { getComparer } from "../../data/comparer";
-import { Culture } from "../Culture";
-import { isObject } from "../../util/isObject";
-
-export class GroupAdapter extends ArrayAdapter {
-   init() {
-      super.init();
-
-      if (this.groupRecordsAlias) this.groupRecordsName = this.groupRecordsAlias;
-
-      if (this.groupings) this.groupBy(this.groupings);
-   }
-
-   getRecords(context, instance, records, parentStore) {
-      let result = super.getRecords(context, instance, records, parentStore);
-
-      if (this.groupings) {
-         let groupedResults = [];
-         this.processLevel([], result, groupedResults, parentStore);
-         result = groupedResults;
-      }
-
-      return result;
-   }
-
-   processLevel(keys, records, result, parentStore) {
-      let level = keys.length;
-      let inverseLevel = this.groupings.length - level;
-
-      if (inverseLevel == 0) {
-         for (let i = 0; i < records.length; i++) {
-            records[i].store.setStore(parentStore);
-            result.push(records[i]);
-         }
-         return;
-      }
-
-      let grouping = this.groupings[level];
-      let { grouper } = grouping;
-      grouper.reset();
-      grouper.processAll(records);
-      let results = grouper.getResults();
-      if (grouping.comparer) results.sort(grouping.comparer);
-
-      results.forEach((gr) => {
-         keys.push(gr.key);
-
-         let key = keys.map(serializeKey).join("|");
-
-         let $group = {
-            ...gr.key,
-            ...gr.aggregates,
-            $name: gr.name,
-            $level: inverseLevel,
-            $records: gr.records || [],
-            $key: key,
-         };
-
-         let data = {
-            [this.recordName]: gr.records.length > 0 ? gr.records[0].data : null,
-            [this.groupName]: $group,
-         };
-
-         let groupStore = new ReadOnlyDataView({
-            store: parentStore,
-            data,
-            immutable: this.immutable,
-         });
-
-         let group = {
-            key,
-            data,
-            group: $group,
-            grouping,
-            store: groupStore,
-            level: inverseLevel,
-         };
-
-         if (grouping.includeHeader !== false)
-            result.push({
-               ...group,
-               type: "group-header",
-               key: "header:" + group.key,
-            });
-
-         this.processLevel(keys, gr.records, result, groupStore);
-
-         if (grouping.includeFooter !== false)
-            result.push({
-               ...group,
-               type: "group-footer",
-               key: "footer:" + group.key,
-            });
-
-         keys.pop();
-      });
-   }
-
-   groupBy(groupings) {
-      if (!groupings) this.groupings = null;
-      else if (isArray(groupings)) {
-         this.groupings = groupings;
-         this.groupings.forEach((g) => {
-            let groupSorters = [];
-            let key = {};
-            for (let name in g.key) {
-               if (!g.key[name] || !isDefined(g.key[name].direction) || !isDefined(g.key[name].value))
-                  g.key[name] = { value: g.key[name], direction: "ASC" };
-               key[name] = g.key[name].value;
-               groupSorters.push({
-                  field: name,
-                  direction: g.key[name].direction,
-               });
-            }
-            g.grouper = new Grouper(key, { ...this.aggregates, ...g.aggregates }, (r) => r.store.getData(), g.text);
-            if (g.comparer == null && groupSorters.length > 0)
-               g.comparer = getComparer(
-                  groupSorters,
-                  (x) => x.key,
-                  this.sortOptions ? Culture.getComparer(this.sortOptions) : null,
-               );
-         });
-      } else throw new Error("Invalid grouping provided.");
-   }
-}
-
-GroupAdapter.prototype.groupName = "$group";
-
-function serializeKey(data) {
-   if (isObject(data))
-      return Object.keys(data)
-         .map((k) => serializeKey(data[k]))
-         .join(":");
-   return data?.toString() ?? "";
-}
+import { ArrayAdapter } from "./ArrayAdapter";
+import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
+import { Grouper } from "../../data/Grouper";
+import { isArray } from "../../util/isArray";
+import { isDefined } from "../../util/isDefined";
+import { getComparer } from "../../data/comparer";
+import { Culture } from "../Culture";
+import { isObject } from "../../util/isObject";
+
+export class GroupAdapter extends ArrayAdapter {
+   init() {
+      super.init();
+
+      if (this.groupRecordsAlias) this.groupRecordsName = this.groupRecordsAlias;
+
+      if (this.groupings) this.groupBy(this.groupings);
+   }
+
+   getRecords(context, instance, records, parentStore) {
+      let result = super.getRecords(context, instance, records, parentStore);
+
+      if (this.groupings) {
+         let groupedResults = [];
+         this.processLevel([], result, groupedResults, parentStore);
+         result = groupedResults;
+      }
+
+      return result;
+   }
+
+   processLevel(keys, records, result, parentStore) {
+      let level = keys.length;
+      let inverseLevel = this.groupings.length - level;
+
+      if (inverseLevel == 0) {
+         if (this.preserveOrder && this.sorter) records = this.sorter(records);
+         for (let i = 0; i < records.length; i++) {
+            records[i].store.setStore(parentStore);
+            result.push(records[i]);
+         }
+         return;
+      }
+
+      let grouping = this.groupings[level];
+      let { grouper } = grouping;
+      grouper.reset();
+      grouper.processAll(records);
+      let results = grouper.getResults();
+
+      if (grouping.comparer && !this.preserveOrder) results.sort(grouping.comparer);
+
+      results.forEach((gr) => {
+         keys.push(gr.key);
+
+         let key = keys.map(serializeKey).join("|");
+
+         let $group = {
+            ...gr.key,
+            ...gr.aggregates,
+            $name: gr.name,
+            $level: inverseLevel,
+            $records: gr.records || [],
+            $key: key,
+         };
+
+         let data = {
+            [this.recordName]: gr.records.length > 0 ? gr.records[0].data : null,
+            [this.groupName]: $group,
+         };
+
+         let groupStore = new ReadOnlyDataView({
+            store: parentStore,
+            data,
+            immutable: this.immutable,
+         });
+
+         let group = {
+            key,
+            data,
+            group: $group,
+            grouping,
+            store: groupStore,
+            level: inverseLevel,
+         };
+
+         if (grouping.includeHeader !== false)
+            result.push({
+               ...group,
+               type: "group-header",
+               key: "header:" + group.key,
+            });
+
+         this.processLevel(keys, gr.records, result, groupStore);
+
+         if (grouping.includeFooter !== false)
+            result.push({
+               ...group,
+               type: "group-footer",
+               key: "footer:" + group.key,
+            });
+
+         keys.pop();
+      });
+   }
+
+   groupBy(groupings) {
+      if (!groupings) this.groupings = null;
+      else if (isArray(groupings)) {
+         this.groupings = groupings;
+         this.groupings.forEach((g) => {
+            let groupSorters = [];
+            let key = {};
+            for (let name in g.key) {
+               if (!g.key[name] || !isDefined(g.key[name].direction) || !isDefined(g.key[name].value))
+                  g.key[name] = { value: g.key[name], direction: "ASC" };
+               key[name] = g.key[name].value;
+               groupSorters.push({
+                  field: name,
+                  direction: g.key[name].direction,
+               });
+            }
+            g.grouper = new Grouper(key, { ...this.aggregates, ...g.aggregates }, (r) => r.store.getData(), g.text);
+            if (g.comparer == null && groupSorters.length > 0)
+               g.comparer = getComparer(
+                  groupSorters,
+                  (x) => x.key,
+                  this.sortOptions ? Culture.getComparer(this.sortOptions) : null,
+               );
+         });
+      } else throw new Error("Invalid grouping provided.");
+   }
+}
+
+GroupAdapter.prototype.groupName = "$group";
+GroupAdapter.prototype.preserveOrder = false;
+
+function serializeKey(data) {
+   if (isObject(data))
+      return Object.keys(data)
+         .map((k) => serializeKey(data[k]))
+         .join(":");
+   return data?.toString() ?? "";
+}

package/src/ui/index.scss

@@ -1,2 +1,2 @@
-
-@import 'layout/index';
+
+@import 'layout/index';

package/src/ui/layout/index.scss

@@ -1,3 +1,3 @@
-
-@import "LabelsLeftLayout";
-@import "LabelsTopLayout";
+
+@import "LabelsLeftLayout";
+@import "LabelsTopLayout";

package/src/ui/layout/variables.scss

@@ -1,2 +1,2 @@
-
-// Layout variables
+
+// Layout variables

package/src/ui/variables.scss

@@ -1,2 +1,2 @@
-
+
 @import "layout/variables";

package/src/util/call-once.scss

@@ -1,7 +1,7 @@
-$cx-call-once-data: () !default;
-
-@function cx-call-once($name) {
-   $result: map_get($cx-call-once-data, $name);
-   $cx-call-once-data: map_merge($cx-call-once-data, ($name: true)) !global;
-   @return $result != true;
+$cx-call-once-data: () !default;
+
+@function cx-call-once($name) {
+   $result: map_get($cx-call-once-data, $name);
+   $cx-call-once-data: map_merge($cx-call-once-data, ($name: true)) !global;
+   @return $result != true;
 }

package/src/util/index.scss

@@ -1,11 +1,11 @@
-.cx-text-left.cx-text-left {
-   text-align: left;
-}
-
-.cx-text-right.cx-text-right {
-   text-align: right;
-}
-
-.cx-text-center.cx-text-center  {
-   text-align: center;
+.cx-text-left.cx-text-left {
+   text-align: left;
+}
+
+.cx-text-right.cx-text-right {
+   text-align: right;
+}
+
+.cx-text-center.cx-text-center  {
+   text-align: center;
 }

package/src/util/scss/divide.scss

@@ -1,3 +1,3 @@
-@function cx-divide($a, $b) {
-   @return $a / $b;
-}
+@function cx-divide($a, $b) {
+   @return $a / $b;
+}

package/src/util/scss/index.scss

@@ -1,9 +1,9 @@
-@import "add-rules";
-@import "calc";
-@import "call-once";
-@import "clockwise";
-@import "colors";
-@import "deep-merge";
-@import "deep-get";
-@import "include";
-@import "divide";
+@import "add-rules";
+@import "calc";
+@import "call-once";
+@import "clockwise";
+@import "colors";
+@import "deep-merge";
+@import "deep-get";
+@import "include";
+@import "divide";