@complat/react-spectra-editor 1.7.0 → 1.8.0

package/dist/components/cmd_bar/r01_layout.js

@@ -226,6 +226,12 @@ const layoutSelect = (classes, layoutSt, updateLayoutAct) => {
           className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
           children: "MS"
         })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+        value: _list_layout.LIST_LAYOUT.LC_MS,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+          children: "LC/MS"
+        })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
         value: _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {

package/dist/components/cmd_bar/r02_scan.js

@@ -37,11 +37,13 @@ const btnRestore = (classes, hasEdit, isEdit, toggleEditAct) => /*#__PURE__*/(0,
     className: "txt-sv-tp",
     children: restoreTp(hasEdit, isEdit)
   }),
-  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
-    className: (0, _classnames.default)('btn-sv-bar-scanrst'),
-    disabled: !hasEdit,
-    onClick: toggleEditAct,
-    children: restoreIcon(classes, hasEdit, isEdit)
+  children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+      className: (0, _classnames.default)('btn-sv-bar-scanrst'),
+      disabled: !hasEdit,
+      onClick: toggleEditAct,
+      children: restoreIcon(classes, hasEdit, isEdit)
+    })
   })
 });
 const btnRrfresh = (classes, disabled, refreshAct) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
@@ -49,12 +51,14 @@ const btnRrfresh = (classes, disabled, refreshAct) => /*#__PURE__*/(0, _jsxRunti
     className: "txt-sv-tp",
     children: "Refresh Scan"
   }),
-  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
-    className: (0, _classnames.default)('btn-sv-bar-scanrfs'),
-    disabled: disabled,
-    onClick: refreshAct,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RefreshOutlined.default, {
-      className: classes.icon
+  children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+      className: (0, _classnames.default)('btn-sv-bar-scanrfs'),
+      disabled: disabled,
+      onClick: refreshAct,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RefreshOutlined.default, {
+        className: classes.icon
+      })
     })
   })
 });

package/dist/components/cmd_bar/r03_threshold.js

@@ -16,6 +16,7 @@ var _CloudDoneOutlined = _interopRequireDefault(require("@mui/icons-material/Clo
 var _HowToRegOutlined = _interopRequireDefault(require("@mui/icons-material/HowToRegOutlined"));
 var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/RefreshOutlined"));
 var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
+var _format = _interopRequireDefault(require("../../helpers/format"));
 var _threshold = require("../../actions/threshold");
 var _common = require("./common");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -95,11 +96,19 @@ const Threshold = ({
   thresValSt,
   isEditSt,
   curveSt,
+  hplcMsSt,
+  layoutSt,
   updateThresholdValueAct,
   resetThresholdValueAct,
   toggleThresholdIsEditAct
 }) => {
-  const thresVal = thresValSt || feature.thresRef;
+  const isLcMs = _format.default.isLCMsLayout(layoutSt);
+  let thresVal;
+  if (isLcMs) {
+    thresVal = hplcMsSt?.threshold?.value != null ? hplcMsSt.threshold.value : feature?.thresRef ?? thresValSt ?? 5;
+  } else {
+    thresVal = thresValSt || (feature ? feature.thresRef : hplcMsSt?.threshold?.value);
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
     className: classes.groupRight,
     children: [setThreshold(classes, thresVal, updateThresholdValueAct, curveSt), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
@@ -139,7 +148,9 @@ const mapStateToProps = (state, props) => (
   hideThresSt: _cfg.default.hideCmdThres(state.layout),
   isEditSt: state.threshold.list[state.curve.curveIdx].isEdit,
   thresValSt: parseFloat(state.threshold.list[state.curve.curveIdx].value) || 0,
-  curveSt: state.curve
+  curveSt: state.curve,
+  hplcMsSt: state.hplcMs,
+  layoutSt: state.layout
 });
 const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
   updateThresholdValueAct: _threshold.updateThresholdValue,
@@ -156,6 +167,11 @@ Threshold.propTypes = {
   curveSt: _propTypes.default.object.isRequired,
   updateThresholdValueAct: _propTypes.default.func.isRequired,
   resetThresholdValueAct: _propTypes.default.func.isRequired,
-  toggleThresholdIsEditAct: _propTypes.default.func.isRequired
+  toggleThresholdIsEditAct: _propTypes.default.func.isRequired,
+  hplcMsSt: _propTypes.default.object.isRequired,
+  layoutSt: _propTypes.default.string
+};
+Threshold.defaultProps = {
+  layoutSt: undefined
 };
 var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Threshold));

package/dist/components/cmd_bar/r04_submit.js

@@ -13,10 +13,12 @@ var _redux = require("redux");
 var _material = require("@mui/material");
 var _styles = require("@mui/styles");
 var _submit = require("../../actions/submit");
+var _hplc_ms = require("../../actions/hplc_ms");
 var _r05_submit_btn = _interopRequireDefault(require("./r05_submit_btn"));
 var _r06_predict_btn = _interopRequireDefault(require("./r06_predict_btn"));
 var _common = require("./common");
 var _format = _interopRequireDefault(require("../../helpers/format"));
+var _list_layout = require("../../constants/list_layout");
 var _jsxRuntime = require("react/jsx-runtime");
 /* eslint-disable prefer-object-spread, function-paren-newline,
 react/function-component-definition */
@@ -31,6 +33,10 @@ const styles = () => Object.assign({
   fieldDecimal: {
     width: 80
   },
+  fieldLcmsIntegrationsExport: {
+    width: 148,
+    minWidth: 148
+  },
   fieldOpertaion: {
     width: 120
   }
@@ -142,6 +148,44 @@ const decimalSelect = (classes, hideSwitch, decimalSt, updateDecimalAct) => {
     })]
   });
 };
+const lcmsIntegrationsExportSelect = (classes, layoutSt, value, onChange) => {
+  if (layoutSt !== _list_layout.LIST_LAYOUT.LC_MS) return null;
+  const v = ['percent', 'area', 'both'].includes(value) ? value : 'percent';
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
+    className: (0, _classnames.default)(classes.fieldLcmsIntegrationsExport),
+    variant: "outlined",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+      id: "select-lcms-intg-export-label",
+      className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+      children: "Integrations text"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Select, {
+      labelId: "select-lcms-intg-export-label",
+      label: "Integrations text",
+      value: v,
+      onChange: onChange,
+      className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-lcms-intg-export'),
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+        value: "percent",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          className: (0, _classnames.default)(classes.txtOpt),
+          children: "Percent only"
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+        value: "area",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          className: (0, _classnames.default)(classes.txtOpt),
+          children: "Area (AUC) only"
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+        value: "both",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          className: (0, _classnames.default)(classes.txtOpt),
+          children: "Percent and area"
+        })
+      })]
+    })]
+  });
+};
 const operationSelect = (classes, operations, operation, onChangeSelect) => {
   const options = operations.map(o => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
     value: o.name,
@@ -150,7 +194,8 @@ const operationSelect = (classes, operations, operation, onChangeSelect) => {
       children: o.name
     })
   }, o.name));
-  const selectedValue = operation.name || operations[0].name;
+  const operationNames = operations.map(o => o.name);
+  const selectedValue = operationNames.includes(operation?.name) ? operation.name : operations[0].name;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
     className: (0, _classnames.default)(classes.fieldOpertaion),
     variant: "outlined",
@@ -199,16 +244,20 @@ const Submit = ({
   operationSt,
   decimalSt,
   isEmWaveSt,
+  layoutSt,
+  lcmsIntegrationsExportSt,
   toggleIsAscendAct,
   toggleIsIntensityAct,
   updateOperationAct,
-  updateDecimalAct
+  updateDecimalAct,
+  setLcmsIntegrationsExportAct
 }) => {
   const onChangeSelect = e => selectOperation(e.target.value, operations, updateOperationAct);
+  const onLcmsIntegrationsExport = e => setLcmsIntegrationsExportAct(e.target.value);
   if (!operations || operations.length === 0) return null;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
     className: classes.groupRightMost,
-    children: [ascendSelect(classes, hideSwitch, isAscendSt, toggleIsAscendAct), intensitySelect(classes, hideSwitch || !isEmWaveSt, isIntensitySt, toggleIsIntensityAct), decimalSelect(classes, hideSwitch, decimalSt, updateDecimalAct), editorOnly ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_r06_predict_btn.default, {
+    children: [ascendSelect(classes, hideSwitch, isAscendSt, toggleIsAscendAct), intensitySelect(classes, hideSwitch || !isEmWaveSt, isIntensitySt, toggleIsIntensityAct), decimalSelect(classes, hideSwitch, decimalSt, updateDecimalAct), lcmsIntegrationsExportSelect(classes, layoutSt, lcmsIntegrationsExportSt, onLcmsIntegrationsExport), editorOnly ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_r06_predict_btn.default, {
       feature: feature,
       forecast: forecast
     }), operationSelect(classes, operations, operationSt, onChangeSelect), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r05_submit_btn.default, {
@@ -223,17 +272,20 @@ const Submit = ({
 const mapStateToProps = (state, props) => (
 // eslint-disable-line
 {
+  layoutSt: state.layout,
   isEmWaveSt: _format.default.isEmWaveLayout(state.layout),
   isAscendSt: state.submit.isAscend,
   isIntensitySt: state.submit.isIntensity,
   decimalSt: state.submit.decimal,
-  operationSt: state.submit.operation
+  operationSt: state.submit.operation,
+  lcmsIntegrationsExportSt: state.hplcMs?.lcmsIntegrationsExport || 'percent'
 });
 const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
   toggleIsAscendAct: _submit.toggleIsAscend,
   toggleIsIntensityAct: _submit.toggleIsIntensity,
   updateOperationAct: _submit.updateOperation,
-  updateDecimalAct: _submit.updateDecimal
+  updateDecimalAct: _submit.updateDecimal,
+  setLcmsIntegrationsExportAct: _hplc_ms.setLcmsIntegrationsExport
 }, dispatch);
 Submit.propTypes = {
   classes: _propTypes.default.object.isRequired,
@@ -251,6 +303,9 @@ Submit.propTypes = {
   toggleIsAscendAct: _propTypes.default.func.isRequired,
   toggleIsIntensityAct: _propTypes.default.func.isRequired,
   updateOperationAct: _propTypes.default.func.isRequired,
-  updateDecimalAct: _propTypes.default.func.isRequired
+  updateDecimalAct: _propTypes.default.func.isRequired,
+  layoutSt: _propTypes.default.string.isRequired,
+  lcmsIntegrationsExportSt: _propTypes.default.string.isRequired,
+  setLcmsIntegrationsExportAct: _propTypes.default.func.isRequired
 };
 var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Submit);

package/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");
@@ -59,23 +59,36 @@ 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,
   upper: false,
   lower: false
 };
+const LCMS_INTEGRATIONS_EXPORT_MODES = ['percent', 'area', 'both'];
+const isLcmsIntegrationsExportMode = v => LCMS_INTEGRATIONS_EXPORT_MODES.includes(v);
+const resolveLcmsIntegrationsExportForSubmit = (analysis, hplcMsSt) => {
+  if (isLcmsIntegrationsExportMode(analysis?.lcmsIntegrationsExport)) {
+    return analysis.lcmsIntegrationsExport;
+  }
+  if (analysis?.lcmsIncludeIntegrationArea === true) {
+    return 'both';
+  }
+  if (isLcmsIntegrationsExportMode(hplcMsSt?.lcmsIntegrationsExport)) {
+    return hplcMsSt.lcmsIntegrationsExport;
+  }
+  return 'percent';
+};
 const pickFromList = (list, index, fallback = null) => Array.isArray(list) && list[index] !== undefined ? list[index] : fallback;
 const hasBoolean = value => typeof value === 'boolean';
 const resolveOptionalBooleanFlags = analysis => {
@@ -156,17 +169,36 @@ const buildSpectrumPayload = ({
     ...optionalBooleanFlags
   };
 };
-const onClickCb = (operationValue, isAscend, isIntensity, layoutSt, shiftSt, analysis, decimalSt, integrationSt, multiplicitySt, waveLengthSt, cyclicvoltaSt, curveSt, axesUnitsSt, detectorSt, dscMetaData, curveList, editPeakSt, thresList, scanSt, feature) => () => {
+const onClickCb = (operationValue, isAscend, isIntensity, layoutSt, shiftSt, analysis, decimalSt, integrationSt, multiplicitySt, waveLengthSt, cyclicvoltaSt, curveSt, axesUnitsSt, detectorSt, dscMetaData, curveList, editPeakSt, thresList, scanSt, feature, hplcMsSt) => () => {
   const defaultCurves = feature ? [{
     feature
   }] : [];
-  const curves = Array.isArray(curveList) && curveList.length > 0 ? curveList : defaultCurves;
+  let curves = Array.isArray(curveList) && curveList.length > 0 ? curveList : defaultCurves;
+  if (layoutSt === 'LC/MS') {
+    curves = curves.filter(c => c.lcmsKind === 'uvvis');
+    if (curves.length === 0) curves = defaultCurves;
+  }
   const fallbackIdx = Number.isFinite(curveSt?.curveIdx) ? curveSt.curveIdx : 0;
   const indicesToSend = curves.length > 0 ? curves.map((_, index) => index) : [fallbackIdx];
+  let lcmsGlobalFields = null;
+  if (layoutSt === 'LC/MS') {
+    const lcmsIntegrationsExport = resolveLcmsIntegrationsExportForSubmit(analysis, hplcMsSt);
+    lcmsGlobalFields = {
+      lcms_peaks: (0, _extractPeaksEdit.formatLcmsPeaksForBackend)(hplcMsSt),
+      lcms_integrals: (0, _extractPeaksEdit.formatLcmsIntegralsForBackend)(hplcMsSt),
+      lcms_integrations_export: lcmsIntegrationsExport,
+      lcms_peaks_text: _format.default.formatedLCMS(hplcMsSt, isAscend, decimalSt, {
+        lcmsIntegrationsExport
+      }),
+      lcms_uvvis_wavelength: hplcMsSt?.uvvis?.selectedWaveLength ?? null,
+      lcms_mz_page: hplcMsSt?.tic?.currentPageValue ?? null,
+      lcms_mz_page_data: (0, _extractPeaksEdit.getLcmsMzPageData)(hplcMsSt)
+    };
+  }
   const spectraList = indicesToSend.map(curveIdx => {
     const curve = curves[curveIdx] || {};
     const curveFeature = curve.feature || feature;
-    return buildSpectrumPayload({
+    const spectrumPayload = buildSpectrumPayload({
       feature: curveFeature,
       curveIdx,
       editPeakSt,
@@ -186,10 +218,20 @@ const onClickCb = (operationValue, isAscend, isIntensity, layoutSt, shiftSt, ana
       analysis,
       decimalSt
     });
+    if (lcmsGlobalFields && curve.lcmsKind === 'uvvis') {
+      return {
+        ...spectrumPayload,
+        ...lcmsGlobalFields
+      };
+    }
+    return spectrumPayload;
   });
   const payload = {
     spectra_list: spectraList
   };
+  if (lcmsGlobalFields) {
+    Object.assign(payload, lcmsGlobalFields);
+  }
   if (Number.isFinite(curveSt?.curveIdx)) {
     payload.curveSt = {
       curveIdx: curveSt.curveIdx
@@ -218,7 +260,8 @@ const BtnSubmit = ({
   curveList,
   axesUnitsSt,
   detectorSt,
-  metaSt
+  metaSt,
+  hplcMsSt
 }) => {
   // const disBtn = peaksEdit.length === 0 || statusSt.btnSubmit || disabled;
   const {
@@ -252,7 +295,7 @@ const BtnSubmit = ({
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
       className: (0, _classnames.default)('btn-sv-bar-submit'),
       color: "primary",
-      onClick: onClickCb(operation.value, isAscend, isIntensity, layoutSt, shiftSt, forecastSt.predictions, decimalSt, integrationSt, multiplicitySt, waveLengthSt, cyclicvoltaPayload, curveSt, axesUnitsSt, detectorSt, dscMetaData, curveList, editPeakSt, thresList, scanSt, feature),
+      onClick: onClickCb(operation.value, isAscend, isIntensity, layoutSt, shiftSt, forecastSt.predictions, decimalSt, integrationSt, multiplicitySt, waveLengthSt, cyclicvoltaPayload, curveSt, axesUnitsSt, detectorSt, dscMetaData, curveList, editPeakSt, thresList, scanSt, feature, hplcMsSt),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_PlayCircleOutline.default, {
         className: classes.icon
       })
@@ -277,9 +320,9 @@ const mapStateToProps = (state, props) => (
   curveList: state.curve.listCurves,
   axesUnitsSt: state.axesUnits,
   detectorSt: state.detector,
-  metaSt: state.meta
+  metaSt: state.meta,
+  hplcMsSt: state.hplcMs
 });
-const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({}, dispatch);
 BtnSubmit.propTypes = {
   classes: _propTypes.default.object.isRequired,
   feature: _propTypes.default.object.isRequired,
@@ -301,6 +344,10 @@ BtnSubmit.propTypes = {
   curveList: _propTypes.default.array.isRequired,
   axesUnitsSt: _propTypes.default.object.isRequired,
   detectorSt: _propTypes.default.object.isRequired,
-  metaSt: _propTypes.default.object.isRequired
+  metaSt: _propTypes.default.object.isRequired,
+  hplcMsSt: _propTypes.default.object
+};
+BtnSubmit.defaultProps = {
+  hplcMsSt: {}
 };
-var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnSubmit);
+var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, null), (0, _styles.withStyles)(styles))(BtnSubmit);

package/dist/components/cmd_bar/r06_predict_btn.js

@@ -82,7 +82,7 @@ const onClickReady = (forecast, peaksEdit, layoutSt, scan, shiftSt, thres, analy
     });
   };
 };
-const onClicUnknown = (feature, forecast, peaksEdit, layoutSt, scan, shiftSt, thres, analysis, integrationSt, multiplicitySt, curveSt) => {
+const onClickUnknown = (feature, forecast, peaksEdit, layoutSt, scan, shiftSt, thres, analysis, integrationSt, multiplicitySt, curveSt) => {
   const {
     refreshCb
   } = forecast;
@@ -170,7 +170,7 @@ const BtnPredict = ({
   if (!(is13Cor1H || isIr)) return null;
   const oriPeaksEdit = (0, _extractPeaksEdit.extractPeaksEdit)(feature, editPeakSt, thresSt, shiftSt, layoutSt);
   const peaksEdit = _format.default.rmShiftFromPeaks(oriPeaksEdit, shiftSt);
-  const scan = (0, _chem.Convert2Scan)(feature, scanSt);
+  const scan = _format.default.isMsLayout(layoutSt) ? (0, _chem.Convert2Scan)(feature, scanSt) : 0;
   const thres = (0, _chem.Convert2Thres)(feature, thresSt);
   const simuCount = simulationSt.nmrSimPeaks.length;
   const uniqCount = [...new Set(simulationSt.nmrSimPeaks)].length;
@@ -191,7 +191,7 @@ const BtnPredict = ({
     realCount = stack.length;
   }
   if (is13Cor1H && simuCount === 0) {
-    const onClickUnknownCb = onClicUnknown(feature, forecast, peaksEdit, layoutSt, scan, shiftSt, thres, forecast.predictions, integrationSt, multiplicitySt, curveSt);
+    const onClickUnknownCb = onClickUnknown(feature, forecast, peaksEdit, layoutSt, scan, shiftSt, thres, forecast.predictions, integrationSt, multiplicitySt, curveSt);
     return renderBtnUnknown(classes, onClickUnknownCb);
   }
   const predictable = isIr || simuCount >= realCount && realCount > 0;
@@ -221,7 +221,7 @@ BtnPredict.propTypes = {
   feature: _propTypes.default.object.isRequired,
   forecast: _propTypes.default.object.isRequired,
   layoutSt: _propTypes.default.string.isRequired,
-  simulationSt: _propTypes.default.array.isRequired,
+  simulationSt: _propTypes.default.object.isRequired,
   editPeakSt: _propTypes.default.object.isRequired,
   scanSt: _propTypes.default.object.isRequired,
   shiftSt: _propTypes.default.object.isRequired,

package/dist/components/cmd_bar/r07_wavelength_btn.js

@@ -28,33 +28,34 @@ const styles = () => Object.assign({
     width: 100
   }
 }, _common.commonStyle);
-const wavelengthSelect = (classes, waveLengthSt, layoutSt, updateWaveLengthAct) => {
+const wavelengthSelect = (classes, waveLengthSt, layoutSt, updateWavelengthAct) => {
   if (!_format.default.isXRDLayout(layoutSt)) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {});
   }
-  const onChange = e => updateWaveLengthAct(e.target.value);
+  const onChange = e => updateWavelengthAct(e.target.value);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
     className: (0, _classnames.default)(classes.fieldLayout),
     variant: "outlined",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
       id: "select-wavelength-label",
       className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
-      children: "Wavelength"
+      children: "Wavelength (nm)"
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
       labelId: "select-wavelength-label",
       label: "Wavelength",
       value: waveLengthSt,
       onChange: onChange,
       className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'),
-      children: _list_wavelength.LIST_WAVE_LENGTH.map(item => {
+      children: _list_wavelength.LIST_WAVE_LENGTH.map((item, idx) => {
         // eslint-disable-line
+        const itemKey = `${item.label}-${item.value}-${item.unit}-${idx}`;
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
           value: item,
           children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
             className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
             children: [item.label, " (", item.value, " ", item.unit, ")"]
           })
-        });
+        }, itemKey);
       })
     })]
   });
@@ -63,10 +64,10 @@ const Wavelength = ({
   classes,
   waveLengthSt,
   layoutSt,
-  updateWaveLengthAct
+  updateWavelengthAct
 }) => /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
   className: classes.groupRight,
-  children: wavelengthSelect(classes, waveLengthSt, layoutSt, updateWaveLengthAct)
+  children: wavelengthSelect(classes, waveLengthSt, layoutSt, updateWavelengthAct)
 });
 const mapStateToProps = (state, props) => (
 // eslint-disable-line
@@ -75,12 +76,12 @@ const mapStateToProps = (state, props) => (
   layoutSt: state.layout
 });
 const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
-  updateWaveLengthAct: _wavelength.updateWaveLength
+  updateWavelengthAct: _wavelength.updateWaveLength
 }, dispatch);
 Wavelength.propTypes = {
   classes: _propTypes.default.object.isRequired,
   layoutSt: _propTypes.default.string.isRequired,
   waveLengthSt: _propTypes.default.object.isRequired,
-  updateWaveLengthAct: _propTypes.default.func.isRequired
+  updateWavelengthAct: _propTypes.default.func.isRequired
 };
 var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Wavelength));

package/dist/components/cmd_bar/r09_detector.js

@@ -64,13 +64,13 @@ const detectorSelect = (classes, detectorSt, curveSt, layoutSt, updateDetectorAc
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
         })
-      }), _list_detectors.LIST_DETECTORS.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+      }, "detector-empty"), _list_detectors.LIST_DETECTORS.map((item, idx) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
         value: item,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
           children: item.name
         })
-      }))]
+      }, item?.name || item?.id || `detector-${idx}`))]
     })]
   });
 };

package/dist/components/cmd_bar/tri_btn.js

@@ -126,6 +126,9 @@ TriBtn.propTypes = {
   content: _propTypes.default.object.isRequired,
   cb: _propTypes.default.func.isRequired,
   children: _propTypes.default.node.isRequired,
-  isClearAllDisabled: _propTypes.default.bool.isRequired
+  isClearAllDisabled: _propTypes.default.bool
+};
+TriBtn.defaultProps = {
+  isClearAllDisabled: false
 };
 var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(TriBtn));

package/dist/components/common/draw.js

@@ -5,16 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.drawMain = exports.drawLabel = exports.drawDisplay = exports.drawDestroy = exports.drawArrowOnCurve = void 0;
 const d3 = require('d3');
-const drawMain = (klass, w, h) => {
-  d3.select(klass).append('svg').attr('class', 'd3Svg').attr('preserveAspectRatio', 'xMinYMin meet').attr('viewBox', `0 0 ${w} ${h}`);
+const {
+  LIST_BRUSH_SVG_GRAPH
+} = require('../../constants/list_graph');
+const drawMain = (klass, w, h, d3svgClass = LIST_BRUSH_SVG_GRAPH.LINE) => {
+  d3.select(klass).append('svg').attr('class', d3svgClass).attr('preserveAspectRatio', 'xMinYMin meet').attr('viewBox', `0 0 ${w} ${h}`);
 };
 exports.drawMain = drawMain;
 const drawLabel = (klass, cLabel, xLabel, yLabel) => {
   d3.select(klass).selectAll('.xLabel').text(xLabel);
   d3.select(klass).selectAll('.yLabel').text(yLabel);
-  if (cLabel) {
-    d3.select(klass).selectAll('.mark-text').text(cLabel);
-  }
+  d3.select(klass).selectAll('.mark-text').text(cLabel || '');
 };
 exports.drawLabel = drawLabel;
 const drawDisplay = (klass, isHidden) => {