react-cheminfo 0.132.0 → 0.133.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/captionEditor/CaptionEditor.d.ts +3 -3
- package/lib/drawing/captionEditor/CaptionEditor.d.ts.map +1 -1
- package/lib/drawing/captionEditor/CaptionEditor.js +8 -4
- package/lib/drawing/captionEditor/CaptionEditor.js.map +1 -1
- package/lib/drawing/captionEditor/CaptionToolbar.d.ts +4 -2
- package/lib/drawing/captionEditor/CaptionToolbar.d.ts.map +1 -1
- package/lib/drawing/captionEditor/CaptionToolbar.js +6 -4
- package/lib/drawing/captionEditor/CaptionToolbar.js.map +1 -1
- package/lib/drawing/captionEditor/index.d.ts +2 -0
- package/lib/drawing/captionEditor/index.d.ts.map +1 -1
- package/lib/drawing/captionEditor/index.js +1 -0
- package/lib/drawing/captionEditor/index.js.map +1 -1
- package/lib/drawing/captionEditor/toolbarInView.d.ts +40 -0
- package/lib/drawing/captionEditor/toolbarInView.d.ts.map +1 -0
- package/lib/drawing/captionEditor/toolbarInView.js +53 -0
- package/lib/drawing/captionEditor/toolbarInView.js.map +1 -0
- package/lib/drawing/core/camera.d.ts +2 -0
- package/lib/drawing/core/camera.d.ts.map +1 -1
- package/lib/drawing/core/camera.js +2 -0
- package/lib/drawing/core/camera.js.map +1 -1
- package/lib/drawing/core/index.d.ts +1 -1
- package/lib/drawing/core/index.d.ts.map +1 -1
- package/lib/drawing/core/index.js +1 -1
- package/lib/drawing/core/index.js.map +1 -1
- package/lib/drawing/render/index.d.ts +1 -1
- package/lib/drawing/render/index.d.ts.map +1 -1
- package/lib/drawing/render/index.js +1 -1
- package/lib/drawing/render/index.js.map +1 -1
- package/lib/drawing/render/pageGrid.d.ts +16 -0
- package/lib/drawing/render/pageGrid.d.ts.map +1 -1
- package/lib/drawing/render/pageGrid.js +28 -10
- package/lib/drawing/render/pageGrid.js.map +1 -1
- package/lib/drawing/ui/PageField.d.ts +29 -0
- package/lib/drawing/ui/PageField.d.ts.map +1 -0
- package/lib/drawing/ui/PageField.js +38 -0
- package/lib/drawing/ui/PageField.js.map +1 -0
- package/lib/drawing/ui/PageGrid.d.ts +20 -0
- package/lib/drawing/ui/PageGrid.d.ts.map +1 -0
- package/lib/drawing/ui/PageGrid.js +26 -0
- package/lib/drawing/ui/PageGrid.js.map +1 -0
- package/lib/drawing/ui/PageSideInput.d.ts +28 -0
- package/lib/drawing/ui/PageSideInput.d.ts.map +1 -0
- package/lib/drawing/ui/PageSideInput.js +47 -0
- package/lib/drawing/ui/PageSideInput.js.map +1 -0
- package/lib/drawing/ui/PageToolbar.d.ts +16 -0
- package/lib/drawing/ui/PageToolbar.d.ts.map +1 -0
- package/lib/drawing/ui/PageToolbar.js +16 -0
- package/lib/drawing/ui/PageToolbar.js.map +1 -0
- package/lib/drawing/ui/PrintSheets.d.ts +32 -0
- package/lib/drawing/ui/PrintSheets.d.ts.map +1 -0
- package/lib/drawing/ui/PrintSheets.js +17 -0
- package/lib/drawing/ui/PrintSheets.js.map +1 -0
- package/lib/drawing/ui/TextToolIcon.d.ts +19 -0
- package/lib/drawing/ui/TextToolIcon.d.ts.map +1 -0
- package/lib/drawing/ui/TextToolIcon.js +21 -0
- package/lib/drawing/ui/TextToolIcon.js.map +1 -0
- package/lib/drawing/ui/ZoomControl.d.ts +25 -0
- package/lib/drawing/ui/ZoomControl.d.ts.map +1 -0
- package/lib/drawing/ui/ZoomControl.js +27 -0
- package/lib/drawing/ui/ZoomControl.js.map +1 -0
- package/lib/drawing/ui/index.d.ts +10 -0
- package/lib/drawing/ui/index.d.ts.map +1 -1
- package/lib/drawing/ui/index.js +7 -0
- package/lib/drawing/ui/index.js.map +1 -1
- package/lib/guide/ui/EmptyGuide.d.ts +5 -2
- package/lib/guide/ui/EmptyGuide.d.ts.map +1 -1
- package/lib/guide/ui/EmptyGuide.js +8 -3
- package/lib/guide/ui/EmptyGuide.js.map +1 -1
- package/lib/guide/ui/GuideFigures.d.ts +6 -0
- package/lib/guide/ui/GuideFigures.d.ts.map +1 -1
- package/lib/guide/ui/GuideFigures.js +5 -5
- package/lib/guide/ui/GuideFigures.js.map +1 -1
- package/lib/mass/core/index.d.ts +1 -0
- package/lib/mass/core/index.d.ts.map +1 -1
- package/lib/mass/core/index.js +1 -0
- package/lib/mass/core/index.js.map +1 -1
- package/lib/mass/core/massDomain.d.ts.map +1 -1
- package/lib/mass/core/massDomain.js +9 -5
- package/lib/mass/core/massDomain.js.map +1 -1
- package/lib/mass/core/massSpectrum.d.ts +9 -0
- package/lib/mass/core/massSpectrum.d.ts.map +1 -1
- package/lib/mass/core/massSpectrum.js.map +1 -1
- package/lib/mass/core/verticalScale.d.ts +30 -0
- package/lib/mass/core/verticalScale.d.ts.map +1 -0
- package/lib/mass/core/verticalScale.js +40 -0
- package/lib/mass/core/verticalScale.js.map +1 -0
- package/lib/mass/ui/MassChart.d.ts.map +1 -1
- package/lib/mass/ui/MassChart.js +4 -38
- package/lib/mass/ui/MassChart.js.map +1 -1
- package/lib/mass/ui/massChartLayers.d.ts +31 -0
- package/lib/mass/ui/massChartLayers.d.ts.map +1 -0
- package/lib/mass/ui/massChartLayers.js +57 -0
- package/lib/mass/ui/massChartLayers.js.map +1 -0
- package/lib/structure/core/index.d.ts +1 -1
- package/lib/structure/core/index.d.ts.map +1 -1
- package/lib/structure/core/index.js.map +1 -1
- package/lib/structure/core/structurePicture.d.ts +32 -1
- package/lib/structure/core/structurePicture.d.ts.map +1 -1
- package/lib/structure/core/structurePicture.js +29 -2
- package/lib/structure/core/structurePicture.js.map +1 -1
- package/lib/structure/ui/StructureEditor.d.ts +2 -1
- package/lib/structure/ui/StructureEditor.d.ts.map +1 -1
- package/lib/structure/ui/StructureEditor.js +9 -3
- package/lib/structure/ui/StructureEditor.js.map +1 -1
- package/lib/structure/ui/StructureEditorGuide.d.ts +15 -0
- package/lib/structure/ui/StructureEditorGuide.d.ts.map +1 -0
- package/lib/structure/ui/StructureEditorGuide.js +26 -0
- package/lib/structure/ui/StructureEditorGuide.js.map +1 -0
- package/lib/structure/ui/structureEditorProps.d.ts +11 -1
- package/lib/structure/ui/structureEditorProps.d.ts.map +1 -1
- package/lib/structure/ui/useCanvasPress.d.ts +23 -0
- package/lib/structure/ui/useCanvasPress.d.ts.map +1 -0
- package/lib/structure/ui/useCanvasPress.js +53 -0
- package/lib/structure/ui/useCanvasPress.js.map +1 -0
- package/lib/xps/core/detectFormat.d.ts +6 -0
- package/lib/xps/core/detectFormat.d.ts.map +1 -1
- package/lib/xps/core/detectFormat.js +8 -0
- package/lib/xps/core/detectFormat.js.map +1 -1
- package/lib/xps/core/xpsEditorApi.d.ts +16 -0
- package/lib/xps/core/xpsEditorApi.d.ts.map +1 -1
- package/lib/xps/ui/XpsCanvas.d.ts +10 -1
- package/lib/xps/ui/XpsCanvas.d.ts.map +1 -1
- package/lib/xps/ui/XpsCanvas.js +14 -3
- package/lib/xps/ui/XpsCanvas.js.map +1 -1
- package/lib/xps/ui/XpsChart.d.ts.map +1 -1
- package/lib/xps/ui/XpsChart.js +12 -43
- package/lib/xps/ui/XpsChart.js.map +1 -1
- package/lib/xps/ui/XpsEditor.d.ts +8 -0
- package/lib/xps/ui/XpsEditor.d.ts.map +1 -1
- package/lib/xps/ui/XpsEditor.js +2 -2
- package/lib/xps/ui/XpsEditor.js.map +1 -1
- package/lib/xps/ui/XpsShell.d.ts +5 -0
- package/lib/xps/ui/XpsShell.d.ts.map +1 -1
- package/lib/xps/ui/XpsShell.js +18 -4
- package/lib/xps/ui/XpsShell.js.map +1 -1
- package/lib/xps/ui/dropEvents.d.ts +8 -1
- package/lib/xps/ui/dropEvents.d.ts.map +1 -1
- package/lib/xps/ui/dropEvents.js +15 -1
- package/lib/xps/ui/dropEvents.js.map +1 -1
- package/lib/xps/ui/useSpectrumDrop.d.ts +6 -0
- package/lib/xps/ui/useSpectrumDrop.d.ts.map +1 -1
- package/lib/xps/ui/useSpectrumDrop.js +1 -1
- package/lib/xps/ui/useSpectrumDrop.js.map +1 -1
- package/lib/xps/ui/useXpsEditorHandle.d.ts +4 -1
- package/lib/xps/ui/useXpsEditorHandle.d.ts.map +1 -1
- package/lib/xps/ui/useXpsEditorHandle.js +6 -2
- package/lib/xps/ui/useXpsEditorHandle.js.map +1 -1
- package/lib/xps/ui/useXpsReadout.d.ts +43 -0
- package/lib/xps/ui/useXpsReadout.d.ts.map +1 -0
- package/lib/xps/ui/useXpsReadout.js +59 -0
- package/lib/xps/ui/useXpsReadout.js.map +1 -0
- package/lib/xps/ui/xpsChartProps.d.ts +9 -0
- package/lib/xps/ui/xpsChartProps.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/drawing/captionEditor/CaptionEditor.tsx +8 -3
- package/src/drawing/captionEditor/CaptionToolbar.tsx +18 -2
- package/src/drawing/captionEditor/index.ts +2 -0
- package/src/drawing/captionEditor/toolbarInView.ts +73 -0
- package/src/drawing/core/camera.ts +3 -0
- package/src/drawing/core/index.ts +1 -0
- package/src/drawing/render/index.ts +2 -0
- package/src/drawing/render/pageGrid.ts +29 -11
- package/src/drawing/ui/PageField.tsx +104 -0
- package/src/drawing/ui/PageGrid.tsx +48 -0
- package/src/drawing/ui/PageSideInput.tsx +81 -0
- package/src/drawing/ui/PageToolbar.tsx +45 -0
- package/src/drawing/ui/PrintSheets.tsx +57 -0
- package/src/drawing/ui/TextToolIcon.tsx +48 -0
- package/src/drawing/ui/ZoomControl.tsx +112 -0
- package/src/drawing/ui/index.ts +10 -0
- package/src/guide/ui/EmptyGuide.tsx +20 -13
- package/src/guide/ui/GuideFigures.tsx +15 -4
- package/src/mass/core/index.ts +1 -0
- package/src/mass/core/massDomain.ts +9 -3
- package/src/mass/core/massSpectrum.ts +9 -0
- package/src/mass/core/verticalScale.ts +48 -0
- package/src/mass/ui/MassChart.tsx +12 -43
- package/src/mass/ui/massChartLayers.ts +66 -0
- package/src/structure/core/index.ts +1 -0
- package/src/structure/core/structurePicture.ts +78 -4
- package/src/structure/ui/StructureEditor.tsx +13 -2
- package/src/structure/ui/StructureEditorGuide.tsx +35 -0
- package/src/structure/ui/structureEditorProps.ts +11 -1
- package/src/structure/ui/useCanvasPress.ts +69 -0
- package/src/xps/core/detectFormat.ts +9 -0
- package/src/xps/core/xpsEditorApi.ts +16 -0
- package/src/xps/ui/XpsCanvas.tsx +26 -3
- package/src/xps/ui/XpsChart.tsx +12 -56
- package/src/xps/ui/XpsEditor.tsx +10 -0
- package/src/xps/ui/XpsShell.tsx +37 -7
- package/src/xps/ui/dropEvents.ts +16 -1
- package/src/xps/ui/useSpectrumDrop.ts +7 -1
- package/src/xps/ui/useXpsEditorHandle.ts +12 -2
- package/src/xps/ui/useXpsReadout.ts +104 -0
- package/src/xps/ui/xpsChartProps.ts +9 -0
- package/styles/caption-editor.css +15 -1
- package/styles/chrome.css +130 -9
- package/styles/drawing.css +100 -0
|
@@ -34,14 +34,41 @@ const SIDE = /\b(?<side>width|height)="(?<pixels>\d+)px"/gu;
|
|
|
34
34
|
* @returns The document and the size it came out at.
|
|
35
35
|
*/
|
|
36
36
|
export function structurePicture(molecule, options = {}) {
|
|
37
|
-
const { bondLength = STRUCTURE_BOND_LENGTH, background = '#ffffff' } = options;
|
|
38
|
-
const
|
|
37
|
+
const { bondLength = STRUCTURE_BOND_LENGTH, background = '#ffffff', id, stereoText = true, fontFamily, depictor, } = options;
|
|
38
|
+
const drawn = molecule.toSVG(CANVAS, CANVAS, id, {
|
|
39
|
+
...depictor,
|
|
40
|
+
...(stereoText ? undefined : NO_STEREO_TEXT),
|
|
39
41
|
autoCrop: true,
|
|
40
42
|
autoCropMargin: Math.max(2, Math.round(bondLength / 6)),
|
|
41
43
|
maxAVBL: Math.max(1, Math.round(bondLength)),
|
|
42
44
|
});
|
|
45
|
+
const markup = fontFamily === undefined ? drawn : withFontFamily(drawn, fontFamily);
|
|
43
46
|
return { markup: painted(markup, background), ...sizeOf(markup) };
|
|
44
47
|
}
|
|
48
|
+
/** What leaves the stereo text out of a picture, wedges kept. */
|
|
49
|
+
const NO_STEREO_TEXT = {
|
|
50
|
+
suppressChiralText: true,
|
|
51
|
+
suppressCIPParity: true,
|
|
52
|
+
suppressESR: true,
|
|
53
|
+
noStereoProblem: true,
|
|
54
|
+
};
|
|
55
|
+
/** The rule OpenChemLib sets the labels' type with, in the document's style. */
|
|
56
|
+
const FONT_RULE = /(?<rule> text \{font-family: )sans-serif;/u;
|
|
57
|
+
/**
|
|
58
|
+
* Set the labels in another type than the `sans-serif` OpenChemLib names.
|
|
59
|
+
*
|
|
60
|
+
* The family is written into a style element, so whatever could close the
|
|
61
|
+
* rule or the element is left out of it.
|
|
62
|
+
* @param markup - The document as OpenChemLib wrote it.
|
|
63
|
+
* @param fontFamily - The CSS `font-family`.
|
|
64
|
+
* @returns The document.
|
|
65
|
+
*/
|
|
66
|
+
function withFontFamily(markup, fontFamily) {
|
|
67
|
+
const family = fontFamily.replaceAll(/[{};<>&]/gu, '').trim();
|
|
68
|
+
if (family === '')
|
|
69
|
+
return markup;
|
|
70
|
+
return markup.replace(FONT_RULE, (_match, rule) => `${rule}${family};`);
|
|
71
|
+
}
|
|
45
72
|
/**
|
|
46
73
|
* Paint a background into the document, so the file does not open
|
|
47
74
|
* transparent.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structurePicture.js","sourceRoot":"","sources":["../../../src/structure/core/structurePicture.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"structurePicture.js","sourceRoot":"","sources":["../../../src/structure/core/structurePicture.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,8 @@ export type { StructureEditorProps } from './structureEditorProps.ts';
|
|
|
12
12
|
/**
|
|
13
13
|
* The canvas structure editor, sized to fill its container and never to hide
|
|
14
14
|
* part of its toolbar, with a tooltip on every toolbar button, a guide to the
|
|
15
|
-
* keys, and a splash on an empty canvas saying how to start
|
|
15
|
+
* keys, and a splash on an empty canvas saying how to start — or the site's own
|
|
16
|
+
* guide in its place.
|
|
16
17
|
* @param props - What to draw, when to reload it, and where to send it.
|
|
17
18
|
* @returns The editor.
|
|
18
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StructureEditor.d.ts","sourceRoot":"","sources":["../../../src/structure/ui/StructureEditor.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"StructureEditor.d.ts","sourceRoot":"","sources":["../../../src/structure/ui/StructureEditor.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,OAAO,CAAC;AAczD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAQtE,YAAY,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAYtE;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,YAAY,CAoHzE"}
|
|
@@ -6,8 +6,10 @@ import { EditorHelpButton } from "./EditorHelpButton.js";
|
|
|
6
6
|
import { EditorImportButton } from "./EditorImportButton.js";
|
|
7
7
|
import { EditorImportProblem } from "./EditorImportProblem.js";
|
|
8
8
|
import { StructureDropOverlay } from "./StructureDropOverlay.js";
|
|
9
|
+
import { StructureEditorGuide } from "./StructureEditorGuide.js";
|
|
9
10
|
import { StructureEditorSplash } from "./StructureEditorSplash.js";
|
|
10
11
|
import { ToolbarTooltip } from "./ToolbarTooltip.js";
|
|
12
|
+
import { useCanvasPress } from "./useCanvasPress.js";
|
|
11
13
|
import { useDebouncedChange } from "./useDebouncedChange.js";
|
|
12
14
|
import { useEditorStructure } from "./useEditorStructure.js";
|
|
13
15
|
import { useStructureDrop } from "./useStructureDrop.js";
|
|
@@ -24,12 +26,13 @@ const EditorCanvas = lazy(async () => {
|
|
|
24
26
|
/**
|
|
25
27
|
* The canvas structure editor, sized to fill its container and never to hide
|
|
26
28
|
* part of its toolbar, with a tooltip on every toolbar button, a guide to the
|
|
27
|
-
* keys, and a splash on an empty canvas saying how to start
|
|
29
|
+
* keys, and a splash on an empty canvas saying how to start — or the site's own
|
|
30
|
+
* guide in its place.
|
|
28
31
|
* @param props - What to draw, when to reload it, and where to send it.
|
|
29
32
|
* @returns The editor.
|
|
30
33
|
*/
|
|
31
34
|
export function StructureEditor(props) {
|
|
32
|
-
const { onChange, fragment = false, inputFormat = 'idcode', value = '', revision = 0, debounce = 300, minHeight = 320, mode = 'molecule', help = true, splash = true, exportable = true, importable = true, onImport, className, style, } = props;
|
|
35
|
+
const { onChange, fragment = false, inputFormat = 'idcode', value = '', revision = 0, debounce = 300, minHeight = 320, mode = 'molecule', help = true, splash = true, exportable = true, importable = true, onImport, guide, className, style, } = props;
|
|
33
36
|
const t = useChromeT();
|
|
34
37
|
const containerRef = useToolbarFloor({ minHeight, revision });
|
|
35
38
|
const handleChange = useDebouncedChange(onChange, debounce, revision);
|
|
@@ -48,9 +51,12 @@ export function StructureEditor(props) {
|
|
|
48
51
|
});
|
|
49
52
|
const takesImports = importable && mode === 'molecule';
|
|
50
53
|
const drop = useStructureDrop(takesImports ? imports.load : undefined);
|
|
54
|
+
const press = useCanvasPress();
|
|
55
|
+
const empty = mode === 'molecule' && drawing.empty && !drop.over;
|
|
56
|
+
const guided = guide !== undefined && empty;
|
|
51
57
|
return (_jsxs("div", { ref: containerRef, className: className === undefined
|
|
52
58
|
? 'structure-editor'
|
|
53
|
-
: `structure-editor ${className}`, style: { ...ROOT_STYLE, minHeight, ...style }, ...drop.targetProps, children: [_jsxs(Suspense, { fallback: _jsx("div", { style: LOADING_STYLE, children: t('structure.loadingEditor') }), children: [_jsx(EditorCanvas, { onChange: handleEdit, fragment: fragment, inputFormat: imports.idCode === null ? inputFormat : 'idcode', value: imports.idCode ?? value, mode: mode }, imports.canvasKey), splash &&
|
|
59
|
+
: `structure-editor ${className}`, style: { ...ROOT_STYLE, minHeight, ...style }, onPointerDownCapture: guided ? press.onPointerDownCapture : undefined, ...drop.targetProps, children: [_jsxs(Suspense, { fallback: _jsx("div", { style: LOADING_STYLE, children: t('structure.loadingEditor') }), children: [_jsx(EditorCanvas, { onChange: handleEdit, fragment: fragment, inputFormat: imports.idCode === null ? inputFormat : 'idcode', value: imports.idCode ?? value, mode: mode }, imports.canvasKey), guided && !press.pressed ? (_jsx(StructureEditorGuide, { children: guide })) : null, splash && guide === undefined && empty ? (_jsx(StructureEditorSplash, { importable: takesImports })) : null, help ? (_jsx(ToolbarTooltip, { containerRef: containerRef, mode: mode })) : null, _jsxs("div", { style: CORNER_STYLE, children: [takesImports ? (_jsx(EditorImportButton, { onImport: imports.load, accept: onImport === undefined ? STRUCTURE_FILES : undefined })) : null, exportable && mode === 'molecule' ? (_jsx(EditorExportButton, { source: drawing.source, fragment: fragment, empty: drawing.empty })) : null, help ? (_jsx(EditorHelpButton, { containerRef: containerRef, mode: mode, fragment: fragment })) : null] }), imports.problem === null ? null : (_jsx(EditorImportProblem, { problem: imports.problem, onDismiss: imports.dismiss }))] }), drop.over ? (_jsx(StructureDropOverlay, { label: t('structure.import.drop'), handlers: drop.overlayProps })) : null] }));
|
|
54
60
|
}
|
|
55
61
|
/**
|
|
56
62
|
* The canvas is positioned out of the height computation, so the container's
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StructureEditor.js","sourceRoot":"","sources":["../../../src/structure/ui/StructureEditor.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAwB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAA0B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA2B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA4B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA6B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAsB,CAAC;AAGtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE;IACzC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,yBAA0B,CAAC,CAAC;IACxD,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE;IACnC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,mBAAoB,CAAC,CAAC;IAClD,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH
|
|
1
|
+
{"version":3,"file":"StructureEditor.js","sourceRoot":"","sources":["../../../src/structure/ui/StructureEditor.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ReactElement, ReactNode } from 'react';
|
|
2
|
+
/**
|
|
3
|
+
* The box a site's guide is drawn in over an empty canvas: beside the toolbar
|
|
4
|
+
* and under the buttons in the corner, so it never covers either.
|
|
5
|
+
*
|
|
6
|
+
* The box itself lets the pointer through; `<EmptyGuide>` takes it back only on
|
|
7
|
+
* its own buttons, links and figures, so a stroke can start on the words.
|
|
8
|
+
* @param props - What the guide shows.
|
|
9
|
+
* @param props.children - The site's guide.
|
|
10
|
+
* @returns The box and the guide in it.
|
|
11
|
+
*/
|
|
12
|
+
export declare function StructureEditorGuide(props: {
|
|
13
|
+
children: ReactNode;
|
|
14
|
+
}): ReactElement;
|
|
15
|
+
//# sourceMappingURL=StructureEditorGuide.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StructureEditorGuide.d.ts","sourceRoot":"","sources":["../../../src/structure/ui/StructureEditorGuide.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIpE;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IAC1C,QAAQ,EAAE,SAAS,CAAC;CACrB,GAAG,YAAY,CAMf"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { EDITOR_TOOLBAR_WIDTH } from "../core/editorToolbarGeometry.js";
|
|
3
|
+
/**
|
|
4
|
+
* The box a site's guide is drawn in over an empty canvas: beside the toolbar
|
|
5
|
+
* and under the buttons in the corner, so it never covers either.
|
|
6
|
+
*
|
|
7
|
+
* The box itself lets the pointer through; `<EmptyGuide>` takes it back only on
|
|
8
|
+
* its own buttons, links and figures, so a stroke can start on the words.
|
|
9
|
+
* @param props - What the guide shows.
|
|
10
|
+
* @param props.children - The site's guide.
|
|
11
|
+
* @returns The box and the guide in it.
|
|
12
|
+
*/
|
|
13
|
+
export function StructureEditorGuide(props) {
|
|
14
|
+
return (_jsx("div", { "data-testid": "structure-editor-guide", style: GUIDE_STYLE, children: props.children }));
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Under the open, export and help buttons in the corner: 4 px from the top, a
|
|
18
|
+
* small button 24 px tall, and 4 px under it.
|
|
19
|
+
*/
|
|
20
|
+
const CORNER_CLEARANCE = 32;
|
|
21
|
+
const GUIDE_STYLE = {
|
|
22
|
+
position: 'absolute',
|
|
23
|
+
inset: `${CORNER_CLEARANCE}px 0 0 ${EDITOR_TOOLBAR_WIDTH}px`,
|
|
24
|
+
pointerEvents: 'none',
|
|
25
|
+
};
|
|
26
|
+
//# sourceMappingURL=StructureEditorGuide.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StructureEditorGuide.js","sourceRoot":"","sources":["../../../src/structure/ui/StructureEditorGuide.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE;;;;;;;;;GASG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAEpC;IACC,OAAO,CACL,6BAAiB,wBAAwB,EAAC,KAAK,EAAE,WAAW,YACzD,KAAK,CAAC,QAAQ,GACX,CACP,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B,MAAM,WAAW,GAAkB;IACjC,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,GAAG,gBAAgB,UAAU,oBAAoB,IAAI;IAC5D,aAAa,EAAE,MAAM;CACtB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CSSProperties } from 'react';
|
|
1
|
+
import type { CSSProperties, ReactNode } from 'react';
|
|
2
2
|
import type { CanvasEditorInputFormat } from 'react-ocl';
|
|
3
3
|
import type { StructureTransfer } from '../core/structureTransfer.ts';
|
|
4
4
|
import type { StructureEditorChange, StructureEditorMode } from './editorChange.ts';
|
|
@@ -68,6 +68,16 @@ export interface StructureEditorProps {
|
|
|
68
68
|
* @default true
|
|
69
69
|
*/
|
|
70
70
|
splash?: boolean;
|
|
71
|
+
/**
|
|
72
|
+
* What an empty canvas shows in place of the splash: the site's
|
|
73
|
+
* `<EmptyGuide>`, drawn beside the toolbar and under the buttons in the
|
|
74
|
+
* corner. The pointer goes through it to the canvas except on its own
|
|
75
|
+
* buttons, links and figures; it goes at the press that starts a stroke, and
|
|
76
|
+
* comes back whenever the canvas is empty again. Shown whatever `splash`
|
|
77
|
+
* says. A reaction canvas shows none.
|
|
78
|
+
* @default undefined — the splash, when `splash` is on
|
|
79
|
+
*/
|
|
80
|
+
guide?: ReactNode;
|
|
71
81
|
/**
|
|
72
82
|
* Put a button in the corner that opens every notation of the drawing — its
|
|
73
83
|
* SMILES, its molfiles, its canonical identifiers — and the picture of it,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structureEditorProps.d.ts","sourceRoot":"","sources":["../../../src/structure/ui/structureEditorProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"structureEditorProps.d.ts","sourceRoot":"","sources":["../../../src/structure/ui/structureEditorProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAEzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,KAAK,EACV,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAE3B,oCAAoC;AACpC,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,QAAQ,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,IAAI,CAAC;IAClD;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;;;;OAQG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACjD;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The press that starts a stroke on the structure editor's canvas, which a
|
|
3
|
+
* site's guide makes way for.
|
|
4
|
+
*/
|
|
5
|
+
import type { PointerEvent as ReactPointerEvent } from 'react';
|
|
6
|
+
/** Whether a stroke is being drawn, and how to hear the press that starts one. */
|
|
7
|
+
export interface CanvasPress {
|
|
8
|
+
/** Whether the drawing area is held down, which the guide makes way for. */
|
|
9
|
+
pressed: boolean;
|
|
10
|
+
/** Put on the editor's box, in the capture phase. */
|
|
11
|
+
onPointerDownCapture: (event: ReactPointerEvent<HTMLElement>) => void;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Hear a press on the drawing area, so the guide goes at the press that starts
|
|
15
|
+
* a stroke rather than once the stroke is reported.
|
|
16
|
+
*
|
|
17
|
+
* A press on the toolbar, on a corner button or on the guide's own buttons is
|
|
18
|
+
* not a stroke. The guide comes back after the release only when the editor
|
|
19
|
+
* has not reported a drawing by then.
|
|
20
|
+
* @returns See {@link CanvasPress}.
|
|
21
|
+
*/
|
|
22
|
+
export declare function useCanvasPress(): CanvasPress;
|
|
23
|
+
//# sourceMappingURL=useCanvasPress.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useCanvasPress.d.ts","sourceRoot":"","sources":["../../../src/structure/ui/useCanvasPress.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAK/D,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,4EAA4E;IAC5E,OAAO,EAAE,OAAO,CAAC;IACjB,qDAAqD;IACrD,oBAAoB,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;CACvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,IAAI,WAAW,CAoB5C"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The press that starts a stroke on the structure editor's canvas, which a
|
|
3
|
+
* site's guide makes way for.
|
|
4
|
+
*/
|
|
5
|
+
import { useCallback, useState } from 'react';
|
|
6
|
+
import { EDITOR_TOOLBAR_WIDTH } from "../core/editorToolbarGeometry.js";
|
|
7
|
+
/**
|
|
8
|
+
* Hear a press on the drawing area, so the guide goes at the press that starts
|
|
9
|
+
* a stroke rather than once the stroke is reported.
|
|
10
|
+
*
|
|
11
|
+
* A press on the toolbar, on a corner button or on the guide's own buttons is
|
|
12
|
+
* not a stroke. The guide comes back after the release only when the editor
|
|
13
|
+
* has not reported a drawing by then.
|
|
14
|
+
* @returns See {@link CanvasPress}.
|
|
15
|
+
*/
|
|
16
|
+
export function useCanvasPress() {
|
|
17
|
+
const [pressed, setPressed] = useState(false);
|
|
18
|
+
const onPointerDownCapture = useCallback((event) => {
|
|
19
|
+
if (!onDrawingArea(event))
|
|
20
|
+
return;
|
|
21
|
+
setPressed(true);
|
|
22
|
+
function release() {
|
|
23
|
+
globalThis.removeEventListener('pointerup', release, true);
|
|
24
|
+
globalThis.removeEventListener('pointercancel', release, true);
|
|
25
|
+
// Once the editor has handled the release too: a stroke that drew
|
|
26
|
+
// something is reported by then, and the guide does not flash back.
|
|
27
|
+
setTimeout(() => setPressed(false), 0);
|
|
28
|
+
}
|
|
29
|
+
// Heard on the way down, which no handler of the canvas can stop.
|
|
30
|
+
globalThis.addEventListener('pointerup', release, true);
|
|
31
|
+
globalThis.addEventListener('pointercancel', release, true);
|
|
32
|
+
}, []);
|
|
33
|
+
return { pressed, onPointerDownCapture };
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Whether a press landed on the drawing area: on the editor's canvas, and to
|
|
37
|
+
* the right of its toolbar. Both live in the editor's shadow root, so the event
|
|
38
|
+
* names the element holding it.
|
|
39
|
+
* @param event - The press, heard on the editor's box.
|
|
40
|
+
* @returns Whether it starts a stroke.
|
|
41
|
+
*/
|
|
42
|
+
function onDrawingArea(event) {
|
|
43
|
+
const { target, currentTarget, clientX } = event;
|
|
44
|
+
if (!(target instanceof Element) || target.closest(CANVAS) === null) {
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
return clientX - currentTarget.getBoundingClientRect().left > TOOLBAR_EDGE;
|
|
48
|
+
}
|
|
49
|
+
/** The element the openchemlib editor is drawn in. */
|
|
50
|
+
const CANVAS = '[data-openchemlib-canvas-editor]';
|
|
51
|
+
/** The toolbar's right edge, inside the editor's one-pixel border. */
|
|
52
|
+
const TOOLBAR_EDGE = EDITOR_TOOLBAR_WIDTH + 1;
|
|
53
|
+
//# sourceMappingURL=useCanvasPress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useCanvasPress.js","sourceRoot":"","sources":["../../../src/structure/ui/useCanvasPress.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAUxE;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc;IAC5B,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,oBAAoB,GAAG,WAAW,CACtC,CAAC,KAAqC,EAAE,EAAE;QACxC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;YAAE,OAAO;QAClC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,SAAS,OAAO;YACd,UAAU,CAAC,mBAAmB,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAC3D,UAAU,CAAC,mBAAmB,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAC/D,kEAAkE;YAClE,oEAAoE;YACpE,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QACzC,CAAC;QACD,kEAAkE;QAClE,UAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACxD,UAAU,CAAC,gBAAgB,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC,EACD,EAAE,CACH,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAC3C,CAAC;AAED;;;;;;GAMG;AACH,SAAS,aAAa,CAAC,KAAqC;IAC1D,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACjD,IAAI,CAAC,CAAC,MAAM,YAAY,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;QACpE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,OAAO,GAAG,aAAa,CAAC,qBAAqB,EAAE,CAAC,IAAI,GAAG,YAAY,CAAC;AAC7E,CAAC;AAED,sDAAsD;AACtD,MAAM,MAAM,GAAG,kCAAkC,CAAC;AAElD,sEAAsE;AACtE,MAAM,YAAY,GAAG,oBAAoB,GAAG,CAAC,CAAC"}
|
|
@@ -14,6 +14,12 @@
|
|
|
14
14
|
* megabytes of digits that nothing would be learned from.
|
|
15
15
|
*/
|
|
16
16
|
import type { XpsFormat } from './xpsSpectrum.ts';
|
|
17
|
+
/**
|
|
18
|
+
* The extensions the readers know, as a file picker's `accept`: what the
|
|
19
|
+
* picker offers first, while a file it does not name is still read by its
|
|
20
|
+
* content.
|
|
21
|
+
*/
|
|
22
|
+
export declare const XPS_FILE_ACCEPT: string;
|
|
17
23
|
/**
|
|
18
24
|
* Decide what a dropped file is, from its first bytes and only then its name.
|
|
19
25
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detectFormat.d.ts","sourceRoot":"","sources":["../../../src/xps/core/detectFormat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"detectFormat.d.ts","sourceRoot":"","sources":["../../../src/xps/core/detectFormat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAuDlD;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAEhB,CAAC;AAKb;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,EACvC,QAAQ,CAAC,EAAE,MAAM,GAChB,SAAS,GAAG,IAAI,CASlB"}
|
|
@@ -60,6 +60,14 @@ const EXTENSIONS = new Map([
|
|
|
60
60
|
['tsv', 'text'],
|
|
61
61
|
['xy', 'text'],
|
|
62
62
|
]);
|
|
63
|
+
/**
|
|
64
|
+
* The extensions the readers know, as a file picker's `accept`: what the
|
|
65
|
+
* picker offers first, while a file it does not name is still read by its
|
|
66
|
+
* content.
|
|
67
|
+
*/
|
|
68
|
+
export const XPS_FILE_ACCEPT = [...EXTENSIONS.keys()]
|
|
69
|
+
.map((extension) => `.${extension}`)
|
|
70
|
+
.join(',');
|
|
63
71
|
/** The one decoder the header is read through, kept rather than rebuilt. */
|
|
64
72
|
const DECODER = new TextDecoder();
|
|
65
73
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detectFormat.js","sourceRoot":"","sources":["../../../src/xps/core/detectFormat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"detectFormat.js","sourceRoot":"","sources":["../../../src/xps/core/detectFormat.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,22 @@ export interface XpsEditorHandle {
|
|
|
55
55
|
setSpectra: (spectra: XpsSpectrum[]) => void;
|
|
56
56
|
/** Close every spectrum and start again from an empty chart. */
|
|
57
57
|
clear: () => void;
|
|
58
|
+
/**
|
|
59
|
+
* Open the viewer's file picker; what is chosen is read as a drop is,
|
|
60
|
+
* joining what is open. A browser opens a picker only for a click, so call
|
|
61
|
+
* it from one — an "Import data…" button of a guide.
|
|
62
|
+
*/
|
|
63
|
+
openFiles: () => void;
|
|
64
|
+
/**
|
|
65
|
+
* Read the clipboard's text as a paste into the viewer is read, joining what
|
|
66
|
+
* is open; what cannot be read is said in the status bar, as for a paste.
|
|
67
|
+
* Call it from a click, which is when a browser lets a page read the
|
|
68
|
+
* clipboard.
|
|
69
|
+
* @returns Resolves once the text is handed to the reader, and rejects when
|
|
70
|
+
* the browser refuses to read the clipboard, so the caller can suggest the
|
|
71
|
+
* paste keys instead.
|
|
72
|
+
*/
|
|
73
|
+
paste: () => Promise<void>;
|
|
58
74
|
/**
|
|
59
75
|
* Frame a binding energy on the chart, keeping the counts axis where it was.
|
|
60
76
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xpsEditorApi.d.ts","sourceRoot":"","sources":["../../../src/xps/core/xpsEditorApi.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,KAAK,CAAC;AAEhC,gDAAgD;AAChD,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC7C;;;;;;;;OAQG;IACH,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC7C,gEAAgE;IAChE,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB;;;;;;;;;;;;;OAaG;IACH,YAAY,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC7E;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,QAAQ,CAAC;CAC1B"}
|
|
1
|
+
{"version":3,"file":"xpsEditorApi.d.ts","sourceRoot":"","sources":["../../../src/xps/core/xpsEditorApi.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,KAAK,CAAC;AAEhC,gDAAgD;AAChD,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC7C;;;;;;;;OAQG;IACH,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC7C,gEAAgE;IAChE,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB;;;;OAIG;IACH,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB;;;;;;;;OAQG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B;;;;;;;;;;;;;OAaG;IACH,YAAY,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC7E;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,QAAQ,CAAC;CAC1B"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ReactNode } from 'react';
|
|
1
2
|
export interface XpsCanvasProps {
|
|
2
3
|
/**
|
|
3
4
|
* The id of the box the chart is drawn in, which a picture of the chart is
|
|
@@ -15,6 +16,13 @@ export interface XpsCanvasProps {
|
|
|
15
16
|
* @default false
|
|
16
17
|
*/
|
|
17
18
|
isReading?: boolean;
|
|
19
|
+
/**
|
|
20
|
+
* What the empty chart shows in place of its own invitation to drop a
|
|
21
|
+
* spectrum: the site's `<EmptyGuide>`, over the whole chart. Gone while a
|
|
22
|
+
* file is dragged over the chart or read, and once anything is open.
|
|
23
|
+
* @default undefined — the chart's own invitation
|
|
24
|
+
*/
|
|
25
|
+
guide?: ReactNode;
|
|
18
26
|
}
|
|
19
27
|
/**
|
|
20
28
|
* The chart side of the split: the drawing, and the status bar under it.
|
|
@@ -28,7 +36,8 @@ export interface XpsCanvasProps {
|
|
|
28
36
|
* The empty chart says what to do with it rather than showing an axis from 0 to
|
|
29
37
|
* 1 and leaving the question open: the two ways in are a file and a paste, and
|
|
30
38
|
* neither is discoverable from a blank plot. The invitation goes as soon as
|
|
31
|
-
* anything is open, since from then on the axes are the answer.
|
|
39
|
+
* anything is open, since from then on the axes are the answer. A site with a
|
|
40
|
+
* guide of its own passes it as `guide`, and it is drawn instead.
|
|
32
41
|
* @param props - Component props.
|
|
33
42
|
* @returns The canvas side of the split.
|
|
34
43
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XpsCanvas.d.ts","sourceRoot":"","sources":["../../../src/xps/ui/XpsCanvas.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"XpsCanvas.d.ts","sourceRoot":"","sources":["../../../src/xps/ui/XpsCanvas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAmBvC,MAAM,WAAW,cAAc;IAC7B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,+BAkF9C"}
|
package/lib/xps/ui/XpsCanvas.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useCallback, useMemo } from 'react';
|
|
3
|
+
import { TOKEN } from "../../tokens/core/familyTokens.js";
|
|
3
4
|
import { hasBindingAxis } from "../core/energyAxis.js";
|
|
4
5
|
import { findSpectrum } from "../core/spectrumGroups.js";
|
|
5
6
|
import { surveyLinesOf } from "../core/surveyElements.js";
|
|
@@ -22,12 +23,13 @@ import { useXpsActions, useXpsEditorState } from "./xpsStateContext.js";
|
|
|
22
23
|
* The empty chart says what to do with it rather than showing an axis from 0 to
|
|
23
24
|
* 1 and leaving the question open: the two ways in are a file and a paste, and
|
|
24
25
|
* neither is discoverable from a blank plot. The invitation goes as soon as
|
|
25
|
-
* anything is open, since from then on the axes are the answer.
|
|
26
|
+
* anything is open, since from then on the axes are the answer. A site with a
|
|
27
|
+
* guide of its own passes it as `guide`, and it is drawn instead.
|
|
26
28
|
* @param props - Component props.
|
|
27
29
|
* @returns The canvas side of the split.
|
|
28
30
|
*/
|
|
29
31
|
export function XpsCanvas(props) {
|
|
30
|
-
const { isOver = false, isReading = false, chartId } = props;
|
|
32
|
+
const { isOver = false, isReading = false, chartId, guide } = props;
|
|
31
33
|
const { state } = useXpsEditorState();
|
|
32
34
|
const actions = useXpsActions();
|
|
33
35
|
const highlight = useXpsHighlight();
|
|
@@ -55,10 +57,11 @@ export function XpsCanvas(props) {
|
|
|
55
57
|
const { selectedId, openPanelIds, domain } = view;
|
|
56
58
|
const { instruments, instrumentId } = settings;
|
|
57
59
|
const quantifying = openPanelIds.includes('quantification');
|
|
60
|
+
const empty = spectra.length === 0 && !isReading;
|
|
58
61
|
const windows = useMemo(() => quantifying
|
|
59
62
|
? quantificationWindows(spectra, selectedId, instruments, instrumentId)
|
|
60
63
|
: undefined, [quantifying, spectra, selectedId, instruments, instrumentId]);
|
|
61
|
-
return (_jsxs("div", { style: sideStyle, children: [_jsxs("div", { id: chartId, style: chartStyle, children: [_jsx(XpsChart, { spectra: spectra, settings: settings, domain: domain, selectedId: selectedId, highlight: highlight, onDomainChange: onDomainChange, onHighlightChange: lookAt, onPickEnergy: onPickEnergy, onSelectSpectrum: actions.selectSpectrum, windows: windows, isOver: isOver, isReading: isReading }),
|
|
64
|
+
return (_jsxs("div", { style: sideStyle, children: [_jsxs("div", { id: chartId, style: chartStyle, children: [_jsx(XpsChart, { spectra: spectra, settings: settings, domain: domain, selectedId: selectedId, highlight: highlight, onDomainChange: onDomainChange, onHighlightChange: lookAt, onPickEnergy: onPickEnergy, onSelectSpectrum: actions.selectSpectrum, windows: windows, isOver: isOver, isReading: isReading }), empty && guide !== undefined && !isOver ? (_jsx("div", { style: guideStyle, children: guide })) : null, empty && guide === undefined ? (_jsxs("div", { style: inviteStyle, children: [_jsx("div", { style: inviteTitleStyle, children: "Drop a spectrum here" }), _jsx("div", { children: "Drop a VAMAS (.vms) file, or paste two columns of numbers \u2014 binding energy in eV, then counts." })] })) : null] }), _jsx(XpsStatusBar, { isReading: isReading })] }));
|
|
62
65
|
}
|
|
63
66
|
// The chart and whatever it has to say, stacked: the pane is the whole height of
|
|
64
67
|
// the split, and the status bar takes what it needs off the bottom of it.
|
|
@@ -95,6 +98,14 @@ const inviteStyle = {
|
|
|
95
98
|
opacity: 0.65,
|
|
96
99
|
};
|
|
97
100
|
const inviteTitleStyle = { fontSize: 15, fontWeight: 600 };
|
|
101
|
+
// Instead of the plot: faint figures over an empty frame of axes read as data
|
|
102
|
+
// drawn on it. The pointer goes through to the chart, which takes the drop.
|
|
103
|
+
const guideStyle = {
|
|
104
|
+
position: 'absolute',
|
|
105
|
+
inset: 0,
|
|
106
|
+
background: TOKEN.surface,
|
|
107
|
+
pointerEvents: 'none',
|
|
108
|
+
};
|
|
98
109
|
/**
|
|
99
110
|
* The windows the selected survey is quantified over, for the chart to shade
|
|
100
111
|
* while the quantification panel is open.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XpsCanvas.js","sourceRoot":"","sources":["../../../src/xps/ui/XpsCanvas.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"XpsCanvas.js","sourceRoot":"","sources":["../../../src/xps/ui/XpsCanvas.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XpsChart.d.ts","sourceRoot":"","sources":["../../../src/xps/ui/XpsChart.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"XpsChart.d.ts","sourceRoot":"","sources":["../../../src/xps/ui/XpsChart.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AA0BvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,SAAS,CAkJxD"}
|
package/lib/xps/ui/XpsChart.js
CHANGED
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import {
|
|
2
|
+
import { useId, useMemo, useRef } from 'react';
|
|
3
3
|
import { MARGIN, plotRect } from "../../chart/core/chartGeometry.js";
|
|
4
|
-
import { chartScale
|
|
4
|
+
import { chartScale } from "../../chart/core/chartScale.js";
|
|
5
5
|
import { Axes } from "../../chart/ui/Axes.js";
|
|
6
6
|
import { AxisGuide } from "../../chart/ui/AxisGuide.js";
|
|
7
7
|
import { SelectionRect } from "../../chart/ui/SelectionRect.js";
|
|
8
|
-
import { useChartPointer } from "../../chart/ui/useChartPointer.js";
|
|
9
8
|
import { useChartSize } from "../../chart/ui/useChartSize.js";
|
|
10
9
|
import { axisEnergy, axisTitle, chartEnergyAxis, chartSourceEnergy, countsTitle, isAxisReversed, } from "../core/energyAxis.js";
|
|
11
|
-
import { nearestPeakEnergy, sameNearestPeak } from "../core/nearestPeak.js";
|
|
12
10
|
import { fullDomain } from "../core/xpsDomain.js";
|
|
13
11
|
import { NO_HIGHLIGHT } from "../core/xpsHighlight.js";
|
|
14
12
|
import { ChartData } from "./ChartData.js";
|
|
15
13
|
import { DropOverlay } from "./DropOverlay.js";
|
|
16
14
|
import { XpsPointerTracker } from "./XpsPointerTracker.js";
|
|
17
15
|
import { useXpsGestures } from "./useXpsGestures.js";
|
|
16
|
+
import { useXpsReadout } from "./useXpsReadout.js";
|
|
18
17
|
/**
|
|
19
18
|
* The chart: every layer of an XPS spectrum, in one SVG.
|
|
20
19
|
*
|
|
@@ -44,10 +43,11 @@ import { useXpsGestures } from "./useXpsGestures.js";
|
|
|
44
43
|
* @returns The chart.
|
|
45
44
|
*/
|
|
46
45
|
export function XpsChart(props) {
|
|
47
|
-
const { spectra, settings, domain, selectedId = null, highlight = NO_HIGHLIGHT, onDomainChange, onHighlightChange, onPickEnergy, onSelectSpectrum, windows, isOver = false, isReading = false, } = props;
|
|
46
|
+
const { spectra, settings, domain, selectedId = null, highlight = NO_HIGHLIGHT, onDomainChange, onHighlightChange, onPickEnergy, onSelectSpectrum, windows, isOver = false, isReading = false, size, } = props;
|
|
48
47
|
const [containerRef, measured] = useChartSize();
|
|
49
48
|
const svgRef = useRef(null);
|
|
50
|
-
const
|
|
49
|
+
const { width, height } = size ?? measured;
|
|
50
|
+
const plot = useMemo(() => plotRect({ width, height }), [width, height]);
|
|
51
51
|
// Read back off the plot rather than off the measurement, so a chart briefly
|
|
52
52
|
// laid out at nothing still draws its axes inside a box that holds them.
|
|
53
53
|
const frameWidth = plot.right + MARGIN.right;
|
|
@@ -74,35 +74,14 @@ export function XpsChart(props) {
|
|
|
74
74
|
onDomainChange,
|
|
75
75
|
onPickEnergy,
|
|
76
76
|
});
|
|
77
|
-
const
|
|
78
|
-
energy: chartValue(xScale, point.x),
|
|
79
|
-
counts: chartValue(yScale, point.y),
|
|
80
|
-
peak: nearestPeakEnergy(spectra, axis, xScale, point.x),
|
|
81
|
-
}), [xScale, yScale, spectra, axis]);
|
|
82
|
-
// Only a change of peak is reported, starting from none: the pointer coming
|
|
83
|
-
// onto the plot over no peak says nothing, so a guide a panel put on the
|
|
84
|
-
// chart stays until the pointer actually reaches a peak.
|
|
85
|
-
const reportedPeak = useRef(null);
|
|
86
|
-
const onReadout = useCallback((readout) => {
|
|
87
|
-
const found = readout?.peak ?? null;
|
|
88
|
-
if (sameNearestPeak(reportedPeak.current, found))
|
|
89
|
-
return;
|
|
90
|
-
reportedPeak.current = found;
|
|
91
|
-
onHighlightChange?.(found === null
|
|
92
|
-
? NO_HIGHLIGHT
|
|
93
|
-
: {
|
|
94
|
-
spectrumId: found.spectrumId,
|
|
95
|
-
peakId: found.peak.id,
|
|
96
|
-
componentId: null,
|
|
97
|
-
bindingEnergy: found.peak.bindingEnergy,
|
|
98
|
-
});
|
|
99
|
-
}, [onHighlightChange]);
|
|
100
|
-
const pointer = useChartPointer({
|
|
77
|
+
const pointer = useXpsReadout({
|
|
101
78
|
svgRef,
|
|
102
79
|
plot,
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
80
|
+
spectra,
|
|
81
|
+
axis,
|
|
82
|
+
xScale,
|
|
83
|
+
yScale,
|
|
84
|
+
onHighlightChange,
|
|
106
85
|
});
|
|
107
86
|
const guideEnergy = highlight.bindingEnergy === null
|
|
108
87
|
? null
|
|
@@ -112,16 +91,6 @@ export function XpsChart(props) {
|
|
|
112
91
|
const clipId = `xps-plot-${useId().replaceAll(/\W/g, '')}`;
|
|
113
92
|
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: svgStyle, ...gestures.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: axisTitle(axis), yTitle: countsTitle(settings.normalise), xTickSpacing: X_TICK_SPACING }), _jsx("g", { clipPath: `url(#${clipId})`, children: _jsx(ChartData, { spectra: spectra, settings: settings, axis: axis, plot: plot, xScale: xScale, yScale: yScale, selectedId: selectedId, highlight: highlight, onSelectSpectrum: onSelectSpectrum, windows: windows }) }), _jsx(AxisGuide, { value: guideEnergy, plot: plot, xScale: xScale }), _jsx(SelectionRect, { selection: gestures.selection, plot: plot }), _jsx(XpsPointerTracker, { position: pointer.position, readout: pointer.readout, plot: plot, xScale: xScale }), _jsx(DropOverlay, { isOver: isOver, isReading: isReading, plot: plot })] }) }));
|
|
114
93
|
}
|
|
115
|
-
/**
|
|
116
|
-
* Whether two readings are about the same peak, which is all the rest of the
|
|
117
|
-
* viewer hears about: the energy under the crosshair changes on every pixel.
|
|
118
|
-
* @param current - The reading last reported.
|
|
119
|
-
* @param next - The reading now.
|
|
120
|
-
* @returns Whether nothing needs reporting.
|
|
121
|
-
*/
|
|
122
|
-
function samePeakReadout(current, next) {
|
|
123
|
-
return sameNearestPeak(current.peak, next.peak);
|
|
124
|
-
}
|
|
125
94
|
/**
|
|
126
95
|
* The room an energy label wants along the bottom, at its widest: `1200` or
|
|
127
96
|
* `284.8` with the space either side of it.
|