react-cheminfo 0.129.0 → 0.131.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/drawing/render/index.d.ts +3 -1
- package/lib/drawing/render/index.d.ts.map +1 -1
- package/lib/drawing/render/index.js +1 -0
- package/lib/drawing/render/index.js.map +1 -1
- package/lib/drawing/render/motion.d.ts +3 -2
- package/lib/drawing/render/motion.d.ts.map +1 -1
- package/lib/drawing/render/motion.js +25 -3
- package/lib/drawing/render/motion.js.map +1 -1
- package/lib/drawing/render/primitives.d.ts +10 -0
- package/lib/drawing/render/primitives.d.ts.map +1 -1
- package/lib/drawing/render/spinning.d.ts +29 -0
- package/lib/drawing/render/spinning.d.ts.map +1 -0
- package/lib/drawing/render/spinning.js +38 -0
- package/lib/drawing/render/spinning.js.map +1 -0
- package/lib/drawing/render/svg.d.ts.map +1 -1
- package/lib/drawing/render/svg.js +8 -2
- package/lib/drawing/render/svg.js.map +1 -1
- 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/lib/overlay/ui/OverlayBarButton.d.ts.map +1 -1
- package/lib/overlay/ui/OverlayBarButton.js +1 -1
- package/lib/overlay/ui/OverlayBarButton.js.map +1 -1
- package/lib/overlay/ui/OverlayInfo.d.ts.map +1 -1
- package/lib/overlay/ui/OverlayInfo.js +1 -1
- package/lib/overlay/ui/OverlayInfo.js.map +1 -1
- package/package.json +1 -1
- package/src/drawing/render/index.ts +3 -0
- package/src/drawing/render/motion.ts +25 -3
- package/src/drawing/render/primitives.ts +11 -0
- package/src/drawing/render/spinning.ts +48 -0
- package/src/drawing/render/svg.ts +8 -2
- package/src/mass/ui/MassChart.tsx +4 -0
- package/src/mass/ui/PeakLabels.tsx +50 -18
- package/src/mass/ui/massChartProps.ts +8 -0
- package/src/overlay/ui/OverlayBarButton.tsx +1 -0
- package/src/overlay/ui/OverlayInfo.tsx +1 -0
|
@@ -20,7 +20,9 @@ export { MAX_SHEETS, enclosingBox, figureBox, paddedBox, pageSheets, sheetLines,
|
|
|
20
20
|
export type { ImagePrimitive } from './pictures.ts';
|
|
21
21
|
export { imageCorners, imageTransform, picturePrimitive } from './pictures.ts';
|
|
22
22
|
export { mapContour, polygonContour, roundedRect } from './outlines.ts';
|
|
23
|
-
export type { CaptionPrimitive, DotPrimitive, LinePrimitive, PathPrimitive, PolygonPrimitive, Primitive, Scene, SceneItem, SceneOwner, TextPrimitive, } from './primitives.ts';
|
|
23
|
+
export type { CaptionPrimitive, DotPrimitive, LinePrimitive, PathPrimitive, PolygonPrimitive, Primitive, Scene, SceneItem, SceneOwner, Spin, TextPrimitive, } from './primitives.ts';
|
|
24
|
+
export type { SpinRun } from './spinning.ts';
|
|
25
|
+
export { spinClass, spinRuns } from './spinning.ts';
|
|
24
26
|
export type { DrawingStyle } from './style.ts';
|
|
25
27
|
export type { MoleculeGroup, SvgOptions } from './svg.ts';
|
|
26
28
|
export { DRAW_NAMESPACE, primitiveMarkup, sceneBody, sheetBody, } from './svg.ts';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,YAAY,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,WAAW,EACX,QAAQ,GACT,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,GACf,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EACL,GAAG,EACH,aAAa,EACb,UAAU,EACV,OAAO,EACP,aAAa,GACd,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzE,YAAY,EACV,aAAa,EACb,YAAY,EACZ,WAAW,EACX,WAAW,GACZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,cAAc,EACd,eAAe,EACf,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,WAAW,EACX,eAAe,EACf,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EACL,UAAU,EACV,QAAQ,EACR,SAAS,EACT,SAAS,EACT,YAAY,EACZ,SAAS,EACT,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,WAAW,EACX,YAAY,EACZ,SAAS,EACT,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EACV,YAAY,EACZ,SAAS,EACT,SAAS,EACT,UAAU,EACV,UAAU,GACX,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxE,YAAY,EACV,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,KAAK,EACL,SAAS,EACT,UAAU,EACV,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EACL,cAAc,EACd,eAAe,EACf,SAAS,EACT,SAAS,GACV,MAAM,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,YAAY,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,WAAW,EACX,QAAQ,GACT,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,GACf,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EACL,GAAG,EACH,aAAa,EACb,UAAU,EACV,OAAO,EACP,aAAa,GACd,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzE,YAAY,EACV,aAAa,EACb,YAAY,EACZ,WAAW,EACX,WAAW,GACZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,cAAc,EACd,eAAe,EACf,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,WAAW,EACX,eAAe,EACf,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,MAAM,aAAa,CAAC;AACrB,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EACL,UAAU,EACV,QAAQ,EACR,SAAS,EACT,SAAS,EACT,YAAY,EACZ,SAAS,EACT,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,WAAW,EACX,YAAY,EACZ,SAAS,EACT,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EACV,YAAY,EACZ,SAAS,EACT,SAAS,EACT,UAAU,EACV,UAAU,GACX,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxE,YAAY,EACV,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,KAAK,EACL,SAAS,EACT,UAAU,EACV,IAAI,EACJ,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EACL,cAAc,EACd,eAAe,EACf,SAAS,EACT,SAAS,GACV,MAAM,UAAU,CAAC"}
|
|
@@ -14,5 +14,6 @@ export { MOTION_ATTRIBUTE, MOTION_CSS, MOTION_STYLE, RUN_FADE, bubbleDelay, figu
|
|
|
14
14
|
export { MAX_SHEETS, enclosingBox, figureBox, paddedBox, pageSheets, sheetLines, } from "./pageGrid.js";
|
|
15
15
|
export { imageCorners, imageTransform, picturePrimitive } from "./pictures.js";
|
|
16
16
|
export { mapContour, polygonContour, roundedRect } from "./outlines.js";
|
|
17
|
+
export { spinClass, spinRuns } from "./spinning.js";
|
|
17
18
|
export { DRAW_NAMESPACE, primitiveMarkup, sceneBody, sheetBody, } from "./svg.js";
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drawing/render/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,WAAW,EACX,QAAQ,GACT,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,GACf,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,GAAG,EACH,aAAa,EACb,UAAU,EACV,OAAO,EACP,aAAa,GACd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAOzE,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,cAAc,EACd,eAAe,EACf,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,WAAW,EACX,eAAe,EACf,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,UAAU,EACV,QAAQ,EACR,SAAS,EACT,SAAS,EACT,YAAY,EACZ,SAAS,EACT,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,WAAW,EACX,YAAY,EACZ,SAAS,EACT,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EACV,YAAY,EACZ,SAAS,EACT,SAAS,EACT,UAAU,EACV,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAexE,OAAO,EACL,cAAc,EACd,eAAe,EACf,SAAS,EACT,SAAS,GACV,MAAM,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drawing/render/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,WAAW,EACX,QAAQ,GACT,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,GACf,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,GAAG,EACH,aAAa,EACb,UAAU,EACV,OAAO,EACP,aAAa,GACd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAOzE,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,cAAc,EACd,eAAe,EACf,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,WAAW,EACX,eAAe,EACf,UAAU,EACV,MAAM,EACN,QAAQ,EACR,SAAS,EACT,WAAW,GACZ,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,UAAU,EACV,QAAQ,EACR,SAAS,EACT,SAAS,EACT,YAAY,EACZ,SAAS,EACT,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,WAAW,EACX,YAAY,EACZ,SAAS,EACT,UAAU,GACX,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,UAAU,EACV,YAAY,EACZ,SAAS,EACT,SAAS,EACT,UAAU,EACV,UAAU,GACX,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAexE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,EACL,cAAc,EACd,eAAe,EACf,SAAS,EACT,SAAS,GACV,MAAM,UAAU,CAAC"}
|
|
@@ -20,7 +20,7 @@ export declare const RUN_FADE: {
|
|
|
20
20
|
* the page carries them once for every scene it draws, and every figure that
|
|
21
21
|
* has something to move carries them too, so the two never drift apart.
|
|
22
22
|
*/
|
|
23
|
-
export declare const MOTION_CSS = "/* A bubble rises from where it is drawn, three of its own heights, fading in\n and out, so a stream of them keeps going. */\n[data-motion='moving'] .glass-bubble {\n animation: glass-bubble-rise 1.4s linear infinite;\n transform-box: fill-box;\n}\n\n@keyframes glass-bubble-rise {\n 0% {\n opacity: 0;\n transform: translateY(0);\n }\n\n 20%,\n 75% {\n opacity: 1;\n }\n\n 100% {\n opacity: 0;\n transform: translateY(-300%);\n }\n}\n\n/* A stir bar seen from the side, turning about the upright: it shortens along\n the way it lies to its own thickness and back, each half turn. */\n[data-motion='moving'] .glass-turning {\n animation: glass-bar-turn 0.35s linear infinite;\n transform-box: fill-box;\n transform-origin: center;\n}\n\n@keyframes glass-bar-turn {\n 0%,\n 100% {\n transform: rotate(var(--glass-lying)) scaleX(1)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 12.5%,\n 87.5% {\n transform: rotate(var(--glass-lying)) scaleX(0.92)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 25%,\n 75% {\n transform: rotate(var(--glass-lying)) scaleX(0.71)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 37.5%,\n 62.5% {\n transform: rotate(var(--glass-lying)) scaleX(0.4)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 50% {\n transform: rotate(var(--glass-lying)) scaleX(0.27)\n rotate(calc(-1 * var(--glass-lying)));\n }\n}\n\n/* A figure carries each bubble running along water, and each drop falling, as\n a run that only shows moving (written hidden, for a program that reads no\n style), and the ones drawn where they stand as a still copy that only shows\n held still. */\n[data-motion='moving'] .glass-run {\n display: inline;\n}\n\n[data-motion='moving'] .glass-stands {\n display: none;\n}\n\n@media print, (prefers-reduced-motion: reduce) {\n .glass-bubble,\n .glass-turning {\n animation: none;\n }\n\n [data-motion='moving'] .glass-run {\n display: none;\n }\n\n [data-motion='moving'] .glass-stands {\n display: inline;\n }\n}";
|
|
23
|
+
export declare const MOTION_CSS = "/* A bubble rises from where it is drawn, three of its own heights, fading in\n and out, so a stream of them keeps going. */\n[data-motion='moving'] .glass-bubble {\n animation: glass-bubble-rise 1.4s linear infinite;\n transform-box: fill-box;\n}\n\n@keyframes glass-bubble-rise {\n 0% {\n opacity: 0;\n transform: translateY(0);\n }\n\n 20%,\n 75% {\n opacity: 1;\n }\n\n 100% {\n opacity: 0;\n transform: translateY(-300%);\n }\n}\n\n/* A stir bar seen from the side, turning about the upright: it shortens along\n the way it lies to its own thickness and back, each half turn. */\n[data-motion='moving'] .glass-turning {\n animation: glass-bar-turn 0.35s linear infinite;\n transform-box: fill-box;\n transform-origin: center;\n}\n\n@keyframes glass-bar-turn {\n 0%,\n 100% {\n transform: rotate(var(--glass-lying)) scaleX(1)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 12.5%,\n 87.5% {\n transform: rotate(var(--glass-lying)) scaleX(0.92)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 25%,\n 75% {\n transform: rotate(var(--glass-lying)) scaleX(0.71)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 37.5%,\n 62.5% {\n transform: rotate(var(--glass-lying)) scaleX(0.4)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 50% {\n transform: rotate(var(--glass-lying)) scaleX(0.27)\n rotate(calc(-1 * var(--glass-lying)));\n }\n}\n\n/* A rotor seen face on, spinning in its plane about the middle of its box,\n clockwise, or the other way when it spins back. */\n[data-motion='moving'] .glass-spinning {\n animation: glass-spin 1.2s linear infinite;\n transform-box: fill-box;\n transform-origin: center;\n}\n\n[data-motion='moving'] .glass-spinning-back {\n animation-direction: reverse;\n}\n\n@keyframes glass-spin {\n to {\n transform: rotate(360deg);\n }\n}\n\n/* A figure carries each bubble running along water, and each drop falling, as\n a run that only shows moving (written hidden, for a program that reads no\n style), and the ones drawn where they stand as a still copy that only shows\n held still. */\n[data-motion='moving'] .glass-run {\n display: inline;\n}\n\n[data-motion='moving'] .glass-stands {\n display: none;\n}\n\n@media print, (prefers-reduced-motion: reduce) {\n .glass-bubble,\n .glass-turning,\n .glass-spinning {\n animation: none;\n }\n\n [data-motion='moving'] .glass-run {\n display: none;\n }\n\n [data-motion='moving'] .glass-stands {\n display: inline;\n }\n}";
|
|
24
24
|
/**
|
|
25
25
|
* The stylesheet a figure carries: {@link MOTION_CSS}, its comments and
|
|
26
26
|
* spaces taken out.
|
|
@@ -45,7 +45,8 @@ export declare function runTiming(flow: NonNullable<PathPrimitive['flow']>): {
|
|
|
45
45
|
repeatCount: string;
|
|
46
46
|
};
|
|
47
47
|
/**
|
|
48
|
-
* Whether a scene has anything that moves: a bubble, a run, a turning piece
|
|
48
|
+
* Whether a scene has anything that moves: a bubble, a run, a turning piece,
|
|
49
|
+
* a spinning rotor.
|
|
49
50
|
* @param scene - The scene.
|
|
50
51
|
* @returns True when a figure of it can be set moving.
|
|
51
52
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/motion.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAQ5D,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAK9C,gEAAgE;AAChE,eAAO,MAAM,QAAQ;;;CAAiD,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"motion.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/motion.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAQ5D,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAK9C,gEAAgE;AAChE,eAAO,MAAM,QAAQ;;;CAAiD,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,UAAU,i+EA2GrB,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,YAAY,QAAyB,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG;IACnE,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAMA;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAehD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKhD"}
|
|
@@ -85,6 +85,24 @@ export const MOTION_CSS = `/* A bubble rises from where it is drawn, three of it
|
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
/* A rotor seen face on, spinning in its plane about the middle of its box,
|
|
89
|
+
clockwise, or the other way when it spins back. */
|
|
90
|
+
[data-motion='moving'] .glass-spinning {
|
|
91
|
+
animation: glass-spin 1.2s linear infinite;
|
|
92
|
+
transform-box: fill-box;
|
|
93
|
+
transform-origin: center;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
[data-motion='moving'] .glass-spinning-back {
|
|
97
|
+
animation-direction: reverse;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
@keyframes glass-spin {
|
|
101
|
+
to {
|
|
102
|
+
transform: rotate(360deg);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
88
106
|
/* A figure carries each bubble running along water, and each drop falling, as
|
|
89
107
|
a run that only shows moving (written hidden, for a program that reads no
|
|
90
108
|
style), and the ones drawn where they stand as a still copy that only shows
|
|
@@ -99,7 +117,8 @@ export const MOTION_CSS = `/* A bubble rises from where it is drawn, three of it
|
|
|
99
117
|
|
|
100
118
|
@media print, (prefers-reduced-motion: reduce) {
|
|
101
119
|
.glass-bubble,
|
|
102
|
-
.glass-turning
|
|
120
|
+
.glass-turning,
|
|
121
|
+
.glass-spinning {
|
|
103
122
|
animation: none;
|
|
104
123
|
}
|
|
105
124
|
|
|
@@ -139,7 +158,8 @@ export function runTiming(flow) {
|
|
|
139
158
|
};
|
|
140
159
|
}
|
|
141
160
|
/**
|
|
142
|
-
* Whether a scene has anything that moves: a bubble, a run, a turning piece
|
|
161
|
+
* Whether a scene has anything that moves: a bubble, a run, a turning piece,
|
|
162
|
+
* a spinning rotor.
|
|
143
163
|
* @param scene - The scene.
|
|
144
164
|
* @returns True when a figure of it can be set moving.
|
|
145
165
|
*/
|
|
@@ -149,7 +169,9 @@ export function sceneMoves(scene) {
|
|
|
149
169
|
return true;
|
|
150
170
|
for (const primitive of item.primitives) {
|
|
151
171
|
if (primitive.kind === 'path' &&
|
|
152
|
-
(primitive.flow !== undefined ||
|
|
172
|
+
(primitive.flow !== undefined ||
|
|
173
|
+
primitive.bubble !== undefined ||
|
|
174
|
+
primitive.spins !== undefined)) {
|
|
153
175
|
return true;
|
|
154
176
|
}
|
|
155
177
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion.js","sourceRoot":"","sources":["../../../src/drawing/render/motion.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,+EAA+E;AAC/E,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,wEAAwE;AACxE,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,2EAA2E;AAC3E,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAE9C,mEAAmE;AACnE,MAAM,MAAM,GAAG,+DAA+D,CAAC;AAE/E,gEAAgE;AAChE,MAAM,CAAC,MAAM,QAAQ,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;AAEvE;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG
|
|
1
|
+
{"version":3,"file":"motion.js","sourceRoot":"","sources":["../../../src/drawing/render/motion.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,6 +87,14 @@ export interface PathPrimitive {
|
|
|
87
87
|
* @default undefined — the whole piece turns, as a stir bar does
|
|
88
88
|
*/
|
|
89
89
|
turns?: true;
|
|
90
|
+
/**
|
|
91
|
+
* The way it spins in its own plane while its piece runs, with the
|
|
92
|
+
* primitives drawn next to it that spin the same way, about the middle of
|
|
93
|
+
* their box: a rotor seen face on, drawn whole about its axle. Set moving
|
|
94
|
+
* it spins; a file holds it still.
|
|
95
|
+
* @default undefined — it does not spin
|
|
96
|
+
*/
|
|
97
|
+
spins?: Spin;
|
|
90
98
|
/**
|
|
91
99
|
* The run of a bubble carried by running water, of one rising through a
|
|
92
100
|
* boiling liquid, of a falling drop: the screen moves it along the path,
|
|
@@ -103,6 +111,8 @@ export interface PathPrimitive {
|
|
|
103
111
|
still?: boolean;
|
|
104
112
|
};
|
|
105
113
|
}
|
|
114
|
+
/** The way a rotor spins, as it is drawn. */
|
|
115
|
+
export type Spin = 'clockwise' | 'anticlockwise';
|
|
106
116
|
/** A filled dot: an unpaired electron, half a lone pair. */
|
|
107
117
|
export interface DotPrimitive {
|
|
108
118
|
/** The kind of primitive. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"primitives.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/primitives.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"primitives.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/primitives.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* What spins in a piece's own plane while it runs — a rotor seen face on —
|
|
3
|
+
* cut out of what the piece is drawn with, so that each part that spins is
|
|
4
|
+
* drawn as one group, turning about its own middle in its place among the
|
|
5
|
+
* rest.
|
|
6
|
+
*/
|
|
7
|
+
import type { Primitive, Spin } from './primitives.ts';
|
|
8
|
+
/** Primitives drawn next to each other, spinning one way or still. */
|
|
9
|
+
export interface SpinRun {
|
|
10
|
+
/** The way they spin, or undefined for primitives that stay still. */
|
|
11
|
+
spins: Spin | undefined;
|
|
12
|
+
/** The primitives, in the order they are drawn. */
|
|
13
|
+
primitives: Primitive[];
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Primitives cut wherever what spins starts, stops or changes way, in the
|
|
17
|
+
* order they are drawn.
|
|
18
|
+
* @param primitives - The primitives of a piece.
|
|
19
|
+
* @returns The runs, still and spinning, in order.
|
|
20
|
+
*/
|
|
21
|
+
export declare function spinRuns(primitives: readonly Primitive[]): SpinRun[];
|
|
22
|
+
/**
|
|
23
|
+
* The class that sets a run spinning, the way it spins, as the motion
|
|
24
|
+
* stylesheet reads it.
|
|
25
|
+
* @param spins - The way it spins.
|
|
26
|
+
* @returns The class.
|
|
27
|
+
*/
|
|
28
|
+
export declare function spinClass(spins: Spin): string;
|
|
29
|
+
//# sourceMappingURL=spinning.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spinning.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/spinning.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvD,sEAAsE;AACtE,MAAM,WAAW,OAAO;IACtB,sEAAsE;IACtE,KAAK,EAAE,IAAI,GAAG,SAAS,CAAC;IACxB,mDAAmD;IACnD,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,GAAG,OAAO,EAAE,CAYpE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,IAAI,GAAG,MAAM,CAI7C"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* What spins in a piece's own plane while it runs — a rotor seen face on —
|
|
3
|
+
* cut out of what the piece is drawn with, so that each part that spins is
|
|
4
|
+
* drawn as one group, turning about its own middle in its place among the
|
|
5
|
+
* rest.
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
8
|
+
* Primitives cut wherever what spins starts, stops or changes way, in the
|
|
9
|
+
* order they are drawn.
|
|
10
|
+
* @param primitives - The primitives of a piece.
|
|
11
|
+
* @returns The runs, still and spinning, in order.
|
|
12
|
+
*/
|
|
13
|
+
export function spinRuns(primitives) {
|
|
14
|
+
const runs = [];
|
|
15
|
+
for (const primitive of primitives) {
|
|
16
|
+
const spins = primitive.kind === 'path' ? primitive.spins : undefined;
|
|
17
|
+
const last = runs.at(-1);
|
|
18
|
+
if (last !== undefined && last.spins === spins) {
|
|
19
|
+
last.primitives.push(primitive);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
runs.push({ spins, primitives: [primitive] });
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return runs;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* The class that sets a run spinning, the way it spins, as the motion
|
|
29
|
+
* stylesheet reads it.
|
|
30
|
+
* @param spins - The way it spins.
|
|
31
|
+
* @returns The class.
|
|
32
|
+
*/
|
|
33
|
+
export function spinClass(spins) {
|
|
34
|
+
return spins === 'clockwise'
|
|
35
|
+
? 'glass-spinning'
|
|
36
|
+
: 'glass-spinning glass-spinning-back';
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=spinning.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"spinning.js","sourceRoot":"","sources":["../../../src/drawing/render/spinning.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH;;;;;GAKG;AACH,MAAM,UAAU,QAAQ,CAAC,UAAgC;IACvD,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAC/C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,KAAW;IACnC,OAAO,KAAK,KAAK,WAAW;QAC1B,CAAC,CAAC,gBAAgB;QAClB,CAAC,CAAC,oCAAoC,CAAC;AAC3C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/svg.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAUxD,OAAO,KAAK,EAGV,SAAS,EACT,KAAK,EAEN,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/svg.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAUxD,OAAO,KAAK,EAGV,SAAS,EACT,KAAK,EAEN,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wDAAwD;AACxD,eAAO,MAAM,cAAc,mCAAmC,CAAC;AAE/D,mEAAmE;AACnE,MAAM,WAAW,aAAa;IAC5B,2CAA2C;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,uBAAuB;IACvB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,uBAAuB;IACvB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED,kCAAkC;AAClC,MAAM,WAAW,UAAU;IACzB,mEAAmE;IACnE,KAAK,EAAE,YAAY,CAAC;IACpB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,CAgBnE;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CACvB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU,GAClB,MAAM,CAUR;AAwFD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,YAAY,EACnB,GAAG,GAAE,MAAoB,GACxB,MAAM,CAsBR"}
|
|
@@ -16,6 +16,7 @@ import { escapeAttribute, escapeText, number } from "./markup.js";
|
|
|
16
16
|
import { RUN_FADE, bubbleDelay, runTiming } from "./motion.js";
|
|
17
17
|
import { figureBox } from "./pageGrid.js";
|
|
18
18
|
import { imageTransform } from "./pictures.js";
|
|
19
|
+
import { spinClass, spinRuns } from "./spinning.js";
|
|
19
20
|
/** The namespace of the attributes a drawing writes. */
|
|
20
21
|
export const DRAW_NAMESPACE = 'https://draw.cheminfo.org/ns/1';
|
|
21
22
|
/**
|
|
@@ -104,8 +105,13 @@ function itemMarkup(item, options) {
|
|
|
104
105
|
const { hex, opacity } = splitColor(item.color ?? style.color);
|
|
105
106
|
const ink = item.color ? ` stroke="${hex}"` : '';
|
|
106
107
|
const faded = opacity < 1 ? ` opacity="${number(opacity)}"` : '';
|
|
107
|
-
const markup = (primitives) => primitives
|
|
108
|
-
.map((
|
|
108
|
+
const markup = (primitives) => spinRuns(primitives)
|
|
109
|
+
.map(({ spins, primitives: run }) => {
|
|
110
|
+
const inner = run.map((one) => primitiveMarkup(one, style, hex));
|
|
111
|
+
return spins
|
|
112
|
+
? `<g class="${spinClass(spins)}">${inner.join('')}</g>`
|
|
113
|
+
: inner.join('');
|
|
114
|
+
})
|
|
109
115
|
.join('');
|
|
110
116
|
// A piece whose paddle alone turns keeps the rest still.
|
|
111
117
|
if (item.turning !== undefined && item.primitives.some(turnsAlone)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/drawing/render/svg.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/drawing/render/svg.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OverlayBarButton.d.ts","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayBarButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAwB,MAAM,mBAAmB,CAAC;AAExE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAOpE,2CAA2C;AAC3C,UAAU,qBAAqB;IAC7B;;;OAGG;IACH,QAAQ,EAAE,SAAS,CAAC;IACpB,yEAAyE;IACzE,SAAS,EAAE,gBAAgB,CAAC;IAC5B,0EAA0E;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"OverlayBarButton.d.ts","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayBarButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAwB,MAAM,mBAAmB,CAAC;AAExE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAOpE,2CAA2C;AAC3C,UAAU,qBAAqB;IAC7B;;;OAGG;IACH,QAAQ,EAAE,SAAS,CAAC;IACpB,yEAAyE;IACzE,SAAS,EAAE,gBAAgB,CAAC;IAC5B,0EAA0E;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,YAAY,CAqB3E"}
|
|
@@ -19,7 +19,7 @@ export function OverlayBarButton(props) {
|
|
|
19
19
|
const { children, placement, label, icon, padded = true } = props;
|
|
20
20
|
const { metrics } = useOverlaySurface();
|
|
21
21
|
const [open, setOpen] = useState(false);
|
|
22
|
-
return (_jsx(PopoverNext, { placement: POPOVER_PLACEMENTS[placement], onInteraction: (next) => setOpen(next), content: padded ? (_jsx("div", { style: overlayPanelStyle(metrics), children: children })) : (_jsx(_Fragment, { children: children })), children: _jsx(OverlayIconButton, { icon: icon, label: label, active: open, opensMenu: true }) }));
|
|
22
|
+
return (_jsx(PopoverNext, { isOpen: open, placement: POPOVER_PLACEMENTS[placement], onInteraction: (next) => setOpen(next), content: padded ? (_jsx("div", { style: overlayPanelStyle(metrics), children: children })) : (_jsx(_Fragment, { children: children })), children: _jsx(OverlayIconButton, { icon: icon, label: label, active: open, opensMenu: true }) }));
|
|
23
23
|
}
|
|
24
24
|
/**
|
|
25
25
|
* Which way the panel opens, per placement.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OverlayBarButton.js","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayBarButton.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAyB,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAyBxD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAA4B;IAC3D,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAClE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IACxC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExC,OAAO,CACL,KAAC,WAAW,IACV,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,EACxC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EACtC,OAAO,EACL,MAAM,CAAC,CAAC,CAAC,CACP,cAAK,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,YAAG,QAAQ,GAAO,CACzD,CAAC,CAAC,CAAC,CACF,4BAAG,QAAQ,GAAI,CAChB,YAGH,KAAC,iBAAiB,IAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,SAAG,GAC3D,CACf,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,kBAAkB,GAAmD;IACzE,UAAU,EAAE,cAAc;IAC1B,WAAW,EAAE,YAAY;IACzB,aAAa,EAAE,WAAW;IAC1B,cAAc,EAAE,SAAS;IACzB,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,YAAY;CACtB,CAAC"}
|
|
1
|
+
{"version":3,"file":"OverlayBarButton.js","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayBarButton.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAyB,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAyBxD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAA4B;IAC3D,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAClE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IACxC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExC,OAAO,CACL,KAAC,WAAW,IACV,MAAM,EAAE,IAAI,EACZ,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,EACxC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EACtC,OAAO,EACL,MAAM,CAAC,CAAC,CAAC,CACP,cAAK,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,YAAG,QAAQ,GAAO,CACzD,CAAC,CAAC,CAAC,CACF,4BAAG,QAAQ,GAAI,CAChB,YAGH,KAAC,iBAAiB,IAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,SAAG,GAC3D,CACf,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,kBAAkB,GAAmD;IACzE,UAAU,EAAE,cAAc;IAC1B,WAAW,EAAE,YAAY;IACzB,aAAa,EAAE,WAAW;IAC1B,cAAc,EAAE,SAAS;IACzB,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,YAAY;CACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OverlayInfo.d.ts","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayInfo.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAiB,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AASpE,sCAAsC;AACtC,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,QAAQ,EAAE,SAAS,CAAC;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC1C;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"OverlayInfo.d.ts","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayInfo.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAiB,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AASpE,sCAAsC;AACtC,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,QAAQ,EAAE,SAAS,CAAC;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC1C;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,YAAY,CAwBjE"}
|
|
@@ -26,7 +26,7 @@ export function OverlayInfo(props) {
|
|
|
26
26
|
const { placement = 'bottom-end', testId } = props;
|
|
27
27
|
const { metrics } = useOverlaySurface();
|
|
28
28
|
const [open, setOpen] = useState(false);
|
|
29
|
-
return (_jsx(PopoverNext, { placement: placement, onInteraction: (next) => setOpen(next), content: _jsx("div", { style: explanationStyle(metrics), children: children }), children: _jsx(OverlayIconButton, { icon: "help", label: name, active: open, testId: testId, opensMenu: true }) }));
|
|
29
|
+
return (_jsx(PopoverNext, { isOpen: open, placement: placement, onInteraction: (next) => setOpen(next), content: _jsx("div", { style: explanationStyle(metrics), children: children }), children: _jsx(OverlayIconButton, { icon: "help", label: name, active: open, testId: testId, opensMenu: true }) }));
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
32
32
|
* The paragraph the glyph opens.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OverlayInfo.js","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayInfo.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA2BxD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,WAAW,CAAC,KAAuB;IACjD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAClC,MAAM,CAAC,GAAG,UAAU,EAAE,CAAC;IACvB,MAAM,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,0BAA0B,CAAC,CAAC;IACpD,MAAM,EAAE,SAAS,GAAG,YAAY,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACnD,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IACxC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExC,OAAO,CACL,KAAC,WAAW,IACV,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EACtC,OAAO,EAAE,cAAK,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,YAAG,QAAQ,GAAO,YAEhE,KAAC,iBAAiB,IAChB,IAAI,EAAC,MAAM,EACX,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,SACT,GACU,CACf,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO;QACL,QAAQ,EAAE,GAAG;QACb,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,GAAG,CAAC,IAAI;QAC9D,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE,OAAO,CAAC,SAAS,GAAG,CAAC;QAC/B,UAAU,EAAE,GAAG;QACf,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"OverlayInfo.js","sourceRoot":"","sources":["../../../src/overlay/ui/OverlayInfo.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA2BxD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,WAAW,CAAC,KAAuB;IACjD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAClC,MAAM,CAAC,GAAG,UAAU,EAAE,CAAC;IACvB,MAAM,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,0BAA0B,CAAC,CAAC;IACpD,MAAM,EAAE,SAAS,GAAG,YAAY,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACnD,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAiB,EAAE,CAAC;IACxC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExC,OAAO,CACL,KAAC,WAAW,IACV,MAAM,EAAE,IAAI,EACZ,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EACtC,OAAO,EAAE,cAAK,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,YAAG,QAAQ,GAAO,YAEhE,KAAC,iBAAiB,IAChB,IAAI,EAAC,MAAM,EACX,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,SACT,GACU,CACf,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO;QACL,QAAQ,EAAE,GAAG;QACb,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,GAAG,CAAC,IAAI;QAC9D,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE,OAAO,CAAC,SAAS,GAAG,CAAC;QAC/B,UAAU,EAAE,GAAG;QACf,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-cheminfo",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.131.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",
|
|
@@ -92,8 +92,11 @@ export type {
|
|
|
92
92
|
Scene,
|
|
93
93
|
SceneItem,
|
|
94
94
|
SceneOwner,
|
|
95
|
+
Spin,
|
|
95
96
|
TextPrimitive,
|
|
96
97
|
} from './primitives.ts';
|
|
98
|
+
export type { SpinRun } from './spinning.ts';
|
|
99
|
+
export { spinClass, spinRuns } from './spinning.ts';
|
|
97
100
|
export type { DrawingStyle } from './style.ts';
|
|
98
101
|
export type { MoleculeGroup, SvgOptions } from './svg.ts';
|
|
99
102
|
export {
|
|
@@ -93,6 +93,24 @@ export const MOTION_CSS = `/* A bubble rises from where it is drawn, three of it
|
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
|
|
96
|
+
/* A rotor seen face on, spinning in its plane about the middle of its box,
|
|
97
|
+
clockwise, or the other way when it spins back. */
|
|
98
|
+
[data-motion='moving'] .glass-spinning {
|
|
99
|
+
animation: glass-spin 1.2s linear infinite;
|
|
100
|
+
transform-box: fill-box;
|
|
101
|
+
transform-origin: center;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
[data-motion='moving'] .glass-spinning-back {
|
|
105
|
+
animation-direction: reverse;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
@keyframes glass-spin {
|
|
109
|
+
to {
|
|
110
|
+
transform: rotate(360deg);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
96
114
|
/* A figure carries each bubble running along water, and each drop falling, as
|
|
97
115
|
a run that only shows moving (written hidden, for a program that reads no
|
|
98
116
|
style), and the ones drawn where they stand as a still copy that only shows
|
|
@@ -107,7 +125,8 @@ export const MOTION_CSS = `/* A bubble rises from where it is drawn, three of it
|
|
|
107
125
|
|
|
108
126
|
@media print, (prefers-reduced-motion: reduce) {
|
|
109
127
|
.glass-bubble,
|
|
110
|
-
.glass-turning
|
|
128
|
+
.glass-turning,
|
|
129
|
+
.glass-spinning {
|
|
111
130
|
animation: none;
|
|
112
131
|
}
|
|
113
132
|
|
|
@@ -155,7 +174,8 @@ export function runTiming(flow: NonNullable<PathPrimitive['flow']>): {
|
|
|
155
174
|
}
|
|
156
175
|
|
|
157
176
|
/**
|
|
158
|
-
* Whether a scene has anything that moves: a bubble, a run, a turning piece
|
|
177
|
+
* Whether a scene has anything that moves: a bubble, a run, a turning piece,
|
|
178
|
+
* a spinning rotor.
|
|
159
179
|
* @param scene - The scene.
|
|
160
180
|
* @returns True when a figure of it can be set moving.
|
|
161
181
|
*/
|
|
@@ -165,7 +185,9 @@ export function sceneMoves(scene: Scene): boolean {
|
|
|
165
185
|
for (const primitive of item.primitives) {
|
|
166
186
|
if (
|
|
167
187
|
primitive.kind === 'path' &&
|
|
168
|
-
(primitive.flow !== undefined ||
|
|
188
|
+
(primitive.flow !== undefined ||
|
|
189
|
+
primitive.bubble !== undefined ||
|
|
190
|
+
primitive.spins !== undefined)
|
|
169
191
|
) {
|
|
170
192
|
return true;
|
|
171
193
|
}
|
|
@@ -92,6 +92,14 @@ export interface PathPrimitive {
|
|
|
92
92
|
* @default undefined — the whole piece turns, as a stir bar does
|
|
93
93
|
*/
|
|
94
94
|
turns?: true;
|
|
95
|
+
/**
|
|
96
|
+
* The way it spins in its own plane while its piece runs, with the
|
|
97
|
+
* primitives drawn next to it that spin the same way, about the middle of
|
|
98
|
+
* their box: a rotor seen face on, drawn whole about its axle. Set moving
|
|
99
|
+
* it spins; a file holds it still.
|
|
100
|
+
* @default undefined — it does not spin
|
|
101
|
+
*/
|
|
102
|
+
spins?: Spin;
|
|
95
103
|
/**
|
|
96
104
|
* The run of a bubble carried by running water, of one rising through a
|
|
97
105
|
* boiling liquid, of a falling drop: the screen moves it along the path,
|
|
@@ -104,6 +112,9 @@ export interface PathPrimitive {
|
|
|
104
112
|
flow?: { path: string; begin: number; duration: number; still?: boolean };
|
|
105
113
|
}
|
|
106
114
|
|
|
115
|
+
/** The way a rotor spins, as it is drawn. */
|
|
116
|
+
export type Spin = 'clockwise' | 'anticlockwise';
|
|
117
|
+
|
|
107
118
|
/** A filled dot: an unpaired electron, half a lone pair. */
|
|
108
119
|
export interface DotPrimitive {
|
|
109
120
|
/** The kind of primitive. */
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* What spins in a piece's own plane while it runs — a rotor seen face on —
|
|
3
|
+
* cut out of what the piece is drawn with, so that each part that spins is
|
|
4
|
+
* drawn as one group, turning about its own middle in its place among the
|
|
5
|
+
* rest.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
import type { Primitive, Spin } from './primitives.ts';
|
|
9
|
+
|
|
10
|
+
/** Primitives drawn next to each other, spinning one way or still. */
|
|
11
|
+
export interface SpinRun {
|
|
12
|
+
/** The way they spin, or undefined for primitives that stay still. */
|
|
13
|
+
spins: Spin | undefined;
|
|
14
|
+
/** The primitives, in the order they are drawn. */
|
|
15
|
+
primitives: Primitive[];
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Primitives cut wherever what spins starts, stops or changes way, in the
|
|
20
|
+
* order they are drawn.
|
|
21
|
+
* @param primitives - The primitives of a piece.
|
|
22
|
+
* @returns The runs, still and spinning, in order.
|
|
23
|
+
*/
|
|
24
|
+
export function spinRuns(primitives: readonly Primitive[]): SpinRun[] {
|
|
25
|
+
const runs: SpinRun[] = [];
|
|
26
|
+
for (const primitive of primitives) {
|
|
27
|
+
const spins = primitive.kind === 'path' ? primitive.spins : undefined;
|
|
28
|
+
const last = runs.at(-1);
|
|
29
|
+
if (last !== undefined && last.spins === spins) {
|
|
30
|
+
last.primitives.push(primitive);
|
|
31
|
+
} else {
|
|
32
|
+
runs.push({ spins, primitives: [primitive] });
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return runs;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* The class that sets a run spinning, the way it spins, as the motion
|
|
40
|
+
* stylesheet reads it.
|
|
41
|
+
* @param spins - The way it spins.
|
|
42
|
+
* @returns The class.
|
|
43
|
+
*/
|
|
44
|
+
export function spinClass(spins: Spin): string {
|
|
45
|
+
return spins === 'clockwise'
|
|
46
|
+
? 'glass-spinning'
|
|
47
|
+
: 'glass-spinning glass-spinning-back';
|
|
48
|
+
}
|
|
@@ -26,6 +26,7 @@ import type {
|
|
|
26
26
|
Scene,
|
|
27
27
|
SceneItem,
|
|
28
28
|
} from './primitives.ts';
|
|
29
|
+
import { spinClass, spinRuns } from './spinning.ts';
|
|
29
30
|
import type { DrawingStyle } from './style.ts';
|
|
30
31
|
|
|
31
32
|
/** The namespace of the attributes a drawing writes. */
|
|
@@ -172,8 +173,13 @@ function itemMarkup(item: SceneItem, options: SvgOptions): string {
|
|
|
172
173
|
const ink = item.color ? ` stroke="${hex}"` : '';
|
|
173
174
|
const faded = opacity < 1 ? ` opacity="${number(opacity)}"` : '';
|
|
174
175
|
const markup = (primitives: readonly Primitive[]) =>
|
|
175
|
-
primitives
|
|
176
|
-
.map((
|
|
176
|
+
spinRuns(primitives)
|
|
177
|
+
.map(({ spins, primitives: run }) => {
|
|
178
|
+
const inner = run.map((one) => primitiveMarkup(one, style, hex));
|
|
179
|
+
return spins
|
|
180
|
+
? `<g class="${spinClass(spins)}">${inner.join('')}</g>`
|
|
181
|
+
: inner.join('');
|
|
182
|
+
})
|
|
177
183
|
.join('');
|
|
178
184
|
// A piece whose paddle alone turns keeps the rest still.
|
|
179
185
|
if (item.turning !== undefined && item.primitives.some(turnsAlone)) {
|
|
@@ -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.
|