cx 24.7.2 → 24.7.3

package/dist/charts.js

@@ -1816,6 +1816,8 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 					name: undefined,
 					active: true,
 					size: undefined,
+					rx: undefined,
+					ry: undefined,
 				},
 			]),
 		);
@@ -1890,6 +1892,8 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 				children: shape(this.svgSize / 2, this.svgSize / 2, entry.size, {
 					style: entry.style,
 					className: className,
+					rx: entry.rx,
+					ry: entry.ry,
 				}),
 			},
 			"svg",
@@ -2054,6 +2058,8 @@ var Marker = /*#__PURE__*/ (function (_BoundedObject) {
 					stack: undefined,
 					stackedX: undefined,
 					stackedY: undefined,
+					rx: undefined,
+					ry: undefined,
 				},
 			]),
 		);
@@ -2285,6 +2291,10 @@ var MarkerComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 				widget.handleClick(e, instance);
 			},
 		};
+		if (shape == "rect" || shape == "square" || shape == "bar" || shape == "column") {
+			shapeProps.rx = data.rx;
+			shapeProps.ry = data.ry;
+		}
 		if (widget.tooltip) {
 			shapeProps.ref = function (c) {
 				_this3.el = c;

package/dist/data.js

@@ -1048,6 +1048,12 @@ var AugmentedViewBase = /*#__PURE__*/ (function (_View) {
 	_proto.isExtraKey = function isExtraKey(key) {
 		throw new Error("abstract");
 	};
+
+	// Stores which need to support nested aliases should override this method
+	_proto.getExtraKeyBinding = function getExtraKeyBinding(key) {
+		var binding = Binding.get(key);
+		return this.isExtraKey(binding.parts[0]) ? Binding.get(binding.parts[0]) : null;
+	};
 	_proto.setExtraKeyValue = function setExtraKeyValue(key, value) {
 		throw new Error("abstract");
 	};
@@ -1055,28 +1061,31 @@ var AugmentedViewBase = /*#__PURE__*/ (function (_View) {
 		throw new Error("abstract");
 	};
 	_proto.setItem = function setItem(path, value) {
-		var binding = Binding.get(path);
-		if (this.isExtraKey(binding.parts[0])) {
-			var bindingRoot = binding.parts[0];
+		var extraKeyBinding = this.getExtraKeyBinding(path);
+		if (extraKeyBinding) {
+			var binding = Binding.get(path);
 			var newValue = value;
-			if (binding.parts.length > 1) {
+			if (binding.parts.length > extraKeyBinding.parts.length) {
 				var data = {};
 				this.embedAugmentData(data, this.store.getData());
-				newValue = binding.set(data, value)[bindingRoot];
+				var _binding = Binding.get(path);
+				data = _binding.set(data, value);
+				newValue = extraKeyBinding.value(data);
 			}
-			return this.setExtraKeyValue(bindingRoot, newValue);
+			return this.setExtraKeyValue(extraKeyBinding.path, newValue);
 		}
 		return _View.prototype.setItem.call(this, path, value);
 	};
 	_proto.deleteItem = function deleteItem(path) {
-		var binding = Binding.get(path);
-		if (this.isExtraKey(binding.parts[0])) {
-			var bindingRoot = binding.parts[0];
-			if (binding.parts.length == 1) return this.deleteExtraKeyValue(bindingRoot);
+		var extraKeyBinding = this.getExtraKeyBinding(path);
+		if (extraKeyBinding) {
+			if (path == extraKeyBinding.path) return this.deleteExtraKeyValue(extraKeyBinding.path);
 			var data = {};
 			this.embedAugmentData(data, this.store.getData());
-			var newValue = binding["delete"](data)[bindingRoot];
-			return this.setExtraKeyValue(bindingRoot, newValue);
+			var binding = Binding.get(path);
+			data = binding["delete"](data);
+			var newValue = extraKeyBinding.value(data);
+			return this.setExtraKeyValue(extraKeyBinding.path, newValue);
 		}
 		return _View.prototype.deleteItem.call(this, path);
 	};
@@ -1958,13 +1967,24 @@ var StoreProxy = /*#__PURE__*/ (function (_View) {
 })(View);
 
 var ArrayElementView = /*#__PURE__*/ (function (_AugmentedViewBase) {
-	function ArrayElementView() {
-		return _AugmentedViewBase.apply(this, arguments) || this;
+	function ArrayElementView(config) {
+		var _this;
+		_this = _AugmentedViewBase.call(this, config) || this;
+		_this.hasNestedAliases =
+			_this.recordAlias.indexOf(".") >= 0 || _this.indexAlias.indexOf(".") >= 0 || _this.lengthAlias.indexOf(".") >= 0;
+		_this.recordBinding = Binding.get(_this.recordAlias);
+		if (_this.hasNestedAliases) {
+			_this.indexBinding = Binding.get(_this.indexAlias);
+			_this.lengthAlias = Binding.get(_this.lengthAlias);
+		}
+		return _this;
 	}
 	_inheritsLoose(ArrayElementView, _AugmentedViewBase);
 	var _proto = ArrayElementView.prototype;
-	_proto.isExtraKey = function isExtraKey(key) {
-		return key == this.recordAlias || key == this.indexAlias || key == this.lengthAlias;
+	_proto.getExtraKeyBinding = function getExtraKeyBinding(key) {
+		if (!key.startsWith(this.recordAlias)) return null;
+		if (key.length == this.recordAlias.length || key[this.recordAlias.length] == ".") return this.recordBinding;
+		return null;
 	};
 	_proto.deleteExtraKeyValue = function deleteExtraKeyValue(key) {
 		if (key != this.recordAlias) throw new Error("Field " + key + " cannot be deleted.");
@@ -1983,9 +2003,19 @@ var ArrayElementView = /*#__PURE__*/ (function (_AugmentedViewBase) {
 	_proto.embedAugmentData = function embedAugmentData(result, parentStoreData) {
 		var array = this.arrayAccessor.get(parentStoreData);
 		if (!isArray(array)) return;
-		result[this.recordAlias] = array[this.itemIndex];
-		result[this.indexAlias] = this.itemIndex;
-		result[this.lengthAlias] = array.length;
+		if (!this.hasNestedAliases) {
+			result[this.recordAlias] = array[this.itemIndex];
+			result[this.indexAlias] = this.itemIndex;
+			result[this.lengthAlias] = array.length;
+		} else {
+			var copy = result;
+			copy = this.recordBinding.set(copy, array[this.itemIndex]);
+			copy = this.indexBinding.set(copy, this.itemIndex);
+			copy = this.lengthAlias.set(copy, array.length);
+			result[this.recordBinding.parts[0]] = copy[this.recordBinding.parts[0]];
+			result[this.indexBinding.parts[0]] = copy[this.indexBinding.parts[0]];
+			result[this.lengthAlias.parts[0]] = copy[this.lengthAlias.parts[0]];
+		}
 	};
 	_proto.setIndex = function setIndex(itemIndex) {
 		this.itemIndex = itemIndex;