@pie-lib/graphing 3.2.0-next.34 → 3.2.0-next.36
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/CHANGELOG.md +10 -0
- package/lib/tools/line/component.js +18 -14
- package/lib/tools/line/component.js.map +1 -1
- package/package.json +6 -6
- package/src/tools/line/component.jsx +26 -14
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [3.2.0-next.36](https://github.com/pie-framework/pie-lib/compare/@pie-lib/graphing@3.2.0-next.35...@pie-lib/graphing@3.2.0-next.36) (2026-04-23)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- **graphing:** restore disabled/correctness styling on Line tool PIE-425 ([de26993](https://github.com/pie-framework/pie-lib/commit/de26993e35aa46437af9f6f9db5126218890dcf7))
|
|
11
|
+
|
|
12
|
+
# [3.2.0-next.35](https://github.com/pie-framework/pie-lib/compare/@pie-lib/graphing@3.2.0-next.34...@pie-lib/graphing@3.2.0-next.35) (2026-04-17)
|
|
13
|
+
|
|
14
|
+
**Note:** Version bump only for package @pie-lib/graphing
|
|
15
|
+
|
|
6
16
|
# [3.2.0-next.34](https://github.com/pie-framework/pie-lib/compare/@pie-lib/graphing@3.2.0-next.33...@pie-lib/graphing@3.2.0-next.34) (2026-04-16)
|
|
7
17
|
|
|
8
18
|
**Note:** Version bump only for package @pie-lib/graphing
|
|
@@ -8,6 +8,7 @@ exports["default"] = exports.ArrowedLine = void 0;
|
|
|
8
8
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
11
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
12
|
var _line = require("../shared/line");
|
|
12
13
|
var _react = _interopRequireDefault(require("react"));
|
|
13
14
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
@@ -17,20 +18,19 @@ var _arrowHead = require("../shared/arrow-head");
|
|
|
17
18
|
var _utils = require("../../utils");
|
|
18
19
|
var _styles = require("@mui/material/styles");
|
|
19
20
|
var _excluded = ["className", "correctness", "disabled", "graphProps", "from", "to", "markerId"];
|
|
21
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
22
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
20
23
|
var StyledArrowedLineRoot = (0, _styles.styled)('g')(function (_ref) {
|
|
21
|
-
var theme = _ref.theme
|
|
24
|
+
var theme = _ref.theme,
|
|
25
|
+
disabled = _ref.disabled,
|
|
26
|
+
correctness = _ref.correctness;
|
|
22
27
|
return {
|
|
23
|
-
line: _line.styles.line(theme),
|
|
24
|
-
enabledArrow: _line.styles.arrow(theme),
|
|
25
|
-
disabledArrow: _line.styles.disabledArrow(theme),
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
correctArrow: _line.styles.correct(theme),
|
|
30
|
-
incorrect: _line.styles.incorrect(theme, 'stroke'),
|
|
31
|
-
incorrectArrow: _line.styles.incorrect(theme),
|
|
32
|
-
missing: _line.styles.missing(theme, 'stroke'),
|
|
33
|
-
missingArrow: _line.styles.missing(theme)
|
|
28
|
+
'& line:not(.hit-area)': _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _line.styles.line(theme)), disabled && _line.styles.disabledSecondary(theme)), correctness === 'correct' && _line.styles.correct(theme, 'stroke')), correctness === 'incorrect' && _line.styles.incorrect(theme, 'stroke')), correctness === 'missing' && _line.styles.missing(theme, 'stroke')),
|
|
29
|
+
'& .enabledArrow': _objectSpread({}, _line.styles.arrow(theme)),
|
|
30
|
+
'& .disabledArrow': _objectSpread({}, _line.styles.disabledArrow(theme)),
|
|
31
|
+
'& .correctArrow': _objectSpread({}, _line.styles.correct(theme)),
|
|
32
|
+
'& .incorrectArrow': _objectSpread({}, _line.styles.incorrect(theme)),
|
|
33
|
+
'& .missingArrow': _objectSpread({}, _line.styles.missing(theme))
|
|
34
34
|
};
|
|
35
35
|
});
|
|
36
36
|
var ArrowedLine = exports.ArrowedLine = function ArrowedLine(props) {
|
|
@@ -53,7 +53,10 @@ var ArrowedLine = exports.ArrowedLine = function ArrowedLine(props) {
|
|
|
53
53
|
eTo = _trig$edges2[1];
|
|
54
54
|
var suffix = correctness || disabled && 'disabled' || 'enabled';
|
|
55
55
|
var finalMarkerId = propMarkerId || markerId;
|
|
56
|
-
return /*#__PURE__*/_react["default"].createElement(StyledArrowedLineRoot,
|
|
56
|
+
return /*#__PURE__*/_react["default"].createElement(StyledArrowedLineRoot, {
|
|
57
|
+
disabled: disabled,
|
|
58
|
+
correctness: correctness
|
|
59
|
+
}, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement(_arrowHead.ArrowMarker, {
|
|
57
60
|
size: (0, _utils.thinnerShapesNeeded)(graphProps) ? 4 : 5,
|
|
58
61
|
id: "".concat(finalMarkerId, "-").concat(suffix),
|
|
59
62
|
className: (0, _classnames["default"])(suffix === 'enabled' ? 'enabledArrow' : suffix === 'disabled' ? 'disabledArrow' : "".concat(suffix, "Arrow"))
|
|
@@ -62,6 +65,7 @@ var ArrowedLine = exports.ArrowedLine = function ArrowedLine(props) {
|
|
|
62
65
|
y1: scale.y(eFrom.y),
|
|
63
66
|
x2: scale.x(eTo.x),
|
|
64
67
|
y2: scale.y(eTo.y),
|
|
68
|
+
className: "hit-area",
|
|
65
69
|
stroke: "transparent",
|
|
66
70
|
strokeWidth: 7,
|
|
67
71
|
style: {
|
|
@@ -73,7 +77,7 @@ var ArrowedLine = exports.ArrowedLine = function ArrowedLine(props) {
|
|
|
73
77
|
y1: scale.y(eFrom.y),
|
|
74
78
|
x2: scale.x(eTo.x),
|
|
75
79
|
y2: scale.y(eTo.y),
|
|
76
|
-
className:
|
|
80
|
+
className: className,
|
|
77
81
|
markerEnd: "url(#".concat(finalMarkerId, "-").concat(suffix, ")"),
|
|
78
82
|
markerStart: "url(#".concat(finalMarkerId, "-").concat(suffix, ")")
|
|
79
83
|
}, rest)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","names":["_line","require","_react","_interopRequireDefault","_propTypes","_plot","_classnames","_arrowHead","_utils","_styles","_excluded","
|
|
1
|
+
{"version":3,"file":"component.js","names":["_line","require","_react","_interopRequireDefault","_propTypes","_plot","_classnames","_arrowHead","_utils","_styles","_excluded","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","StyledArrowedLineRoot","styled","_ref","theme","disabled","correctness","styles","line","disabledSecondary","correct","incorrect","missing","arrow","disabledArrow","ArrowedLine","exports","props","markerId","genUid","className","graphProps","from","to","propMarkerId","rest","_objectWithoutProperties2","scale","_getAdjustedGraphLimi","getAdjustedGraphLimits","domain","range","_trig$edges","trig","edges","_trig$edges2","_slicedToArray2","eFrom","eTo","suffix","finalMarkerId","createElement","ArrowMarker","size","thinnerShapesNeeded","id","concat","classNames","x1","x","y1","y","x2","y2","stroke","strokeWidth","style","cursor","pointerEvents","_extends2","markerEnd","markerStart","propTypes","PropTypes","string","bool","types","GraphPropsType","PointType","Line","lineBase","Component","lineToolComponent","_default"],"sources":["../../../src/tools/line/component.jsx"],"sourcesContent":["import { lineBase, lineToolComponent, styles } from '../shared/line';\nimport React from 'react';\nimport PropTypes from 'prop-types';\nimport { trig, types } from '@pie-lib/plot';\nimport classNames from 'classnames';\nimport { ArrowMarker, genUid } from '../shared/arrow-head';\nimport { getAdjustedGraphLimits, thinnerShapesNeeded } from '../../utils';\nimport { styled } from '@mui/material/styles';\n\nconst StyledArrowedLineRoot = styled('g')(({ theme, disabled, correctness }) => ({\n '& line:not(.hit-area)': {\n ...styles.line(theme),\n ...(disabled && styles.disabledSecondary(theme)),\n ...(correctness === 'correct' && styles.correct(theme, 'stroke')),\n ...(correctness === 'incorrect' && styles.incorrect(theme, 'stroke')),\n ...(correctness === 'missing' && styles.missing(theme, 'stroke')),\n },\n '& .enabledArrow': {\n ...styles.arrow(theme),\n },\n '& .disabledArrow': {\n ...styles.disabledArrow(theme),\n },\n '& .correctArrow': {\n ...styles.correct(theme),\n },\n '& .incorrectArrow': {\n ...styles.incorrect(theme),\n },\n '& .missingArrow': {\n ...styles.missing(theme),\n },\n}));\n\nexport const ArrowedLine = (props) => {\n const markerId = genUid();\n const { className, correctness, disabled, graphProps, from, to, markerId: propMarkerId, ...rest } = props;\n const { scale } = graphProps;\n const { domain, range } = getAdjustedGraphLimits(graphProps);\n const [eFrom, eTo] = trig.edges(domain, range)(from, to);\n const suffix = correctness || (disabled && 'disabled') || 'enabled';\n const finalMarkerId = propMarkerId || markerId;\n\n return (\n <StyledArrowedLineRoot disabled={disabled} correctness={correctness}>\n <defs>\n <ArrowMarker\n size={thinnerShapesNeeded(graphProps) ? 4 : 5}\n id={`${finalMarkerId}-${suffix}`}\n className={classNames(\n suffix === 'enabled' ? 'enabledArrow' : suffix === 'disabled' ? 'disabledArrow' : `${suffix}Arrow`,\n )}\n />\n </defs>\n {/* Transparent wider line captures pointer events (+2px each side) */}\n <line\n x1={scale.x(eFrom.x)}\n y1={scale.y(eFrom.y)}\n x2={scale.x(eTo.x)}\n y2={scale.y(eTo.y)}\n className=\"hit-area\"\n stroke=\"transparent\"\n strokeWidth={7}\n style={{ cursor: 'pointer', pointerEvents: 'stroke' }}\n />\n <line\n x1={scale.x(eFrom.x)}\n y1={scale.y(eFrom.y)}\n x2={scale.x(eTo.x)}\n y2={scale.y(eTo.y)}\n className={className}\n markerEnd={`url(#${finalMarkerId}-${suffix})`}\n markerStart={`url(#${finalMarkerId}-${suffix})`}\n {...rest}\n />\n </StyledArrowedLineRoot>\n );\n};\n\nArrowedLine.propTypes = {\n className: PropTypes.string,\n correctness: PropTypes.string,\n disabled: PropTypes.bool,\n graphProps: types.GraphPropsType,\n from: types.PointType,\n to: types.PointType,\n markerId: PropTypes.string,\n};\n\nconst Line = lineBase(ArrowedLine);\nconst Component = lineToolComponent(Line);\n\nexport default Component;\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "3.2.0-next.
|
|
6
|
+
"version": "3.2.0-next.36",
|
|
7
7
|
"description": "Graphing components",
|
|
8
8
|
"keywords": [
|
|
9
9
|
"react",
|
|
@@ -22,11 +22,11 @@
|
|
|
22
22
|
"@mapbox/point-geometry": "^1.1.0",
|
|
23
23
|
"@mui/icons-material": "^7.3.4",
|
|
24
24
|
"@mui/material": "^7.3.4",
|
|
25
|
-
"@pie-lib/drag": "^3.2.0-next.
|
|
26
|
-
"@pie-lib/editable-html-tip-tap": "^1.2.0-next.
|
|
25
|
+
"@pie-lib/drag": "^3.2.0-next.10",
|
|
26
|
+
"@pie-lib/editable-html-tip-tap": "^1.2.0-next.36",
|
|
27
27
|
"@pie-lib/graphing-utils": "^2.2.0-next.3",
|
|
28
|
-
"@pie-lib/plot": "^3.2.0-next.
|
|
29
|
-
"@pie-lib/render-ui": "^5.2.0-next.
|
|
28
|
+
"@pie-lib/plot": "^3.2.0-next.36",
|
|
29
|
+
"@pie-lib/render-ui": "^5.2.0-next.9",
|
|
30
30
|
"@pie-lib/translator": "^3.2.0-next.3",
|
|
31
31
|
"@visx/axis": "^3.0.0",
|
|
32
32
|
"@visx/clip-path": "^3.0.0",
|
|
@@ -54,6 +54,6 @@
|
|
|
54
54
|
"peerDependencies": {
|
|
55
55
|
"react": "^18.2.0"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "6ed326bed124056a8f5a7ff52386f8b12fbf650b",
|
|
58
58
|
"scripts": {}
|
|
59
59
|
}
|
|
@@ -7,18 +7,29 @@ import { ArrowMarker, genUid } from '../shared/arrow-head';
|
|
|
7
7
|
import { getAdjustedGraphLimits, thinnerShapesNeeded } from '../../utils';
|
|
8
8
|
import { styled } from '@mui/material/styles';
|
|
9
9
|
|
|
10
|
-
const StyledArrowedLineRoot = styled('g')(({ theme }) => ({
|
|
11
|
-
line:
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
10
|
+
const StyledArrowedLineRoot = styled('g')(({ theme, disabled, correctness }) => ({
|
|
11
|
+
'& line:not(.hit-area)': {
|
|
12
|
+
...styles.line(theme),
|
|
13
|
+
...(disabled && styles.disabledSecondary(theme)),
|
|
14
|
+
...(correctness === 'correct' && styles.correct(theme, 'stroke')),
|
|
15
|
+
...(correctness === 'incorrect' && styles.incorrect(theme, 'stroke')),
|
|
16
|
+
...(correctness === 'missing' && styles.missing(theme, 'stroke')),
|
|
17
|
+
},
|
|
18
|
+
'& .enabledArrow': {
|
|
19
|
+
...styles.arrow(theme),
|
|
20
|
+
},
|
|
21
|
+
'& .disabledArrow': {
|
|
22
|
+
...styles.disabledArrow(theme),
|
|
23
|
+
},
|
|
24
|
+
'& .correctArrow': {
|
|
25
|
+
...styles.correct(theme),
|
|
26
|
+
},
|
|
27
|
+
'& .incorrectArrow': {
|
|
28
|
+
...styles.incorrect(theme),
|
|
29
|
+
},
|
|
30
|
+
'& .missingArrow': {
|
|
31
|
+
...styles.missing(theme),
|
|
32
|
+
},
|
|
22
33
|
}));
|
|
23
34
|
|
|
24
35
|
export const ArrowedLine = (props) => {
|
|
@@ -31,7 +42,7 @@ export const ArrowedLine = (props) => {
|
|
|
31
42
|
const finalMarkerId = propMarkerId || markerId;
|
|
32
43
|
|
|
33
44
|
return (
|
|
34
|
-
<StyledArrowedLineRoot>
|
|
45
|
+
<StyledArrowedLineRoot disabled={disabled} correctness={correctness}>
|
|
35
46
|
<defs>
|
|
36
47
|
<ArrowMarker
|
|
37
48
|
size={thinnerShapesNeeded(graphProps) ? 4 : 5}
|
|
@@ -47,6 +58,7 @@ export const ArrowedLine = (props) => {
|
|
|
47
58
|
y1={scale.y(eFrom.y)}
|
|
48
59
|
x2={scale.x(eTo.x)}
|
|
49
60
|
y2={scale.y(eTo.y)}
|
|
61
|
+
className="hit-area"
|
|
50
62
|
stroke="transparent"
|
|
51
63
|
strokeWidth={7}
|
|
52
64
|
style={{ cursor: 'pointer', pointerEvents: 'stroke' }}
|
|
@@ -56,7 +68,7 @@ export const ArrowedLine = (props) => {
|
|
|
56
68
|
y1={scale.y(eFrom.y)}
|
|
57
69
|
x2={scale.x(eTo.x)}
|
|
58
70
|
y2={scale.y(eTo.y)}
|
|
59
|
-
className={
|
|
71
|
+
className={className}
|
|
60
72
|
markerEnd={`url(#${finalMarkerId}-${suffix})`}
|
|
61
73
|
markerStart={`url(#${finalMarkerId}-${suffix})`}
|
|
62
74
|
{...rest}
|