@d3plus/core 3.0.16 → 3.1.1

package/es/index.js

@@ -1,4 +1,4 @@
 export { AreaPlot, BarChart, BoxWhisker, BumpChart, Donut, Geomap, LinePlot, Matrix, Network, Pack, Pie, Plot, Priestley, Radar, RadialMatrix, Rings, Sankey, StackedArea, Tree, Treemap, Viz } from "./src/charts/index.js";
 export { Axis, AxisBottom, AxisLeft, AxisRight, AxisTop, ColorScale, Legend, Message, TextBox, Timeline, Tooltip } from "./src/components/index.js";
 export { Area, Bar, Box, Circle, Image, Line, Path, Rect, Shape, Whisker } from "./src/shapes/index.js";
-export { accessor, BaseClass, configPrep, constant, RESET, uuid } from "./src/utils/index.js";
+export { accessor, BaseClass, configPrep, constant, RESET } from "./src/utils/index.js";

package/es/src/charts/AreaPlot.js

@@ -74,9 +74,7 @@ var AreaPlot = /*#__PURE__*/ function(Plot) {
     return AreaPlot;
 }(Plot);
 /**
-    @class AreaPlot
-    @extends Plot
-    @desc Creates an area plot based on an array of data.
+    Creates an area plot based on an array of data.
     @example <caption>the equivalent of calling:</caption>
 new d3plus.Plot()
   .baseline(0)

package/es/src/charts/BarChart.js

@@ -81,9 +81,7 @@ var BarChart = /*#__PURE__*/ function(Plot) {
     return BarChart;
 }(Plot);
 /**
-    @class BarChart
-    @extends Plot
-    @desc Creates a bar chart based on an array of data.
+    Creates a bar chart based on an array of data.
     @example <caption>the equivalent of calling:</caption>
 new d3plus.Plot()
   .baseline(0)

package/es/src/charts/BoxWhisker.js

@@ -70,7 +70,7 @@ var BoxWhisker = /*#__PURE__*/ function(Plot) {
         _this._discrete = "x";
         _this._shape = constant("Box");
         _this._tooltipConfig = assign(_this._tooltipConfig, {
-            title: function(d, i) {
+            title: function title(d, i) {
                 if (!d) return "";
                 while(d.__d3plus__ && d.data){
                     d = d.data;
@@ -86,7 +86,5 @@ var BoxWhisker = /*#__PURE__*/ function(Plot) {
     return BoxWhisker;
 }(Plot);
 /**
-    @class BoxWhisker
-    @extends Plot
-    @desc Creates a simple box and whisker based on an array of data.
+    Creates a simple box and whisker based on an array of data.
 */ export { BoxWhisker as default };

package/es/src/charts/BumpChart.js

@@ -33,6 +33,7 @@ function _inherits(subClass, superClass) {
     if (superClass) _set_prototype_of(subClass, superClass);
 }
 function _instanceof(left, right) {
+    "@swc/helpers - instanceof";
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     } else {
@@ -79,7 +80,7 @@ var BumpChart = /*#__PURE__*/ function(Plot) {
             return _this._y(d);
         });
         _this.yConfig({
-            tickFormat: function(val) {
+            tickFormat: function tickFormat(val) {
                 var data = _this._formattedData;
                 var xMin = _instanceof(data[0].x, Date) ? data[0].x.getTime() : data[0].x;
                 var startData = data.filter(function(d) {
@@ -92,7 +93,7 @@ var BumpChart = /*#__PURE__*/ function(Plot) {
             }
         });
         _this.y2Config({
-            tickFormat: function(val) {
+            tickFormat: function tickFormat(val) {
                 var data = _this._formattedData;
                 var xMax = _instanceof(data[data.length - 1].x, Date) ? data[data.length - 1].x.getTime() : data[data.length - 1].x;
                 var endData = data.filter(function(d) {
@@ -115,9 +116,7 @@ var BumpChart = /*#__PURE__*/ function(Plot) {
     return BumpChart;
 }(Plot);
 /**
-    @class BumpChart
-    @extends Plot
-    @desc Creates a bump chart based on an array of data.
+    Creates a bump chart based on an array of data.
     @example <caption>the equivalent of calling:</caption>
 new d3plus.Plot()
   .discrete("x")

package/es/src/charts/Donut.js

@@ -78,7 +78,5 @@ var Donut = /*#__PURE__*/ function(Pie) {
     return Donut;
 }(Pie);
 /**
-    @class Donut
-    @extends Pie
-    @desc Extends the Pie visualization to create a donut chart.
+    Extends the Pie visualization to create a donut chart.
 */ export { Donut as default };

package/es/src/charts/Geomap.js

@@ -71,6 +71,7 @@ function _inherits(subClass, superClass) {
     if (superClass) _set_prototype_of(subClass, superClass);
 }
 function _instanceof(left, right) {
+    "@swc/helpers - instanceof";
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     } else {
@@ -178,9 +179,9 @@ import attributions from "./helpers/tileAttributions.js";
 }
 /**
     @name topo2feature
-    @desc Converts a specific topojson object key into a feature ready for projection.
-    @param {Object} *topo* A valid topojson json object.
-    @param {String} [*key*] The topojson object key to be used. If undefined, the first key available will be used.
+    Converts a specific topojson object key into a feature ready for projection.
+    @param topo A valid topojson json object.
+    @param key The topojson object key to be used. If undefined, the first key available will be used.
     @private
 */ function topo2feature(topo, key) {
     var k = key && topo.objects[key] ? key : Object.keys(topo.objects)[0];
@@ -205,16 +206,16 @@ var Geomap = /*#__PURE__*/ function(Viz) {
         _this._projectionPadding = parseSides(20);
         _this._shape = constant("Circle");
         _this._shapeConfig = assign(_this._shapeConfig, {
-            ariaLabel: function(d, i) {
+            ariaLabel: function ariaLabel(d, i) {
                 return "".concat(_this._drawLabel(d, i), ", ").concat(_this._pointSize(d, i));
             },
             hoverOpacity: 1,
             Path: {
-                ariaLabel: function(d, i) {
+                ariaLabel: function ariaLabel(d, i) {
                     var validColorScale = _this._colorScale ? ", ".concat(_this._colorScale(d, i)) : "";
                     return "".concat(_this._drawLabel(d, i)).concat(validColorScale, ".");
                 },
-                fill: function(d, i) {
+                fill: function fill(d, i) {
                     if (_this._colorScale && !_this._coordData.features.includes(d)) {
                         var c = _this._colorScale(d);
                         if (c !== undefined && c !== null) {
@@ -230,17 +231,17 @@ var Geomap = /*#__PURE__*/ function(Viz) {
                     return _this._topojsonFill(d, i);
                 },
                 on: {
-                    mouseenter: function(d, i, x, event) {
+                    mouseenter: function mouseenter(d, i, x, event) {
                         return !_this._coordData.features.includes(d) ? _this._on.mouseenter.bind(_this)(d, i, x, event) : null;
                     },
                     "mousemove.shape": function(d, i, x, event) {
                         return !_this._coordData.features.includes(d) ? _this._on["mousemove.shape"].bind(_this)(d, i, x, event) : null;
                     },
-                    mouseleave: function(d, i, x, event) {
+                    mouseleave: function mouseleave(d, i, x, event) {
                         return !_this._coordData.features.includes(d) ? _this._on.mouseleave.bind(_this)(d, i, x, event) : null;
                     }
                 },
-                stroke: function(d, i) {
+                stroke: function stroke(d, i) {
                     var c = typeof _this._shapeConfig.Path.fill === "function" ? _this._shapeConfig.Path.fill(d, i) : _this._shapeConfig.Path.fill;
                     return color(c).darker();
                 },
@@ -290,7 +291,7 @@ var Geomap = /*#__PURE__*/ function(Viz) {
                         "a",
                         "b",
                         "c"
-                    ][Math.random() * 3 | 0]).replace("{z}", z).replace("{x}", x).replace("{y}", y);
+                    ][Math.random() * 3 | 0]).replace("{z}", "".concat(z)).replace("{x}", "".concat(x)).replace("{y}", "".concat(y));
                 }).attr("x", function(param) {
                     var _param = _sliced_to_array(param, 1), x = _param[0];
                     return x * scale + tileData.translate[0] * scale - transform.x / transform.k;
@@ -355,7 +356,9 @@ var Geomap = /*#__PURE__*/ function(Viz) {
                     });
                     return arr;
                 }, []);
-                var r = scales["scale".concat(this._pointSizeScale.charAt(0).toUpperCase()).concat(this._pointSizeScale.slice(1))]().domain(extent(pointData, function(d, i) {
+                var scaleName = "scale".concat(this._pointSizeScale.charAt(0).toUpperCase()).concat(this._pointSizeScale.slice(1));
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                var r = scales[scaleName]().domain(extent(pointData, function(d, i) {
                     return _this._pointSize(d, i);
                 })).range([
                     this._pointSizeMin,
@@ -526,12 +529,9 @@ var Geomap = /*#__PURE__*/ function(Viz) {
         },
         {
             /**
-      @memberof Geomap
-      @desc Topojson files sometimes include small geographies that negatively impact how the library determines the default zoom level (for example, a small island or territory far off the coast that is barely visible to the eye). The fitFilter method can be used to remove specific geographies from the logic used to determine the zooming.
+      Topojson files sometimes include small geographies that negatively impact how the library determines the default zoom level (for example, a small island or territory far off the coast that is barely visible to the eye). The fitFilter method can be used to remove specific geographies from the logic used to determine the zooming.
 
 The *value* passed can be a single id to remove, an array of ids, or a filter function. Take a look at the [Choropleth Example](http://d3plus.org/examples/d3plus-geomap/getting-started/) to see it in action.
-      @param {Number|String|Array|Function} [*value*]
-      @chainable
   */ key: "fitFilter",
             value: function fitFilter(_) {
                 if (arguments.length) {
@@ -549,12 +549,9 @@ The *value* passed can be a single id to remove, an array of ids, or a filter fu
         },
         {
             /**
-      @memberof Geomap
-      @desc If the topojson being used to determine the zoom fit (either the main [topojson](#Geomap.topojson) object or the [fitObject](#Geomap.fitObject)) contains multiple geographical sets (for example, a file containing state and county boundaries), use this method to indentify which set to use for the zoom fit.
+      If the topojson being used to determine the zoom fit (either the main [topojson](#Geomap.topojson) object or the [fitObject](#Geomap.fitObject)) contains multiple geographical sets (for example, a file containing state and county boundaries), use this method to indentify which set to use for the zoom fit.
 
 If not specified, the first key in the *Array* returned from using `Object.keys` on the topojson will be used.
-      @param {String} *value*
-      @chainable
   */ key: "fitKey",
             value: function fitKey(_) {
                 if (arguments.length) {
@@ -567,13 +564,11 @@ If not specified, the first key in the *Array* returned from using `Object.keys`
         },
         {
             /**
-      @memberof Geomap
-      @desc The topojson to be used for the initial projection [fit extent](https://github.com/d3/d3-geo#projection_fitExtent). The value passed should either be a valid Topojson *Object* or a *String* representing a filepath or URL to be loaded.
+      The topojson to be used for the initial projection [fit extent](https://github.com/d3/d3-geo#projection_fitExtent). The value passed should either be a valid Topojson *Object* or a *String* representing a filepath or URL to be loaded.
 
 Additionally, a custom formatting function can be passed as a second argument to this method. This custom function will be passed the data that has been loaded, as long as there are no errors. This function needs to return the final Topojson *Object*.
-      @param {Object|String} *data* = `undefined`
-      @param {Function} [*formatter*]
-      @chainable
+      @param _ `undefined`
+      @param f Topojson data or a URL to load.
   */ key: "fitObject",
             value: function fitObject(_, f) {
                 if (arguments.length) {
@@ -586,10 +581,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc The color visible behind any shapes drawn on the map projection. By default, a color value matching the color used in the map tiles is used to help mask the loading time needed to render the tiles. Any value CSS color value may be used, including hexidecimal, rgb, rgba, and color strings like `"blue"` and `"transparent"`.
-      @param {String} [*value* = "#d4dadc"]
-      @chainable
+      The color visible behind any shapes drawn on the map projection. By default, a color value matching the color used in the map tiles is used to help mask the loading time needed to render the tiles. Any value CSS color value may be used, including hexidecimal, rgb, rgba, and color strings like `"blue"` and `"transparent"`.
+      @param _ "#d4dadc"]
   */ key: "ocean",
             value: function ocean(_) {
                 return arguments.length ? (this._ocean = _, this) : this._ocean;
@@ -597,10 +590,7 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc The accessor to be used when detecting coordinate points in the objects passed to the [data](https://d3plus.org/docs/#Viz.data) method. Values are expected to be in the format `[longitude, latitude]`, which is in-line with d3's expected coordinate mapping.
-      @param {Function|Array} [*value*]
-      @chainable
+      The accessor to be used when detecting coordinate points in the objects passed to the [data](https://d3plus.org/docs/#Viz.data) method. Values are expected to be in the format `[longitude, latitude]`, which is in-line with d3's expected coordinate mapping.
   */ key: "point",
             value: function point(_) {
                 return arguments.length ? (this._point = typeof _ === "function" ? _ : constant(_), this) : this._point;
@@ -608,10 +598,7 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc The accessor or static value to be used for sizing coordinate points.
-      @param {Function|Number} [*value*]
-      @chainable
+      The accessor or static value to be used for sizing coordinate points.
   */ key: "pointSize",
             value: function pointSize(_) {
                 return arguments.length ? (this._pointSize = typeof _ === "function" ? _ : constant(_), this) : this._pointSize;
@@ -619,10 +606,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc The maximum pixel radius used in the scale for sizing coordinate points.
-      @param {Number} [*value* = 10]
-      @chainable
+      The maximum pixel radius used in the scale for sizing coordinate points.
+      @param _ 10]
   */ key: "pointSizeMax",
             value: function pointSizeMax(_) {
                 return arguments.length ? (this._pointSizeMax = _, this) : this._pointSizeMax;
@@ -630,10 +615,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc The minimum pixel radius used in the scale for sizing coordinate points.
-      @param {Number} [*value* = 5]
-      @chainable
+      The minimum pixel radius used in the scale for sizing coordinate points.
+      @param _ 5]
   */ key: "pointSizeMin",
             value: function pointSizeMin(_) {
                 return arguments.length ? (this._pointSizeMin = _, this) : this._pointSizeMin;
@@ -641,10 +624,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc Sets the map projection used when displaying topojson and coordinate points. All of the projections exported from [d3-geo](https://github.com/d3/d3-geo#projections), [d3-geo-projection](https://github.com/d3/d3-geo-projection#api-reference), and [d3-composite-projections](http://geoexamples.com/d3-composite-projections/) are accepted, whether as the string name (ie. "geoMercator") or the generator function itself. Map tiles are only usable when the projection is set to Mercator (which is also the default value).
-      @param {Function|String} *projection* = "geoMercator"
-      @chainable
+      The map projection used when displaying topojson and coordinate points. All projections from [d3-geo](https://github.com/d3/d3-geo#projections), [d3-geo-projection](https://github.com/d3/d3-geo-projection#api-reference), and [d3-composite-projections](http://geoexamples.com/d3-composite-projections/) are accepted, either as the string name (ie. "geoMercator") or the generator function itself. Map tiles are only usable when the projection is set to Mercator (the default).
+      @param _ "geoMercator"
   */ key: "projection",
             value: function projection(_) {
                 if (arguments.length && _ !== "geoMercator") this.tiles(false);
@@ -653,10 +634,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc The outer padding between the edge of the visualization and the shapes drawn. The value passed can be either a single number to be used on all sides, or a CSS string pattern (ie. `"20px 0 10px"`).
-      @param {Number|String} [*value* = 20]
-      @chainable
+      The outer padding between the edge of the visualization and the shapes drawn. The value passed can be either a single number to be used on all sides, or a CSS string pattern (ie. `"20px 0 10px"`).
+      @param _ 20]
   */ key: "projectionPadding",
             value: function projectionPadding(_) {
                 return arguments.length ? (this._projectionPadding = parseSides(_), this) : this._projectionPadding;
@@ -664,10 +643,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc An array that corresponds to the value passed to the projection's [rotate](https://github.com/d3/d3-geo#projection_rotate) function. Use this method to shift the centerpoint of a map.
-      @param {Array} [*value* = [0, 0]]
-      @chainable
+      An array that corresponds to the value passed to the projection's [rotate](https://github.com/d3/d3-geo#projection_rotate) function. Use this method to shift the centerpoint of a map.
+      @param _ [0, 0]]
   */ key: "projectionRotate",
             value: function projectionRotate(_) {
                 if (arguments.length) {
@@ -682,10 +659,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc Toggles the visibility of the map tiles.
-      @param {Boolean} [*value* = true]
-      @chainable
+      Toggles the visibility of the map tiles.
+      @param _ true]
   */ key: "tiles",
             value: function tiles(_) {
                 if (arguments.length) {
@@ -700,10 +675,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc By default, d3plus uses the `light_all` style provided by [CARTO](https://carto.com/location-data-services/basemaps/) for it's map tiles. The [tileUrl](https://d3plus.org/docs/#Geomap.tileUrl) method changes the base URL used for fetching the tiles, as long as the string passed contains `{x}`, `{y}`, and `{z}` variables enclosed in curly brackets for the zoom logic to load the correct tiles.
-      @param {String} [url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png"]
-      @chainable
+      By default, d3plus uses the `light_all` style provided by [CARTO](https://carto.com/location-data-services/basemaps/) for it's map tiles. The [tileUrl](https://d3plus.org/docs/#Geomap.tileUrl) method changes the base URL used for fetching the tiles, as long as the string passed contains `{x}`, `{y}`, and `{z}` variables enclosed in curly brackets for the zoom logic to load the correct tiles.
+      @param _ "https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png"]
   */ key: "tileUrl",
             value: function tileUrl(_) {
                 if (arguments.length) {
@@ -717,13 +690,11 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc The topojson to be used for drawing geographical paths. The value passed should either be a valid Topojson *Object* or a *String* representing a filepath or URL to be loaded.
+      The topojson to be used for drawing geographical paths. The value passed should either be a valid Topojson *Object* or a *String* representing a filepath or URL to be loaded.
 
 Additionally, a custom formatting function can be passed as a second argument to this method. This custom function will be passed the data that has been loaded, as long as there are no errors. This function should return the final Topojson *Obejct*.
-      @param {Object|String} *data* = []
-      @param {Function} [*formatter*]
-      @chainable
+      @param _ []
+      @param f Topojson data or a URL to load.
   */ key: "topojson",
             value: function topojson(_, f) {
                 if (arguments.length) {
@@ -736,10 +707,8 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc The function is used to set default color of the map.
-      @param {String|Function} *value* = string
-      @chainable
+      The function is used to set default color of the map.
+      @param _ string
   */ key: "topojsonFill",
             value: function topojsonFill(_) {
                 return arguments.length ? (this._topojsonFill = typeof _ === "function" ? _ : constant(_), this, this) : this._topojsonFill;
@@ -747,10 +716,7 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc If the [topojson](#Geomap.topojson) being used contains boundaries that should not be shown, this method can be used to filter them out of the final output. The *value* passed can be a single id to remove, an array of ids, or a filter function.
-      @param {Number|String|Array|Function} [*value*]
-      @chainable
+      If the [topojson](#Geomap.topojson) being used contains boundaries that should not be shown, this method can be used to filter them out of the final output. The *value* passed can be a single id to remove, an array of ids, or a filter function.
   */ key: "topojsonFilter",
             value: function topojsonFilter(_) {
                 if (arguments.length) {
@@ -768,12 +734,9 @@ Additionally, a custom formatting function can be passed as a second argument to
         },
         {
             /**
-      @memberof Geomap
-      @desc If the [topojson](#Geomap.topojson) contains multiple geographical sets (for example, a file containing state and county boundaries), use this method to indentify which set to use.
+      If the [topojson](#Geomap.topojson) contains multiple geographical sets (for example, a file containing state and county boundaries), use this method to indentify which set to use.
 
 If not specified, the first key in the *Array* returned from using `Object.keys` on the topojson will be used.
-      @param {String} *value*
-      @chainable
   */ key: "topojsonKey",
             value: function topojsonKey(_) {
                 if (arguments.length) {
@@ -786,10 +749,8 @@ If not specified, the first key in the *Array* returned from using `Object.keys`
         },
         {
             /**
-      @memberof Geomap
-      @desc The accessor used to map each topojson geometry to it's corresponding [data](https://d3plus.org/docs/#Viz.data) point.
-      @param {String|Function} *value* = "id"
-      @chainable
+      The accessor used to map each topojson geometry to it's corresponding [data](https://d3plus.org/docs/#Viz.data) point.
+      @param _ "id"
   */ key: "topojsonId",
             value: function topojsonId(_) {
                 return arguments.length ? (this._topojsonId = typeof _ === "function" ? _ : accessor(_), this, this) : this._topojsonId;
@@ -799,7 +760,5 @@ If not specified, the first key in the *Array* returned from using `Object.keys`
     return Geomap;
 }(Viz);
 /**
-    @class Geomap
-    @extends Viz
-    @desc Creates a geographical map with zooming, panning, image tiles, and the ability to layer choropleth paths and coordinate points. See [this example](https://d3plus.org/examples/d3plus-geomap/getting-started/) for help getting started.
+    Creates a geographical map with zooming, panning, image tiles, and the ability to layer choropleth paths and coordinate points. See [this example](https://d3plus.org/examples/d3plus-geomap/getting-started/) for help getting started.
 */ export { Geomap as default };

package/es/src/charts/LinePlot.js

@@ -73,9 +73,7 @@ var LinePlot = /*#__PURE__*/ function(Plot) {
     return LinePlot;
 }(Plot);
 /**
-    @class LinePlot
-    @extends Plot
-    @desc Creates a line plot based on an array of data.
+    Creates a line plot based on an array of data.
     @example <caption>the equivalent of calling:</caption>
 new d3plus.Plot()
   .discrete("x")

package/es/src/charts/Matrix.js

@@ -153,8 +153,7 @@ var Matrix = /*#__PURE__*/ function(Viz) {
     _create_class(Matrix, [
         {
             /**
-      @memberof Matrix
-      @desc Extends the draw behavior of the abstract Viz class.
+      Extends the draw behavior of the abstract Viz class.
       @private
   */ key: "_draw",
             value: function _draw(callback) {
@@ -168,7 +167,7 @@ var Matrix = /*#__PURE__*/ function(Viz) {
                     opacity: 1
                 };
                 var columnRotation = width / columnValues.length < 120;
-                var selectElem = function(name, opts) {
+                var selectElem = function selectElem(name, opts) {
                     return elem("g.d3plus-Matrix-".concat(name), Object.assign({
                         parent: parent,
                         transition: transition
@@ -230,10 +229,10 @@ var Matrix = /*#__PURE__*/ function(Viz) {
                 }).node()).config({
                     height: cellHeight - this._cellPadding,
                     width: cellWidth - this._cellPadding,
-                    x: function(d) {
+                    x: function x(d) {
                         return columnScale(d.column) + cellWidth / 2;
                     },
-                    y: function(d) {
+                    y: function y(d) {
                         return rowScale(d.row) + cellHeight / 2;
                     }
                 }).config(rectConfig).render());
@@ -242,20 +241,17 @@ var Matrix = /*#__PURE__*/ function(Viz) {
         },
         {
             /**
-      @memberof Matrix
-      @desc The pixel padding in between each cell.
-      @param {Number} [*value* = 2]
-  */ key: "cellPadding",
+      The pixel padding in between each cell.
+*/ key: "cellPadding",
             value: function cellPadding(_) {
                 return arguments.length ? (this._cellPadding = _, this) : this._cellPadding;
             }
         },
         {
             /**
-      @memberof Matrix
-      @desc Determines which key in your data should be used for each column in the matrix. Can be either a String that matches a key used in every data point, or an accessor function that receives a data point and it's index in the data array, and is expected to return it's column value.
-      @param {String|Function} [*value*]
-      @example
+      Determines which key in your data should be used for each column in the matrix. Can be either a String that matches a key used in every data point, or an accessor function that receives a data point and it's index in the data array, and is expected to return it's column value.
+
+@example
 function column(d) {
   return d.name;
 }
@@ -266,31 +262,25 @@ function column(d) {
         },
         {
             /**
-      @memberof Matrix
-      @desc A pass-through to the underlying [Axis](http://d3plus.org/docs/#Axis) config used for the column labels.
-      @param {Object} *value*
-      @chainable
-  */ key: "columnConfig",
+      A pass-through to the underlying [Axis](http://d3plus.org/docs/#Axis) config used for the column labels.
+*/ key: "columnConfig",
             value: function columnConfig(_) {
                 return arguments.length ? (this._columnConfig = assign(this._columnConfig, _), this) : this._columnConfig;
             }
         },
         {
             /**
-      @memberof Matrix
-      @desc A manual list of IDs to be used for columns.
-      @param {Array} [*value*]
-  */ key: "columnList",
+      A manual list of IDs to be used for columns.
+*/ key: "columnList",
             value: function columnList(_) {
                 return arguments.length ? (this._columnList = _, this) : this._columnList;
             }
         },
         {
             /**
-      @memberof Matrix
-      @desc A sort comparator function that is run on the unique set of column values.
-      @param {Function} [*value*]
-      @example
+      A sort comparator function that is run on the unique set of column values.
+
+@example
 function column(a, b) {
   return a.localeCompare(b);
 }
@@ -301,10 +291,9 @@ function column(a, b) {
         },
         {
             /**
-      @memberof Matrix
-      @desc Determines which key in your data should be used for each row in the matrix. Can be either a String that matches a key used in every data point, or an accessor function that receives a data point and it's index in the data array, and is expected to return it's row value.
-      @param {String|Function} [*value*]
-      @example
+      Determines which key in your data should be used for each row in the matrix. Can be either a String that matches a key used in every data point, or an accessor function that receives a data point and it's index in the data array, and is expected to return it's row value.
+
+@example
 function row(d) {
   return d.name;
 }
@@ -315,31 +304,25 @@ function row(d) {
         },
         {
             /**
-      @memberof Matrix
-      @desc A pass-through to the underlying [Axis](http://d3plus.org/docs/#Axis) config used for the row labels.
-      @param {Object} *value*
-      @chainable
-  */ key: "rowConfig",
+      A pass-through to the underlying [Axis](http://d3plus.org/docs/#Axis) config used for the row labels.
+*/ key: "rowConfig",
             value: function rowConfig(_) {
                 return arguments.length ? (this._rowConfig = assign(this._rowConfig, _), this) : this._rowConfig;
             }
         },
         {
             /**
-      @memberof Matrix
-      @desc A manual list of IDs to be used for rows.
-      @param {Array} [*value*]
-  */ key: "rowList",
+      A manual list of IDs to be used for rows.
+*/ key: "rowList",
             value: function rowList(_) {
                 return arguments.length ? (this._rowList = _, this) : this._rowList;
             }
         },
         {
             /**
-      @memberof Matrix
-      @desc A sort comparator function that is run on the unique set of row values.
-      @param {Function} [*value*]
-      @example
+      A sort comparator function that is run on the unique set of row values.
+
+@example
 function row(a, b) {
   return a.localeCompare(b);
 }
@@ -352,7 +335,5 @@ function row(a, b) {
     return Matrix;
 }(Viz);
 /**
-    @class Matrix
-    @extends Viz
-    @desc Creates a simple rows/columns Matrix view of any dataset. See [this example](https://d3plus.org/examples/d3plus-matrix/getting-started/) for help getting started using the Matrix class.
+    Creates a simple rows/columns Matrix view of any dataset. See [this example](https://d3plus.org/examples/d3plus-matrix/getting-started/) for help getting started using the Matrix class.
 */ export { Matrix as default };