cx 25.10.0 → 25.11.1

package/dist/ui.js

@@ -979,7 +979,7 @@ var ArrayAdapter = /*#__PURE__*/ (function (_DataAdapter) {
 				var record = _this.mapRecord(context, instance, data, parentStore, recordsAccessor, index);
 				result.push(record);
 			});
-		if (this.sorter) result = this.sorter(result);
+		if (this.sorter && !this.preserveOrder) result = this.sorter(result);
 		return result;
 	};
 	_proto.mapRecord = function mapRecord(context, instance, data, parentStore, recordsAccessor, index) {
@@ -1666,12 +1666,10 @@ var Instance = /*#__PURE__*/ (function () {
 		// widget is initialized when the first instance is initialized
 		if (!this.widget.initialized) {
 			this.widget.init(context);
-
-			// init default values
-			this.widget.selector.init(this.parentStore);
 			this.widget.initialized = true;
 		}
 		if (!this.dataSelector) {
+			this.widget.selector.init(this.parentStore);
 			this.dataSelector = this.widget.selector.createStoreSelector();
 		}
 
@@ -4288,6 +4286,7 @@ var GroupAdapter = /*#__PURE__*/ (function (_ArrayAdapter) {
 		var level = keys.length;
 		var inverseLevel = this.groupings.length - level;
 		if (inverseLevel == 0) {
+			if (this.preserveOrder && this.sorter) records = this.sorter(records);
 			for (var i = 0; i < records.length; i++) {
 				records[i].store.setStore(parentStore);
 				result.push(records[i]);
@@ -4299,7 +4298,7 @@ var GroupAdapter = /*#__PURE__*/ (function (_ArrayAdapter) {
 		grouper.reset();
 		grouper.processAll(records);
 		var results = grouper.getResults();
-		if (grouping.comparer) results.sort(grouping.comparer);
+		if (grouping.comparer && !this.preserveOrder) results.sort(grouping.comparer);
 		results.forEach(function (gr) {
 			var _data;
 			keys.push(gr.key);
@@ -4388,6 +4387,7 @@ var GroupAdapter = /*#__PURE__*/ (function (_ArrayAdapter) {
 	return GroupAdapter;
 })(ArrayAdapter);
 GroupAdapter.prototype.groupName = "$group";
+GroupAdapter.prototype.preserveOrder = false;
 function serializeKey(data) {
 	var _data$toString;
 	if (isObject(data))

package/dist/widgets.js

@@ -15826,6 +15826,7 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 				indexName: this.indexName,
 				sortOptions: this.sortOptions,
 				groupings: grouping,
+				preserveOrder: this.preserveGroupOrder,
 			},
 			this.dataAdapter,
 		);
@@ -16860,6 +16861,7 @@ Grid.prototype.preciseMeasurements = false;
 Grid.prototype.hoverChannel = "default";
 Grid.prototype.focusable = null; // automatically resolved
 Grid.prototype.allowsFileDrops = false;
+Grid.prototype.preserveGroupOrder = false;
 Widget.alias("grid", Grid);
 Localization.registerPrototype("cx/widgets/Grid", Grid);
 var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "25.10.0",
+   "version": "25.11.1",
    "description": "Advanced JavaScript UI framework for admin and dashboard applications with ready to use grid, form and chart components.",
    "main": "index.js",
    "jsnext:main": "src/index.js",

package/src/data/Grouper.spec.js

@@ -1,57 +1,57 @@
-let Grouper = require("./Grouper").Grouper;
-import assert from "assert";
-
-describe("Grouper", function () {
-   describe("single grouping", function () {
-      it("should work", function () {
-         let data = [
-            { name: "John", age: 12 },
-            { name: "Jane", age: 12 },
-         ];
-
-         let grouper = new Grouper({ name: { bind: "name" } });
-         grouper.processAll(data);
-
-         let results = grouper.getResults();
-         // console.log(results);
-         assert.equal(results.length, 2);
-      });
-
-      it("keys can have nested properties", function () {
-         let data = [
-            { name: "John", age: 12 },
-            { name: "Jane", age: 12 },
-         ];
-
-         let grouper = new Grouper({ "person.name": { bind: "name" } });
-         grouper.processAll(data);
-
-         let results = grouper.getResults();
-         assert.equal(results.length, 2);
-         assert.equal(results[0].key.person?.name, "John");
-         assert.equal(results[1].key.person?.name, "Jane");
-      });
-   });
-
-   describe("multi grouping", function () {
-      it("should work", function () {
-         let data = [
-            { name: "John", age: 12 },
-            { name: "John", age: 12 },
-            { name: "John", age: 13 },
-            { name: "John", age: 14 },
-            { name: "Jane", age: 12 },
-            { name: "Jane", age: 13 },
-            { name: "Jane", age: 14 },
-         ];
-
-         let grouper = new Grouper({ name: { bind: "name" }, age: { bind: "age" } });
-         grouper.processAll(data);
-
-         let results = grouper.getResults();
-         // console.log(results);
-         assert.equal(results.length, 6);
-         assert.equal(results[0].records.length, 2);
-      });
-   });
-});
+import { Grouper } from "./Grouper";
+import assert from "assert";
+
+describe("Grouper", function () {
+   describe("single grouping", function () {
+      it("should work", function () {
+         let data = [
+            { name: "John", age: 12 },
+            { name: "Jane", age: 12 },
+         ];
+
+         let grouper = new Grouper({ name: { bind: "name" } });
+         grouper.processAll(data);
+
+         let results = grouper.getResults();
+         // console.log(results);
+         assert.equal(results.length, 2);
+      });
+
+      it("keys can have nested properties", function () {
+         let data = [
+            { name: "John", age: 12 },
+            { name: "Jane", age: 12 },
+         ];
+
+         let grouper = new Grouper({ "person.name": { bind: "name" } });
+         grouper.processAll(data);
+
+         let results = grouper.getResults();
+         assert.equal(results.length, 2);
+         assert.equal(results[0].key.person?.name, "John");
+         assert.equal(results[1].key.person?.name, "Jane");
+      });
+   });
+
+   describe("multi grouping", function () {
+      it("should work", function () {
+         let data = [
+            { name: "John", age: 12 },
+            { name: "John", age: 12 },
+            { name: "John", age: 13 },
+            { name: "John", age: 14 },
+            { name: "Jane", age: 12 },
+            { name: "Jane", age: 13 },
+            { name: "Jane", age: 14 },
+         ];
+
+         let grouper = new Grouper({ name: { bind: "name" }, age: { bind: "age" } });
+         grouper.processAll(data);
+
+         let results = grouper.getResults();
+         // console.log(results);
+         assert.equal(results.length, 6);
+         assert.equal(results[0].records.length, 2);
+      });
+   });
+});

package/src/ui/Instance.js

@@ -36,14 +36,11 @@ export class Instance {
       // widget is initialized when the first instance is initialized
       if (!this.widget.initialized) {
          this.widget.init(context);
-
-         // init default values
-         this.widget.selector.init(this.parentStore);
-
          this.widget.initialized = true;
       }
 
       if (!this.dataSelector) {
+         this.widget.selector.init(this.parentStore);
          this.dataSelector = this.widget.selector.createStoreSelector();
       }
 

package/src/ui/adapter/ArrayAdapter.js

@@ -1,152 +1,152 @@
-import { DataAdapter } from "./DataAdapter";
-import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
-import { sorter } from "../../data/comparer";
-import { isArray } from "../../util/isArray";
-import { ArrayElementView } from "../../data/ArrayElementView";
-import { getAccessor } from "../../data/getAccessor";
-import { Culture } from "../Culture";
-import { isDefined, isObject } from "../../util";
-
-export class ArrayAdapter extends DataAdapter {
-   init() {
-      this.recordsAccessor = getAccessor(this.recordsBinding ? this.recordsBinding : this.recordsAccessor);
-
-      //resolve accessor chains
-      this.recordName = this.recordName.toString();
-      this.indexName = this.indexName.toString();
-   }
-
-   initInstance(context, instance) {
-      if (!instance.recordStoreCache) {
-         instance.recordStoreCache = new WeakMap();
-         instance.cacheByKey = {};
-      }
-
-      if (!instance.recordsAccessor && this.recordsAccessor) {
-         instance.recordsAccessor = this.recordsAccessor.bindInstance
-            ? this.recordsAccessor.bindInstance(instance)
-            : this.recordsAccessor;
-      }
-   }
-
-   getRecords(context, instance, records, parentStore) {
-      if (!instance.recordStoreCache) this.initInstance(context, instance);
-
-      return this.mapRecords(context, instance, records, parentStore, instance.recordsAccessor);
-   }
-
-   mapRecords(context, instance, records, parentStore, recordsAccessor) {
-      let result = [];
-
-      if (!instance.recordStoreCache) this.initInstance(context, instance);
-
-      if (isArray(records))
-         records.forEach((data, index) => {
-            if (this.filterFn && !this.filterFn(data)) return;
-
-            let record = this.mapRecord(context, instance, data, parentStore, recordsAccessor, index);
-
-            result.push(record);
-         });
-
-      if (this.sorter) result = this.sorter(result);
-
-      return result;
-   }
-
-   mapRecord(context, instance, data, parentStore, recordsAccessor, index) {
-      let key = this.cacheByKeyField && this.keyField ? data[this.keyField] : null;
-      let recordStore = key != null ? instance.cacheByKey[key] : instance.recordStoreCache.get(data);
-
-      if (recordsAccessor) {
-         if (!recordStore)
-            recordStore = new ArrayElementView({
-               store: parentStore,
-               arrayAccessor: recordsAccessor,
-               itemIndex: index,
-               recordAlias: this.recordName,
-               indexAlias: this.indexName,
-               immutable: this.immutable,
-               sealed: this.sealed,
-            });
-         else {
-            recordStore.setStore(parentStore);
-            recordStore.setIndex(index);
-         }
-      } else {
-         if (!recordStore)
-            recordStore = new ReadOnlyDataView({
-               store: parentStore,
-               data: {
-                  [this.recordName]: data,
-                  [this.indexName]: index,
-               },
-               immutable: this.immutable,
-               sealed: this.sealed,
-            });
-         else {
-            recordStore.setStore(parentStore);
-            recordStore.setData(data);
-         }
-      }
-
-      // cache by the key or by data reference
-      if (key != null) instance.cacheByKey[key] = recordStore;
-      else if (isObject(data)) instance.recordStoreCache.set(data, recordStore);
-
-      return {
-         store: recordStore,
-         index: index,
-         data: data,
-         type: "data",
-         key: this.keyField ? data[this.keyField] : index,
-      };
-   }
-
-   setFilter(filterFn) {
-      this.filterFn = filterFn;
-   }
-
-   getComparer(sortOptions) {
-      return sortOptions ? Culture.getComparer(sortOptions) : null;
-   }
-
-   buildSorter(sorters) {
-      if (isArray(sorters) && sorters.length > 0) {
-         let fieldValueMapper;
-         let dataAccessor;
-
-         //if all sorters are based on record fields access data directly (faster)
-         if (sorters.every((x) => x.field && x.value == null)) {
-            dataAccessor = (x) => x.data;
-            fieldValueMapper = (x) => ({ bind: x.field });
-         } else {
-            dataAccessor = (x) => x.store.getData();
-            fieldValueMapper = (x) => ({ bind: this.recordName + "." + x.field });
-         }
-         this.sorter = sorter(
-            sorters.map((x) => {
-               let s = Object.assign({}, x);
-               if (s.field && s.value == null) s.value = fieldValueMapper(s);
-               if (!s.comparer)
-                  s.comparer = this.getComparer(isDefined(s.sortOptions) ? s.sortOptions : this.sortOptions);
-               return s;
-            }),
-            dataAccessor,
-         );
-      } else {
-         this.sorter = null;
-      }
-   }
-
-   sort(sorters) {
-      this.buildSorter(sorters);
-   }
-}
-
-ArrayAdapter.prototype.immutable = false;
-ArrayAdapter.prototype.sealed = false;
-ArrayAdapter.prototype.keyField = null;
-ArrayAdapter.prototype.cacheByKeyField = true;
-
-ArrayAdapter.autoInit = true;
+import { DataAdapter } from "./DataAdapter";
+import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
+import { sorter } from "../../data/comparer";
+import { isArray } from "../../util/isArray";
+import { ArrayElementView } from "../../data/ArrayElementView";
+import { getAccessor } from "../../data/getAccessor";
+import { Culture } from "../Culture";
+import { isDefined, isObject } from "../../util";
+
+export class ArrayAdapter extends DataAdapter {
+   init() {
+      this.recordsAccessor = getAccessor(this.recordsBinding ? this.recordsBinding : this.recordsAccessor);
+
+      //resolve accessor chains
+      this.recordName = this.recordName.toString();
+      this.indexName = this.indexName.toString();
+   }
+
+   initInstance(context, instance) {
+      if (!instance.recordStoreCache) {
+         instance.recordStoreCache = new WeakMap();
+         instance.cacheByKey = {};
+      }
+
+      if (!instance.recordsAccessor && this.recordsAccessor) {
+         instance.recordsAccessor = this.recordsAccessor.bindInstance
+            ? this.recordsAccessor.bindInstance(instance)
+            : this.recordsAccessor;
+      }
+   }
+
+   getRecords(context, instance, records, parentStore) {
+      if (!instance.recordStoreCache) this.initInstance(context, instance);
+
+      return this.mapRecords(context, instance, records, parentStore, instance.recordsAccessor);
+   }
+
+   mapRecords(context, instance, records, parentStore, recordsAccessor) {
+      let result = [];
+
+      if (!instance.recordStoreCache) this.initInstance(context, instance);
+
+      if (isArray(records))
+         records.forEach((data, index) => {
+            if (this.filterFn && !this.filterFn(data)) return;
+
+            let record = this.mapRecord(context, instance, data, parentStore, recordsAccessor, index);
+
+            result.push(record);
+         });
+
+      if (this.sorter && !this.preserveOrder) result = this.sorter(result);
+
+      return result;
+   }
+
+   mapRecord(context, instance, data, parentStore, recordsAccessor, index) {
+      let key = this.cacheByKeyField && this.keyField ? data[this.keyField] : null;
+      let recordStore = key != null ? instance.cacheByKey[key] : instance.recordStoreCache.get(data);
+
+      if (recordsAccessor) {
+         if (!recordStore)
+            recordStore = new ArrayElementView({
+               store: parentStore,
+               arrayAccessor: recordsAccessor,
+               itemIndex: index,
+               recordAlias: this.recordName,
+               indexAlias: this.indexName,
+               immutable: this.immutable,
+               sealed: this.sealed,
+            });
+         else {
+            recordStore.setStore(parentStore);
+            recordStore.setIndex(index);
+         }
+      } else {
+         if (!recordStore)
+            recordStore = new ReadOnlyDataView({
+               store: parentStore,
+               data: {
+                  [this.recordName]: data,
+                  [this.indexName]: index,
+               },
+               immutable: this.immutable,
+               sealed: this.sealed,
+            });
+         else {
+            recordStore.setStore(parentStore);
+            recordStore.setData(data);
+         }
+      }
+
+      // cache by the key or by data reference
+      if (key != null) instance.cacheByKey[key] = recordStore;
+      else if (isObject(data)) instance.recordStoreCache.set(data, recordStore);
+
+      return {
+         store: recordStore,
+         index: index,
+         data: data,
+         type: "data",
+         key: this.keyField ? data[this.keyField] : index,
+      };
+   }
+
+   setFilter(filterFn) {
+      this.filterFn = filterFn;
+   }
+
+   getComparer(sortOptions) {
+      return sortOptions ? Culture.getComparer(sortOptions) : null;
+   }
+
+   buildSorter(sorters) {
+      if (isArray(sorters) && sorters.length > 0) {
+         let fieldValueMapper;
+         let dataAccessor;
+
+         //if all sorters are based on record fields access data directly (faster)
+         if (sorters.every((x) => x.field && x.value == null)) {
+            dataAccessor = (x) => x.data;
+            fieldValueMapper = (x) => ({ bind: x.field });
+         } else {
+            dataAccessor = (x) => x.store.getData();
+            fieldValueMapper = (x) => ({ bind: this.recordName + "." + x.field });
+         }
+         this.sorter = sorter(
+            sorters.map((x) => {
+               let s = Object.assign({}, x);
+               if (s.field && s.value == null) s.value = fieldValueMapper(s);
+               if (!s.comparer)
+                  s.comparer = this.getComparer(isDefined(s.sortOptions) ? s.sortOptions : this.sortOptions);
+               return s;
+            }),
+            dataAccessor,
+         );
+      } else {
+         this.sorter = null;
+      }
+   }
+
+   sort(sorters) {
+      this.buildSorter(sorters);
+   }
+}
+
+ArrayAdapter.prototype.immutable = false;
+ArrayAdapter.prototype.sealed = false;
+ArrayAdapter.prototype.keyField = null;
+ArrayAdapter.prototype.cacheByKeyField = true;
+
+ArrayAdapter.autoInit = true;