cx 24.9.3 → 24.10.0

package/LICENSE-THIRD-PARTY.md

@@ -1,91 +1,91 @@
-# Third-Party Software Licenses
-
-### React
-
-https://github.com/facebook/react/blob/master/LICENSE
-
-BSD License
-
-For React software
-
-Copyright (c) 2013-present, Facebook, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-### route-parser
-
-https://github.com/rcs/route-parser/blob/master/LICENSE.md
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Ryan Sorensen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-### mocha
-
-https://github.com/mochajs/mocha/blob/master/LICENSE
-
-(The MIT License)
-
-Copyright (c) 2011-2016 TJ Holowaychuk <tj@vision-media.ca>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# Third-Party Software Licenses
+
+### React
+
+https://github.com/facebook/react/blob/master/LICENSE
+
+BSD License
+
+For React software
+
+Copyright (c) 2013-present, Facebook, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+### route-parser
+
+https://github.com/rcs/route-parser/blob/master/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Ryan Sorensen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+### mocha
+
+https://github.com/mochajs/mocha/blob/master/LICENSE
+
+(The MIT License)
+
+Copyright (c) 2011-2016 TJ Holowaychuk <tj@vision-media.ca>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/LICENSE.md

@@ -1,7 +1,7 @@
-Copyright 2021 Codaxy d.o.o. Banja Luka
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2021 Codaxy d.o.o. Banja Luka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,46 +1,46 @@
-# CxJS
-
-This is the main package of the [CxJS](https://cxjs.io/) framework.
-
-Cx is a feature-rich framework for building data-oriented web applications.
-
-Cx is inspired by React and Angular and tries to offer the best features from both worlds.
-Out of the box, Cx provides:
-
--  a complete set of widgets
--  charts
--  two-way data-binding options
--  controllers
--  layouts
--  customizable appearance (Sass)
-
-Cx is based on ES6 and JSX and requires `babel-plugin-transform-cx-jsx`.
-Cx widgets use React to render and update the DOM.
-
-### Getting Started
-
--  [Examples](https://cxjs.io/examples)
--  [Documentation](https://cxjs.io/docs)
--  [Themes](https://cxjs.io/themes)
--  [Fiddle](https://cxjs.io/fiddle)
-
-## Demo Applications
-
-<a href="https://cxjs.io/starter">
-    <img src="https://raw.githubusercontent.com/codaxy/cx/master/misc/screenshots/starter/analytics.png" alt="Cx Starter Kit" height="200px" />
-</a>
-<a href="https://codaxy.github.io/state-of-js-2016-explorer/">
-    <img src="https://raw.githubusercontent.com/codaxy/cx/master/misc/screenshots/sofjs2016/StateOfJs.png" alt="State of JS 2016 Explorer" height="200px" />
-</a>
-<a href="https://mstijak.github.io/tdo/">
-    <img src="https://raw.githubusercontent.com/codaxy/cx/master/misc/screenshots/tdo/tdo.png" alt="Tdo" height="200px" />
-</a>
-
-### Installation
-
-The easiest way to set up a new Cx project is to use
-the [Cx Command Line Interface](https://cxjs.io/v/master/docs/intro/command-line).
-
-### License
-
-[MIT License](./LICENSE.md)
+# CxJS
+
+This is the main package of the [CxJS](https://cxjs.io/) framework.
+
+Cx is a feature-rich framework for building data-oriented web applications.
+
+Cx is inspired by React and Angular and tries to offer the best features from both worlds.
+Out of the box, Cx provides:
+
+-  a complete set of widgets
+-  charts
+-  two-way data-binding options
+-  controllers
+-  layouts
+-  customizable appearance (Sass)
+
+Cx is based on ES6 and JSX and requires `babel-plugin-transform-cx-jsx`.
+Cx widgets use React to render and update the DOM.
+
+### Getting Started
+
+-  [Examples](https://cxjs.io/examples)
+-  [Documentation](https://cxjs.io/docs)
+-  [Themes](https://cxjs.io/themes)
+-  [Fiddle](https://cxjs.io/fiddle)
+
+## Demo Applications
+
+<a href="https://cxjs.io/starter">
+    <img src="https://raw.githubusercontent.com/codaxy/cx/master/misc/screenshots/starter/analytics.png" alt="Cx Starter Kit" height="200px" />
+</a>
+<a href="https://codaxy.github.io/state-of-js-2016-explorer/">
+    <img src="https://raw.githubusercontent.com/codaxy/cx/master/misc/screenshots/sofjs2016/StateOfJs.png" alt="State of JS 2016 Explorer" height="200px" />
+</a>
+<a href="https://mstijak.github.io/tdo/">
+    <img src="https://raw.githubusercontent.com/codaxy/cx/master/misc/screenshots/tdo/tdo.png" alt="Tdo" height="200px" />
+</a>
+
+### Installation
+
+The easiest way to set up a new Cx project is to use
+the [Cx Command Line Interface](https://cxjs.io/v/master/docs/intro/command-line).
+
+### License
+
+[MIT License](./LICENSE.md)

package/dist/charts.css

@@ -80,27 +80,30 @@
 }
 
 .cxb-legend {
-  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  flex-wrap: wrap;
+  gap: 5px 10px;
+}
+
+.cxb-legend.cxs-vertical {
+  flex-direction: column;
 }
 
 .cxe-legend-entry {
-  display: inline-block;
-  padding: 5px 5px 5px 30px;
+  display: flex;
+  align-items: center;
+  padding: 5px;
+  gap: 5px;
   font-size: smaller;
   position: relative;
-  margin: 5px;
   box-sizing: border-box;
   cursor: pointer;
 }
-.cxb-legend.cxs-vertical .cxe-legend-entry {
-  display: block;
-  text-align: left;
-}
 
 .cxe-legend-svg {
-  position: absolute;
-  left: 5px;
-  top: 50%;
+  flex-shrink: 0;
 }
 
 .cxe-legend-shape {
@@ -108,17 +111,17 @@
 }
 
 .cxb-legendentry {
-  display: inline-block;
-  padding: 5px 0 5px 30px;
+  display: inline-flex;
+  align-items: center;
+  padding: 5px;
+  gap: 5px;
   position: relative;
   box-sizing: border-box;
   cursor: pointer;
 }
 
 .cxe-legendentry-svg {
-  position: absolute;
-  left: 5px;
-  top: 50%;
+  flex-shrink: 0;
 }
 
 .cxe-legendentry-shape {

package/dist/charts.js

@@ -17,7 +17,7 @@ import {
 	shallowEquals,
 	debug,
 	isDefined,
-	stopPropagation,
+	isNonEmptyArray,
 	closest,
 	getTopLevelBoundingClientRect,
 	Format,
@@ -1657,13 +1657,6 @@ var Legend = /*#__PURE__*/ (function (_HtmlElement) {
 	}
 	_inheritsLoose(Legend, _HtmlElement);
 	var _proto = Legend.prototype;
-	_proto.prepareData = function prepareData(context, instance) {
-		var data = instance.data;
-		data.stateMods = Object.assign(data.stateMods || {}, {
-			vertical: this.vertical,
-		});
-		_HtmlElement.prototype.prepareData.call(this, context, instance);
-	};
 	_proto.declareData = function declareData() {
 		var _HtmlElement$prototyp;
 		(_HtmlElement$prototyp = _HtmlElement.prototype.declareData).call.apply(
@@ -1671,15 +1664,34 @@ var Legend = /*#__PURE__*/ (function (_HtmlElement) {
 			[this].concat(Array.prototype.slice.call(arguments), [
 				{
 					shape: undefined,
+					entryStyle: {
+						structured: true,
+					},
+					entryClass: {
+						structured: true,
+					},
 				},
 			]),
 		);
 	};
+	_proto.init = function init() {
+		this.entryStyle = parseStyle(this.entryStyle);
+		_HtmlElement.prototype.init.call(this);
+	};
+	_proto.prepareData = function prepareData(context, instance) {
+		var data = instance.data;
+		data.stateMods = Object.assign(data.stateMods || {}, {
+			vertical: this.vertical,
+		});
+		_HtmlElement.prototype.prepareData.call(this, context, instance);
+	};
 	_proto.isValidHtmlAttribute = function isValidHtmlAttribute(attrName) {
 		switch (attrName) {
 			case "shapeSize":
 			case "svgSize":
 			case "shape":
+			case "entryStyle":
+			case "entryClass":
 				return false;
 			default:
 				return _HtmlElement.prototype.isValidHtmlAttribute.call(this, attrName);
@@ -1711,42 +1723,48 @@ var Legend = /*#__PURE__*/ (function (_HtmlElement) {
 		var CSS = this.CSS;
 		var entries = instance.legends[this.name] && instance.legends[this.name].entries,
 			list;
-		if (isArray(entries) && entries.length > 0) {
-			list = /*#__PURE__*/ jsx(
-				"div",
-				{
-					className: CSS.element(this.baseClass, "wrap"),
-					children: entries.map(function (e, i) {
-						return withHoverSync(i, e.hoverSync, e.hoverChannel, e.hoverId, function (_ref) {
-							var onMouseMove = _ref.onMouseMove,
-								onMouseLeave = _ref.onMouseLeave,
-								hover = _ref.hover;
-							return /*#__PURE__*/ jsxs(
-								"div",
-								{
-									className: CSS.element(_this.baseClass, "entry", {
-										"color-root": true,
-										hover: hover,
-										disabled: e.disabled,
-										selected: e.selected,
-									}),
-									onClick: e.onClick,
-									onMouseMove: onMouseMove,
-									onMouseLeave: onMouseLeave,
-									children: [_this.renderShape(e, instance.data.shape), e.name],
-								},
-								i,
-							);
-						});
-					}),
-				},
-				"wrap",
-			);
+		var _instance$data = instance.data,
+			entryClass = _instance$data.entryClass,
+			entryStyle = _instance$data.entryStyle,
+			shape = _instance$data.shape;
+		if (isNonEmptyArray(entries)) {
+			list = entries.map(function (e, i) {
+				return withHoverSync(i, e.hoverSync, e.hoverChannel, e.hoverId, function (_ref) {
+					var onMouseMove = _ref.onMouseMove,
+						onMouseLeave = _ref.onMouseLeave,
+						hover = _ref.hover;
+					return /*#__PURE__*/ jsxs(
+						"div",
+						{
+							className: CSS.expand(
+								CSS.element(_this.baseClass, "entry", {
+									"color-root": true,
+									hover: hover,
+									disabled: e.disabled,
+									selected: e.selected,
+								}),
+								entryClass,
+							),
+							style: entryStyle,
+							onClick: e.onClick,
+							onMouseMove: onMouseMove,
+							onMouseLeave: onMouseLeave,
+							children: [
+								_this.renderShape(e, shape),
+								/*#__PURE__*/ jsx("div", {
+									children: e.name,
+								}),
+							],
+						},
+						i,
+					);
+				});
+			});
 		}
 		return [list, _HtmlElement.prototype.renderChildren.call(this, context, instance)];
 	};
 	_proto.renderShape = function renderShape(entry, legendEntriesShape) {
-		var _this$CSS$element;
+		var _this$CSS$element, _style$fill, _style$stroke;
 		var className = this.CSS.element(
 			this.baseClass,
 			"shape",
@@ -1756,15 +1774,19 @@ var Legend = /*#__PURE__*/ (function (_HtmlElement) {
 			_this$CSS$element),
 		);
 		var shape = getShape(legendEntriesShape || entry.shape || "square");
+
+		// if the entry has a custom fill or stroke set, use it for both values
+		var style = _extends({}, entry.style);
+		style.fill = (_style$fill = style.fill) != null ? _style$fill : style.stroke;
+		style.stroke = (_style$stroke = style.stroke) != null ? _style$stroke : style.fill;
 		return /*#__PURE__*/ jsx("svg", {
 			className: this.CSS.element(this.baseClass, "svg"),
 			style: {
 				width: this.svgSize + "px",
 				height: this.svgSize + "px",
-				marginTop: -this.svgSize / 2 + "px",
 			},
 			children: shape(this.svgSize / 2, this.svgSize / 2, entry.shapeSize || this.shapeSize, {
-				style: entry.style,
+				style: style,
 				className: className,
 			}),
 		});
@@ -1802,21 +1824,21 @@ Legend.Scope = /*#__PURE__*/ (function (_PureContainer) {
 })(PureContainer);
 var LegendScope = Legend.Scope;
 
-var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
+var LegendEntry = /*#__PURE__*/ (function (_Container) {
 	function LegendEntry() {
-		return _HtmlElement.apply(this, arguments) || this;
+		return _Container.apply(this, arguments) || this;
 	}
-	_inheritsLoose(LegendEntry, _HtmlElement);
+	_inheritsLoose(LegendEntry, _Container);
 	var _proto = LegendEntry.prototype;
 	_proto.init = function init() {
 		this.selection = Selection.create(this.selection);
-		_HtmlElement.prototype.init.call(this);
+		_Container.prototype.init.call(this);
 	};
 	_proto.declareData = function declareData() {
-		var _HtmlElement$prototyp;
+		var _Container$prototype$;
 		var selection = this.selection.configureWidget(this);
-		(_HtmlElement$prototyp = _HtmlElement.prototype.declareData).call.apply(
-			_HtmlElement$prototyp,
+		(_Container$prototype$ = _Container.prototype.declareData).call.apply(
+			_Container$prototype$,
 			[this].concat(Array.prototype.slice.call(arguments), [
 				selection,
 				{
@@ -1830,6 +1852,7 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 					size: undefined,
 					rx: undefined,
 					ry: undefined,
+					text: undefined,
 				},
 			]),
 		);
@@ -1837,13 +1860,13 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 	_proto.prepareData = function prepareData(context, instance) {
 		var data = instance.data;
 		if (data.name && !data.colorName) data.colorName = data.name;
-		_HtmlElement.prototype.prepareData.call(this, context, instance);
+		_Container.prototype.prepareData.call(this, context, instance);
 	};
 	_proto.explore = function explore(context, instance) {
 		var data = instance.data;
 		instance.colorMap = data.colorMap && context.getColorMap && context.getColorMap(data.colorMap);
 		if (instance.colorMap && data.colorName) instance.colorMap.acknowledge(data.colorName);
-		_HtmlElement.prototype.explore.call(this, context, instance);
+		_Container.prototype.explore.call(this, context, instance);
 	};
 	_proto.prepare = function prepare(context, instance) {
 		var data = instance.data,
@@ -1853,23 +1876,6 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 			if (instance.cache("colorIndex", data.colorIndex)) instance.markShouldUpdate(context);
 		}
 	};
-	_proto.attachProps = function attachProps(context, instance, props) {
-		var _this = this;
-		var shape = this.renderShape(instance);
-		props.children = [shape, props.children];
-		props.onMouseDown = stopPropagation;
-		props.onClick = function (e) {
-			_this.handleClick(e, instance);
-		};
-		delete props.active;
-		delete props.selection;
-		delete props.colorMap;
-		delete props.colorIndex;
-		delete props.shape;
-		delete props.name;
-		delete props.selected;
-		delete props.svgSize;
-	};
 	_proto.handleClick = function handleClick(e, instance) {
 		if (this.onClick && instance.invoke("onClick", e, instance) === false) return;
 		e.stopPropagation();
@@ -1877,8 +1883,27 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 		if (any || this.legendAction == "toggle") if (instance.set("active", !instance.data.active)) return;
 		if ((any || this.legendAction == "select") && !this.selection.isDummy) this.selection.selectInstance(instance);
 	};
+	_proto.render = function render(context, instance, key) {
+		var data = instance.data;
+		var content = !isUndefined(this.text) ? data.text : this.renderChildren(context, instance);
+		return /*#__PURE__*/ jsxs(
+			"div",
+			{
+				className: data.classNames,
+				style: data.style,
+				children: [
+					this.renderShape(instance),
+					content != null &&
+						/*#__PURE__*/ jsx("div", {
+							children: content,
+						}),
+				],
+			},
+			key,
+		);
+	};
 	_proto.renderShape = function renderShape(instance) {
-		var _this$CSS$element;
+		var _this$CSS$element, _style$fill, _style$stroke;
 		var entry = instance.data;
 		var className = this.CSS.element(
 			this.baseClass,
@@ -1892,6 +1917,11 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 			_this$CSS$element),
 		);
 		var shape = getShape(entry.shape || "square");
+
+		// if the entry has a custom fill or stroke set, use it for both values
+		var style = _extends({}, entry.style);
+		style.fill = (_style$fill = style.fill) != null ? _style$fill : style.stroke;
+		style.stroke = (_style$stroke = style.stroke) != null ? _style$stroke : style.fill;
 		return /*#__PURE__*/ jsx(
 			"svg",
 			{
@@ -1899,10 +1929,9 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 				style: {
 					width: this.svgSize + "px",
 					height: this.svgSize + "px",
-					marginTop: -this.svgSize / 2 + "px",
 				},
 				children: shape(this.svgSize / 2, this.svgSize / 2, entry.size, {
-					style: entry.style,
+					style: style,
 					className: className,
 					rx: entry.rx,
 					ry: entry.ry,
@@ -1912,12 +1941,13 @@ var LegendEntry = /*#__PURE__*/ (function (_HtmlElement) {
 		);
 	};
 	return LegendEntry;
-})(HtmlElement);
+})(Container);
 LegendEntry.prototype.baseClass = "legendentry";
 LegendEntry.prototype.shape = "square";
 LegendEntry.prototype.legendAction = "auto";
 LegendEntry.prototype.size = 18;
 LegendEntry.prototype.svgSize = 20;
+LegendEntry.prototype.styled = true;
 Widget.alias("legend-entry", LegendEntry);
 
 var ColorMap = /*#__PURE__*/ (function (_Widget) {