Skip to content

Commit d06fae4

Browse files
Nicolass67Nicolass67
committed
Enhance UI components for standalone layout and content panels
1 parent 1540543 commit d06fae4

61 files changed

Lines changed: 2810 additions & 1549 deletions

Some content is hidden

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,13 @@ const Viewer = ({
4747
className: classes.icon
4848
})
4949
})
50-
}), hideCmdAnaViewerSt ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
50+
}), hideCmdAnaViewerSt || disableCmdAnaViewerSt ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
5151
title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
5252
className: "txt-sv-tp",
5353
children: "Analysis Viewer"
5454
}),
5555
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
5656
className: (0, _classnames.default)((0, _common.focusStyle)(isfocusAnalysisSt, classes), 'btn-sv-bar-analysis'),
57-
disabled: disableCmdAnaViewerSt,
5857
onClick: onViewAnalysis,
5958
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SpellcheckOutlined.default, {
6059
className: classes.icon

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ const Peak = ({
5858
dataPeaks
5959
});
6060
};
61+
const showAddPeak = !disableAddPeakSt;
62+
const showRmPeak = !disableRmPeakSt;
63+
const showSetRef = !disableSetRefSt;
64+
const showClearAll = !disableRmPeakSt;
65+
if (!showAddPeak && !showRmPeak && !showSetRef && !showClearAll) {
66+
return null;
67+
}
6168
if (isHandleMaxAndMinPeaksSt) {
6269
const {
6370
spectraList
@@ -80,60 +87,57 @@ const Peak = ({
8087
return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
8188
className: classes.group,
8289
"data-testid": "Peak",
83-
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
90+
children: [showAddPeak ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
8491
title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
8592
className: "txt-sv-tp",
8693
children: "Add Peak"
8794
}),
8895
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
8996
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
9097
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddPeakSt, classes), 'btn-sv-bar-addpeak'),
91-
disabled: disableAddPeakSt,
9298
onClick: onSweepPeakAdd,
9399
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
94100
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addpeak'),
95101
children: "P+"
96102
})
97103
})
98104
})
99-
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
105+
}) : null, showRmPeak ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
100106
title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
101107
className: "txt-sv-tp",
102108
children: "Remove Peak"
103109
}),
104110
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
105111
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
106112
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmPeakSt, classes), 'btn-sv-bar-rmpeak'),
107-
disabled: disableRmPeakSt,
108113
onClick: onSweepPeakDELETE,
109114
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
110115
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeak'),
111116
children: "P-"
112117
})
113118
})
114119
})
115-
}), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_tri_btn.default, {
120+
}) : null, showClearAll ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_tri_btn.default, {
116121
content: {
117122
tp: 'Clear All Peaks'
118123
},
119124
cb: onClearAll,
120-
isClearAllDisabled: disableRmPeakSt,
125+
isClearAllDisabled: false,
121126
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
122127
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmallpeaks'),
123128
children: "P"
124129
}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
125130
className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmallpeaks'),
126131
children: "x"
127132
})]
128-
}), !disableSetRefSt ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
133+
}) : null, showSetRef ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
129134
title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
130135
className: "txt-sv-tp",
131136
children: "Set Reference"
132137
}),
133138
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
134139
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
135140
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-sv-bar-setref'),
136-
disabled: disableSetRefSt,
137141
onClick: onSweepAnchorShift,
138142
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_AddLocationOutlined.default, {
139143
className: classes.icon

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const styles = () => Object.assign({
3434
txtIcon: {}
3535
}, _common.commonStyle);
3636
const iconSize = '16px';
37-
const setFactor = (classes, isDisable, integrationSt, setIntegrationFkrAct, curveIdx) => {
37+
const setFactor = (classes, integrationSt, setIntegrationFkrAct, curveIdx) => {
3838
const onFactorChanged = e => {
3939
e.target.blur();
4040
setIntegrationFkrAct({
@@ -60,7 +60,6 @@ const setFactor = (classes, isDisable, integrationSt, setIntegrationFkrAct, curv
6060
}
6161
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
6262
className: classes.field,
63-
disabled: isDisable,
6463
id: "intg-factor-name",
6564
type: "number",
6665
value: refFactor,
@@ -101,6 +100,9 @@ const Integration = ({
101100
const onClearAll = () => clearIntegrationAllAct({
102101
curveIdx
103102
});
103+
if (isDisableSt) {
104+
return null;
105+
}
104106
return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
105107
className: classes.group,
106108
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
@@ -111,12 +113,11 @@ const Integration = ({
111113
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
112114
children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_common.MuButton, {
113115
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddIntgSt, classes), 'btn-add-inter'),
114-
disabled: isDisableSt,
115116
onClick: onSweepIntegtAdd,
116117
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.default, {
117118
path: _js.mdiMathIntegral,
118119
size: iconSize,
119-
color: iconColor(isFocusAddIntgSt || isDisableSt),
120+
color: iconColor(isFocusAddIntgSt),
120121
className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-addint')
121122
}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
122123
className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-addint'),
@@ -132,12 +133,11 @@ const Integration = ({
132133
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
133134
children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_common.MuButton, {
134135
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmIntgSt, classes), 'btn-remove-inter'),
135-
disabled: isDisableSt,
136136
onClick: onSweepIntegtRm,
137137
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.default, {
138138
path: _js.mdiMathIntegral,
139139
size: iconSize,
140-
color: iconColor(isFocusRmIntgSt || isDisableSt),
140+
color: iconColor(isFocusRmIntgSt),
141141
className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-rmint')
142142
}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
143143
className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmint'),
@@ -153,25 +153,24 @@ const Integration = ({
153153
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
154154
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
155155
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-set-inter-ref'),
156-
disabled: isDisableSt,
157156
onClick: onSweepIntegtSR,
158157
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.default, {
159158
path: _js.mdiReflectVertical,
160159
size: iconSize,
161-
color: iconColor(isFocusSetRefSt || isDisableSt),
160+
color: iconColor(isFocusSetRefSt),
162161
className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-refint')
163162
})
164163
})
165164
})
166-
}), !ignoreRef ? setFactor(classes, isDisableSt, integrationSt, setIntegrationFkrAct, curveIdx) : null, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_tri_btn.default, {
165+
}), !ignoreRef ? setFactor(classes, integrationSt, setIntegrationFkrAct, curveIdx) : null, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_tri_btn.default, {
167166
content: {
168167
tp: 'Clear All Integration'
169168
},
170169
cb: onClearAll,
171170
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.default, {
172171
path: _js.mdiMathIntegral,
173172
size: iconSize,
174-
color: iconColor(isDisableSt),
173+
color: iconColor(false),
175174
className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-rmallint')
176175
}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
177176
className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmallint'),

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ const Multiplicity = ({
4747
const onClearAll = () => clearMpyAllAct({
4848
curveIdx
4949
});
50+
if (disableAddMpySt) {
51+
return null;
52+
}
5053
return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
5154
className: classes.group,
5255
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
@@ -57,7 +60,6 @@ const Multiplicity = ({
5760
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
5861
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
5962
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddMpySt, classes), 'btn-sv-bar-addmpy'),
60-
disabled: disableAddMpySt,
6163
onClick: onSweepMutAdd,
6264
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
6365
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addmpy'),
@@ -73,7 +75,6 @@ const Multiplicity = ({
7375
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
7476
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
7577
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmMpySt, classes), 'btn-sv-bar-rmmpy'),
76-
disabled: disableRmMpySt,
7778
onClick: onOneMutAdd,
7879
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
7980
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmmpy'),
@@ -89,7 +90,6 @@ const Multiplicity = ({
8990
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
9091
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
9192
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddPeakSt, classes), 'btn-sv-bar-addpeakmpy'),
92-
disabled: disableMpyPeakSt,
9393
onClick: onPeakMutAdd,
9494
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
9595
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addpeakmpy'),
@@ -105,22 +105,19 @@ const Multiplicity = ({
105105
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
106106
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
107107
className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmPeakSt, classes), 'btn-sv-bar-rmpeakmpy'),
108-
disabled: disableMpyPeakSt,
109108
onClick: onPeakMutRm,
110109
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
111110
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeakmpy'),
112111
children: "JP-"
113112
})
114113
})
115114
})
116-
}), disableAddMpySt ? null :
117-
/*#__PURE__*/
118-
// eslint-disable-line
119-
(0, _jsxRuntime.jsx)(_tri_btn.default, {
115+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tri_btn.default, {
120116
content: {
121117
tp: 'Clear All Multiplicity'
122118
},
123119
cb: onClearAll,
120+
isClearAllDisabled: false,
124121
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
125122
className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmallmpy'),
126123
children: "Jx"

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ const Pecker = ({
110110
} = spectra;
111111
hasRefPeaks = hasRefPeak;
112112
}
113-
return !_cfg.default.hidePanelCyclicVolta(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
113+
if (_cfg.default.hidePanelCyclicVolta(layoutSt)) {
114+
return null;
115+
}
116+
return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
117+
className: classes.group,
114118
"data-testid": "Pecker",
115119
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
116120
title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
@@ -161,7 +165,7 @@ const Pecker = ({
161165
})
162166
})
163167
})]
164-
}) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {});
168+
});
165169
};
166170
const mapStateToProps = (state, _) => (
167171
// eslint-disable-line

0 commit comments

Comments
 (0)