Skip to content

Commit cf56166

Browse files
baolanlequangLan Le
baolanlequang
authored and
Lan Le
committed
feat: update UI to material v5 (#157)
1 parent d2c92c2 commit cf56166

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1227
-1083
lines changed

‎.github/workflows/testing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Testing
33
on: push
44

55
jobs:
6-
build:
6+
testing:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v2

‎dist/components/cmd_bar/01_viewer.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _SpellcheckOutlined = _interopRequireDefault(require("@material-ui/icons/SpellcheckOutlined"));
15-
var _TimelineOutlined = _interopRequireDefault(require("@material-ui/icons/TimelineOutlined"));
16-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _SpellcheckOutlined = _interopRequireDefault(require("@mui/icons-material/SpellcheckOutlined"));
15+
var _TimelineOutlined = _interopRequireDefault(require("@mui/icons-material/TimelineOutlined"));
16+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
1717
var _ui = require("../../actions/ui");
1818
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
1919
var _common = require("./common");
@@ -33,7 +33,8 @@ const Viewer = _ref => {
3333
const onViewSpectrum = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.SPECTRUM);
3434
const onViewAnalysis = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS);
3535
return /*#__PURE__*/_react.default.createElement("span", {
36-
className: classes.group
36+
className: classes.group,
37+
"data-testid": "Viewer"
3738
}, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
3839
title: /*#__PURE__*/_react.default.createElement("span", {
3940
className: "txt-sv-tp"
@@ -74,4 +75,4 @@ Viewer.propTypes = {
7475
disableCmdAnaViewerSt: _propTypes.default.bool.isRequired,
7576
setUiViewerTypeAct: _propTypes.default.func.isRequired
7677
};
77-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Viewer);
78+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Viewer);

‎dist/components/cmd_bar/02_zoom.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _ZoomInOutlined = _interopRequireDefault(require("@material-ui/icons/ZoomInOutlined"));
15-
var _FindReplaceOutlined = _interopRequireDefault(require("@material-ui/icons/FindReplaceOutlined"));
16-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _ZoomInOutlined = _interopRequireDefault(require("@mui/icons-material/ZoomInOutlined"));
15+
var _FindReplaceOutlined = _interopRequireDefault(require("@mui/icons-material/FindReplaceOutlined"));
16+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
1717
var _ui = require("../../actions/ui");
1818
var _common = require("./common");
1919
var _list_ui = require("../../constants/list_ui");
@@ -29,7 +29,8 @@ const Zoom = _ref => {
2929
const onSweepZoomIn = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMIN);
3030
const onSweepZoomReset = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMRESET);
3131
return /*#__PURE__*/_react.default.createElement("span", {
32-
className: classes.group
32+
className: classes.group,
33+
"data-testid": "Zoom"
3334
}, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
3435
title: /*#__PURE__*/_react.default.createElement("span", {
3536
className: "txt-sv-tp"
@@ -63,4 +64,4 @@ Zoom.propTypes = {
6364
isfocusZoomSt: _propTypes.default.bool.isRequired,
6465
setUiSweepTypeAct: _propTypes.default.func.isRequired
6566
};
66-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Zoom);
67+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Zoom);

‎dist/components/cmd_bar/03_peak.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
15-
var _AddLocationOutlined = _interopRequireDefault(require("@material-ui/icons/AddLocationOutlined"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
15+
var _AddLocationOutlined = _interopRequireDefault(require("@mui/icons-material/AddLocationOutlined"));
1616
var _ui = require("../../actions/ui");
1717
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
1818
var _common = require("./common");
@@ -124,4 +124,4 @@ Peak.propTypes = {
124124
cyclicVotaSt: _propTypes.default.object.isRequired,
125125
curveSt: _propTypes.default.object.isRequired
126126
};
127-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Peak);
127+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Peak);

‎dist/components/cmd_bar/04_integration.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
15-
var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
15+
var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
1616
var _react2 = _interopRequireDefault(require("@mdi/react"));
1717
var _js = require("@mdi/js");
1818
var _integration = require("../../actions/integration");
@@ -185,4 +185,4 @@ Integration.propTypes = {
185185
curveSt: _propTypes.default.object.isRequired,
186186
integrationSt: _propTypes.default.object.isRequired
187187
};
188-
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Integration));
188+
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Integration));

‎dist/components/cmd_bar/05_multiplicity.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
1515
var _ui = require("../../actions/ui");
1616
var _multiplicity = require("../../actions/multiplicity");
1717
var _list_ui = require("../../constants/list_ui");
@@ -130,4 +130,4 @@ Multiplicity.propTypes = {
130130
clearMpyAllAct: _propTypes.default.func.isRequired,
131131
curveSt: _propTypes.default.object.isRequired
132132
};
133-
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Multiplicity));
133+
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Multiplicity));

‎dist/components/cmd_bar/06_undo_redo.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ var _redux = require("redux");
1111
var _propTypes = _interopRequireDefault(require("prop-types"));
1212
var _classnames = _interopRequireDefault(require("classnames"));
1313
var _reduxUndo = require("redux-undo");
14-
var _styles = require("@material-ui/core/styles");
15-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
16-
var _RedoOutlined = _interopRequireDefault(require("@material-ui/icons/RedoOutlined"));
17-
var _UndoOutlined = _interopRequireDefault(require("@material-ui/icons/UndoOutlined"));
14+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
15+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
16+
var _RedoOutlined = _interopRequireDefault(require("@mui/icons-material/RedoOutlined"));
17+
var _UndoOutlined = _interopRequireDefault(require("@mui/icons-material/UndoOutlined"));
1818
var _common = require("./common");
1919
/* eslint-disable prefer-object-spread, function-paren-newline,
2020
react/function-component-definition, react/require-default-props, max-len,
@@ -72,4 +72,4 @@ UndoRedo.propTypes = {
7272
onUndoAct: _propTypes.default.func.isRequired,
7373
onRedoAct: _propTypes.default.func.isRequired
7474
};
75-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(UndoRedo);
75+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(UndoRedo);

‎dist/components/cmd_bar/07_pecker.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _classnames = _interopRequireDefault(require("classnames"));
1212
var _propTypes = _interopRequireDefault(require("prop-types"));
13-
var _styles = require("@material-ui/core/styles");
14-
var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
13+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
14+
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
1515
var _ui = require("../../actions/ui");
1616
var _common = require("./common");
1717
var _list_ui = require("../../constants/list_ui");
@@ -72,4 +72,4 @@ Pecker.propTypes = {
7272
cyclicVotaSt: _propTypes.default.object.isRequired,
7373
jcampIdx: _propTypes.default.any
7474
};
75-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Pecker);
75+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Pecker);

‎dist/components/cmd_bar/common.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
55
value: true
66
});
77
exports.focusStyle = exports.commonStyle = exports.MuButton = void 0;
8-
var _styles = require("@material-ui/core/styles");
9-
var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
8+
var _styles = require("@mui/styles");
9+
var _Button = _interopRequireDefault(require("@mui/material/Button"));
1010
const MuButton = exports.MuButton = (0, _styles.withStyles)({
1111
root: {
1212
border: '1px solid #ccc',
@@ -17,7 +17,8 @@ const MuButton = exports.MuButton = (0, _styles.withStyles)({
1717
lineHeight: '20px',
1818
minWidth: 30,
1919
padding: 0,
20-
width: 30
20+
width: 30,
21+
color: 'black'
2122
}
2223
})(_Button.default);
2324
const commonStyle = exports.commonStyle = {

‎dist/components/cmd_bar/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
99
var _reactRedux = require("react-redux");
1010
var _redux = require("redux");
1111
var _propTypes = _interopRequireDefault(require("prop-types"));
12-
var _styles = require("@material-ui/core/styles");
12+
var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
1313
var _common = require("./common");
1414
var _viewer = _interopRequireDefault(require("./01_viewer"));
1515
var _zoom = _interopRequireDefault(require("./02_zoom"));
@@ -74,4 +74,4 @@ CmdBar.propTypes = {
7474
jcampIdx: _propTypes.default.any,
7575
hideThreshold: _propTypes.default.bool
7676
};
77-
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(CmdBar);
77+
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(CmdBar);

0 commit comments

Comments
 (0)