cx 22.10.0 → 22.10.2

package/dist/ui.js

@@ -2366,7 +2366,11 @@ var InstanceCache = /*#__PURE__*/ (function() {
 			this.children[k] = instance;
 		}
 
-		if (instance.store !== store) instance.setStore(store);
+		if (instance.store !== store) {
+			instance.setStore(store);
+			if (instance.cached) delete instance.cached.rawData; // force prepareData to execute again
+		}
+
 		return instance;
 	};
 

package/dist/widgets.js

@@ -17800,6 +17800,10 @@ var Grid = /*#__PURE__*/ (function(_Widget) {
 		if (this.onCreateIsRecordSelectable) {
 			instance.isRecordSelectable = instance.invoke("onCreateIsRecordSelectable", null, instance);
 		}
+
+		if (this.onTrackMappedRecords) {
+			instance.invoke("onTrackMappedRecords", instance.records, instance);
+		}
 	};
 
 	_proto.initInstance = function initInstance(context, instance) {

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "22.10.0",
+   "version": "22.10.2",
    "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/comparer.js

@@ -3,7 +3,7 @@ import { isDefined } from "../util/isDefined";
 import { defaultCompare } from "./defaultCompare";
 
 export function getComparer(sorters, dataAccessor, comparer) {
-   let data = (sorters || []).map((s) => {
+   let resolvedSorters = (sorters || []).map((s) => {
       let selector = isDefined(s.value) ? getSelector(s.value) : s.field ? (x) => x[s.field] : () => null;
       return {
          getter: dataAccessor ? (x) => selector(dataAccessor(x)) : selector,
@@ -14,13 +14,16 @@ export function getComparer(sorters, dataAccessor, comparer) {
 
    return function (a, b) {
       let d, av, bv;
-      for (let i = 0; i < data.length; i++) {
-         d = data[i];
+      for (let i = 0; i < resolvedSorters.length; i++) {
+         d = resolvedSorters[i];
          av = d.getter(a);
          bv = d.getter(b);
 
-         // show nulls always on the bottom         
-         if (av == null) return bv == null ? 0 : 1;
+         // show nulls always on the bottom
+         if (av == null) {
+            if (bv == null) continue;
+            else return 1;
+         }
          if (bv == null) return -1;
 
          let r = d.compare(av, bv);

package/src/ui/Instance.js

@@ -558,7 +558,10 @@ export class InstanceCache {
          instance = new Instance(widget, k, this.parent);
          this.children[k] = instance;
       }
-      if (instance.store !== store) instance.setStore(store);
+      if (instance.store !== store) {
+         instance.setStore(store);
+         if (instance.cached) delete instance.cached.rawData; // force prepareData to execute again
+      }
 
       return instance;
    }

package/src/widgets/grid/Grid.d.ts

@@ -354,10 +354,10 @@ interface GridProps extends StyledContainerProps {
    /** A value used to uniquely identify the record within the hover sync group. */
    rowHoverId?: StringProp;
 
-   /** Set to true or false to explicitly define if grid is allowed to receive focus.  */
+   /** Set to true or false to explicitly define if grid is allowed to receive focus. */
    focusable?: boolean;
 
-   /** Callback function to retrieve grouping data.  */
+   /** Callback function to retrieve grouping data. */
    onGetGrouping?: (params: any, instance: Instance) => GridGroupingConfig[];
 
    /** Callback function to dynamically calculate columns.  */
@@ -365,6 +365,13 @@ interface GridProps extends StyledContainerProps {
 
    /** Allow grid to receive drag and drop operations containing files. */
    allowsFileDrops?: boolean;
+
+   /**
+    * Callback function to track and retrieve displayed records.
+    * Accepts new records as a first argument.
+    * If onCreateFilter callback is defined, filtered records can be retrieved using this callback.
+    */
+   onTrackMappedRecords?: (records: Record[], instance: Instance) => void;
 }
 
 export class Grid extends Widget<GridProps> {}

package/src/widgets/grid/Grid.js

@@ -349,6 +349,10 @@ export class Grid extends Widget {
       if (this.onCreateIsRecordSelectable) {
          instance.isRecordSelectable = instance.invoke("onCreateIsRecordSelectable", null, instance);
       }
+
+      if (this.onTrackMappedRecords) {
+         instance.invoke("onTrackMappedRecords", instance.records, instance);
+      }
    }
 
    initInstance(context, instance) {