cx 23.4.4 → 23.5.0

package/dist/charts.js

@@ -902,7 +902,7 @@ PieSlice.prototype.legend = "legend";
 PieSlice.prototype.active = true;
 PieSlice.prototype.stack = "stack";
 PieSlice.prototype.legendAction = "auto";
-PieSlice.prototype.legendShape = "rect";
+PieSlice.prototype.legendShape = "circle";
 PieSlice.prototype.hoverChannel = "default";
 PieSlice.prototype.styled = true;
 Widget.alias("pie-chart", PieChart);
@@ -1544,6 +1544,17 @@ var Legend = /*#__PURE__*/ (function (_HtmlElement) {
 		});
 		_HtmlElement.prototype.prepareData.call(this, context, instance);
 	};
+	_proto.declareData = function declareData() {
+		var _HtmlElement$prototyp;
+		(_HtmlElement$prototyp = _HtmlElement.prototype.declareData).call.apply(
+			_HtmlElement$prototyp,
+			[this].concat(Array.prototype.slice.call(arguments), [
+				{
+					shape: undefined,
+				},
+			])
+		);
+	};
 	_proto.isValidHtmlAttribute = function isValidHtmlAttribute(attrName) {
 		switch (attrName) {
 			case "shapeSize":
@@ -1599,7 +1610,7 @@ var Legend = /*#__PURE__*/ (function (_HtmlElement) {
 									onClick: e.onClick,
 									onMouseMove: onMouseMove,
 									onMouseLeave: onMouseLeave,
-									children: [_this.renderShape(e), e.name],
+									children: [_this.renderShape(e, instance.data.shape), e.name],
 								},
 								i
 							);
@@ -1611,7 +1622,7 @@ var Legend = /*#__PURE__*/ (function (_HtmlElement) {
 		}
 		return [list, _HtmlElement.prototype.renderChildren.call(this, context, instance)];
 	};
-	_proto.renderShape = function renderShape(entry) {
+	_proto.renderShape = function renderShape(entry, legendEntriesShape) {
 		var _this$CSS$element;
 		var className = this.CSS.element(
 			this.baseClass,
@@ -1621,7 +1632,7 @@ var Legend = /*#__PURE__*/ (function (_HtmlElement) {
 				entry.colorIndex != null && (isUndefined(entry.active) || entry.active)),
 			_this$CSS$element)
 		);
-		var shape = getShape(entry.shape || "square");
+		var shape = getShape(legendEntriesShape || entry.shape || "square");
 		return /*#__PURE__*/ jsx("svg", {
 			className: this.CSS.element(this.baseClass, "svg"),
 			style: {
@@ -1642,6 +1653,7 @@ Legend.prototype.baseClass = "legend";
 Legend.prototype.vertical = false;
 Legend.prototype.memoize = false;
 Legend.prototype.shapeSize = 18;
+Legend.prototype.shape = null;
 Legend.prototype.svgSize = 20;
 Widget.alias("legend", Legend);
 Legend.Scope = /*#__PURE__*/ (function (_PureContainer) {

package/dist/data.js

@@ -57,15 +57,8 @@ var Binding = /*#__PURE__*/ (function () {
 	function Binding(path) {
 		this.path = path;
 		this.parts = path.split(".");
-		var body = "return (x";
-		var selector = "x";
-		for (var i = 0; i < this.parts.length; i++) {
-			if (this.parts[i][0] >= "0" && this.parts[i][0] <= "9") selector += "[" + this.parts[i] + "]";
-			else selector += "." + this.parts[i];
-			if (i + 1 < this.parts.length) body += " && " + selector;
-			else body += " ? " + selector + " : undefined";
-		}
-		body += ")";
+		var body = "return x";
+		for (var i = 0; i < this.parts.length; i++) body += '?.["' + this.parts[i] + '"]';
 		this.value = new Function("x", body);
 	}
 	var _proto = Binding.prototype;