@complat/react-spectra-editor 1.4.0 → 1.5.0

package/dist/components/cmd_bar/02_zoom.js

@@ -36,11 +36,13 @@ const Zoom = ({
         className: "txt-sv-tp",
         children: "Zoom In"
       }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
-        className: (0, _classnames.default)((0, _common.focusStyle)(isfocusZoomSt, classes), 'btn-sv-bar-zoomin'),
-        onClick: onSweepZoomIn,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ZoomInOutlined.default, {
-          className: (0, _classnames.default)(classes.icon, classes.iconWp)
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+          className: (0, _classnames.default)((0, _common.focusStyle)(isfocusZoomSt, classes), 'btn-sv-bar-zoomin'),
+          onClick: onSweepZoomIn,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ZoomInOutlined.default, {
+            className: (0, _classnames.default)(classes.icon, classes.iconWp)
+          })
         })
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
@@ -48,11 +50,13 @@ const Zoom = ({
         className: "txt-sv-tp",
         children: "Reset Zoom"
       }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
-        className: (0, _classnames.default)('btn-sv-bar-zoomreset'),
-        onClick: onSweepZoomReset,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FindReplaceOutlined.default, {
-          className: classes.icon
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+          className: (0, _classnames.default)('btn-sv-bar-zoomreset'),
+          onClick: onSweepZoomReset,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FindReplaceOutlined.default, {
+            className: classes.icon
+          })
         })
       })
     })]

package/dist/components/cmd_bar/r01_layout.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactRedux = require("react-redux");
@@ -21,6 +21,7 @@ var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
 var _common = require("./common");
 var _format = _interopRequireDefault(require("../../helpers/format"));
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /* eslint-disable prefer-object-spread, function-paren-newline,
 react/function-component-definition */
 
@@ -33,31 +34,30 @@ const styles = () => Object.assign({
   }
 }, _common.commonStyle);
 const shiftSelect = (classes, layoutSt, setShiftRefAct, shiftSt, curveSt) => {
-  if (_cfg.default.hideSolvent(layoutSt)) return null;
-  // const onChange = (e) => setShiftRefAct(e.target.value);
+  if (_cfg.default.hideSolvent(layoutSt)) {
+    return null;
+  }
   const {
     curveIdx
   } = curveSt;
   const {
     shifts
   } = shiftSt;
-  const selectedShift = shifts[curveIdx];
-  const shiftRef = selectedShift.ref;
+  const selectedShift = shifts[curveIdx] || {};
+  const listShift = (0, _list_shift.getListShift)(layoutSt) || [];
+  const shiftRefName = selectedShift?.ref?.name || '';
+  const isInList = listShift.some(r => r.name === shiftRefName);
+  const selectValue = isInList ? shiftRefName : '';
   const onChange = e => {
-    const payload = {
-      dataToSet: e.target.value,
-      curveIdx
-    };
-    setShiftRefAct(payload);
+    const name = e.target.value;
+    const refObj = listShift.find(r => r.name === name);
+    if (refObj) {
+      setShiftRefAct({
+        dataToSet: refObj,
+        curveIdx
+      });
+    }
   };
-  const listShift = (0, _list_shift.getListShift)(layoutSt);
-  const content = listShift.map(ref => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
-    value: ref,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-shift'),
-      children: `${ref.name}: ${_format.default.strNumberFixedDecimal(ref.value, 2)} ppm`
-    })
-  }, ref.name));
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
     className: (0, _classnames.default)(classes.fieldShift),
     variant: "outlined",
@@ -66,12 +66,18 @@ const shiftSelect = (classes, layoutSt, setShiftRefAct, shiftSt, curveSt) => {
       className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
       children: "Reference"
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
-      value: shiftRef,
+      value: selectValue,
       labelId: "select-solvent-label",
       label: "Solvent",
       onChange: onChange,
       className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift'),
-      children: content
+      children: listShift.map(ref => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+        value: ref.name,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-shift'),
+          children: `${ref.name}: ${_format.default.strNumberFixedDecimal(ref.value, 2)} ppm`
+        })
+      }, ref.name))
     })]
   });
 };
@@ -243,6 +249,54 @@ const layoutSelect = (classes, layoutSt, updateLayoutAct) => {
     })]
   });
 };
+const PLACEHOLDER = '- - -';
+const norm = s => (s || '').toString().toLowerCase().normalize('NFKD').replace(/[^a-z0-9]+/g, '');
+function solventKeyOf(feature) {
+  const r = feature?.metadata?.solventName ?? feature?.metadata?.solvent ?? feature?.meta?.solventName ?? feature?.meta?.solvent ?? feature?.solventName ?? feature?.solvent ?? null;
+  const a = feature?.metadata?.solvent_label ?? feature?.metadata?.solventLabel ?? null;
+  const raw = r && r !== PLACEHOLDER ? r : null;
+  const alt = a && a !== PLACEHOLDER ? a : null;
+  return norm(raw || alt || '');
+}
+function pickBestRef(list, key) {
+  if (!key || !list?.length) return null;
+  const scored = [];
+  list.forEach(r => {
+    const nLabel = norm(r.label);
+    const nName = norm(r.name);
+    const nNsdb = norm(r.nsdb);
+    let s = 0;
+    if (nLabel && nLabel === key) s += 3;
+    if (nNsdb && nNsdb.includes(key)) s += 2;
+    if (nName && nName.includes(key)) s += 1;
+    if (s > 0) scored.push({
+      r,
+      s
+    });
+  });
+  if (!scored.length) return null;
+  let max = 0;
+  scored.forEach(x => {
+    if (x.s > max) max = x.s;
+  });
+  let cand = scored.filter(x => x.s === max).map(x => x.r);
+  if (cand.length > 1) {
+    const vals = cand.map(c => typeof c.value === 'number' ? c.value : null).filter(v => v != null).sort((a, b) => a - b);
+    if (vals.length) {
+      const m = vals[Math.floor(vals.length / 2)];
+      cand = cand.slice().sort((a, b) => Math.abs((a.value ?? m) - m) - Math.abs((b.value ?? m) - m));
+    }
+    if (cand.length > 1) {
+      cand.sort((a, b) => (a.name?.length || 0) - (b.name?.length || 0));
+    }
+  }
+  return cand[0] || null;
+}
+function isRefUnset(shiftSt, curveIdx, list) {
+  const name = shiftSt?.shifts?.[curveIdx]?.ref?.name || '';
+  if (!name || name === PLACEHOLDER) return true;
+  return !(list || []).some(r => r.name === name);
+}
 const Layout = ({
   classes,
   feature,
@@ -252,13 +306,28 @@ const Layout = ({
   updateLayoutAct,
   curveSt,
   shiftSt
-}) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-  className: classes.groupRight,
-  children: [layoutSelect(classes, layoutSt, updateLayoutAct), shiftSelect(classes, layoutSt, setShiftRefAct, shiftSt, curveSt), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r02_scan.default, {
-    feature: feature,
-    hasEdit: hasEdit
-  })]
-});
+}) => {
+  const {
+    curveIdx
+  } = curveSt;
+  const list = (0, _list_shift.getListShift)(layoutSt) || [];
+  const unset = isRefUnset(shiftSt, curveIdx, list);
+  const key = solventKeyOf(feature);
+  const best = pickBestRef(list, key);
+  (0, _react.useEffect)(() => {
+    if (unset && best) setShiftRefAct({
+      dataToSet: best,
+      curveIdx
+    });
+  }, [unset, best, curveIdx, setShiftRefAct]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+    className: classes.groupRight,
+    children: [layoutSelect(classes, layoutSt, updateLayoutAct), shiftSelect(classes, layoutSt, setShiftRefAct, shiftSt, curveSt), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r02_scan.default, {
+      feature: feature,
+      hasEdit: hasEdit
+    })]
+  });
+};
 const mapStateToProps = (state, props) => (
 // eslint-disable-line
 {

package/dist/components/cmd_bar/r03_threshold.js

@@ -107,12 +107,14 @@ const Threshold = ({
         className: "txt-sv-tp",
         children: "Restore Threshold"
       }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
-        className: (0, _classnames.default)('btn-sv-bar-thresref'),
-        disabled: _cfg.default.btnCmdThres(thresVal),
-        onClick: resetThresholdValueAct,
-        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-thresref'),
+          disabled: _cfg.default.btnCmdThres(thresVal),
+          onClick: resetThresholdValueAct,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RefreshOutlined.default, {
+            className: classes.icon
+          })
         })
       })
     }), hideThresSt ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
@@ -120,11 +122,13 @@ const Threshold = ({
         className: "txt-sv-tp",
         children: restoreTp(hasEdit, isEditSt)
       }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
-        className: (0, _classnames.default)('btn-sv-bar-thresrst'),
-        disabled: _cfg.default.btnCmdThres(thresVal),
-        onClick: toggleThresholdIsEditAct,
-        children: restoreIcon(classes, hasEdit, isEditSt)
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+          className: (0, _classnames.default)('btn-sv-bar-thresrst'),
+          disabled: _cfg.default.btnCmdThres(thresVal),
+          onClick: toggleThresholdIsEditAct,
+          children: restoreIcon(classes, hasEdit, isEditSt)
+        })
       })
     })]
   });

package/dist/components/d3_multi/multi_focus.js

@@ -97,6 +97,19 @@ class MultiFocus {
     this.isFirefox = typeof InstallTrigger !== 'undefined';
     this.cyclicvoltaSt = null;
   }
+  getGlobalXExtent() {
+    let allData = [...this.data];
+    if (this.otherLineData) {
+      this.otherLineData.forEach(lineData => {
+        allData = [...allData, ...lineData.data];
+      });
+    }
+    const xes = d3.extent(allData, d => d.x).sort((a, b) => a - b);
+    return {
+      xL: xes[0],
+      xU: xes[1]
+    };
+  }
   getShouldUpdate(nextEpSt) {
     const {
       prevXt,
@@ -283,6 +296,14 @@ class MultiFocus {
   drawOtherLines(layout) {
     d3.selectAll('.line-clip-compare').remove();
     if (!this.otherLineData) return null;
+    const {
+      yt
+    } = (0, _compass.TfRescale)(this);
+    const globalXExtent = this.getGlobalXExtent();
+    const reverse = this.reverseXAxis(this.layout);
+    const xRange = reverse ? [this.w, 0] : [0, this.w];
+    const xtGlobal = d3.scaleLinear().domain([globalXExtent.xL, globalXExtent.xU]).range(xRange);
+    const globalPathCall = d3.line().x(d => xtGlobal(d.x)).y(d => yt(d.y));
     this.otherLineData.forEach((entry, idx) => {
       const {
         data,
@@ -290,7 +311,7 @@ class MultiFocus {
       } = entry;
       const pathColor = color ? color : _format.default.mutiEntitiesColors(idx);
       const path = (0, _mount.MountComparePath)(this, pathColor, idx, 0.4);
-      path.attr('d', this.pathCall(data));
+      path.attr('d', globalPathCall(data));
       if (this.layout === _list_layout.LIST_LAYOUT.AIF && this.isShowAllCurves === true) {
         path.attr('marker-mid', 'url(#arrow-left)');
       }

package/dist/components/panel/info.js

@@ -31,7 +31,23 @@ const styles = () => ({
   },
   panelSummary: {
     backgroundColor: '#eee',
-    height: 32
+    height: 32,
+    minHeight: 32,
+    '& .MuiAccordionSummary-content': {
+      margin: 0
+    }
+  },
+  subSectionHeader: {
+    backgroundColor: '#eee',
+    height: 32,
+    lineHeight: '32px',
+    paddingLeft: 10,
+    textAlign: 'left',
+    fontWeight: 'bold',
+    fontSize: '0.8rem',
+    fontFamily: 'Helvetica',
+    borderTop: '1px solid #dcdcdc',
+    color: 'rgba(0, 0, 0, 0.87)'
   },
   panelDetail: {
     backgroundColor: '#fff',
@@ -82,10 +98,32 @@ const styles = () => ({
     fontSize: '0.8rem',
     fontFamily: 'Helvetica',
     textAlign: 'left'
+  },
+  quillContainer: {
+    margin: '10px 10px',
+    backgroundColor: '#fff',
+    '& .ql-container': {
+      border: 'none'
+    },
+    '& .ql-editor': {
+      minHeight: '60px'
+    },
+    '& .ql-editor.ql-blank::before': {
+      fontStyle: 'normal',
+      color: 'rgba(0, 0, 0, 0.54)'
+    }
   }
 });
 const simTitle = () => 'Simulated signals from NMRshiftDB';
 const simContent = nmrSimPeaks => nmrSimPeaks && nmrSimPeaks.sort((a, b) => a - b).join(', ');
+const normalizeQuillValue = val => {
+  if (!val) return '';
+  if (val === '<p><br></p>' || val === '<p></p>') return '';
+  return val;
+};
+const handleDescriptionChanged = (value, onDescriptionChanged) => {
+  onDescriptionChanged(normalizeQuillValue(value));
+};
 const aucValue = integration => {
   if (!integration) {
     return '';
@@ -336,7 +374,7 @@ const InfoPanel = ({
           children: "Freq : "
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
-          children: `${parseInt(observeFrequency, 10)} Hz` || ' - '
+          children: `${parseInt(observeFrequency, 10)} MHz` || ' - '
         })]
       }) : null, _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd),
@@ -379,26 +417,34 @@ const InfoPanel = ({
         layout: layoutSt,
         dscMetaData: dscMetaData,
         updateAction: updateDSCMetaDataAct
-      })]
-    }), !_format.default.isCyclicVoltaLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactQuill.default, {
-      className: (0, _classnames.default)(classes.quill, 'card-sv-quill'),
-      value: descriptions,
-      modules: {
-        toolbar: false
-      },
-      onChange: onDescriptionChanged,
-      readOnly: canChangeDescription !== undefined ? !canChangeDescription : true
-    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      children: !editorOnly && _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: (0, _classnames.default)(classes.rowRoot, classes.rowOddSim),
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-          className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
-          children: [simTitle(), ":"]
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-          className: (0, _classnames.default)(classes.tTxt, classes.tTxtSim, 'txt-sv-panel-txt'),
-          children: simContent(simulationSt.nmrSimPeaks)
+      }), !editorOnly && _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: classes.subSectionHeader,
+          children: simTitle()
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: (0, _classnames.default)(classes.rowRoot, classes.rowOddSim),
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+            className: (0, _classnames.default)(classes.tTxt, classes.tTxtSim, 'txt-sv-panel-txt'),
+            children: simContent(simulationSt.nmrSimPeaks)
+          })
+        })]
+      }) : null, !_format.default.isCyclicVoltaLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: classes.subSectionHeader,
+          children: "Content"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: classes.quillContainer,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactQuill.default, {
+            value: normalizeQuillValue(descriptions),
+            placeholder: canChangeDescription ? 'Add text here...' : undefined,
+            readOnly: !canChangeDescription,
+            modules: {
+              toolbar: false
+            },
+            onChange: value => handleDescriptionChanged(value, onDescriptionChanged)
+          })
         })]
-      }) : null
+      }) : null]
     })]
   });
 };
@@ -422,7 +468,7 @@ InfoPanel.propTypes = {
   integration: _propTypes.default.object.isRequired,
   editorOnly: _propTypes.default.bool.isRequired,
   molSvg: _propTypes.default.string.isRequired,
-  descriptions: _propTypes.default.array.isRequired,
+  descriptions: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array]).isRequired,
   layoutSt: _propTypes.default.string.isRequired,
   simulationSt: _propTypes.default.array.isRequired,
   shiftSt: _propTypes.default.object.isRequired,

package/dist/constants/list_shift.js

@@ -396,10 +396,10 @@ const hTrifluoroethanolD32 = {
   label: 'Trifluoroethanol-d3'
 };
 const LIST_SHIFT_1H = exports.LIST_SHIFT_1H = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32];
-const LIST_SHIFT_19F = exports.LIST_SHIFT_19F = [];
-const LIST_SHIFT_31P = exports.LIST_SHIFT_31P = [];
-const LIST_SHIFT_15N = exports.LIST_SHIFT_15N = [];
-const LIST_SHIFT_29Si = exports.LIST_SHIFT_29Si = [];
+const LIST_SHIFT_19F = exports.LIST_SHIFT_19F = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32];
+const LIST_SHIFT_31P = exports.LIST_SHIFT_31P = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32];
+const LIST_SHIFT_15N = exports.LIST_SHIFT_15N = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32];
+const LIST_SHIFT_29Si = exports.LIST_SHIFT_29Si = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32];
 const getListShift = layoutSt => {
   switch (layoutSt) {
     case _list_layout.LIST_LAYOUT.H1:

package/dist/helpers/format.js

@@ -492,7 +492,7 @@ const formatPeaksByPrediction = (peaks, layout, isAscend, decimal, predictions =
   return body;
 };
 const compareColors = idx => ['#ABB2B9', '#EDBB99', '#ABEBC6', '#D2B4DE', '#F9E79F'][idx % 5];
-const mutiEntitiesColors = idx => ['#d35400', '#2980b9', '#8e44ad', '#2c3e50', '#6D214F', '#182C61', '#BDC581'][idx % 7];
+const mutiEntitiesColors = idx => ['#2980b9', '#e4b423', '#8e44ad', '#2c3e50', '#6D214F', '#182C61', '#BDC581'][idx % 7];
 const strNumberFixedDecimal = (number, decimal = -1) => {
   if (decimal <= 0) {
     return `${number}`;

package/package.json

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