cx 25.5.0 → 25.5.2

package/dist/ui.js

@@ -1017,7 +1017,7 @@ var ArrayAdapter = /*#__PURE__*/ (function (_DataAdapter) {
 
 		// cache by the key or by data reference
 		if (key != null) instance.cacheByKey[key] = recordStore;
-		else instance.recordStoreCache.set(data, recordStore);
+		else if (isObject(data)) instance.recordStoreCache.set(data, recordStore);
 		return {
 			store: recordStore,
 			index: index,
@@ -1147,6 +1147,12 @@ var Repeater = /*#__PURE__*/ (function (_Container) {
 	_proto.initInstance = function initInstance(context, instance) {
 		this.dataAdapter.initInstance(context, instance);
 	};
+	_proto.applyParentStore = function applyParentStore(instance) {
+		_Container.prototype.applyParentStore.call(this, instance);
+
+		// force prepareData to execute again and propagate the store change to the records
+		if (instance.cached) delete instance.cached.rawData;
+	};
 	_proto.prepareData = function prepareData(context, instance) {
 		var _this = this;
 		var data = instance.data;
@@ -2975,21 +2981,6 @@ var DataProxy = /*#__PURE__*/ (function (_PureContainer) {
 	_proto.init = function init() {
 		if (!this.data) this.data = {};
 		if (this.alias) this.data[this.alias] = this.value;
-
-		// nesting is required to avoid resetting the store on every render and recalculating the data
-		this.container = PureContainer.create({
-			type: PureContainer,
-			items: this.children || this.items,
-			layout: this.layout,
-			controller: this.controller,
-			outerLayout: this.outerLayout,
-			ws: this.ws,
-		});
-		this.children = [this.container];
-		delete this.items;
-		delete this.controller;
-		delete this.outerLayout;
-		this.layout = UseParentLayout;
 		_PureContainer.prototype.init.call(this);
 	};
 	_proto.initInstance = function initInstance(context, instance) {

package/dist/widgets.js

@@ -1272,6 +1272,12 @@ var List = /*#__PURE__*/ (function (_Widget) {
 		});
 		_Widget.prototype.prepareData.call(this, context, instance);
 	};
+	_proto.applyParentStore = function applyParentStore(instance) {
+		_Widget.prototype.applyParentStore.call(this, instance);
+
+		// force prepareData to execute again and propagate the store change to the records
+		if (instance.cached) delete instance.cached.rawData;
+	};
 	_proto.explore = function explore(context, instance, data) {
 		var _this2 = this;
 		var instances = [];
@@ -7334,7 +7340,10 @@ var Checkbox = /*#__PURE__*/ (function (_Field) {
 			"label",
 			{
 				className: data.classNames,
-				onMouseDown: stopPropagation,
+				onMouseDown: function onMouseDown(e) {
+					e.stopPropagation();
+					if (_this.unfocusable) e.preventDefault();
+				},
 				onMouseMove: function onMouseMove(e) {
 					return tooltipMouseMove$1.apply(void 0, [e].concat(getFieldTooltip(instance)));
 				},
@@ -15644,6 +15653,12 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 				page: 1,
 			};
 	};
+	_proto.applyParentStore = function applyParentStore(instance) {
+		_Container.prototype.applyParentStore.call(this, instance);
+
+		// force prepareData to execute again and propagate the store change to the records
+		if (instance.cached) delete instance.cached.rawData;
+	};
 	_proto.createRowTemplate = function createRowTemplate(context, columnParams, instance, groupingData) {
 		var _this = this;
 		var row = this.row || {};

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "25.5.0",
+   "version": "25.5.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/AugmentedViewBase.js

@@ -1,77 +1,77 @@
-import { View } from "./View";
-import { Binding } from "./Binding";
-
-export class AugmentedViewBase extends View {
-   getData() {
-      if (this.sealed && this.meta.version === this.cache.version && this.meta === this.store.meta)
-         return this.cache.result;
-      let parentStoreData = this.store.getData();
-      let result = this.getBaseData(parentStoreData);
-      this.embedAugmentData(result, parentStoreData);
-      this.cache.result = result;
-      this.cache.parentStoreData = parentStoreData;
-      this.cache.version = this.meta.version;
-      this.meta = this.store.meta;
-      return this.cache.result;
-   }
-
-   getBaseData(parentStoreData) {
-      if (this.sealed || this.immutable || this.store.sealed) return { ...parentStoreData };
-      return parentStoreData;
-   }
-
-   embedAugmentData(result, parentStoreData) {
-      throw new Error("abstract");
-   }
-
-   isExtraKey(key) {
-      throw new Error("abstract");
-   }
-
-   // Stores which need to support nested aliases should override this method
-   getExtraKeyBinding(key) {
-      let binding = Binding.get(key);
-      return this.isExtraKey(binding.parts[0]) ? Binding.get(binding.parts[0]) : null;
-   }
-
-   setExtraKeyValue(key, value) {
-      throw new Error("abstract");
-   }
-
-   deleteExtraKeyValue(key) {
-      throw new Error("abstract");
-   }
-
-   setItem(path, value) {
-      let extraKeyBinding = this.getExtraKeyBinding(path);
-      if (extraKeyBinding) {
-         let binding = Binding.get(path);
-         let newValue = value;
-         if (binding.parts.length > extraKeyBinding.parts.length) {
-            let data = {};
-            this.embedAugmentData(data, this.store.getData());
-            let binding = Binding.get(path);
-            data = binding.set(data, value);
-            newValue = extraKeyBinding.value(data);
-         }
-         return this.setExtraKeyValue(extraKeyBinding.path, newValue);
-      }
-      return super.setItem(path, value);
-   }
-
-   deleteItem(path) {
-      let extraKeyBinding = this.getExtraKeyBinding(path);
-      if (extraKeyBinding) {
-         if (path == extraKeyBinding.path) return this.deleteExtraKeyValue(extraKeyBinding.path);
-         let data = {};
-         this.embedAugmentData(data, this.store.getData());
-         let binding = Binding.get(path);
-         data = binding.delete(data);
-         let newValue = extraKeyBinding.value(data);
-         return this.setExtraKeyValue(extraKeyBinding.path, newValue);
-      }
-      return super.deleteItem(path);
-   }
-}
-
-AugmentedViewBase.prototype.immutable = false;
+import { View } from "./View";
+import { Binding } from "./Binding";
+
+export class AugmentedViewBase extends View {
+   getData() {
+      if (this.sealed && this.meta.version === this.cache.version && this.meta === this.store.meta)
+         return this.cache.result;
+      let parentStoreData = this.store.getData();
+      let result = this.getBaseData(parentStoreData);
+      this.embedAugmentData(result, parentStoreData);
+      this.cache.result = result;
+      this.cache.parentStoreData = parentStoreData;
+      this.cache.version = this.meta.version;
+      this.meta = this.store.meta;
+      return this.cache.result;
+   }
+
+   getBaseData(parentStoreData) {
+      if (this.sealed || this.immutable || this.store.sealed) return { ...parentStoreData };
+      return parentStoreData;
+   }
+
+   embedAugmentData(result, parentStoreData) {
+      throw new Error("abstract");
+   }
+
+   isExtraKey(key) {
+      throw new Error("abstract");
+   }
+
+   // Stores which need to support nested aliases should override this method
+   getExtraKeyBinding(key) {
+      let binding = Binding.get(key);
+      return this.isExtraKey(binding.parts[0]) ? Binding.get(binding.parts[0]) : null;
+   }
+
+   setExtraKeyValue(key, value) {
+      throw new Error("abstract");
+   }
+
+   deleteExtraKeyValue(key) {
+      throw new Error("abstract");
+   }
+
+   setItem(path, value) {
+      let extraKeyBinding = this.getExtraKeyBinding(path);
+      if (extraKeyBinding) {
+         let binding = Binding.get(path);
+         let newValue = value;
+         if (binding.parts.length > extraKeyBinding.parts.length) {
+            let data = {};
+            this.embedAugmentData(data, this.store.getData());
+            let binding = Binding.get(path);
+            data = binding.set(data, value);
+            newValue = extraKeyBinding.value(data);
+         }
+         return this.setExtraKeyValue(extraKeyBinding.path, newValue);
+      }
+      return super.setItem(path, value);
+   }
+
+   deleteItem(path) {
+      let extraKeyBinding = this.getExtraKeyBinding(path);
+      if (extraKeyBinding) {
+         if (path == extraKeyBinding.path) return this.deleteExtraKeyValue(extraKeyBinding.path);
+         let data = {};
+         this.embedAugmentData(data, this.store.getData());
+         let binding = Binding.get(path);
+         data = binding.delete(data);
+         let newValue = extraKeyBinding.value(data);
+         return this.setExtraKeyValue(extraKeyBinding.path, newValue);
+      }
+      return super.deleteItem(path);
+   }
+}
+
+AugmentedViewBase.prototype.immutable = false;

package/src/data/ExposedRecordView.js

@@ -1,75 +1,75 @@
-import { View } from "./View";
-import { Binding } from "./Binding";
-
-export class ExposedRecordView extends View {
-   getData() {
-      if (
-         this.sealed &&
-         this.meta.version === this.cache.version &&
-         this.cache.itemIndex === this.itemIndex &&
-         this.meta === this.store.meta
-      )
-         return this.cache.result;
-
-      this.cache.result = this.embed(this.store.getData());
-      this.cache.version = this.meta.version;
-      this.cache.itemIndex = this.itemIndex;
-      this.meta = this.store.meta;
-      return this.cache.result;
-   }
-
-   embed(data) {
-      const collection = this.collectionBinding.value(data);
-      const record = collection[this.itemIndex];
-      const copy = this.sealed || this.immutable || this.store.sealed ? { ...data } : data;
-      copy[this.recordName] = record;
-      if (this.indexName) copy[this.indexName] = this.itemIndex;
-      return copy;
-   }
-
-   setIndex(index) {
-      this.itemIndex = index;
-   }
-
-   setItem(path, value) {
-      if (path == this.recordName || path.indexOf(this.recordName + ".") == 0) {
-         const storeData = this.store.getData();
-         const collection = this.collectionBinding.value(storeData);
-         const data = this.embed(storeData);
-         const d = Binding.get(path).set(data, value);
-         if (d === data) return false;
-         const record = d[this.recordName];
-         const newCollection = [
-            ...collection.slice(0, this.itemIndex),
-            record,
-            ...collection.slice(this.itemIndex + 1),
-         ];
-         return this.store.setItem(this.collectionBinding.path, newCollection);
-      }
-      return this.store.setItem(path, value);
-   }
-
-   deleteItem(path) {
-      let storeData, collection, newCollection;
-
-      if (path == this.recordName) {
-         storeData = this.store.getData();
-         collection = this.collectionBinding.value(storeData);
-         newCollection = [...collection.slice(0, this.itemIndex), ...collection.slice(this.itemIndex + 1)];
-         return this.store.setItem(this.collectionBinding.path, newCollection);
-      } else if (path.indexOf(this.recordName + ".") == 0) {
-         storeData = this.store.getData();
-         collection = this.collectionBinding.value(storeData);
-         const data = this.embed(storeData);
-         const d = Binding.get(path).delete(data);
-         if (d === data) return false;
-         const record = d[this.recordName];
-         newCollection = [...collection.slice(0, this.itemIndex), record, ...collection.slice(this.itemIndex + 1)];
-         return this.store.setItem(this.collectionBinding.path, newCollection);
-      }
-
-      return this.store.deleteItem(path);
-   }
-}
-
-ExposedRecordView.prototype.immutable = false;
+import { View } from "./View";
+import { Binding } from "./Binding";
+
+export class ExposedRecordView extends View {
+   getData() {
+      if (
+         this.sealed &&
+         this.meta.version === this.cache.version &&
+         this.cache.itemIndex === this.itemIndex &&
+         this.meta === this.store.meta
+      )
+         return this.cache.result;
+
+      this.cache.result = this.embed(this.store.getData());
+      this.cache.version = this.meta.version;
+      this.cache.itemIndex = this.itemIndex;
+      this.meta = this.store.meta;
+      return this.cache.result;
+   }
+
+   embed(data) {
+      const collection = this.collectionBinding.value(data);
+      const record = collection[this.itemIndex];
+      const copy = this.sealed || this.immutable || this.store.sealed ? { ...data } : data;
+      copy[this.recordName] = record;
+      if (this.indexName) copy[this.indexName] = this.itemIndex;
+      return copy;
+   }
+
+   setIndex(index) {
+      this.itemIndex = index;
+   }
+
+   setItem(path, value) {
+      if (path == this.recordName || path.indexOf(this.recordName + ".") == 0) {
+         const storeData = this.store.getData();
+         const collection = this.collectionBinding.value(storeData);
+         const data = this.embed(storeData);
+         const d = Binding.get(path).set(data, value);
+         if (d === data) return false;
+         const record = d[this.recordName];
+         const newCollection = [
+            ...collection.slice(0, this.itemIndex),
+            record,
+            ...collection.slice(this.itemIndex + 1),
+         ];
+         return this.store.setItem(this.collectionBinding.path, newCollection);
+      }
+      return this.store.setItem(path, value);
+   }
+
+   deleteItem(path) {
+      let storeData, collection, newCollection;
+
+      if (path == this.recordName) {
+         storeData = this.store.getData();
+         collection = this.collectionBinding.value(storeData);
+         newCollection = [...collection.slice(0, this.itemIndex), ...collection.slice(this.itemIndex + 1)];
+         return this.store.setItem(this.collectionBinding.path, newCollection);
+      } else if (path.indexOf(this.recordName + ".") == 0) {
+         storeData = this.store.getData();
+         collection = this.collectionBinding.value(storeData);
+         const data = this.embed(storeData);
+         const d = Binding.get(path).delete(data);
+         if (d === data) return false;
+         const record = d[this.recordName];
+         newCollection = [...collection.slice(0, this.itemIndex), record, ...collection.slice(this.itemIndex + 1)];
+         return this.store.setItem(this.collectionBinding.path, newCollection);
+      }
+
+      return this.store.deleteItem(path);
+   }
+}
+
+ExposedRecordView.prototype.immutable = false;

package/src/data/ExposedValueView.js

@@ -1,73 +1,73 @@
-import { View } from "./View";
-import { Binding } from "./Binding";
-
-export class ExposedValueView extends View {
-   getData() {
-      if (
-         this.sealed &&
-         this.meta.version === this.cache.version &&
-         this.cache.key === this.key &&
-         this.meta == this.store.meta
-      )
-         return this.cache.result;
-
-      let data = this.store.getData();
-      let container = this.containerBinding.value(data) || {};
-      let record = container[this.key];
-
-      this.cache.version = this.meta.version;
-      this.cache.key = this.key;
-      this.cache.result = this.sealed || this.immutable || this.store.sealed ? { ...data } : data;
-      this.cache.result[this.recordName] = record;
-      this.meta = this.store.meta;
-      return this.cache.result;
-   }
-
-   setKey(key) {
-      this.key = key;
-   }
-
-   getKey() {
-      return this.key;
-   }
-
-   setItem(path, value) {
-      if (path == this.recordName || path.indexOf(this.recordName + ".") == 0) {
-         var data = this.getData();
-         var d = Binding.get(path).set(data, value);
-         if (d === data) return false;
-         var container = this.containerBinding.value(d);
-         var record = d[this.recordName];
-         var newContainer = Object.assign({}, container);
-         newContainer[this.key] = record;
-         return this.store.setItem(this.containerBinding.path, newContainer);
-      }
-      return this.store.setItem(path, value);
-   }
-
-   deleteItem(path) {
-      var data, container, newContainer;
-
-      if (path == this.recordName) {
-         data = this.getData();
-         container = this.containerBinding.value(data);
-         if (!container || !container.hasOwnProperty(path)) return false;
-         newContainer = Object.assign({}, container);
-         delete newContainer[this.key];
-         this.store.set(this.containerBinding.path, newContainer);
-      } else if (path.indexOf(this.recordName + ".") == 0) {
-         data = this.getData();
-         var d = Binding.get(path).delete(data);
-         if (d === data) return false;
-         container = this.containerBinding.value(d);
-         var record = d[this.recordName];
-         newContainer = Object.assign({}, container);
-         newContainer[this.key] = record;
-         return this.store.setItem(this.containerBinding.path, newContainer);
-      }
-
-      return this.store.deleteItem(path);
-   }
-}
-
-ExposedValueView.prototype.immutable = false;
+import { View } from "./View";
+import { Binding } from "./Binding";
+
+export class ExposedValueView extends View {
+   getData() {
+      if (
+         this.sealed &&
+         this.meta.version === this.cache.version &&
+         this.cache.key === this.key &&
+         this.meta == this.store.meta
+      )
+         return this.cache.result;
+
+      let data = this.store.getData();
+      let container = this.containerBinding.value(data) || {};
+      let record = container[this.key];
+
+      this.cache.version = this.meta.version;
+      this.cache.key = this.key;
+      this.cache.result = this.sealed || this.immutable || this.store.sealed ? { ...data } : data;
+      this.cache.result[this.recordName] = record;
+      this.meta = this.store.meta;
+      return this.cache.result;
+   }
+
+   setKey(key) {
+      this.key = key;
+   }
+
+   getKey() {
+      return this.key;
+   }
+
+   setItem(path, value) {
+      if (path == this.recordName || path.indexOf(this.recordName + ".") == 0) {
+         var data = this.getData();
+         var d = Binding.get(path).set(data, value);
+         if (d === data) return false;
+         var container = this.containerBinding.value(d);
+         var record = d[this.recordName];
+         var newContainer = Object.assign({}, container);
+         newContainer[this.key] = record;
+         return this.store.setItem(this.containerBinding.path, newContainer);
+      }
+      return this.store.setItem(path, value);
+   }
+
+   deleteItem(path) {
+      var data, container, newContainer;
+
+      if (path == this.recordName) {
+         data = this.getData();
+         container = this.containerBinding.value(data);
+         if (!container || !container.hasOwnProperty(path)) return false;
+         newContainer = Object.assign({}, container);
+         delete newContainer[this.key];
+         this.store.set(this.containerBinding.path, newContainer);
+      } else if (path.indexOf(this.recordName + ".") == 0) {
+         data = this.getData();
+         var d = Binding.get(path).delete(data);
+         if (d === data) return false;
+         container = this.containerBinding.value(d);
+         var record = d[this.recordName];
+         newContainer = Object.assign({}, container);
+         newContainer[this.key] = record;
+         return this.store.setItem(this.containerBinding.path, newContainer);
+      }
+
+      return this.store.deleteItem(path);
+   }
+}
+
+ExposedValueView.prototype.immutable = false;