react-cheminfo 0.129.0 → 0.130.0
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/mass/ui/MassChart.d.ts.map +1 -1
- package/lib/mass/ui/MassChart.js +4 -2
- package/lib/mass/ui/MassChart.js.map +1 -1
- package/lib/mass/ui/PeakLabels.d.ts +9 -3
- package/lib/mass/ui/PeakLabels.d.ts.map +1 -1
- package/lib/mass/ui/PeakLabels.js +38 -15
- package/lib/mass/ui/PeakLabels.js.map +1 -1
- package/lib/mass/ui/massChartProps.d.ts +8 -0
- package/lib/mass/ui/massChartProps.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/mass/ui/MassChart.tsx +4 -0
- package/src/mass/ui/PeakLabels.tsx +50 -18
- package/src/mass/ui/massChartProps.ts +8 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MassChart.d.ts","sourceRoot":"","sources":["../../../src/mass/ui/MassChart.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAiB1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"MassChart.d.ts","sourceRoot":"","sources":["../../../src/mass/ui/MassChart.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAiB1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI1D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,YAAY,CAkL7D"}
|
package/lib/mass/ui/MassChart.js
CHANGED
|
@@ -32,7 +32,7 @@ import { useMassZoom } from "./useMassZoom.js";
|
|
|
32
32
|
* @returns The chart.
|
|
33
33
|
*/
|
|
34
34
|
export function MassChart(props) {
|
|
35
|
-
const { spectra, labelledId, showLabels = true, labelLimit = DEFAULT_LABEL_LIMIT, showCharges = false, mzDecimals: askedDecimals, annotationLabels, highlightMz = null, onPeakHover, domain = null, onDomainChange, onPlotClick, drag = 'xAxis', answersKeys = true, emphasisedId = null, width, height, children, } = props;
|
|
35
|
+
const { spectra, labelledId, showLabels = true, labelLimit = DEFAULT_LABEL_LIMIT, showCharges = false, mzDecimals: askedDecimals, annotationLabels, highlightMz = null, onPeakHover, domain = null, onDomainChange, onPlotClick, onPeakLabelClick, drag = 'xAxis', answersKeys = true, emphasisedId = null, width, height, children, } = props;
|
|
36
36
|
const [containerRef, measured] = useChartSize();
|
|
37
37
|
const svgRef = useRef(null);
|
|
38
38
|
const plot = useMemo(() => plotRect({
|
|
@@ -88,7 +88,9 @@ export function MassChart(props) {
|
|
|
88
88
|
// React's generated id carries the punctuation it keeps its own ids apart
|
|
89
89
|
// with, which a URL fragment is under no obligation to accept.
|
|
90
90
|
const clipId = `mass-plot-${useId().replaceAll(/\W/g, '')}`;
|
|
91
|
-
return (_jsx("div", { ref: containerRef, style: containerStyle, children: _jsxs("svg", { ref: svgRef, role: "img", "aria-label": CHART_LABEL, width: frameWidth, height: frameHeight, viewBox: `0 0 ${frameWidth} ${frameHeight}`, style: chartSurfaceStyle(pointer.position !== null), ...handlers, children: [_jsx("defs", { children: _jsx("clipPath", { id: clipId, children: _jsx("rect", { x: plot.left, y: plot.top, width: plot.width, height: plot.height }) }) }), _jsx(Axes, { plot: plot, xDomain: shown.x, yDomain: shown.y, xScale: xScale, yScale: yScale, xTitle: "m/z", yTitle: "relative intensity (%)" }), _jsxs("g", { clipPath: `url(#${clipId})`, children: [painted.map((spectrum) => (_jsx(SpectrumTrace, { spectrum: spectrum, plot: plot, xScale: xScale, yScale: yScale, strokeWidth: spectrum.id === emphasisedId ? EMPHASISED_WIDTH : undefined }, spectrum.id))), children] }), showLabels && labelled !== null ? (_jsx(PeakLabels, { spectrum: labelled, plot: plot, xScale: xScale, yScale: yScale, limit: labelLimit, showCharges: showCharges, mzDecimals: labelDecimals, ...(annotationLabels === undefined ? {} : { annotationLabels }),
|
|
91
|
+
return (_jsx("div", { ref: containerRef, style: containerStyle, children: _jsxs("svg", { ref: svgRef, role: "img", "aria-label": CHART_LABEL, width: frameWidth, height: frameHeight, viewBox: `0 0 ${frameWidth} ${frameHeight}`, style: chartSurfaceStyle(pointer.position !== null), ...handlers, children: [_jsx("defs", { children: _jsx("clipPath", { id: clipId, children: _jsx("rect", { x: plot.left, y: plot.top, width: plot.width, height: plot.height }) }) }), _jsx(Axes, { plot: plot, xDomain: shown.x, yDomain: shown.y, xScale: xScale, yScale: yScale, xTitle: "m/z", yTitle: "relative intensity (%)" }), _jsxs("g", { clipPath: `url(#${clipId})`, children: [painted.map((spectrum) => (_jsx(SpectrumTrace, { spectrum: spectrum, plot: plot, xScale: xScale, yScale: yScale, strokeWidth: spectrum.id === emphasisedId ? EMPHASISED_WIDTH : undefined }, spectrum.id))), children] }), showLabels && labelled !== null ? (_jsx(PeakLabels, { spectrum: labelled, plot: plot, xScale: xScale, yScale: yScale, limit: labelLimit, showCharges: showCharges, mzDecimals: labelDecimals, ...(annotationLabels === undefined ? {} : { annotationLabels }), ...(onPeakLabelClick === undefined
|
|
92
|
+
? {}
|
|
93
|
+
: { onClick: onPeakLabelClick }), color: spectra.length > 1 ? labelled.color : undefined })) : null, _jsx(AxisGuide, { value: highlightMz, plot: plot, xScale: xScale }), _jsx(SelectionRect, { selection: selection, plot: plot }), _jsx(MassPointerTracker, { position: pointer.position, readout: pointer.readout, plot: plot, mzDecimals: readoutDecimals })] }) }));
|
|
92
94
|
}
|
|
93
95
|
/**
|
|
94
96
|
* The one spectrum whose peaks are labelled.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MassChart.js","sourceRoot":"","sources":["../../../src/mass/ui/MassChart.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MassChart.js","sourceRoot":"","sources":["../../../src/mass/ui/MassChart.tsx"],"names":[],"mappings":"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"}
|
|
@@ -64,6 +64,12 @@ export interface PeakLabelsProps {
|
|
|
64
64
|
* @default undefined
|
|
65
65
|
*/
|
|
66
66
|
onHover?: (peak: HoveredPeak | null) => void;
|
|
67
|
+
/**
|
|
68
|
+
* Called with the peak whose stack was clicked. The stack then shows a hand,
|
|
69
|
+
* and a press on it is its own: it starts no drag and is no click on the plot.
|
|
70
|
+
* @default undefined
|
|
71
|
+
*/
|
|
72
|
+
onClick?: (peak: HoveredPeak) => void;
|
|
67
73
|
}
|
|
68
74
|
/**
|
|
69
75
|
* The tops of the best peaks of one spectrum, and what each of them reads.
|
|
@@ -83,9 +89,9 @@ export interface PeakLabelsProps {
|
|
|
83
89
|
* around each glyph, where a filled box would hide the very data it is about.
|
|
84
90
|
*
|
|
85
91
|
* The numbers take no pointer event; the room they occupy does, as one
|
|
86
|
-
* transparent rectangle per stack, and only when somebody asked for it —
|
|
87
|
-
* stack
|
|
88
|
-
* underneath goes on following the pointer.
|
|
92
|
+
* transparent rectangle per stack, and only when somebody asked for it — to be
|
|
93
|
+
* told which stack the pointer rests on, or which one was clicked — while the
|
|
94
|
+
* crosshair underneath goes on following the pointer.
|
|
89
95
|
* @param props - Component props.
|
|
90
96
|
* @returns The marks and the labels, as SVG.
|
|
91
97
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeakLabels.d.ts","sourceRoot":"","sources":["../../../src/mass/ui/PeakLabels.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"PeakLabels.d.ts","sourceRoot":"","sources":["../../../src/mass/ui/PeakLabels.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA+B,YAAY,EAAE,MAAM,OAAO,CAAC;AAGvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAQjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAK5D,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,QAAQ,EAAE,YAAY,CAAC;IACvB,2EAA2E;IAC3E,IAAI,EAAE,QAAQ,CAAC;IACf,8CAA8C;IAC9C,MAAM,EAAE,UAAU,CAAC;IACnB;;;;OAIG;IACH,MAAM,EAAE,UAAU,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IAC7C;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;CACvC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,YAAY,CA4H/D"}
|
|
@@ -20,14 +20,14 @@ import { planPeakLabels } from "../core/peakLabelPlan.js";
|
|
|
20
20
|
* around each glyph, where a filled box would hide the very data it is about.
|
|
21
21
|
*
|
|
22
22
|
* The numbers take no pointer event; the room they occupy does, as one
|
|
23
|
-
* transparent rectangle per stack, and only when somebody asked for it —
|
|
24
|
-
* stack
|
|
25
|
-
* underneath goes on following the pointer.
|
|
23
|
+
* transparent rectangle per stack, and only when somebody asked for it — to be
|
|
24
|
+
* told which stack the pointer rests on, or which one was clicked — while the
|
|
25
|
+
* crosshair underneath goes on following the pointer.
|
|
26
26
|
* @param props - Component props.
|
|
27
27
|
* @returns The marks and the labels, as SVG.
|
|
28
28
|
*/
|
|
29
29
|
export function PeakLabels(props) {
|
|
30
|
-
const { spectrum, plot, xScale, yScale, limit, showCharges = false, mzDecimals, annotationLabels, below = false, color = CHART_COLORS.labelText, intensityScale = 1, onHover, } = props;
|
|
30
|
+
const { spectrum, plot, xScale, yScale, limit, showCharges = false, mzDecimals, annotationLabels, below = false, color = CHART_COLORS.labelText, intensityScale = 1, onHover, onClick, } = props;
|
|
31
31
|
const plans = useMemo(() => planPeakLabels({
|
|
32
32
|
spectrum,
|
|
33
33
|
plot,
|
|
@@ -59,19 +59,42 @@ export function PeakLabels(props) {
|
|
|
59
59
|
const markStyle = useMemo(() => ({ stroke: color }), [color]);
|
|
60
60
|
return (_jsxs("g", { children: [_jsx("g", { pointerEvents: "none", style: markStyle, children: plans.map((plan) => (_jsx("line", { x1: plan.tipX, y1: plan.tipY, x2: plan.tipX, y2: below
|
|
61
61
|
? plan.tipY - PEAK_LABEL.topMark
|
|
62
|
-
: plan.tipY + PEAK_LABEL.topMark }, plan.key))) }), _jsx("g", { pointerEvents: "none", style: stackStyle, children: written.map((plan) => (_jsx("text", { textAnchor: "middle", children: plan.lines.map((line, index) => (_jsx("tspan", { x: plan.labelX, y: plan.baselines[index], style: LINE_STYLES[line.kind], children: line.text }, line.kind))) }, plan.key))) }), onHover === undefined
|
|
62
|
+
: plan.tipY + PEAK_LABEL.topMark }, plan.key))) }), _jsx("g", { pointerEvents: "none", style: stackStyle, children: written.map((plan) => (_jsx("text", { textAnchor: "middle", children: plan.lines.map((line, index) => (_jsx("tspan", { x: plan.labelX, y: plan.baselines[index], style: LINE_STYLES[line.kind], children: line.text }, line.kind))) }, plan.key))) }), onHover === undefined && onClick === undefined
|
|
63
63
|
? null
|
|
64
|
-
: written.map((plan) => (_jsx("rect", { x: plan.box.x, y: plan.box.y, width: plan.box.width, height: plan.box.height, fill: "transparent",
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
64
|
+
: written.map((plan) => (_jsx("rect", { x: plan.box.x, y: plan.box.y, width: plan.box.width, height: plan.box.height, fill: "transparent", ...(onHover === undefined
|
|
65
|
+
? {}
|
|
66
|
+
: {
|
|
67
|
+
onPointerEnter: () => onHover(hoveredPeak(plan, below)),
|
|
68
|
+
onPointerLeave: () => onHover(null),
|
|
69
|
+
}), ...(onClick === undefined
|
|
70
|
+
? {}
|
|
71
|
+
: {
|
|
72
|
+
style: CLICKABLE_STACK,
|
|
73
|
+
// Kept from the chart, which would capture the pointer for a
|
|
74
|
+
// drag and take the click with it.
|
|
75
|
+
onPointerDown: (event) => event.stopPropagation(),
|
|
76
|
+
onClick: () => onClick(hoveredPeak(plan, below)),
|
|
77
|
+
}) }, plan.key)))] }));
|
|
74
78
|
}
|
|
79
|
+
/**
|
|
80
|
+
* The peak a stack is about, as the pointer reports it.
|
|
81
|
+
* @param plan - The stack.
|
|
82
|
+
* @param below - Whether the stacks hang under the sticks.
|
|
83
|
+
* @returns The peak, anchored at the edge of the stack facing away from the
|
|
84
|
+
* stick, so a card hanging off it never covers the peak it is about.
|
|
85
|
+
*/
|
|
86
|
+
function hoveredPeak(plan, below) {
|
|
87
|
+
return {
|
|
88
|
+
key: plan.key,
|
|
89
|
+
mz: plan.peak.x,
|
|
90
|
+
intensity: plan.peak.y,
|
|
91
|
+
charge: plan.peak.charge,
|
|
92
|
+
x: plan.labelX,
|
|
93
|
+
y: below ? plan.box.y + plan.box.height : plan.box.y,
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
/** A stack that can be clicked says so. */
|
|
97
|
+
const CLICKABLE_STACK = { cursor: 'pointer' };
|
|
75
98
|
/**
|
|
76
99
|
* How each line of a stack is set.
|
|
77
100
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeakLabels.js","sourceRoot":"","sources":["../../../src/mass/ui/PeakLabels.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAIhC,OAAO,EACL,YAAY,EACZ,UAAU,EACV,UAAU,EACV,WAAW,EACX,UAAU,GACX,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"PeakLabels.js","sourceRoot":"","sources":["../../../src/mass/ui/PeakLabels.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
*/
|
|
13
13
|
import type { ReactNode } from 'react';
|
|
14
14
|
import type { ZoomDragMode } from '../../chart/core/chartDomain.ts';
|
|
15
|
+
import type { HoveredPeak } from '../core/labelStackBox.ts';
|
|
15
16
|
import type { MassDomain, MassSpectrum } from '../core/massSpectrum.ts';
|
|
16
17
|
import type { NearestPeak } from '../core/nearestPeak.ts';
|
|
17
18
|
export interface MassChartProps {
|
|
@@ -90,6 +91,13 @@ export interface MassChartProps {
|
|
|
90
91
|
* @default undefined
|
|
91
92
|
*/
|
|
92
93
|
onPlotClick?: (mz: number, peak: NearestPeak | null) => void;
|
|
94
|
+
/**
|
|
95
|
+
* Told which labelled peak was clicked, by its label. The labels then show a
|
|
96
|
+
* hand, and a press on one is never a click on the plot: a host that wants the
|
|
97
|
+
* m/z a reader can see written passes this rather than `onPlotClick`.
|
|
98
|
+
* @default undefined
|
|
99
|
+
*/
|
|
100
|
+
onPeakLabelClick?: (peak: HoveredPeak) => void;
|
|
93
101
|
/**
|
|
94
102
|
* What a drag across the plot asks for: the m/z axis alone, or exactly the
|
|
95
103
|
* rectangle it sweeps out.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"massChartProps.d.ts","sourceRoot":"","sources":["../../../src/mass/ui/massChartProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,MAAM,WAAW,cAAc;IAC7B,+EAA+E;IAC/E,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IACjC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IACjD;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IAC9C;;;;;OAKG;IACH,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IAC7D;;;;OAIG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB"}
|
|
1
|
+
{"version":3,"file":"massChartProps.d.ts","sourceRoot":"","sources":["../../../src/mass/ui/massChartProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,MAAM,WAAW,cAAc;IAC7B,+EAA+E;IAC/E,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IACjC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IACjD;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IAC9C;;;;;OAKG;IACH,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IAC7D;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IAC/C;;;;OAIG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-cheminfo",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.130.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "React components, hooks and framework-free helpers shared by the cheminfo sites: site chrome, citations, sharing, routing, pedagogy, charts, and the structure, orbital and 3D molecule viewers",
|
|
6
6
|
"author": "Luc Patiny",
|
|
@@ -50,6 +50,7 @@ export function MassChart(props: MassChartProps): ReactElement {
|
|
|
50
50
|
domain = null,
|
|
51
51
|
onDomainChange,
|
|
52
52
|
onPlotClick,
|
|
53
|
+
onPeakLabelClick,
|
|
53
54
|
drag = 'xAxis',
|
|
54
55
|
answersKeys = true,
|
|
55
56
|
emphasisedId = null,
|
|
@@ -196,6 +197,9 @@ export function MassChart(props: MassChartProps): ReactElement {
|
|
|
196
197
|
showCharges={showCharges}
|
|
197
198
|
mzDecimals={labelDecimals}
|
|
198
199
|
{...(annotationLabels === undefined ? {} : { annotationLabels })}
|
|
200
|
+
{...(onPeakLabelClick === undefined
|
|
201
|
+
? {}
|
|
202
|
+
: { onClick: onPeakLabelClick })}
|
|
199
203
|
color={spectra.length > 1 ? labelled.color : undefined}
|
|
200
204
|
/>
|
|
201
205
|
) : null}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CSSProperties, ReactElement } from 'react';
|
|
1
|
+
import type { CSSProperties, PointerEvent, ReactElement } from 'react';
|
|
2
2
|
import { useMemo } from 'react';
|
|
3
3
|
|
|
4
4
|
import type { PlotRect } from '../../chart/core/chartGeometry.ts';
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
import type { HoveredPeak } from '../core/labelStackBox.ts';
|
|
14
14
|
import type { MassSpectrum } from '../core/massSpectrum.ts';
|
|
15
15
|
import type { PeakLabelLineKind } from '../core/peakLabelLines.ts';
|
|
16
|
+
import type { PeakLabelPlan } from '../core/peakLabelPlan.ts';
|
|
16
17
|
import { planPeakLabels } from '../core/peakLabelPlan.ts';
|
|
17
18
|
|
|
18
19
|
export interface PeakLabelsProps {
|
|
@@ -76,6 +77,12 @@ export interface PeakLabelsProps {
|
|
|
76
77
|
* @default undefined
|
|
77
78
|
*/
|
|
78
79
|
onHover?: (peak: HoveredPeak | null) => void;
|
|
80
|
+
/**
|
|
81
|
+
* Called with the peak whose stack was clicked. The stack then shows a hand,
|
|
82
|
+
* and a press on it is its own: it starts no drag and is no click on the plot.
|
|
83
|
+
* @default undefined
|
|
84
|
+
*/
|
|
85
|
+
onClick?: (peak: HoveredPeak) => void;
|
|
79
86
|
}
|
|
80
87
|
|
|
81
88
|
/**
|
|
@@ -96,9 +103,9 @@ export interface PeakLabelsProps {
|
|
|
96
103
|
* around each glyph, where a filled box would hide the very data it is about.
|
|
97
104
|
*
|
|
98
105
|
* The numbers take no pointer event; the room they occupy does, as one
|
|
99
|
-
* transparent rectangle per stack, and only when somebody asked for it —
|
|
100
|
-
* stack
|
|
101
|
-
* underneath goes on following the pointer.
|
|
106
|
+
* transparent rectangle per stack, and only when somebody asked for it — to be
|
|
107
|
+
* told which stack the pointer rests on, or which one was clicked — while the
|
|
108
|
+
* crosshair underneath goes on following the pointer.
|
|
102
109
|
* @param props - Component props.
|
|
103
110
|
* @returns The marks and the labels, as SVG.
|
|
104
111
|
*/
|
|
@@ -116,6 +123,7 @@ export function PeakLabels(props: PeakLabelsProps): ReactElement {
|
|
|
116
123
|
color = CHART_COLORS.labelText,
|
|
117
124
|
intensityScale = 1,
|
|
118
125
|
onHover,
|
|
126
|
+
onClick,
|
|
119
127
|
} = props;
|
|
120
128
|
|
|
121
129
|
const plans = useMemo(
|
|
@@ -195,7 +203,7 @@ export function PeakLabels(props: PeakLabelsProps): ReactElement {
|
|
|
195
203
|
</text>
|
|
196
204
|
))}
|
|
197
205
|
</g>
|
|
198
|
-
{onHover === undefined
|
|
206
|
+
{onHover === undefined && onClick === undefined
|
|
199
207
|
? null
|
|
200
208
|
: written.map((plan) => (
|
|
201
209
|
<rect
|
|
@@ -205,25 +213,49 @@ export function PeakLabels(props: PeakLabelsProps): ReactElement {
|
|
|
205
213
|
width={plan.box.width}
|
|
206
214
|
height={plan.box.height}
|
|
207
215
|
fill="transparent"
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
216
|
+
{...(onHover === undefined
|
|
217
|
+
? {}
|
|
218
|
+
: {
|
|
219
|
+
onPointerEnter: () => onHover(hoveredPeak(plan, below)),
|
|
220
|
+
onPointerLeave: () => onHover(null),
|
|
221
|
+
})}
|
|
222
|
+
{...(onClick === undefined
|
|
223
|
+
? {}
|
|
224
|
+
: {
|
|
225
|
+
style: CLICKABLE_STACK,
|
|
226
|
+
// Kept from the chart, which would capture the pointer for a
|
|
227
|
+
// drag and take the click with it.
|
|
228
|
+
onPointerDown: (event: PointerEvent) =>
|
|
229
|
+
event.stopPropagation(),
|
|
230
|
+
onClick: () => onClick(hoveredPeak(plan, below)),
|
|
231
|
+
})}
|
|
221
232
|
/>
|
|
222
233
|
))}
|
|
223
234
|
</g>
|
|
224
235
|
);
|
|
225
236
|
}
|
|
226
237
|
|
|
238
|
+
/**
|
|
239
|
+
* The peak a stack is about, as the pointer reports it.
|
|
240
|
+
* @param plan - The stack.
|
|
241
|
+
* @param below - Whether the stacks hang under the sticks.
|
|
242
|
+
* @returns The peak, anchored at the edge of the stack facing away from the
|
|
243
|
+
* stick, so a card hanging off it never covers the peak it is about.
|
|
244
|
+
*/
|
|
245
|
+
function hoveredPeak(plan: PeakLabelPlan, below: boolean): HoveredPeak {
|
|
246
|
+
return {
|
|
247
|
+
key: plan.key,
|
|
248
|
+
mz: plan.peak.x,
|
|
249
|
+
intensity: plan.peak.y,
|
|
250
|
+
charge: plan.peak.charge,
|
|
251
|
+
x: plan.labelX,
|
|
252
|
+
y: below ? plan.box.y + plan.box.height : plan.box.y,
|
|
253
|
+
};
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
/** A stack that can be clicked says so. */
|
|
257
|
+
const CLICKABLE_STACK: CSSProperties = { cursor: 'pointer' };
|
|
258
|
+
|
|
227
259
|
/**
|
|
228
260
|
* How each line of a stack is set.
|
|
229
261
|
*
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
import type { ReactNode } from 'react';
|
|
15
15
|
|
|
16
16
|
import type { ZoomDragMode } from '../../chart/core/chartDomain.ts';
|
|
17
|
+
import type { HoveredPeak } from '../core/labelStackBox.ts';
|
|
17
18
|
import type { MassDomain, MassSpectrum } from '../core/massSpectrum.ts';
|
|
18
19
|
import type { NearestPeak } from '../core/nearestPeak.ts';
|
|
19
20
|
|
|
@@ -93,6 +94,13 @@ export interface MassChartProps {
|
|
|
93
94
|
* @default undefined
|
|
94
95
|
*/
|
|
95
96
|
onPlotClick?: (mz: number, peak: NearestPeak | null) => void;
|
|
97
|
+
/**
|
|
98
|
+
* Told which labelled peak was clicked, by its label. The labels then show a
|
|
99
|
+
* hand, and a press on one is never a click on the plot: a host that wants the
|
|
100
|
+
* m/z a reader can see written passes this rather than `onPlotClick`.
|
|
101
|
+
* @default undefined
|
|
102
|
+
*/
|
|
103
|
+
onPeakLabelClick?: (peak: HoveredPeak) => void;
|
|
96
104
|
/**
|
|
97
105
|
* What a drag across the plot asks for: the m/z axis alone, or exactly the
|
|
98
106
|
* rectangle it sweeps out.
|