npm - @gpa-gemstone/react-graph - Versions diffs - 1.0.34 → 1.0.35 - Mend

@gpa-gemstone/react-graph 1.0.34 → 1.0.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/lib/PointNode.js CHANGED Viewed

@@ -55,18 +55,36 @@ var MaxPoints = 20;
  */
 var PointNode = /** @class */ (function () {
     function PointNode(data) {
+        var _this = this;
+        this.dim = data[0].length;
         // That minimum time stamp that fits in this bucket
         this.minT = data[0][0];
         // The maximum time stamp that might fit in this bucket
         this.maxT = data[data.length - 1][0];
-        this.avgY = 0;
+        // Intializing other vars
+        this.avgV = Array(this.dim - 1).fill(0);
+        this.minV = Array(this.dim - 1).fill(0);
+        this.maxV = Array(this.dim - 1).fill(0);
         this.children = null;
         this.points = null;
         if (data.length <= MaxPoints) {
+            if (data.some(function (point) { return point.length != _this.dim; }))
+                throw new TypeError("Jagged data passed to PointNode. All points should all be " + this.dim + " dimensions.");
             this.points = data;
-            this.minY = Math.min.apply(Math, __spreadArray([], __read(data.filter(function (pt) { return !isNaN(pt[1]); }).map(function (pt) { return pt[1]; })), false));
-            this.maxY = Math.max.apply(Math, __spreadArray([], __read(data.filter(function (pt) { return !isNaN(pt[1]); }).map(function (pt) { return pt[1]; })), false));
-            this.avgY = 0;
+            var _loop_1 = function (index_1) {
+                this_1.minV[index_1 - 1] = Math.min.apply(Math, __spreadArray([], __read(data.filter(function (pt) { return !isNaN(pt[index_1]); }).map(function (pt) { return pt[index_1]; })), false));
+            };
+            var this_1 = this;
+            for (var index_1 = 1; index_1 < this.dim; index_1++) {
+                _loop_1(index_1);
+            }
+            var _loop_2 = function (index_2) {
+                this_2.maxV[index_2 - 1] = Math.max.apply(Math, __spreadArray([], __read(data.filter(function (pt) { return !isNaN(pt[index_2]); }).map(function (pt) { return pt[index_2]; })), false));
+            };
+            var this_2 = this;
+            for (var index_2 = 1; index_2 < this.dim; index_2++) {
+                _loop_2(index_2);
+            }
             return;
         }
         var nLevel = Math.floor(Math.pow(data.length, 1 / MaxPoints));
@@ -77,31 +95,60 @@ var PointNode = /** @class */ (function () {
             this.children.push(new PointNode(data.slice(index, index + blockSize)));
             index = index + blockSize;
         }
-        this.avgY = 0;
-        this.maxY = Math.max.apply(Math, __spreadArray([], __read(this.children.map(function (node) { return node.maxY; })), false));
-        this.minY = Math.min.apply(Math, __spreadArray([], __read(this.children.map(function (node) { return node.minY; })), false));
+        var _loop_3 = function (index_3) {
+            this_3.minV[index_3] = Math.min.apply(Math, __spreadArray([], __read(this_3.children.map(function (node) { return node.minV[index_3]; })), false));
+        };
+        var this_3 = this;
+        for (var index_3 = 0; index_3 < this.dim - 1; index_3++) {
+            _loop_3(index_3);
+        }
+        var _loop_4 = function (index_4) {
+            this_4.maxV[index_4] = Math.max.apply(Math, __spreadArray([], __read(this_4.children.map(function (node) { return node.maxV[index_4]; })), false));
+        };
+        var this_4 = this;
+        for (var index_4 = 0; index_4 < this.dim - 1; index_4++) {
+            _loop_4(index_4);
+        }
     }
-    PointNode.prototype.GetData = function (Tstart, Tend) {
+    PointNode.prototype.GetData = function (Tstart, Tend, IncludeEdges) {
+        var _this = this;
         if (this.points != null && Tstart <= this.minT && Tend >= this.maxT)
             return this.points;
+        if (this.points != null && IncludeEdges !== undefined && IncludeEdges)
+            return this.points.filter(function (pt, i) {
+                var _a, _b;
+                return (pt[0] >= Tstart && pt[0] <= Tend) ||
+                    i < (((_b = (_a = _this.points) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) - 1) && (_this.points ? [i + 1][0] : 0) >= Tstart ||
+                    i > 0 && (_this.points ? [i - 1][0] : 0) <= Tend;
+            });
         if (this.points != null)
-            return this.points.filter(function (pt) { return pt[0] >= Tstart && pt[1] <= Tend; });
+            return this.points.filter(function (pt) { return pt[0] >= Tstart && pt[0] <= Tend; });
         var result = [];
-        return result.concat.apply(result, __spreadArray([], __read(this.children.filter(function (node) { return Tstart <= node.minT && Tend >= node.maxT; }).map(function (node) { return node.GetData(Tstart, Tend); })), false));
+        return result.concat.apply(result, __spreadArray([], __read(this.children.filter(function (node) { return Tstart <= node.minT && Tend >= node.maxT; }).map(function (node) { return node.GetData(Tstart, Tend, IncludeEdges); })), false));
     };
     PointNode.prototype.GetFullData = function () {
         return this.GetData(this.minT, this.maxT);
     };
-    PointNode.prototype.GetLimits = function (Tstart, Tend) {
-        var max = this.maxY;
-        var min = this.minY;
+    PointNode.prototype.GetAllLimits = function (Tstart, Tend) {
+        var result = Array(this.dim - 1);
+        for (var index = 0; index < this.dim - 1; index++)
+            result[index] = this.GetLimits(Tstart, Tend, index);
+        return result;
+    };
+    // Note: Dimension indexing does not include time, I.E. in (x,y), y would be dimension 0;
+    PointNode.prototype.GetLimits = function (Tstart, Tend, dimension) {
+        var currentIndex = dimension !== null && dimension !== void 0 ? dimension : 0;
+        var max = this.maxV[currentIndex];
+        var min = this.minV[currentIndex];
         if (this.points == null && !(Tstart <= this.minT && Tend > this.maxT)) {
-            var limits = this.children.filter(function (n) { return n.maxT > Tstart && n.minT < Tend; }).map(function (n) { return n.GetLimits(Tstart, Tend); });
+            // Array represents all limits of buckets
+            var limits = this.children.filter(function (n) { return n.maxT > Tstart && n.minT < Tend; }).map(function (n) { return n.GetLimits(Tstart, Tend, currentIndex); });
             min = Math.min.apply(Math, __spreadArray([], __read(limits.map(function (pt) { return pt[0]; })), false));
             max = Math.max.apply(Math, __spreadArray([], __read(limits.map(function (pt) { return pt[1]; })), false));
         }
         if (this.points != null && !(Tstart <= this.minT && Tend > this.maxT)) {
-            var limits = this.points.filter(function (pt) { return pt[0] > Tstart && pt[0] < Tend; }).map(function (pt) { return pt[1]; });
+            // Array represents all numbers within this bucket that fall in range
+            var limits = this.points.filter(function (pt) { return pt[0] > Tstart && pt[0] < Tend; }).map(function (pt) { return pt[currentIndex + 1]; });
             min = Math.min.apply(Math, __spreadArray([], __read(limits), false));
             max = Math.max.apply(Math, __spreadArray([], __read(limits), false));
         }
@@ -154,4 +201,4 @@ var PointNode = /** @class */ (function () {
     return PointNode;
 }());
 exports.PointNode = PointNode;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PointNode.js","sourceRoot":"","sources":["../src/PointNode.tsx"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PointNode.js","sourceRoot":"","sources":["../src/PointNode.tsx"],"names":[],"mappings":"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"}

package/lib/SymbolicMarker.js CHANGED Viewed

@@ -45,6 +45,22 @@ var SymbolicMarker = function (props) {
     var _a = __read(React.useState({ x: props.xPos, y: props.yPos }), 2), position = _a[0], setPosition = _a[1];
     var _b = __read(React.useState(false), 2), isSelected = _b[0], setSelected = _b[1];
     var _c = __read(React.useState(""), 2), guid = _c[0], setGuid = _c[1];
+    var isInBounds = React.useCallback(function (xArg, yArg) {
+        var xP = context.XTransformation(props.xPos);
+        var xT = context.XTransformation(xArg);
+        var yP = context.YTransformation(props.yPos, GraphContext_1.AxisMap.get(props.axis));
+        var yT = context.YTransformation(yArg, GraphContext_1.AxisMap.get(props.axis));
+        // Note: This is actually a rectangular box
+        return (xT <= xP + props.radius && xT >= xP - props.radius && yT <= yP + props.radius && yT >= yP - props.radius);
+    }, [props.axis, props.yPos, props.yPos, props.radius, GraphContext_1.AxisMap]);
+    var onClick = React.useCallback(function (xArg, yArg) {
+        if (isInBounds(xArg, yArg))
+            setSelected(true);
+    }, [setSelected, isInBounds]);
+    var onMove = React.useCallback(function (xArg, yArg) {
+        if (props.onHover !== undefined && isInBounds(xArg, yArg))
+            props.onHover();
+    }, [props.onHover, isInBounds]);
     React.useEffect(function () {
         var id = context.RegisterSelect({
             onRelease: function (_) { return setSelected(false); },
@@ -66,7 +82,7 @@ var SymbolicMarker = function (props) {
             onMove: onMove,
             axis: props.axis
         });
-    }, [props.radius, props.xPos, props.yPos, props.axis]);
+    }, [onClick, onMove]);
     React.useEffect(function () {
         setPosition({ x: props.xPos, y: props.yPos });
     }, [props.xPos, props.yPos]);
@@ -84,22 +100,6 @@ var SymbolicMarker = function (props) {
         if (isSelected)
             setPosition({ x: context.XHover, y: context.YHover[GraphContext_1.AxisMap.get(props.axis)] });
     }, [context.XHover, context.YHover]);
-    function isInBounds(xArg, yArg) {
-        var xP = context.XTransformation(props.xPos);
-        var xT = context.XTransformation(xArg);
-        var yP = context.YTransformation(props.yPos, GraphContext_1.AxisMap.get(props.axis));
-        var yT = context.YTransformation(yArg, GraphContext_1.AxisMap.get(props.axis));
-        // Note: This is actually a rectangular box
-        return (xT <= xP + props.radius && xT >= xP - props.radius && yT <= yP + props.radius && yT >= yP - props.radius);
-    }
-    function onClick(xArg, yArg) {
-        if (isInBounds(xArg, yArg))
-            setSelected(true);
-    }
-    function onMove(xArg, yArg) {
-        if (props.onHover !== undefined && isInBounds(xArg, yArg))
-            props.onHover();
-    }
     return (React.createElement(React.Fragment, null,
         React.createElement(SymbolicGraphic, { x: props.xPos, y: props.yPos, r: props.radius, a: GraphContext_1.AxisMap.get(props.axis) }, props.children),
         props.setPosition !== undefined && (props.xPos !== position.x || props.yPos !== position.y) ?
@@ -113,4 +113,4 @@ var SymbolicGraphic = function (props) {
     return (React.createElement("foreignObject", { x: xPixels - props.r, y: yPixels - props.r, width: 2 * props.r, height: 2 * props.r }, props.children));
 };
 exports.default = SymbolicMarker;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3ltYm9saWNNYXJrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvU3ltYm9saWNNYXJrZXIudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx5R0FBeUc7QUFDekcsNkJBQTZCO0FBQzdCLEVBQUU7QUFDRixxRUFBcUU7QUFDckUsRUFBRTtBQUNGLHdHQUF3RztBQUN4Ryx3R0FBd0c7QUFDeEcsc0dBQXNHO0FBQ3RHLHdGQUF3RjtBQUN4RixFQUFFO0FBQ0YsMENBQTBDO0FBQzFDLEVBQUU7QUFDRix3R0FBd0c7QUFDeEcsd0dBQXdHO0FBQ3hHLDRFQUE0RTtBQUM1RSxFQUFFO0FBQ0YsOEJBQThCO0FBQzlCLHdHQUF3RztBQUN4RywwQkFBMEI7QUFDMUIsbURBQW1EO0FBQ25ELEVBQUU7QUFDRix5R0FBeUc7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUd6Ryw2QkFBK0I7QUFDL0IsK0NBQWdGO0FBV2hGLElBQU0sY0FBYyxHQUFvQyxVQUFDLEtBQUs7SUFDNUQsSUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBQywyQkFBWSxDQUFDLENBQUM7SUFDekMsSUFBQSxLQUFBLE9BQTBCLEtBQUssQ0FBQyxRQUFRLENBQXlCLEVBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUMsQ0FBQyxJQUFBLEVBQS9GLFFBQVEsUUFBQSxFQUFFLFdBQVcsUUFBMEUsQ0FBQztJQUNqRyxJQUFBLEtBQUEsT0FBNEIsS0FBSyxDQUFDLFFBQVEsQ0FBVSxLQUFLLENBQUMsSUFBQSxFQUF6RCxVQUFVLFFBQUEsRUFBRSxXQUFXLFFBQWtDLENBQUM7SUFDM0QsSUFBQSxLQUFBLE9BQWtCLEtBQUssQ0FBQyxRQUFRLENBQVMsRUFBRSxDQUFDLElBQUEsRUFBM0MsSUFBSSxRQUFBLEVBQUUsT0FBTyxRQUE4QixDQUFDO0lBRW5ELEtBQUssQ0FBQyxTQUFTLENBQUM7UUFDZCxJQUFNLEVB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3ltYm9saWNNYXJrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvU3ltYm9saWNNYXJrZXIudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx5R0FBeUc7QUFDekcsNkJBQTZCO0FBQzdCLEVBQUU7QUFDRixxRUFBcUU7QUFDckUsRUFBRTtBQUNGLHdHQUF3RztBQUN4Ryx3R0FBd0c7QUFDeEcsc0dBQXNHO0FBQ3RHLHdGQUF3RjtBQUN4RixFQUFFO0FBQ0YsMENBQTBDO0FBQzFDLEVBQUU7QUFDRix3R0FBd0c7QUFDeEcsd0dBQXdHO0FBQ3hHLDRFQUE0RTtBQUM1RSxFQUFFO0FBQ0YsOEJBQThCO0FBQzlCLHdHQUF3RztBQUN4RywwQkFBMEI7QUFDMUIsbURBQW1EO0FBQ25ELEVBQUU7QUFDRix5R0FBeUc7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUd6Ryw2QkFBK0I7QUFDL0IsK0NBQWdGO0FBV2hGLElBQU0sY0FBYyxHQUFvQyxVQUFDLEtBQUs7SUFDNUQsSUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBQywyQkFBWSxDQUFDLENBQUM7SUFDekMsSUFBQSxLQUFBLE9BQTBCLEtBQUssQ0FBQyxRQUFRLENBQXlCLEVBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUMsQ0FBQyxJQUFBLEVBQS9GLFFBQVEsUUFBQSxFQUFFLFdBQVcsUUFBMEUsQ0FBQztJQUNqRyxJQUFBLEtBQUEsT0FBNEIsS0FBSyxDQUFDLFFBQVEsQ0FBVSxLQUFLLENBQUMsSUFBQSxFQUF6RCxVQUFVLFFBQUEsRUFBRSxXQUFXLFFBQWtDLENBQUM7SUFDM0QsSUFBQSxLQUFBLE9BQWtCLEtBQUssQ0FBQyxRQUFRLENBQVMsRUFBRSxDQUFDLElBQUEsRUFBM0MsSUFBSSxRQUFBLEVBQUUsT0FBTyxRQUE4QixDQUFDO0lBRW5ELElBQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxXQUFXLENB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

package/lib/TimeAxis.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export interface IProps {
     setHeight: (h: number) => void;
     label?: string;
     showTicks?: boolean;
+    showDate?: boolean;
     showRightMostTick?: boolean;
     showLeftMostTick?: boolean;
 }

package/lib/TimeAxis.js CHANGED Viewed

@@ -67,6 +67,7 @@ function TimeAxis(props) {
     var _f = __read(React.useState(0), 2), hLabel = _f[0], setHlabel = _f[1];
     var _g = __read(React.useState(0), 2), hAxis = _g[0], setHAxis = _g[1];
     var _h = __read(React.useState('YYYY'), 2), tFormat = _h[0], setTformat = _h[1];
+    var _j = __read(React.useState(''), 2), dFormat = _j[0], setDformat = _j[1];
     // Adjust space for X Axis labels
     React.useEffect(function () {
         var dX = (props.label !== undefined ? (0, helper_functions_1.GetTextHeight)("Segoe UI", '1em', props.label + GetUnitLabel()) : 0);
@@ -74,7 +75,7 @@ function TimeAxis(props) {
     }, [tick, props.label, tFormat]);
     // Adjust space for X Tick labels
     React.useEffect(function () {
-        var dX = Math.max.apply(Math, __spreadArray([], __read(tick.map(function (t) { return (0, helper_functions_1.GetTextHeight)("Segoe UI", '1em', formatTS(t)); })), false));
+        var dX = Math.max.apply(Math, __spreadArray([], __read(tick.map(function (t) { return (0, helper_functions_1.GetTextHeight)("Segoe UI", '1em', formatTS(t, tFormat)); })), false));
         dX = (isFinite(dX) ? dX : 0) + 12;
         setHAxis(dX);
     }, [tick, tFormat]);
@@ -83,28 +84,48 @@ function TimeAxis(props) {
             props.setHeight(hAxis + hLabel);
     }, [hAxis, hLabel, props.heightAxis, props.setHeight]);
     React.useEffect(function () {
+        var _a;
         var deltaT = context.XDomain[1] - context.XDomain[0];
         if (deltaT === 0)
             return;
         var format = 'YYYY';
-        if (deltaT < msPerYear * 15 && deltaT >= msPerYear)
+        var dateFormat = '';
+        if (deltaT < msPerYear * 15 && deltaT >= msPerYear) {
             format = 'MM YY';
-        if (deltaT < msPerYear && deltaT >= 30 * msPerDay)
+            dateFormat = '';
+        }
+        if (deltaT < msPerYear && deltaT >= 30 * msPerDay) {
             format = 'MM/DD';
-        if (deltaT < 30 * msPerDay && deltaT >= 2 * msPerDay)
+            dateFormat = 'YY';
+        }
+        if (deltaT < 30 * msPerDay && deltaT >= 2 * msPerDay) {
             format = 'MM/DD HH';
-        if (deltaT < 2 * msPerDay && deltaT >= 30 * msPerHour)
+            dateFormat = 'YY';
+        }
+        if (deltaT < 2 * msPerDay && deltaT >= 30 * msPerHour) {
             format = 'HH';
-        if (deltaT < 30 * msPerHour && deltaT >= msPerHour)
+            dateFormat = 'MM/DD';
+        }
+        if (deltaT < 30 * msPerHour && deltaT >= msPerHour) {
             format = 'HH:mm';
-        if (deltaT < msPerHour && deltaT >= 30 * msPerMinute)
+            dateFormat = 'MM/DD';
+        }
+        if (deltaT < msPerHour && deltaT >= 30 * msPerMinute) {
             format = 'mm';
-        if (deltaT < 30 * msPerMinute && deltaT >= msPerMinute)
+            dateFormat = 'MM/DD HH';
+        }
+        if (deltaT < 30 * msPerMinute && deltaT >= msPerMinute) {
             format = 'mm:ss';
-        if (deltaT < 30 * msPerSecond && deltaT >= msPerSecond)
+            dateFormat = 'MM/DD HH';
+        }
+        if (deltaT < 30 * msPerSecond && deltaT >= msPerSecond) {
             format = 'ss.SS';
-        if (deltaT < msPerSecond)
+            dateFormat = 'MM/DD HH:mm';
+        }
+        if (deltaT < msPerSecond) {
             format = 'SSS';
+            dateFormat = 'MM/DD HH:mm:ss';
+        }
         var Tstart = moment.utc(context.XDomain[0]);
         var Tend = moment.utc(context.XDomain[1]);
         var Tdiff = moment.duration(moment.utc(context.XDomain[1]).diff(moment.utc(context.XDomain[0])));
@@ -290,7 +311,11 @@ function TimeAxis(props) {
         newTicks.pop();
         setTick(newTicks.map(function (t) { return t.valueOf(); }));
         setTformat(format);
-    }, [context.XDomain]);
+        if ((_a = props.showDate) !== null && _a !== void 0 ? _a : false)
+            setDformat(dateFormat);
+        else
+            setDformat('');
+    }, [context.XDomain, props.showDate]);
     function GetUnitLabel() {
         if (tFormat === 'SSS')
             return " (ms)";
@@ -343,9 +368,9 @@ function TimeAxis(props) {
         setTopOfDay(d);
         d.dayOfYear(0);
     }
-    function formatTS(t) {
+    function formatTS(t, f) {
         var TS = moment.utc(t);
-        return TS.format(tFormat);
+        return TS.format(f);
     }
     return (React.createElement("g", null,
         React.createElement("path", { stroke: 'black', style: { strokeWidth: 1 }, d: "M " + (props.offsetLeft - (((_a = props.showLeftMostTick) !== null && _a !== void 0 ? _a : true) ? 0 : 8)) + " " + (props.height - props.offsetBottom) + " H " + (props.width - props.offsetRight + (((_b = props.showRightMostTick) !== null && _b !== void 0 ? _b : true) ? 0 : 8)) }),
@@ -354,9 +379,10 @@ function TimeAxis(props) {
         props.showTicks === undefined || props.showTicks ?
             React.createElement(React.Fragment, null,
                 tick.map(function (l, i) { return React.createElement("path", { key: i, stroke: 'black', style: { strokeWidth: 1, transition: 'd 0.5s' }, d: "M " + context.XTransformation(l) + " " + (props.height - props.offsetBottom + 6) + " v " + -6 }); }),
-                tick.map(function (l, i) { return React.createElement("text", { fill: 'black', key: i, style: { fontSize: '1em', textAnchor: 'middle', dominantBaseline: 'hanging', transition: 'x 0.5s, y 0.5s' }, y: props.height - props.offsetBottom + 8, x: context.XTransformation(l) }, formatTS(l)); }))
+                tick.map(function (l, i) { return React.createElement("text", { fill: 'black', key: i, style: { fontSize: '1em', textAnchor: 'middle', dominantBaseline: 'hanging', transition: 'x 0.5s, y 0.5s' }, y: props.height - props.offsetBottom + 8, x: context.XTransformation(l) }, formatTS(l, tFormat)); }))
             : null,
-        props.label !== undefined ? React.createElement("text", { fill: 'black', style: { fontSize: '1em', textAnchor: 'middle', dominantBaseline: 'middle' }, x: props.offsetLeft + ((props.width - props.offsetLeft - props.offsetRight) / 2), y: props.height - props.offsetBottom + hAxis }, props.label + GetUnitLabel()) : null));
+        props.label !== undefined ? React.createElement("text", { fill: 'black', style: { fontSize: '1em', textAnchor: 'middle', dominantBaseline: 'middle' }, x: props.offsetLeft + ((props.width - props.offsetLeft - props.offsetRight) / 2), y: props.height - props.offsetBottom + hAxis }, props.label + GetUnitLabel()) : null,
+        (dFormat !== '' && tick.length > 0) ? React.createElement("text", { fill: 'black', style: { fontSize: '1em', textAnchor: 'end', dominantBaseline: 'middle' }, x: props.width - props.offsetRight, y: props.height - props.offsetBottom + hAxis }, formatTS(tick[0], dFormat)) : null));
 }
 exports.default = React.memo(TimeAxis);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TimeAxis.js","sourceRoot":"","sources":["../src/TimeAxis.tsx"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TimeAxis.js","sourceRoot":"","sources":["../src/TimeAxis.tsx"],"names":[],"mappings":"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"}

package/lib/index.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import Plot from './Plot';
 import Line from './Line';
+import HeatMapChart from './HeatMapChart';
 import LineWithThreshold from './LineWithThreshold';
 import HorizontalMarker from './HorizontalMarker';
 import VerticalMarker from './VerticalMarker';
@@ -9,4 +10,4 @@ import AggregatingCircles from './AggregatingCircles';
 import Circle from './Circle';
 import Infobox from './Infobox';
 import { AxisMap } from './GraphContext';
-export { Plot, Line, LineWithThreshold, Button, HorizontalMarker, VerticalMarker, SymbolicMarker, Circle, AggregatingCircles, Infobox, AxisMap };
+export { Plot, Line, HeatMapChart, LineWithThreshold, Button, HorizontalMarker, VerticalMarker, SymbolicMarker, Circle, AggregatingCircles, Infobox, AxisMap };

package/lib/index.js CHANGED Viewed

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AxisMap = exports.Infobox = exports.AggregatingCircles = exports.Circle = exports.SymbolicMarker = exports.VerticalMarker = exports.HorizontalMarker = exports.Button = exports.LineWithThreshold = exports.Line = exports.Plot = void 0;
+exports.AxisMap = exports.Infobox = exports.AggregatingCircles = exports.Circle = exports.SymbolicMarker = exports.VerticalMarker = exports.HorizontalMarker = exports.Button = exports.LineWithThreshold = exports.HeatMapChart = exports.Line = exports.Plot = void 0;
 var Plot_1 = require("./Plot");
 exports.Plot = Plot_1.default;
 var Line_1 = require("./Line");
 exports.Line = Line_1.default;
+var HeatMapChart_1 = require("./HeatMapChart");
+exports.HeatMapChart = HeatMapChart_1.default;
 var LineWithThreshold_1 = require("./LineWithThreshold");
 exports.LineWithThreshold = LineWithThreshold_1.default;
 var HorizontalMarker_1 = require("./HorizontalMarker");
@@ -23,4 +25,4 @@ var Infobox_1 = require("./Infobox");
 exports.Infobox = Infobox_1.default;
 var GraphContext_1 = require("./GraphContext");
 Object.defineProperty(exports, "AxisMap", { enumerable: true, get: function () { return GraphContext_1.AxisMap; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0JBQTBCO0FBYXRCLGVBYkcsY0FBSSxDQWFIO0FBWlIsK0JBQTBCO0FBYXRCLGVBYkcsY0FBSSxDQWFIO0FBWlIseURBQW9EO0FBYWhELDRCQWJHLDJCQUFpQixDQWFIO0FBWnJCLHVEQUFrRDtBQWM5QywyQkFkRywwQkFBZ0IsQ0FjSDtBQWJwQixtREFBOEM7QUFjMUMseUJBZEcsd0JBQWMsQ0FjSDtBQWJsQixtREFBOEM7QUFjMUMseUJBZEcsd0JBQWMsQ0FjSDtBQWJsQixtQ0FBOEI7QUFVMUIsaUJBVkcsZ0JBQU0sQ0FVSDtBQVRWLDJEQUFzRDtBQWNsRCw2QkFkRyw0QkFBa0IsQ0FjSDtBQWJ0QixtQ0FBOEI7QUFZMUIsaUJBWkcsZ0JBQU0sQ0FZSDtBQVhWLHFDQUFnQztBQWE1QixrQkFiRyxpQkFBTyxDQWFIO0FBWlgsK0NBQXlDO0FBYXJDLHdGQWJLLHNCQUFPLE9BYUwifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0JBQTBCO0FBY3RCLGVBZEcsY0FBSSxDQWNIO0FBYlIsK0JBQTBCO0FBY3RCLGVBZEcsY0FBSSxDQWNIO0FBYlIsK0NBQTBDO0FBY3RDLHVCQWRHLHNCQUFZLENBY0g7QUFiaEIseURBQW9EO0FBY2hELDRCQWRHLDJCQUFpQixDQWNIO0FBYnJCLHVEQUFrRDtBQWU5QywyQkFmRywwQkFBZ0IsQ0FlSDtBQWRwQixtREFBOEM7QUFlMUMseUJBZkcsd0JBQWMsQ0FlSDtBQWRsQixtREFBOEM7QUFlMUMseUJBZkcsd0JBQWMsQ0FlSDtBQWRsQixtQ0FBOEI7QUFXMUIsaUJBWEcsZ0JBQU0sQ0FXSDtBQVZWLDJEQUFzRDtBQWVsRCw2QkFmRyw0QkFBa0IsQ0FlSDtBQWR0QixtQ0FBOEI7QUFhMUIsaUJBYkcsZ0JBQU0sQ0FhSDtBQVpWLHFDQUFnQztBQWM1QixrQkFkRyxpQkFBTyxDQWNIO0FBYlgsK0NBQXlDO0FBY3JDLHdGQWRLLHNCQUFPLE9BY0wifQ==

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@gpa-gemstone/react-graph",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "Interactive UI Components for GPA products",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -46,7 +46,7 @@
   },
   "dependencies":   {
     "@gpa-gemstone/gpa-symbols": "0.0.28",
-    "@gpa-gemstone/helper-functions": "0.0.25",
+    "@gpa-gemstone/helper-functions": "0.0.26",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "react": "^18.2.0"