@complat/react-spectra-editor 1.0.0-rc16 → 1.0.0-rc17

package/README.md

@@ -37,3 +37,17 @@ $ yarn start
 
 [demo & step-by-step manual](https://github.com/ComPlat/react-spectra-editor/blob/master/DEMO_MANUAL.md)
 
+
+
+## Acknowledgments
+
+This project has been funded by the **[DFG]**.
+
+[![DFG Logo]][DFG]
+
+
+Funded by the [Deutsche Forschungsgemeinschaft (DFG, German Research Foundation)](https://www.dfg.de/) under the [National Research Data Infrastructure – NFDI4Chem](https://nfdi4chem.de/) – Projektnummer **441958208** since 2020.
+
+
+[DFG]: https://www.dfg.de/en/
+[DFG Logo]: https://www.dfg.de/zentralablage/bilder/service/logos_corporate_design/logo_negativ_267.png

package/dist/components/cmd_bar/common.js

@@ -86,6 +86,14 @@ const commonStyle = {
   },
   selectInput: {
     height: 30
+  },
+  txtLabelBottomInput: {
+    fontFamily: 'Helvetica',
+    backgroundColor: 'white',
+    fontSize: 12,
+    margin: '22% 0 0 7px',
+    padding: '0 10px 0 10px',
+    transform: 'scale(0.75)'
   }
 };
 exports.commonStyle = commonStyle;

package/dist/components/cmd_bar/r03_threshold.js

@@ -12,6 +12,7 @@ var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
 var _InputAdornment = _interopRequireDefault(require("@material-ui/core/InputAdornment"));
+var _core = require("@material-ui/core");
 var _styles = require("@material-ui/core/styles");
 var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
 var _CloudDoneOutlined = _interopRequireDefault(require("@material-ui/icons/CloudDoneOutlined"));
@@ -42,7 +43,9 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct) => {
       updateThresholdValueAct(e.target.value);
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_TextField.default, {
+  return /*#__PURE__*/_react.default.createElement(_core.FormControl, {
+    variant: "outlined"
+  }, /*#__PURE__*/_react.default.createElement(_TextField.default, {
     className: classes.field,
     id: "outlined-name",
     placeholder: "N.A.",
@@ -56,14 +59,13 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct) => {
         min: 0.01
       }
     },
-    label: /*#__PURE__*/_react.default.createElement("span", {
-      className: (0, _classnames.default)(classes.txtLabel, 'txtfield-sv-bar-label')
-    }, "Threshold"),
     onChange: onChange,
     onBlur: onBlur,
     onKeyPress: onEnterPress,
     variant: "outlined"
-  });
+  }), /*#__PURE__*/_react.default.createElement(_core.InputLabel, {
+    className: (0, _classnames.default)(classes.txtLabelBottomInput)
+  }, "Threshold"));
 };
 const restoreIcon = (classes, hasEdit, isEdit) => hasEdit && isEdit ? /*#__PURE__*/_react.default.createElement(_HowToRegOutlined.default, {
   className: classes.icon

package/dist/components/panel/compare.js

@@ -12,8 +12,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _reactDropzone = _interopRequireDefault(require("react-dropzone"));
-var _ExpansionPanel = _interopRequireDefault(require("@material-ui/core/ExpansionPanel"));
-var _ExpansionPanelSummary = _interopRequireDefault(require("@material-ui/core/ExpansionPanelSummary"));
+var _core = require("@material-ui/core");
 var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
 var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff"));
 var _Table = _interopRequireDefault(require("@material-ui/core/Table"));
@@ -218,14 +217,14 @@ const ComparePanel = _ref2 => {
     rmOthersOneAct,
     toggleShowAct
   } = _ref2;
-  return /*#__PURE__*/_react.default.createElement(_ExpansionPanel.default, {
+  return /*#__PURE__*/_react.default.createElement(_core.Accordion, {
     expanded: expand,
     onChange: onExapnd,
     className: (0, _classnames.default)(classes.panel),
     TransitionProps: {
       unmountOnExit: true
     } // increase ExpansionPanel performance
-  }, /*#__PURE__*/_react.default.createElement(_ExpansionPanelSummary.default, {
+  }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
     expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
     className: (0, _classnames.default)(classes.panelSummary)
   }, /*#__PURE__*/_react.default.createElement(_Typography.default, {

package/dist/components/panel/cyclic_voltamery_data.js

@@ -46,7 +46,7 @@ const styles = () => ({
   },
   table: {
     width: '100%',
-    wordWrap: 'break-all',
+    overflowWrap: 'anywhere',
     fontSize: '14px !important'
   },
   td: {
@@ -137,13 +137,13 @@ const CyclicVoltammetryPanel = _ref => {
     }
   };
   const getDelta = data => {
-    return data.max && data.min ? (0, _chem.GetCyclicVoltaPeakSeparate)(data.max.x, data.min.x) : 'undefined';
+    return data.max && data.min ? (0, _chem.GetCyclicVoltaPeakSeparate)(data.max.x, data.min.x).toFixed(5) : 'undefined';
   };
   const getRatio = (feature, data) => {
     const featureData = feature.data[0];
     const idx = featureData.x.indexOf(feature.maxX);
     const y_pecker = data.pecker ? data.pecker.y : featureData.y[idx];
-    return data.max && data.min ? (0, _chem.GetCyclicVoltaRatio)(data.max.y, data.min.y, y_pecker).toFixed(8) : 'undefined';
+    return data.max && data.min ? (0, _chem.GetCyclicVoltaRatio)(data.max.y, data.min.y, y_pecker).toFixed(5) : 'undefined';
   };
   const rows = list.map((o, idx) => ({
     idx,
@@ -159,7 +159,7 @@ const CyclicVoltammetryPanel = _ref => {
       jcampIdx
     })
   }));
-  return /*#__PURE__*/_react.default.createElement(_core.ExpansionPanel, null, /*#__PURE__*/_react.default.createElement(_core.ExpansionPanelSummary, {
+  return /*#__PURE__*/_react.default.createElement(_core.Accordion, null, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
     expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
     className: (0, _classnames.default)(classes.panelSummary)
   }, /*#__PURE__*/_react.default.createElement(_Typography.default, {

package/dist/components/panel/graph_selection.js

@@ -39,13 +39,17 @@ const styles = () => ({
     backgroundColor: '#fff',
     fontSize: '0.8em',
     margin: '0',
-    padding: '10px 2px 2px 10px'
+    padding: '10px 2px 2px 10px',
+    maxWidth: '95%',
+    overflowWrap: 'anywhere'
   },
   curveSelected: {
     backgroundColor: '#2196f3',
     fontSize: '0.8em',
     color: '#fff',
-    padding: '10px 2px 2px 10px'
+    padding: '10px 2px 2px 10px',
+    maxWidth: '95%',
+    overflowWrap: 'anywhere'
   }
 });
 const GraphSelectionPanel = _ref => {

package/dist/components/panel/index.js

@@ -20,7 +20,7 @@ var _graph_selection = _interopRequireDefault(require("./graph_selection"));
 var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
 /* eslint-disable react/prop-types, react/require-default-props */
 
-const theme = (0, _styles.createMuiTheme)({
+const theme = (0, _styles.createTheme)({
   typography: {
     useNextVariants: true
   }

package/dist/components/panel/info.js

@@ -12,8 +12,7 @@ var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _reactSvgFileZoomPan = _interopRequireDefault(require("@complat/react-svg-file-zoom-pan"));
 var _reactQuill = _interopRequireDefault(require("react-quill"));
-var _ExpansionPanel = _interopRequireDefault(require("@material-ui/core/ExpansionPanel"));
-var _ExpansionPanelSummary = _interopRequireDefault(require("@material-ui/core/ExpansionPanelSummary"));
+var _core = require("@material-ui/core");
 var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
 var _Divider = _interopRequireDefault(require("@material-ui/core/Divider"));
 var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
@@ -155,14 +154,14 @@ const InfoPanel = _ref => {
     originStack = integration.originStack; // eslint-disable-line
   }
 
-  return /*#__PURE__*/_react.default.createElement(_ExpansionPanel.default, {
+  return /*#__PURE__*/_react.default.createElement(_core.Accordion, {
     expanded: expand,
     onChange: onExapnd,
     className: (0, _classnames.default)(classes.panel),
     TransitionProps: {
       unmountOnExit: true
     } // increase ExpansionPanel performance
-  }, /*#__PURE__*/_react.default.createElement(_ExpansionPanelSummary.default, {
+  }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
     expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
     className: (0, _classnames.default)(classes.panelSummary)
   }, /*#__PURE__*/_react.default.createElement(_Typography.default, {

package/dist/components/panel/multiplicity.js

@@ -10,8 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactRedux = require("react-redux");
 var _redux = require("redux");
-var _ExpansionPanel = _interopRequireDefault(require("@material-ui/core/ExpansionPanel"));
-var _ExpansionPanelSummary = _interopRequireDefault(require("@material-ui/core/ExpansionPanelSummary"));
+var _core = require("@material-ui/core");
 var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
 var _Divider = _interopRequireDefault(require("@material-ui/core/Divider"));
 var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
@@ -248,14 +247,14 @@ const MultiplicityPanel = _ref => {
     resetMpyOneAct
   } = _ref;
   const digits = 4;
-  return /*#__PURE__*/_react.default.createElement(_ExpansionPanel.default, {
+  return /*#__PURE__*/_react.default.createElement(_core.Accordion, {
     expanded: expand,
     onChange: onExapnd,
     className: (0, _classnames.default)(classes.panel),
     TransitionProps: {
       unmountOnExit: true
     } // increase ExpansionPanel performance
-  }, /*#__PURE__*/_react.default.createElement(_ExpansionPanelSummary.default, {
+  }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
     expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
     className: (0, _classnames.default)(classes.panelSummary)
   }, /*#__PURE__*/_react.default.createElement(_Typography.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@complat/react-spectra-editor",
-  "version": "1.0.0-rc16",
+  "version": "1.0.0-rc17",
   "description": "An editor to View and Edit Chemical Spectra data (NMR, IR and MS, CV, UIVIS, XRD).",
   "repository": {
     "type": "git",
@@ -34,7 +34,6 @@
     "react-dropzone": "^8.0.3",
     "react-quill": "^2.0.0",
     "react-redux": "^7.2.0",
-    "react-svg-file-zoom-pan": "^1.0.5",
     "react-svg-inline": "^2.1.1",
     "redux": "^4.1.1",
     "redux-saga": "^1.1.3",