feat: update UI to material v5 (#157)

ComPlat · Nov 8, 2023 · bf95f7d · bf95f7d
1 parent cfba776
commit bf95f7d
Show file tree

Hide file tree

Showing 89 changed files with 1,227 additions and 1,083 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -3,7 +3,7 @@ name: Testing
 on: push
 
 jobs:
-  build:
+  testing:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/dist/components/cmd_bar/01_viewer.js b/dist/components/cmd_bar/01_viewer.js
@@ -10,10 +10,10 @@ var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _styles = require("@material-ui/core/styles");
-var _SpellcheckOutlined = _interopRequireDefault(require("@material-ui/icons/SpellcheckOutlined"));
-var _TimelineOutlined = _interopRequireDefault(require("@material-ui/icons/TimelineOutlined"));
-var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
+var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
+var _SpellcheckOutlined = _interopRequireDefault(require("@mui/icons-material/SpellcheckOutlined"));
+var _TimelineOutlined = _interopRequireDefault(require("@mui/icons-material/TimelineOutlined"));
+var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _ui = require("../../actions/ui");
 var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
 var _common = require("./common");
@@ -33,7 +33,8 @@ const Viewer = _ref => {
   const onViewSpectrum = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.SPECTRUM);
   const onViewAnalysis = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS);
   return /*#__PURE__*/_react.default.createElement("span", {
-    className: classes.group
+    className: classes.group,
+    "data-testid": "Viewer"
   }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
     title: /*#__PURE__*/_react.default.createElement("span", {
       className: "txt-sv-tp"
@@ -74,4 +75,4 @@ Viewer.propTypes = {
   disableCmdAnaViewerSt: _propTypes.default.bool.isRequired,
   setUiViewerTypeAct: _propTypes.default.func.isRequired
 };
-var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Viewer);
+var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Viewer);
diff --git a/dist/components/cmd_bar/02_zoom.js b/dist/components/cmd_bar/02_zoom.js
@@ -10,10 +10,10 @@ var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _styles = require("@material-ui/core/styles");
-var _ZoomInOutlined = _interopRequireDefault(require("@material-ui/icons/ZoomInOutlined"));
-var _FindReplaceOutlined = _interopRequireDefault(require("@material-ui/icons/FindReplaceOutlined"));
-var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
+var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
+var _ZoomInOutlined = _interopRequireDefault(require("@mui/icons-material/ZoomInOutlined"));
+var _FindReplaceOutlined = _interopRequireDefault(require("@mui/icons-material/FindReplaceOutlined"));
+var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _ui = require("../../actions/ui");
 var _common = require("./common");
 var _list_ui = require("../../constants/list_ui");
@@ -29,7 +29,8 @@ const Zoom = _ref => {
   const onSweepZoomIn = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMIN);
   const onSweepZoomReset = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMRESET);
   return /*#__PURE__*/_react.default.createElement("span", {
-    className: classes.group
+    className: classes.group,
+    "data-testid": "Zoom"
   }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
     title: /*#__PURE__*/_react.default.createElement("span", {
       className: "txt-sv-tp"
@@ -63,4 +64,4 @@ Zoom.propTypes = {
   isfocusZoomSt: _propTypes.default.bool.isRequired,
   setUiSweepTypeAct: _propTypes.default.func.isRequired
 };
-var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Zoom);
+var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Zoom);
diff --git a/dist/components/cmd_bar/03_peak.js b/dist/components/cmd_bar/03_peak.js
@@ -10,9 +10,9 @@ var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _styles = require("@material-ui/core/styles");
-var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
-var _AddLocationOutlined = _interopRequireDefault(require("@material-ui/icons/AddLocationOutlined"));
+var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
+var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
+var _AddLocationOutlined = _interopRequireDefault(require("@mui/icons-material/AddLocationOutlined"));
 var _ui = require("../../actions/ui");
 var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
 var _common = require("./common");
@@ -124,4 +124,4 @@ Peak.propTypes = {
   cyclicVotaSt: _propTypes.default.object.isRequired,
   curveSt: _propTypes.default.object.isRequired
 };
-var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Peak);
+var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Peak);
diff --git a/dist/components/cmd_bar/04_integration.js b/dist/components/cmd_bar/04_integration.js
@@ -10,9 +10,9 @@ var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _styles = require("@material-ui/core/styles");
-var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
-var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
+var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
+var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
+var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _react2 = _interopRequireDefault(require("@mdi/react"));
 var _js = require("@mdi/js");
 var _integration = require("../../actions/integration");
@@ -185,4 +185,4 @@ Integration.propTypes = {
   curveSt: _propTypes.default.object.isRequired,
   integrationSt: _propTypes.default.object.isRequired
 };
-var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Integration));
+var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Integration));
diff --git a/dist/components/cmd_bar/05_multiplicity.js b/dist/components/cmd_bar/05_multiplicity.js
@@ -10,8 +10,8 @@ var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _styles = require("@material-ui/core/styles");
-var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
+var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
+var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _ui = require("../../actions/ui");
 var _multiplicity = require("../../actions/multiplicity");
 var _list_ui = require("../../constants/list_ui");
@@ -130,4 +130,4 @@ Multiplicity.propTypes = {
   clearMpyAllAct: _propTypes.default.func.isRequired,
   curveSt: _propTypes.default.object.isRequired
 };
-var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Multiplicity));
+var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Multiplicity));
diff --git a/dist/components/cmd_bar/06_undo_redo.js b/dist/components/cmd_bar/06_undo_redo.js
@@ -11,10 +11,10 @@ var _redux = require("redux");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reduxUndo = require("redux-undo");
-var _styles = require("@material-ui/core/styles");
-var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
-var _RedoOutlined = _interopRequireDefault(require("@material-ui/icons/RedoOutlined"));
-var _UndoOutlined = _interopRequireDefault(require("@material-ui/icons/UndoOutlined"));
+var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
+var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
+var _RedoOutlined = _interopRequireDefault(require("@mui/icons-material/RedoOutlined"));
+var _UndoOutlined = _interopRequireDefault(require("@mui/icons-material/UndoOutlined"));
 var _common = require("./common");
 /* eslint-disable prefer-object-spread, function-paren-newline,
 react/function-component-definition, react/require-default-props, max-len,
@@ -72,4 +72,4 @@ UndoRedo.propTypes = {
   onUndoAct: _propTypes.default.func.isRequired,
   onRedoAct: _propTypes.default.func.isRequired
 };
-var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(UndoRedo);
+var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(UndoRedo);
diff --git a/dist/components/cmd_bar/07_pecker.js b/dist/components/cmd_bar/07_pecker.js
@@ -10,8 +10,8 @@ var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _styles = require("@material-ui/core/styles");
-var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip"));
+var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
+var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _ui = require("../../actions/ui");
 var _common = require("./common");
 var _list_ui = require("../../constants/list_ui");
@@ -72,4 +72,4 @@ Pecker.propTypes = {
   cyclicVotaSt: _propTypes.default.object.isRequired,
   jcampIdx: _propTypes.default.any
 };
-var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Pecker);
+var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Pecker);
diff --git a/dist/components/cmd_bar/common.js b/dist/components/cmd_bar/common.js
@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.focusStyle = exports.commonStyle = exports.MuButton = void 0;
-var _styles = require("@material-ui/core/styles");
-var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
+var _styles = require("@mui/styles");
+var _Button = _interopRequireDefault(require("@mui/material/Button"));
 const MuButton = exports.MuButton = (0, _styles.withStyles)({
   root: {
     border: '1px solid #ccc',
@@ -17,7 +17,8 @@ const MuButton = exports.MuButton = (0, _styles.withStyles)({
     lineHeight: '20px',
     minWidth: 30,
     padding: 0,
-    width: 30
+    width: 30,
+    color: 'black'
   }
 })(_Button.default);
 const commonStyle = exports.commonStyle = {

diff --git a/dist/components/cmd_bar/index.js b/dist/components/cmd_bar/index.js
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _reactRedux = require("react-redux");
 var _redux = require("redux");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _styles = require("@material-ui/core/styles");
+var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
 var _common = require("./common");
 var _viewer = _interopRequireDefault(require("./01_viewer"));
 var _zoom = _interopRequireDefault(require("./02_zoom"));
@@ -74,4 +74,4 @@ CmdBar.propTypes = {
   jcampIdx: _propTypes.default.any,
   hideThreshold: _propTypes.default.bool
 };
-var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(CmdBar);
+var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(CmdBar);