Merge branch 'master' into feat/comparison-spectra

Author: headri

CHANGELOG.md

@@ -0,0 +1,28 @@
+# Changelog
+
+All notable changes to this project are documented in this file.
+The format is based on [Keep a Changelog](https://keepachangelog.com/),
+and this project adheres to [Semantic Versioning](https://semver.org/).
+
+## [1.8.0] - 2026-06-29
+
+### Added
+- LC/MS visualization support for OpenLab and Chemstation data (#289)
+- Two-click integration: creation, split, and visual split with JCAMP persistence (#303)
+- Developer architecture documentation (#307)
+
+### Fixed
+- LC/MS review regressions B1, B4–B7 (#316):
+  - peak-add restored on non-LC/MS layouts (NMR/IR/MS)
+  - `Convert2Peak` honours stored LC/MS peaks (with offset) instead of recomputing
+  - CV current-density factor corrected for areas in mm² (chart, panel and submit/export)
+  - crash guards for the UV-Vis viewer update path and `drawBar`
+
+### CI / Build
+- GitHub Actions moved to node24 action runtimes; Node pinned to 22.23.1 (#315)
+
+### Dependencies
+- Bump http-proxy-middleware 2.0.9 → 2.0.10 (#311)
+- Bump tmp 0.2.4 → 0.2.7 (#306)
+
+[1.8.0]: https://github.com/ComPlat/react-spectra-editor/releases/tag/v1.8.0

dist/components/cmd_bar/r05_submit_btn.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.computeCvYScaleFactor = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactRedux = require("react-redux");
@@ -60,17 +60,16 @@ const computeCvYScaleFactor = (feature, cyclicvoltaSt) => {
   const rawArea = (cyclicvoltaSt.areaValue === '' ? 1.0 : cyclicvoltaSt.areaValue) || 1.0;
   const areaUnit = cyclicvoltaSt.areaUnit || 'cm²';
   const safeArea = rawArea > 0 ? rawArea : 1.0;
+  // areaInCm2 already converts mm² → cm², so factor is A/cm². Do NOT divide by 100 again.
   const areaInCm2 = areaUnit === 'mm²' ? safeArea / 100.0 : safeArea;
   let factor = 1.0 / areaInCm2;
   const baseY = feature && feature.yUnit ? String(feature.yUnit) : 'A';
   if (/mA/i.test(baseY)) {
     factor *= 1000.0;
   }
-  if (areaUnit === 'mm²') {
-    factor /= 100.0;
-  }
   return factor;
 };
+exports.computeCvYScaleFactor = computeCvYScaleFactor;
 const defaultThreshold = {
   isEdit: true,
   value: false,

dist/components/d3_line_rect/index.js

@@ -396,15 +396,12 @@ class ViewerLineRect extends _react.default.Component {
     } = zoom || {};
     if (!Array.isArray(sweepExtent)) return;
     const uvvisViewFeature = this.extractUvvisView();
-    if (uvvisViewFeature) {
+    if (uvvisViewFeature?.data?.[0]) {
       const hasLineSvg = !!document.querySelector(`${this.rootKlassLine} .${_list_graph.LIST_BRUSH_SVG_GRAPH.LINE}`);
       if (!hasLineSvg) {
         (0, _draw.drawMain)(this.rootKlassLine, W, H, _list_graph.LIST_BRUSH_SVG_GRAPH.LINE);
       }
-      const {
-        data
-      } = uvvisViewFeature;
-      const currentData = data[0];
+      const currentData = uvvisViewFeature.data[0];
       const {
         x,
         y

dist/components/d3_line_rect/rect_focus.js

@@ -147,6 +147,7 @@ class RectFocus {
       yt
     } = (0, _compass.TfRescale)(this);
     this.updatePathCall(xt, yt);
+    if (!this.tTrEndPts.length) return;
     const yRef = this.tTrEndPts[0].y;
     const bars = this.bars.selectAll('rect').data(this.data);
     bars.exit().attr('class', 'exit').remove();

dist/components/d3_multi/multi_focus.js

@@ -195,15 +195,13 @@ class MultiFocus {
       const rawArea = (cyclicvoltaSt.areaValue === '' ? 1.0 : cyclicvoltaSt.areaValue) || 1.0;
       const areaUnit = cyclicvoltaSt.areaUnit || 'cm²';
       const safeArea = rawArea > 0 ? rawArea : 1.0;
+      // areaInCm2 already converts mm² → cm², so factor is A/cm². Do NOT divide by 100 again.
       const areaInCm2 = areaUnit === 'mm²' ? safeArea / 100.0 : safeArea;
       factor = 1.0 / areaInCm2;
       const baseY = feature && feature.yUnit ? String(feature.yUnit) : 'A';
       if (/mA/i.test(baseY)) {
         factor *= 1000.0;
       }
-      if (areaUnit === 'mm²') {
-        factor /= 100.0;
-      }
     }
     return factor;
   }

dist/components/panel/cyclic_voltamery_data.js

@@ -174,11 +174,12 @@ const CyclicVoltammetryPanel = ({
     const rawArea = (cyclicVoltaState && cyclicVoltaState.areaValue === '' ? 1.0 : cyclicVoltaState?.areaValue) || 1.0;
     const areaUnit = cyclicVoltaState && cyclicVoltaState.areaUnit ? cyclicVoltaState.areaUnit : 'cm²';
     const safeArea = rawArea > 0 ? rawArea : 1.0;
+    const areaInCm2 = areaUnit === 'mm²' ? safeArea / 100.0 : safeArea;
     let val = y;
     let unit = isMilli ? 'mA' : 'A';
     if (useDensity) {
-      val = y / safeArea;
-      unit = `${unit}/${areaUnit}`;
+      val = y / areaInCm2;
+      unit = `${unit}/cm²`;
     }
     if (isMilli) {
       val *= 1000.0;

dist/helpers/chem.js

@@ -161,6 +161,12 @@ const ToFrequency = exports.ToFrequency = (0, _reselect.createSelector)(getLayou
 const getThreshold = state => state.threshold ? state.threshold.list[state.curve.curveIdx].value * 1.0 : false;
 const Convert2Peak = (feature, threshold, offset, upThreshold = false, lowThreshold = false) => {
   if (feature?.operation?.layout === 'LC/MS') {
+    if (feature.peaks?.length) {
+      return feature.peaks.map(p => ({
+        x: p.x - (offset || 0),
+        y: p.y
+      }));
+    }
     const data = feature.data[0];
     if (!data) return [];
     const {
@@ -196,12 +202,6 @@ const Convert2Peak = (feature, threshold, offset, upThreshold = false, lowThresh
   const {
     layout
   } = operation;
-  if (_format.default.isLCMsLayout(layout) && feature.peaks) {
-    return feature.peaks.map(p => ({
-      x: p.x - (offset || 0),
-      y: p.y
-    }));
-  }
   if ((_format.default.isCyclicVoltaLayout(layout) || _format.default.isCDSLayout(layout)) && (upperThres || lowerThres)) {
     let upperThresVal = upThreshold || upperThres;
     if (!upperThresVal) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@complat/react-spectra-editor",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "description": "An editor to View and Edit Chemical Spectra data (NMR, IR, MS, CV, UIVIS, XRD, GC, and DSC).",
   "repository": {
     "type": "git",