@complat/react-spectra-editor 1.0.0-rc5 → 1.0.0-rc6

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
       };

package/dist/constants/action_type.js

@@ -89,7 +89,8 @@ const INTEGRATION = {
   SET_REF: 'INTEGRATION_SET_REF',
   SET_FKR: 'INTEGRATION_SET_FKR',
   RESET_ALL_RDC: 'INTEGRATION_RESET_ALL_RDC',
-  CLEAR_ALL: 'INTEGRATION_CLEAR_ALL'
+  CLEAR_ALL: 'INTEGRATION_CLEAR_ALL',
+  SWEEP: 'INTEGRATION_SWEEP'
 };
 exports.INTEGRATION = INTEGRATION;
 const SIMULATION = {

package/dist/reducers/reducer_shift.js

@@ -59,21 +59,39 @@ const resetEnable = payload => {
 };
 const resetShift = (state, action) => {
   const {
-    selectedIdx,
+    payload
+  } = action;
+  const {
+    curvesInfo
+  } = payload;
+  const {
+    isMultiCurve,
+    curveIdx,
+    numberOfCurve
+  } = curvesInfo;
+  const {
     shifts
   } = state;
-  let selectedShift = shifts[selectedIdx];
+  let selectedShift = shifts[curveIdx];
   if (selectedShift === false || selectedShift === undefined) {
     selectedShift = defaultEmptyShift;
   }
+  if (isMultiCurve) {
+    for (let idx = 0; idx < numberOfCurve; idx += 1) {
+      const checkShift = shifts[idx];
+      if (!checkShift) {
+        shifts[idx] = defaultEmptyShift;
+      }
+    }
+  }
   const newShift = Object.assign({}, selectedShift, {
-    ref: resetRef(action.payload),
-    enable: resetEnable(action.payload)
+    ref: resetRef(payload),
+    enable: resetEnable(payload)
   });
-  shifts[selectedIdx] = newShift;
+  shifts[curveIdx] = newShift;
   return Object.assign({}, state, {
     shifts,
-    selectedIdx
+    selectedIdx: curveIdx
   });
 };
 const updateShift = (state, action) => {

package/dist/sagas/saga_manager.js

@@ -9,31 +9,28 @@ var _action_type = require("../constants/action_type");
 const getLayout = state => state.layout;
 const getCurveSt = state => state.curve;
 const getIntegrationSt = state => state.integration.present;
-// const getShiftSt = (state) => state.shift;
-
 function* resetShift(action) {
-  // const curveSt = yield select(getCurveSt);
+  const curveSt = yield (0, _effects.select)(getCurveSt);
   const layout = yield (0, _effects.select)(getLayout);
-  // const shiftSt = yield select(getShiftSt);
-
   const {
     payload
   } = action;
-  // const { shift } = payload;
-  // console.log(payload);
-  // console.log(shiftSt);
-  // const { curveIdx } = curveSt;
-  // const { shifts } = shiftSt;
-  // shifts[curveIdx] = shift;
-
-  // const newPayload = Object.assign({}, shiftSt, { shifts, selectedIdx: curveIdx })
-
+  const {
+    curveIdx,
+    listCurves
+  } = curveSt;
+  const numberOfCurve = listCurves.length;
   yield (0, _effects.put)({
     type: _action_type.MANAGER.RESETSHIFT,
     payload: Object.assign(
     // eslint-disable-line
     {}, payload, {
-      layout
+      layout,
+      curvesInfo: {
+        isMultiCurve: numberOfCurve > 0,
+        curveIdx,
+        numberOfCurve
+      }
     })
   });
 }

package/package.json

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