@gpa-gemstone/react-graph 1.0.74 → 1.0.75
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.
- package/lib/GraphContext.d.ts +8 -0
- package/lib/GraphContext.js +3 -1
- package/lib/HeatLegend.js +6 -18
- package/lib/HeatMapChart.js +4 -4
- package/lib/InteractiveButtons.d.ts +2 -0
- package/lib/InteractiveButtons.js +24 -12
- package/lib/Legend.d.ts +6 -1
- package/lib/Legend.js +116 -60
- package/lib/LegendContext.d.ts +3 -5
- package/lib/LegendContext.js +3 -5
- package/lib/Line.js +10 -4
- package/lib/LineLegend.d.ts +1 -1
- package/lib/LineLegend.js +13 -51
- package/lib/LineWithThreshold.js +9 -3
- package/lib/Pill.d.ts +73 -0
- package/lib/Pill.js +165 -0
- package/lib/Plot.d.ts +11 -0
- package/lib/Plot.js +84 -65
- package/lib/index.d.ts +2 -2
- package/lib/index.js +3 -3
- package/package.json +3 -3
- package/lib/Oval.d.ts +0 -64
- package/lib/Oval.js +0 -132
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gpa-gemstone/react-graph",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.75",
|
|
4
4
|
"description": "Interactive UI Components for GPA products",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -45,8 +45,8 @@
|
|
|
45
45
|
"typescript": "5.5.3"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@gpa-gemstone/gpa-symbols": "0.0.
|
|
49
|
-
"@gpa-gemstone/helper-functions": "0.0.
|
|
48
|
+
"@gpa-gemstone/gpa-symbols": "0.0.52",
|
|
49
|
+
"@gpa-gemstone/helper-functions": "0.0.42",
|
|
50
50
|
"html2canvas": "^1.4.1",
|
|
51
51
|
"lodash": "^4.17.21",
|
|
52
52
|
"moment": "^2.29.4",
|
package/lib/Oval.d.ts
DELETED
|
@@ -1,64 +0,0 @@
|
|
|
1
|
-
import { IActionFunctions, AxisIdentifier } from './GraphContext';
|
|
2
|
-
export interface IProps {
|
|
3
|
-
/**
|
|
4
|
-
* Data for the oval and circles:
|
|
5
|
-
* [x1, x2, y]
|
|
6
|
-
* - x1: The x-coordinate of the left edge of the oval.
|
|
7
|
-
* - x2: The x-coordinate of the right edge of the oval.
|
|
8
|
-
* - y: The y-coordinate of the center of the oval.
|
|
9
|
-
*/
|
|
10
|
-
Data: [number, number, number];
|
|
11
|
-
/**
|
|
12
|
-
* Fill color of the oval.
|
|
13
|
-
* @type {string}
|
|
14
|
-
*/
|
|
15
|
-
Color: string;
|
|
16
|
-
/**
|
|
17
|
-
* Color of text in oval.
|
|
18
|
-
* @type {string}
|
|
19
|
-
*/
|
|
20
|
-
TextColor?: string;
|
|
21
|
-
/**
|
|
22
|
-
* The vertical radius of the oval.
|
|
23
|
-
* @type {number}
|
|
24
|
-
*/
|
|
25
|
-
Radius: number;
|
|
26
|
-
/**
|
|
27
|
-
* Stroke color of the oval and circles.
|
|
28
|
-
* @optional
|
|
29
|
-
* @type {string}
|
|
30
|
-
*/
|
|
31
|
-
BorderColor?: string;
|
|
32
|
-
/**
|
|
33
|
-
* Stroke thickness of the oval and circles.
|
|
34
|
-
* @optional
|
|
35
|
-
* @type {number}
|
|
36
|
-
*/
|
|
37
|
-
BorderThickness?: number;
|
|
38
|
-
/**
|
|
39
|
-
* Optional text to display inside the oval.
|
|
40
|
-
* @optional
|
|
41
|
-
* @type {string}
|
|
42
|
-
*/
|
|
43
|
-
Text?: string;
|
|
44
|
-
/**
|
|
45
|
-
* Opacity of the oval and circles.
|
|
46
|
-
* @optional
|
|
47
|
-
* @type {number}
|
|
48
|
-
*/
|
|
49
|
-
Opacity?: number;
|
|
50
|
-
/**
|
|
51
|
-
* Axis identifier used for vertical positioning.
|
|
52
|
-
* @optional
|
|
53
|
-
* @type {AxisIdentifier}
|
|
54
|
-
*/
|
|
55
|
-
Axis?: AxisIdentifier;
|
|
56
|
-
/**
|
|
57
|
-
* Callback function to handle click events on the oval. Provides action functions to update domains.
|
|
58
|
-
* @optional
|
|
59
|
-
* @type {(actions: IActionFunctions) => void}
|
|
60
|
-
*/
|
|
61
|
-
OnClick?: (x: number, y: number, actions: IActionFunctions) => void;
|
|
62
|
-
}
|
|
63
|
-
declare const Oval: (props: IProps) => JSX.Element | null;
|
|
64
|
-
export default Oval;
|
package/lib/Oval.js
DELETED
|
@@ -1,132 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// ******************************************************************************************************
|
|
3
|
-
// Oval.tsx - Gbtc
|
|
4
|
-
//
|
|
5
|
-
// Copyright © 2024, Grid Protection Alliance. All Rights Reserved.
|
|
6
|
-
//
|
|
7
|
-
// Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
|
|
8
|
-
// the NOTICE file distributed with this work for additional information regarding copyright ownership.
|
|
9
|
-
// The GPA licenses this file to you under the MIT License (MIT), the "License"; you may not use this
|
|
10
|
-
// file except in compliance with the License. You may obtain a copy of the License at:
|
|
11
|
-
//
|
|
12
|
-
// http://opensource.org/licenses/MIT
|
|
13
|
-
//
|
|
14
|
-
// Unless agreed to in writing, the subject software distributed under the License is distributed on an
|
|
15
|
-
// "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
|
|
16
|
-
// License for the specific language governing permissions and limitations.
|
|
17
|
-
//
|
|
18
|
-
// Code Modification History:
|
|
19
|
-
// ----------------------------------------------------------------------------------------------------
|
|
20
|
-
// 09/03/2024 - Preston Crawford
|
|
21
|
-
// Generated original version of source code.
|
|
22
|
-
//
|
|
23
|
-
// ******************************************************************************************************
|
|
24
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
25
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
26
|
-
if (!m) return o;
|
|
27
|
-
var i = m.call(o), r, ar = [], e;
|
|
28
|
-
try {
|
|
29
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
30
|
-
}
|
|
31
|
-
catch (error) { e = { error: error }; }
|
|
32
|
-
finally {
|
|
33
|
-
try {
|
|
34
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
35
|
-
}
|
|
36
|
-
finally { if (e) throw e.error; }
|
|
37
|
-
}
|
|
38
|
-
return ar;
|
|
39
|
-
};
|
|
40
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
41
|
-
var helper_functions_1 = require("@gpa-gemstone/helper-functions");
|
|
42
|
-
var React = require("react");
|
|
43
|
-
var GraphContext_1 = require("./GraphContext");
|
|
44
|
-
var Oval = function (props) {
|
|
45
|
-
var _a;
|
|
46
|
-
var context = React.useContext(GraphContext_1.GraphContext);
|
|
47
|
-
var _b = __read(React.useState(""), 2), guid = _b[0], setGuid = _b[1];
|
|
48
|
-
var _c = __read(React.useState(1), 2), textSize = _c[0], setTextSize = _c[1];
|
|
49
|
-
// Update data series information in the graph context based on circle properties
|
|
50
|
-
React.useEffect(function () {
|
|
51
|
-
if (guid === "")
|
|
52
|
-
return;
|
|
53
|
-
context.UpdateData(guid, {
|
|
54
|
-
axis: props.Axis,
|
|
55
|
-
legend: undefined,
|
|
56
|
-
getMax: function (t) { return (t[0] < props.Data[0] && t[1] > props.Data[1] ? props.Data[2] : undefined); },
|
|
57
|
-
getMin: function (t) { return (t[0] < props.Data[0] && t[1] > props.Data[1] ? props.Data[2] : undefined); },
|
|
58
|
-
});
|
|
59
|
-
}, [props.Axis, props.Data]);
|
|
60
|
-
// Add a new data series on component mount / removing on unmount
|
|
61
|
-
React.useEffect(function () {
|
|
62
|
-
var id = context.AddData({
|
|
63
|
-
axis: props.Axis,
|
|
64
|
-
legend: undefined,
|
|
65
|
-
getMax: function (t) { return (t[0] < props.Data[0] && t[1] > props.Data[1] ? props.Data[2] : undefined); },
|
|
66
|
-
getMin: function (t) { return (t[0] < props.Data[0] && t[1] > props.Data[1] ? props.Data[2] : undefined); },
|
|
67
|
-
});
|
|
68
|
-
setGuid(id);
|
|
69
|
-
return function () {
|
|
70
|
-
context.RemoveData(id);
|
|
71
|
-
};
|
|
72
|
-
}, []);
|
|
73
|
-
// Adjust text size within the oval to ensure it fits
|
|
74
|
-
React.useEffect(function () {
|
|
75
|
-
if (props.Text === undefined)
|
|
76
|
-
return;
|
|
77
|
-
var fontFamily = "Segoe UI";
|
|
78
|
-
var fontSizeUnit = "em";
|
|
79
|
-
var ovalWidth = Math.abs(context.XTransformation(props.Data[1]) - context.XTransformation(props.Data[0])) + (2 * props.Radius);
|
|
80
|
-
var ovalHeight = 2 * props.Radius;
|
|
81
|
-
var minSize = 0.05;
|
|
82
|
-
var maxSize = 5;
|
|
83
|
-
var bestSize = maxSize;
|
|
84
|
-
var calculateTextSize = function (size) {
|
|
85
|
-
var dX = (0, helper_functions_1.GetTextWidth)(fontFamily, size + fontSizeUnit, props.Text);
|
|
86
|
-
var dY = (0, helper_functions_1.GetTextHeight)(fontFamily, size + fontSizeUnit, props.Text);
|
|
87
|
-
return { dX: dX, dY: dY };
|
|
88
|
-
};
|
|
89
|
-
while (maxSize - minSize > 0.01) {
|
|
90
|
-
var midSize = (maxSize + minSize) / 2;
|
|
91
|
-
var _a = calculateTextSize(midSize), dX = _a.dX, dY = _a.dY;
|
|
92
|
-
if (dX <= ovalWidth && dY <= ovalHeight) {
|
|
93
|
-
bestSize = midSize;
|
|
94
|
-
minSize = midSize; // Try larger
|
|
95
|
-
}
|
|
96
|
-
else
|
|
97
|
-
maxSize = midSize; // Try smaller
|
|
98
|
-
}
|
|
99
|
-
setTextSize(bestSize);
|
|
100
|
-
}, [props.Text, props.Radius, context.XTransformation, props.Data]);
|
|
101
|
-
// Set up a click handler if provided in props
|
|
102
|
-
React.useEffect(function () {
|
|
103
|
-
if (guid === "" || props.OnClick === undefined)
|
|
104
|
-
return;
|
|
105
|
-
context.UpdateSelect(guid, { onClick: onClick });
|
|
106
|
-
}, [props.OnClick, context.UpdateFlag]);
|
|
107
|
-
// Handle click events on the oval
|
|
108
|
-
function onClick(xClick, yClick) {
|
|
109
|
-
if (props.OnClick === undefined)
|
|
110
|
-
return;
|
|
111
|
-
// Calculate positions and determine if the click was within the oval bounds
|
|
112
|
-
var axis = GraphContext_1.AxisMap.get(props.Axis);
|
|
113
|
-
var xClickTransformed = context.XTransformation(xClick);
|
|
114
|
-
var yClickTransformed = context.YTransformation(yClick, axis);
|
|
115
|
-
var x1Transformed = context.XTransformation(props.Data[0]) - props.Radius;
|
|
116
|
-
var x2Transformed = context.XTransformation(props.Data[1]) + props.Radius;
|
|
117
|
-
var yTransformed = context.YTransformation(props.Data[2], axis);
|
|
118
|
-
var isWithinHorizontalBounds = xClickTransformed >= x1Transformed && xClickTransformed <= x2Transformed;
|
|
119
|
-
var isWithinVerticalBounds = yClickTransformed >= yTransformed - props.Radius && yClickTransformed <= yTransformed + props.Radius;
|
|
120
|
-
if (isWithinHorizontalBounds && isWithinVerticalBounds)
|
|
121
|
-
props.OnClick(xClick, yClick, { setYDomain: context.SetYDomain, setTDomain: context.SetXDomain });
|
|
122
|
-
}
|
|
123
|
-
// Render null if coordinates are not valid, otherwise render the circle / text
|
|
124
|
-
if (!isFinite(context.XTransformation((props.Data[0], props.Data[1]) / 2)) || !isFinite(context.YTransformation(props.Data[2], GraphContext_1.AxisMap.get(props.Axis))))
|
|
125
|
-
return null;
|
|
126
|
-
return (React.createElement("g", null,
|
|
127
|
-
React.createElement("rect", { x: context.XTransformation(props.Data[0]) - props.Radius, y: context.YTransformation(props.Data[2], GraphContext_1.AxisMap.get(props.Axis)) - props.Radius, width: Math.abs(context.XTransformation(props.Data[1]) - context.XTransformation(props.Data[0])) + (2 * props.Radius), height: 2 * props.Radius, rx: props.Radius, ry: props.Radius, fill: props.Color, opacity: props.Opacity, stroke: props.BorderColor, strokeWidth: props.BorderThickness, onClick: function (e) { return onClick(e.clientX, e.clientY); } }),
|
|
128
|
-
props.Text !== undefined ?
|
|
129
|
-
React.createElement("text", { fill: (_a = props.TextColor) !== null && _a !== void 0 ? _a : 'currentColor', style: { fontSize: textSize + 'em', textAnchor: 'middle', dominantBaseline: 'middle' }, y: context.YTransformation(props.Data[2], GraphContext_1.AxisMap.get(props.Axis)), x: (context.XTransformation(props.Data[0]) + context.XTransformation(props.Data[1])) / 2 }, props.Text) : null));
|
|
130
|
-
};
|
|
131
|
-
exports.default = Oval;
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Oval.js","sourceRoot":"","sources":["../src/Oval.tsx"],"names":[],"mappings":"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"}
|