@complat/react-spectra-editor 1.3.5 → 1.4.1

package/dist/layer_content.js

@@ -13,6 +13,7 @@ var _index = _interopRequireDefault(require("./components/d3_line/index"));
 var _index2 = _interopRequireDefault(require("./components/d3_rect/index"));
 var _forecast_viewer = _interopRequireDefault(require("./components/forecast_viewer"));
 var _format = _interopRequireDefault(require("./helpers/format"));
+var _jsxRuntime = require("react/jsx-runtime");
 /* eslint-disable prefer-object-spread, default-param-last, react/function-component-definition */
 
 const extractLayout = (forecast, layoutSt) => {
@@ -32,17 +33,16 @@ const extractLayout = (forecast, layoutSt) => {
     isXRD
   };
 };
-const Content = _ref => {
-  let {
-    topic,
-    feature,
-    cLabel,
-    xLabel,
-    yLabel,
-    forecast,
-    operations,
-    layoutSt
-  } = _ref;
+const Content = ({
+  topic,
+  feature,
+  cLabel,
+  xLabel,
+  yLabel,
+  forecast,
+  operations,
+  layoutSt
+}) => {
   const {
     showForecast,
     isNmr,
@@ -52,7 +52,7 @@ const Content = _ref => {
     isXRD
   } = extractLayout(forecast, layoutSt);
   if (showForecast) {
-    return /*#__PURE__*/_react.default.createElement(_forecast_viewer.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_forecast_viewer.default, {
       topic: topic,
       cLabel: cLabel,
       xLabel: xLabel,
@@ -67,7 +67,7 @@ const Content = _ref => {
     });
   }
   if (isMs) {
-    return /*#__PURE__*/_react.default.createElement(_index2.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.default, {
       topic: topic,
       cLabel: cLabel,
       xLabel: xLabel,
@@ -76,7 +76,7 @@ const Content = _ref => {
       isHidden: false
     });
   }
-  return /*#__PURE__*/_react.default.createElement(_index.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {
     topic: topic,
     cLabel: cLabel,
     xLabel: xLabel,

package/dist/layer_init.js

@@ -18,6 +18,7 @@ var _layer_prism = _interopRequireDefault(require("./layer_prism"));
 var _format = _interopRequireDefault(require("./helpers/format"));
 var _multi_jcamps_viewer = _interopRequireDefault(require("./components/multi_jcamps_viewer"));
 var _curve = require("./actions/curve");
+var _jsxRuntime = require("react/jsx-runtime");
 /* eslint-disable prefer-object-spread, default-param-last */
 
 const styles = () => ({});
@@ -42,14 +43,10 @@ class LayerInit extends _react.default.Component {
     this.updateMultiEntities();
   }
   normChange(prevProps) {
-    const prevFeatures = prevProps.entity.features;
-    const prevPeak = prevFeatures.editPeak || prevFeatures.autoPeak;
     const {
       entity
     } = this.props;
-    const nextFeatures = entity.features;
-    const nextPeak = nextFeatures.editPeak || nextFeatures.autoPeak;
-    if (prevPeak !== nextPeak) {
+    if (prevProps.entity !== entity) {
       this.execReset();
     }
   }
@@ -62,7 +59,8 @@ class LayerInit extends _react.default.Component {
       resetInitNmrAct,
       resetInitCommonWithIntergationAct,
       resetDetectorAct,
-      updateDSCMetaDataAct
+      updateDSCMetaDataAct,
+      resetMultiplicityAct
     } = this.props;
     resetInitCommonAct();
     resetDetectorAct();
@@ -76,8 +74,7 @@ class LayerInit extends _react.default.Component {
       const editPeak = features.editPeak || features[0];
       const baseFeat = editPeak || autoPeak;
       resetInitMsAct(baseFeat);
-    }
-    if (_format.default.isNmrLayout(layout)) {
+    } else if (_format.default.isNmrLayout(layout)) {
       const {
         integration,
         multiplicity,
@@ -102,6 +99,8 @@ class LayerInit extends _react.default.Component {
         dscMetaData
       } = features;
       updateDSCMetaDataAct(dscMetaData);
+    } else {
+      resetMultiplicityAct();
     }
   }
   initReducer() {
@@ -150,7 +149,7 @@ class LayerInit extends _react.default.Component {
     const xxLabel = !xLabel && xLabel === '' ? `X (${target.xUnit})` : xLabel;
     const yyLabel = !yLabel && yLabel === '' ? `Y (${target.yUnit})` : yLabel;
     if (multiEntities) {
-      return /*#__PURE__*/_react.default.createElement(_multi_jcamps_viewer.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_multi_jcamps_viewer.default, {
         multiEntities: multiEntities,
         entityFileNames: entityFileNames,
         userManualLink: userManualLink,
@@ -160,7 +159,7 @@ class LayerInit extends _react.default.Component {
       });
     } else if (_format.default.isCyclicVoltaLayout(layout)) {
       // eslint-disable-line
-      return /*#__PURE__*/_react.default.createElement(_multi_jcamps_viewer.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_multi_jcamps_viewer.default, {
         multiEntities: [entity],
         entityFileNames: entityFileNames,
         userManualLink: userManualLink,
@@ -169,7 +168,7 @@ class LayerInit extends _react.default.Component {
         operations: operations
       });
     }
-    return /*#__PURE__*/_react.default.createElement(_layer_prism.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_layer_prism.default, {
       entity: entity,
       cLabel: cLabel,
       xLabel: xxLabel,
@@ -194,6 +193,7 @@ const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
   resetInitMsAct: _manager.resetInitMs,
   resetInitCommonWithIntergationAct: _manager.resetInitCommonWithIntergation,
   resetDetectorAct: _manager.resetDetector,
+  resetMultiplicityAct: _manager.resetMultiplicity,
   updateOperationAct: _submit.updateOperation,
   updateMetaPeaksAct: _meta.updateMetaPeaks,
   addOthersAct: _jcamp.addOthers,
@@ -230,6 +230,7 @@ LayerInit.propTypes = {
   userManualLink: _propTypes.default.object,
   // eslint-disable-line
   resetDetectorAct: _propTypes.default.func.isRequired,
+  resetMultiplicityAct: _propTypes.default.func.isRequired,
   updateDSCMetaDataAct: _propTypes.default.func.isRequired
 };
 var _default = exports.default = (0, _reactRedux.connect)(

package/dist/layer_prism.js

@@ -16,29 +16,29 @@ var _index2 = _interopRequireDefault(require("./components/cmd_bar/index"));
 var _layer_content = _interopRequireDefault(require("./layer_content"));
 var _list_ui = require("./constants/list_ui");
 var _extractParams = require("./helpers/extractParams");
+var _jsxRuntime = require("react/jsx-runtime");
 /* eslint-disable prefer-object-spread, default-param-last,
 react/function-component-definition, react/require-default-props
 */
 
 const styles = () => ({});
-const LayerPrism = _ref => {
-  let {
-    entity,
-    cLabel,
-    xLabel,
-    yLabel,
-    forecast,
-    operations,
-    descriptions,
-    molSvg,
-    editorOnly,
-    exactMass,
-    thresSt,
-    scanSt,
-    uiSt,
-    canChangeDescription,
-    onDescriptionChanged
-  } = _ref;
+const LayerPrism = ({
+  entity,
+  cLabel,
+  xLabel,
+  yLabel,
+  forecast,
+  operations,
+  descriptions,
+  molSvg,
+  editorOnly,
+  exactMass,
+  thresSt,
+  scanSt,
+  uiSt,
+  canChangeDescription,
+  onDescriptionChanged
+}) => {
   const {
     topic,
     feature,
@@ -50,70 +50,81 @@ const LayerPrism = _ref => {
     viewer
   } = uiSt;
   if (viewer === _list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS) {
-    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_index2.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.default, {
+        feature: feature,
+        hasEdit: hasEdit,
+        forecast: forecast,
+        operations: operations,
+        editorOnly: editorOnly
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "react-spectrum-editor",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+          container: true,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+            item: true,
+            xs: 12,
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layer_content.default, {
+              topic: topic,
+              feature: feature,
+              cLabel: cLabel,
+              xLabel: xLabel,
+              yLabel: yLabel,
+              forecast: forecast,
+              operations: operations
+            })
+          })
+        })
+      })]
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.default, {
       feature: feature,
       hasEdit: hasEdit,
       forecast: forecast,
       operations: operations,
       editorOnly: editorOnly
-    }), /*#__PURE__*/_react.default.createElement("div", {
-      className: "react-spectrum-editor"
-    }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
-      container: true
-    }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
-      item: true,
-      xs: 12
-    }, /*#__PURE__*/_react.default.createElement(_layer_content.default, {
-      topic: topic,
-      feature: feature,
-      cLabel: cLabel,
-      xLabel: xLabel,
-      yLabel: yLabel,
-      forecast: forecast,
-      operations: operations
-    })))));
-  }
-  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_index2.default, {
-    feature: feature,
-    hasEdit: hasEdit,
-    forecast: forecast,
-    operations: operations,
-    editorOnly: editorOnly
-  }), /*#__PURE__*/_react.default.createElement("div", {
-    className: "react-spectrum-editor"
-  }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
-    container: true
-  }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
-    item: true,
-    xs: 9
-  }, /*#__PURE__*/_react.default.createElement(_layer_content.default, {
-    topic: topic,
-    feature: feature,
-    cLabel: cLabel,
-    xLabel: xLabel,
-    yLabel: yLabel,
-    forecast: forecast,
-    operations: operations
-  })), /*#__PURE__*/_react.default.createElement(_Grid.default, {
-    item: true,
-    xs: 3,
-    align: "center"
-  }, /*#__PURE__*/_react.default.createElement(_index.default, {
-    feature: feature,
-    integration: integration,
-    editorOnly: editorOnly,
-    molSvg: molSvg,
-    exactMass: exactMass,
-    descriptions: descriptions,
-    canChangeDescription: canChangeDescription,
-    onDescriptionChanged: onDescriptionChanged
-  })))));
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "react-spectrum-editor",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Grid.default, {
+        container: true,
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+          item: true,
+          xs: 9,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layer_content.default, {
+            topic: topic,
+            feature: feature,
+            cLabel: cLabel,
+            xLabel: xLabel,
+            yLabel: yLabel,
+            forecast: forecast,
+            operations: operations
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+          item: true,
+          xs: 3,
+          align: "center",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {
+            feature: feature,
+            integration: integration,
+            editorOnly: editorOnly,
+            molSvg: molSvg,
+            exactMass: exactMass,
+            descriptions: descriptions,
+            canChangeDescription: canChangeDescription,
+            onDescriptionChanged: onDescriptionChanged
+          })
+        })]
+      })
+    })]
+  });
 };
 const mapStateToProps = (state, props) => (
 // eslint-disable-line
 {
   scanSt: state.scan,
-  thresSt: state.threshold,
+  thresSt: state.threshold.list[state.curve.curveIdx],
   uiSt: state.ui
 });
 const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({}, dispatch);

package/dist/reducers/reducer_axes.js

@@ -13,8 +13,7 @@ const initialState = {
     yUnit: ''
   }]
 };
-const updateAxis = function (state, payload) {
-  let isYAxis = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+const updateAxis = (state, payload, isYAxis = false) => {
   const {
     value,
     curveIndex
@@ -44,9 +43,7 @@ const updateAxis = function (state, payload) {
     axes
   });
 };
-const axesReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const axesReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.AXES.UPDATE_X_AXIS:
       return updateAxis(state, action.payload);

package/dist/reducers/reducer_curve.js

@@ -9,7 +9,7 @@ var _action_type = require("../constants/action_type");
 var _extractParams = require("../helpers/extractParams");
 var _chem = require("../helpers/chem");
 var _format = _interopRequireDefault(require("../helpers/format"));
-/* eslint-disable prefer-object-spread, default-param-last */
+/* eslint-disable prefer-object-spread, default-param-last, max-len */
 
 const initialState = {
   listCurves: [],
@@ -26,8 +26,11 @@ const setAllCurves = (state, action) => {
         topic,
         feature,
         hasEdit,
-        integration
-      } = (0, _extractParams.extractParams)(entity, 1);
+        integration,
+        multiplicity
+      } = (0, _extractParams.extractParams)(entity, {
+        isEdit: true
+      });
       // const layout = entity.layout;
       const {
         layout
@@ -40,6 +43,7 @@ const setAllCurves = (state, action) => {
         feature,
         hasEdit,
         integration,
+        multiplicity,
         maxminPeak,
         color,
         curveIdx: idx
@@ -55,9 +59,7 @@ const setAllCurves = (state, action) => {
     listCurves: payload
   });
 };
-const curveReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const curveReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.CURVE.SELECT_WORKING_CURVE:
       return Object.assign({}, state, {

package/dist/reducers/reducer_detector.js

@@ -25,9 +25,7 @@ const updateOrAppendCurve = (curves, targetCurveIdx, newCurve) => {
   }
   return [...curves, newCurve];
 };
-const detectorReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const detectorReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.SEC.UPDATE_DETECTOR:
       const {

package/dist/reducers/reducer_edit_peak.js

@@ -202,9 +202,7 @@ const clearAllPeaks = (state, action) => {
     peaks: newPeaks
   });
 };
-const editPeakReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const editPeakReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.EDITPEAK.ADD_POSITIVE:
       return addToPos(state, action);

package/dist/reducers/reducer_forecast.js

@@ -101,9 +101,7 @@ const updateNmrStatus = (state, action) => {
   });
   return newSt;
 };
-const forecastReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const forecastReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.FORECAST.INIT_STATUS:
       if (!action.payload) return state;

package/dist/reducers/reducer_integration.js

@@ -208,9 +208,7 @@ const clearAll = (state, action) => {
     selectedIdx: curveIdx
   });
 };
-const integrationReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const integrationReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.UI.SWEEP.SELECT_INTEGRATION:
       return addToStack(state, action);

package/dist/reducers/reducer_jcamp.js

@@ -14,11 +14,10 @@ const initialState = {
     addOthersCb: false
   }]
 };
-const addOthers = (state, _ref) => {
-  let {
-    others,
-    addOthersCb
-  } = _ref;
+const addOthers = (state, {
+  others,
+  addOthersCb
+}) => {
   const {
     selectedIdx,
     jcamps
@@ -81,9 +80,7 @@ const toggleShow = (state, payload) => {
     jcamps
   });
 };
-const layoutReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const layoutReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.JCAMP.ADD_OTHERS:
       return addOthers(state, action.payload);

package/dist/reducers/reducer_layout.js

@@ -9,9 +9,7 @@ var _list_layout = require("../constants/list_layout");
 /* eslint-disable prefer-object-spread, default-param-last */
 
 const initialState = _list_layout.LIST_LAYOUT.C13;
-const layoutReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const layoutReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.LAYOUT.UPDATE:
       return action.payload;

package/dist/reducers/reducer_manager.js

@@ -8,9 +8,7 @@ exports.default = void 0;
 // import { MANAGER } from '../constants/action_type';
 
 const initialState = {};
-const managerReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const managerReducer = (state = initialState, action) => {
   switch (action.type) {
     default:
       return state;

package/dist/reducers/reducer_meta.js

@@ -27,9 +27,7 @@ const updateMetaData = (state, action) => {
     dscMetaData
   });
 };
-const metaReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const metaReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.META.UPDATE_PEAKS_RDC:
       return Object.assign({}, state, action.payload);

package/dist/reducers/reducer_multiplicity.js

@@ -164,9 +164,7 @@ const clearAll = (state, action) => {
     multiplicities: newMultiplicities
   });
 };
-const multiplicityReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const multiplicityReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.EDITPEAK.SHIFT:
       return setShift(state, action);
@@ -191,6 +189,8 @@ const multiplicityReducer = function () {
       return clearAll(state, action);
     case _action_type.MANAGER.RESETALL:
       return state;
+    case _action_type.MANAGER.RESET_MULTIPLICITY:
+      return initialState;
     default:
       return _undo_redo_config.undoRedoActions.indexOf(action.type) >= 0 ? Object.assign({}, state) : state;
   }

package/dist/reducers/reducer_scan.js

@@ -30,9 +30,7 @@ const toggleIsAuto = state => Object.assign({}, state, {
   isAuto: !state.isAuto,
   target: false
 });
-const scanReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const scanReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.SCAN.SET_TARGET:
     case _action_type.SCAN.RESET_TARGET:

package/dist/reducers/reducer_shift.js

@@ -217,9 +217,7 @@ const addNegative = (state, action) => {
     selectedIdx: curveIdx
   });
 };
-const shiftReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const shiftReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.SHIFT.SET_REF:
       return setRef(state, action);

package/dist/reducers/reducer_simulation.js

@@ -14,9 +14,7 @@ const resetAll = (state, action) => {
   const newState = action.payload;
   return Object.assign({}, state, newState);
 };
-const simulatioinReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const simulatioinReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.SIMULATION.RESET_ALL_RDC:
       return resetAll(state, action);

package/dist/reducers/reducer_status.js

@@ -10,9 +10,7 @@ var _action_type = require("../constants/action_type");
 const initialState = {
   btnSubmit: false
 };
-const statusReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const statusReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.STATUS.TOGGLEBTNSUBMIT:
       return Object.assign({}, state, {

package/dist/reducers/reducer_submit.js

@@ -20,9 +20,7 @@ const initialState = {
 const updateOperation = action => ({
   operation: action.payload || initialState.operation
 });
-const submitReducer = function () {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  let action = arguments.length > 1 ? arguments[1] : undefined;
+const submitReducer = (state = initialState, action) => {
   switch (action.type) {
     case _action_type.SUBMIT.TOGGLE_IS_ASCEND:
       return Object.assign({}, state, {