@complat/react-spectra-editor 1.0.0-rc6.alpha.0 → 1.0.0-rc6.alpha.2

package/dist/components/cmd_bar/r01_layout.js

@@ -34,9 +34,24 @@ const styles = () => Object.assign({
     width: 100
   }
 }, _common.commonStyle);
-const shiftSelect = (classes, layoutSt, shiftRefSt, setShiftRefAct) => {
+const shiftSelect = (classes, layoutSt, setShiftRefAct, shiftSt, curveSt) => {
   if (_cfg.default.hideSolvent(layoutSt)) return null;
-  const onChange = e => setShiftRefAct(e.target.value);
+  // const onChange = (e) => setShiftRefAct(e.target.value);
+  const {
+    curveIdx
+  } = curveSt;
+  const {
+    shifts
+  } = shiftSt;
+  const selectedShift = shifts[curveIdx];
+  const shiftRef = selectedShift.ref;
+  const onChange = e => {
+    const payload = {
+      dataToSet: e.target.value,
+      curveIdx
+    };
+    setShiftRefAct(payload);
+  };
   const listShift = (0, _list_shift.getListShift)(layoutSt);
   const content = listShift.map(ref => /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
     value: ref,
@@ -50,7 +65,7 @@ const shiftSelect = (classes, layoutSt, shiftRefSt, setShiftRefAct) => {
   }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, {
     className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
   }, "Solvent"), /*#__PURE__*/_react.default.createElement(_Select.default, {
-    value: shiftRefSt,
+    value: shiftRef,
     onChange: onChange,
     input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, {
       className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift'),
@@ -148,13 +163,14 @@ const Layout = _ref => {
     feature,
     hasEdit,
     layoutSt,
-    shiftRefSt,
     setShiftRefAct,
-    updateLayoutAct
+    updateLayoutAct,
+    curveSt,
+    shiftSt
   } = _ref;
   return /*#__PURE__*/_react.default.createElement("span", {
     className: classes.groupRight
-  }, layoutSelect(classes, layoutSt, updateLayoutAct), shiftSelect(classes, layoutSt, shiftRefSt, setShiftRefAct), /*#__PURE__*/_react.default.createElement(_r02_scan.default, {
+  }, layoutSelect(classes, layoutSt, updateLayoutAct), shiftSelect(classes, layoutSt, setShiftRefAct, shiftSt, curveSt), /*#__PURE__*/_react.default.createElement(_r02_scan.default, {
     feature: feature,
     hasEdit: hasEdit
   }));
@@ -163,7 +179,8 @@ const mapStateToProps = (state, props) => (
 // eslint-disable-line
 {
   layoutSt: state.layout,
-  shiftRefSt: state.shift.ref
+  curveSt: state.curve,
+  shiftSt: state.shift
 });
 const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
   setShiftRefAct: _shift.setShiftRef,
@@ -174,9 +191,10 @@ Layout.propTypes = {
   feature: _propTypes.default.object.isRequired,
   hasEdit: _propTypes.default.bool.isRequired,
   layoutSt: _propTypes.default.string.isRequired,
-  shiftRefSt: _propTypes.default.object.isRequired,
   setShiftRefAct: _propTypes.default.func.isRequired,
-  updateLayoutAct: _propTypes.default.func.isRequired
+  updateLayoutAct: _propTypes.default.func.isRequired,
+  curveSt: _propTypes.default.object.isRequired,
+  shiftSt: _propTypes.default.object.isRequired
 };
 var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Layout));
 exports.default = _default;

package/dist/components/panel/graph_selection.js

@@ -80,16 +80,17 @@ const GraphSelectionPanel = _ref => {
   if (selectedSubLayout && subLayoutValues.length > 1) {
     const subLayout = subLayoutsInfo[selectedSubLayout];
     itemsSubLayout = subLayout.map((spectra, idx) => {
+      const spectraIdx = spectra.curveIdx;
       const {
         color
       } = spectra;
       let filename = '';
-      if (entityFileNames && curveIdx < entityFileNames.length) {
-        filename = entityFileNames[curveIdx];
+      if (entityFileNames && spectraIdx < entityFileNames.length) {
+        filename = entityFileNames[spectraIdx];
       }
       return {
         name: `${idx + 1}.`,
-        idx,
+        idx: spectraIdx,
         color,
         filename
       };
@@ -155,7 +156,7 @@ const GraphSelectionPanel = _ref => {
     style: {
       backgroundColor: item.color
     }
-  }), item.filename !== '' ? /*#__PURE__*/_react.default.createElement("span", null, "File: ", item.filename) : null // eslint-disable-line
+  }), item.name !== '' ? /*#__PURE__*/_react.default.createElement("span", null, "File: ", item.name) : null // eslint-disable-line
   )))))) : /*#__PURE__*/_react.default.createElement(_core.List, null, items.map(item => /*#__PURE__*/_react.default.createElement(_core.ListItem, {
     key: item.idx,
     onClick: () => onChange(item.idx),

package/dist/reducers/reducer_shift.js

@@ -61,11 +61,14 @@ const resetShift = (state, action) => {
   const {
     payload
   } = action;
+  const {
+    curvesInfo
+  } = payload;
   const {
     isMultiCurve,
     curveIdx,
     numberOfCurve
-  } = payload;
+  } = curvesInfo;
   const {
     shifts
   } = state;
@@ -76,7 +79,7 @@ const resetShift = (state, action) => {
   if (isMultiCurve) {
     for (let idx = 0; idx < numberOfCurve; idx += 1) {
       const checkShift = shifts[idx];
-      if (checkShift === false || checkShift === undefined) {
+      if (!checkShift) {
         shifts[idx] = defaultEmptyShift;
       }
     }

package/package.json

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