Skip to content

Commit e401ab1

Browse files
baolanlequangbaolanlequang
authored
fix: fixed info panel for CV layout (#155) (#160)
1 parent 0350482 commit e401ab1

File tree

18 files changed

+2245
-1902
lines changed

18 files changed

+2245
-1902
lines changed

‎dist/components/cmd_bar/common.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@ const commonStyle = {
8686
},
8787
selectInput: {
8888
height: 30
89+
},
90+
txtLabelBottomInput: {
91+
fontFamily: 'Helvetica',
92+
backgroundColor: 'white',
93+
fontSize: 12,
94+
margin: '22% 0 0 7px',
95+
padding: '0 10px 0 10px',
96+
transform: 'scale(0.75)'
8997
}
9098
};
9199
exports.commonStyle = commonStyle;

‎dist/components/cmd_bar/r03_threshold.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ var _reactRedux = require("react-redux");
1212
var _redux = require("redux");
1313
var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
1414
var _InputAdornment = _interopRequireDefault(require("@material-ui/core/InputAdornment"));
15+
var _core = require("@material-ui/core");
1516
var _styles = require("@material-ui/core/styles");
1617
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
1718
var _CloudDoneOutlined = _interopRequireDefault(require("@material-ui/icons/CloudDoneOutlined"));
@@ -42,7 +43,9 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct) => {
4243
updateThresholdValueAct(e.target.value);
4344
}
4445
};
45-
return /*#__PURE__*/_react.default.createElement(_TextField.default, {
46+
return /*#__PURE__*/_react.default.createElement(_core.FormControl, {
47+
variant: "outlined"
48+
}, /*#__PURE__*/_react.default.createElement(_TextField.default, {
4649
className: classes.field,
4750
id: "outlined-name",
4851
placeholder: "N.A.",
@@ -56,14 +59,13 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct) => {
5659
min: 0.01
5760
}
5861
},
59-
label: /*#__PURE__*/_react.default.createElement("span", {
60-
className: (0, _classnames.default)(classes.txtLabel, 'txtfield-sv-bar-label')
61-
}, "Threshold"),
6262
onChange: onChange,
6363
onBlur: onBlur,
6464
onKeyPress: onEnterPress,
6565
variant: "outlined"
66-
});
66+
}), /*#__PURE__*/_react.default.createElement(_core.InputLabel, {
67+
className: (0, _classnames.default)(classes.txtLabelBottomInput)
68+
}, "Threshold"));
6769
};
6870
const restoreIcon = (classes, hasEdit, isEdit) => hasEdit && isEdit ? /*#__PURE__*/_react.default.createElement(_HowToRegOutlined.default, {
6971
className: classes.icon

‎dist/components/panel/compare.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
1212
var _reactRedux = require("react-redux");
1313
var _redux = require("redux");
1414
var _reactDropzone = _interopRequireDefault(require("react-dropzone"));
15-
var _ExpansionPanel = _interopRequireDefault(require("@material-ui/core/ExpansionPanel"));
16-
var _ExpansionPanelSummary = _interopRequireDefault(require("@material-ui/core/ExpansionPanelSummary"));
15+
var _core = require("@material-ui/core");
1716
var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
1817
var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff"));
1918
var _Table = _interopRequireDefault(require("@material-ui/core/Table"));
@@ -218,14 +217,14 @@ const ComparePanel = _ref2 => {
218217
rmOthersOneAct,
219218
toggleShowAct
220219
} = _ref2;
221-
return /*#__PURE__*/_react.default.createElement(_ExpansionPanel.default, {
220+
return /*#__PURE__*/_react.default.createElement(_core.Accordion, {
222221
expanded: expand,
223222
onChange: onExapnd,
224223
className: (0, _classnames.default)(classes.panel),
225224
TransitionProps: {
226225
unmountOnExit: true
227226
} // increase ExpansionPanel performance
228-
}, /*#__PURE__*/_react.default.createElement(_ExpansionPanelSummary.default, {
227+
}, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
229228
expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
230229
className: (0, _classnames.default)(classes.panelSummary)
231230
}, /*#__PURE__*/_react.default.createElement(_Typography.default, {

‎dist/components/panel/cyclic_voltamery_data.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const styles = () => ({
4646
},
4747
table: {
4848
width: '100%',
49-
wordWrap: 'break-all',
49+
overflowWrap: 'anywhere',
5050
fontSize: '14px !important'
5151
},
5252
td: {
@@ -137,13 +137,13 @@ const CyclicVoltammetryPanel = _ref => {
137137
}
138138
};
139139
const getDelta = data => {
140-
return data.max && data.min ? (0, _chem.GetCyclicVoltaPeakSeparate)(data.max.x, data.min.x) : 'undefined';
140+
return data.max && data.min ? (0, _chem.GetCyclicVoltaPeakSeparate)(data.max.x, data.min.x).toFixed(5) : 'undefined';
141141
};
142142
const getRatio = (feature, data) => {
143143
const featureData = feature.data[0];
144144
const idx = featureData.x.indexOf(feature.maxX);
145145
const y_pecker = data.pecker ? data.pecker.y : featureData.y[idx];
146-
return data.max && data.min ? (0, _chem.GetCyclicVoltaRatio)(data.max.y, data.min.y, y_pecker).toFixed(8) : 'undefined';
146+
return data.max && data.min ? (0, _chem.GetCyclicVoltaRatio)(data.max.y, data.min.y, y_pecker).toFixed(5) : 'undefined';
147147
};
148148
const rows = list.map((o, idx) => ({
149149
idx,
@@ -159,7 +159,7 @@ const CyclicVoltammetryPanel = _ref => {
159159
jcampIdx
160160
})
161161
}));
162-
return /*#__PURE__*/_react.default.createElement(_core.ExpansionPanel, null, /*#__PURE__*/_react.default.createElement(_core.ExpansionPanelSummary, {
162+
return /*#__PURE__*/_react.default.createElement(_core.Accordion, null, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
163163
expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
164164
className: (0, _classnames.default)(classes.panelSummary)
165165
}, /*#__PURE__*/_react.default.createElement(_Typography.default, {

‎dist/components/panel/graph_selection.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,17 @@ const styles = () => ({
3939
backgroundColor: '#fff',
4040
fontSize: '0.8em',
4141
margin: '0',
42-
padding: '10px 2px 2px 10px'
42+
padding: '10px 2px 2px 10px',
43+
maxWidth: '95%',
44+
overflowWrap: 'anywhere'
4345
},
4446
curveSelected: {
4547
backgroundColor: '#2196f3',
4648
fontSize: '0.8em',
4749
color: '#fff',
48-
padding: '10px 2px 2px 10px'
50+
padding: '10px 2px 2px 10px',
51+
maxWidth: '95%',
52+
overflowWrap: 'anywhere'
4953
}
5054
});
5155
const GraphSelectionPanel = _ref => {

‎dist/components/panel/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var _graph_selection = _interopRequireDefault(require("./graph_selection"));
2020
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
2121
/* eslint-disable react/prop-types, react/require-default-props */
2222

23-
const theme = (0, _styles.createMuiTheme)({
23+
const theme = (0, _styles.createTheme)({
2424
typography: {
2525
useNextVariants: true
2626
}

‎dist/components/panel/info.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ var _reactRedux = require("react-redux");
1212
var _redux = require("redux");
1313
var _reactSvgFileZoomPan = _interopRequireDefault(require("@complat/react-svg-file-zoom-pan"));
1414
var _reactQuill = _interopRequireDefault(require("react-quill"));
15-
var _ExpansionPanel = _interopRequireDefault(require("@material-ui/core/ExpansionPanel"));
16-
var _ExpansionPanelSummary = _interopRequireDefault(require("@material-ui/core/ExpansionPanelSummary"));
15+
var _core = require("@material-ui/core");
1716
var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
1817
var _Divider = _interopRequireDefault(require("@material-ui/core/Divider"));
1918
var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
@@ -155,14 +154,14 @@ const InfoPanel = _ref => {
155154
originStack = integration.originStack; // eslint-disable-line
156155
}
157156

158-
return /*#__PURE__*/_react.default.createElement(_ExpansionPanel.default, {
157+
return /*#__PURE__*/_react.default.createElement(_core.Accordion, {
159158
expanded: expand,
160159
onChange: onExapnd,
161160
className: (0, _classnames.default)(classes.panel),
162161
TransitionProps: {
163162
unmountOnExit: true
164163
} // increase ExpansionPanel performance
165-
}, /*#__PURE__*/_react.default.createElement(_ExpansionPanelSummary.default, {
164+
}, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
166165
expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
167166
className: (0, _classnames.default)(classes.panelSummary)
168167
}, /*#__PURE__*/_react.default.createElement(_Typography.default, {

‎dist/components/panel/multiplicity.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
1010
var _classnames = _interopRequireDefault(require("classnames"));
1111
var _reactRedux = require("react-redux");
1212
var _redux = require("redux");
13-
var _ExpansionPanel = _interopRequireDefault(require("@material-ui/core/ExpansionPanel"));
14-
var _ExpansionPanelSummary = _interopRequireDefault(require("@material-ui/core/ExpansionPanelSummary"));
13+
var _core = require("@material-ui/core");
1514
var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
1615
var _Divider = _interopRequireDefault(require("@material-ui/core/Divider"));
1716
var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
@@ -248,14 +247,14 @@ const MultiplicityPanel = _ref => {
248247
resetMpyOneAct
249248
} = _ref;
250249
const digits = 4;
251-
return /*#__PURE__*/_react.default.createElement(_ExpansionPanel.default, {
250+
return /*#__PURE__*/_react.default.createElement(_core.Accordion, {
252251
expanded: expand,
253252
onChange: onExapnd,
254253
className: (0, _classnames.default)(classes.panel),
255254
TransitionProps: {
256255
unmountOnExit: true
257256
} // increase ExpansionPanel performance
258-
}, /*#__PURE__*/_react.default.createElement(_ExpansionPanelSummary.default, {
257+
}, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
259258
expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
260259
className: (0, _classnames.default)(classes.panelSummary)
261260
}, /*#__PURE__*/_react.default.createElement(_Typography.default, {

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@complat/react-spectra-editor",
3-
"version": "1.0.0-rc16",
3+
"version": "1.0.0-rc17",
44
"description": "An editor to View and Edit Chemical Spectra data (NMR, IR and MS, CV, UIVIS, XRD).",
55
"repository": {
66
"type": "git",
@@ -34,7 +34,6 @@
3434
"react-dropzone": "^8.0.3",
3535
"react-quill": "^2.0.0",
3636
"react-redux": "^7.2.0",
37-
"react-svg-file-zoom-pan": "^1.0.5",
3837
"react-svg-inline": "^2.1.1",
3938
"redux": "^4.1.1",
4039
"redux-saga": "^1.1.3",

‎src/components/cmd_bar/common.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ const commonStyle = {
8181
selectInput: {
8282
height: 30,
8383
},
84+
txtLabelBottomInput: {
85+
fontFamily: 'Helvetica',
86+
backgroundColor: 'white',
87+
fontSize: 12,
88+
margin: '22% 0 0 7px',
89+
padding: '0 10px 0 10px',
90+
transform: 'scale(0.75)',
91+
},
8492
};
8593

8694
const focusStyle = (criteria, cls) => (criteria ? [cls.btnHt] : []);

0 commit comments

Comments
 (0)