orc-shared 5.99.0-dev.2 → 5.99.0-dev.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/MaterialUI/DataDisplay/PredefinedElements/StepperModal.js +3 -3
- package/dist/components/MaterialUI/DataDisplay/PredefinedElements/TableInfoBar.js +1 -1
- package/dist/components/MaterialUI/Inputs/InputBase.js +209 -24
- package/dist/components/MaterialUI/muiThemes.js +1 -1
- package/package.json +1 -1
- package/src/components/MaterialUI/DataDisplay/PredefinedElements/StepperModal.js +2 -2
- package/src/components/MaterialUI/DataDisplay/PredefinedElements/StepperModal.test.js +74 -0
- package/src/components/MaterialUI/DataDisplay/PredefinedElements/TableInfoBar.js +1 -1
- package/src/components/MaterialUI/Inputs/InputBase.js +209 -8
- package/src/components/MaterialUI/Inputs/InputBase.test.js +481 -3
- package/src/components/MaterialUI/muiThemes.js +1 -1
|
@@ -111,7 +111,7 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
|
|
|
111
111
|
};
|
|
112
112
|
});
|
|
113
113
|
var StepperModal = function StepperModal(_ref) {
|
|
114
|
-
var _steps$currentStep, _steps$currentStep$fu, _steps$currentStep2, _steps$currentStep3, _steps$currentStep4;
|
|
114
|
+
var _steps$currentStep, _steps$currentStep$fu, _steps$currentStep2, _steps$currentStep3, _steps$currentStep4, _steps$currentStep5, _steps$currentStep6;
|
|
115
115
|
var _ref$steps = _ref.steps,
|
|
116
116
|
steps = _ref$steps === void 0 ? [] : _ref$steps,
|
|
117
117
|
_ref$title = _ref.title,
|
|
@@ -180,7 +180,7 @@ var StepperModal = function StepperModal(_ref) {
|
|
|
180
180
|
}, /*#__PURE__*/_react.default.createElement(_Button.default, {
|
|
181
181
|
variant: "outlined",
|
|
182
182
|
onClick: closeCallback
|
|
183
|
-
}, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _sharedMessages.default.cancel)), currentStep < steps.length - 1 && (((_steps$
|
|
183
|
+
}, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _sharedMessages.default.cancel)), (currentStep < steps.length - 1 || ((_steps$currentStep4 = steps[currentStep]) == null ? void 0 : _steps$currentStep4.isIntermediate)) && (((_steps$currentStep5 = steps[currentStep]) == null || (_steps$currentStep5 = _steps$currentStep5.actions) == null ? void 0 : _steps$currentStep5.length) > 0 ? steps[currentStep].actions.map(function (action) {
|
|
184
184
|
return /*#__PURE__*/_react.default.createElement(_Button.default, {
|
|
185
185
|
key: action.value,
|
|
186
186
|
variant: "contained",
|
|
@@ -199,7 +199,7 @@ var StepperModal = function StepperModal(_ref) {
|
|
|
199
199
|
return nextClick();
|
|
200
200
|
},
|
|
201
201
|
disableElevation: true
|
|
202
|
-
}, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _sharedMessages.default.next))), currentStep === steps.length - 1 && /*#__PURE__*/_react.default.createElement(_Button.default, {
|
|
202
|
+
}, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, _sharedMessages.default.next))), currentStep === steps.length - 1 && !((_steps$currentStep6 = steps[currentStep]) != null && _steps$currentStep6.isIntermediate) && /*#__PURE__*/_react.default.createElement(_Button.default, {
|
|
203
203
|
variant: "contained",
|
|
204
204
|
color: "primary",
|
|
205
205
|
disabled: nextDisabled,
|
|
@@ -36,7 +36,7 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
|
|
|
36
36
|
label: {
|
|
37
37
|
fontSize: theme.typography.h2Size,
|
|
38
38
|
fontFamily: theme.typography.fontFamily,
|
|
39
|
-
fontWeight: theme.typography.
|
|
39
|
+
fontWeight: theme.typography.fontWeightRegular
|
|
40
40
|
}
|
|
41
41
|
};
|
|
42
42
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
exports.useStyles = exports.default = exports.AdvancedNumericInput = void 0;
|
|
4
|
+
exports.useStyles = exports.default = exports.AdvancedNumericInput = exports.AdvancedIntegerInput = void 0;
|
|
5
5
|
var _react = _interopRequireWildcard(require("react"));
|
|
6
6
|
var _styles = require("@material-ui/core/styles");
|
|
7
7
|
var _InputBase = _interopRequireDefault(require("@material-ui/core/InputBase"));
|
|
@@ -9,7 +9,10 @@ var _InputBaseProps = _interopRequireWildcard(require("./InputBaseProps"));
|
|
|
9
9
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
10
10
|
var _reactNumberFormat = require("react-number-format");
|
|
11
11
|
var _inputHelper = require("../../../utils/inputHelper");
|
|
12
|
-
var
|
|
12
|
+
var _Icon = _interopRequireDefault(require("../DataDisplay/Icon"));
|
|
13
|
+
var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
|
|
14
|
+
var _excluded = ["inputRef", "onChange"],
|
|
15
|
+
_excluded2 = ["integerButtons"];
|
|
13
16
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
14
17
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
15
18
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -21,17 +24,17 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
|
|
|
21
24
|
var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
|
|
22
25
|
enterModule && enterModule(module);
|
|
23
26
|
})();
|
|
27
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
28
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
29
|
+
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
30
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
31
|
+
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
24
32
|
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
25
33
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
26
34
|
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
27
35
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
28
36
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
29
37
|
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
30
|
-
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
31
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
32
|
-
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
33
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
34
|
-
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
35
38
|
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
36
39
|
function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
|
|
37
40
|
function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
|
|
@@ -76,13 +79,21 @@ var useStyles = exports.useStyles = (0, _styles.makeStyles)(function (theme) {
|
|
|
76
79
|
minWidth: 0,
|
|
77
80
|
border: "".concat(theme.spacing(0.1), " solid ").concat(theme.palette.grey.borders),
|
|
78
81
|
borderRadius: function borderRadius(props) {
|
|
79
|
-
|
|
82
|
+
var topLeft = props.label ? 0 : 0.5;
|
|
83
|
+
var topRight = props.isAdvancedNumericInput ? 0 : 0.5;
|
|
84
|
+
var bottomRight = topRight;
|
|
85
|
+
var bottomLeft = topLeft;
|
|
86
|
+
return theme.spacing(topLeft, topRight, bottomRight, bottomLeft);
|
|
80
87
|
},
|
|
81
88
|
paddingLeft: theme.spacing(0.85),
|
|
82
89
|
"&:focus, &:active": {
|
|
83
90
|
border: "".concat(theme.spacing(0.1), " solid ").concat(theme.palette.focus),
|
|
84
91
|
borderRadius: function borderRadius(props) {
|
|
85
|
-
|
|
92
|
+
var topLeft = props.label ? 0 : 0.5;
|
|
93
|
+
var topRight = props.isAdvancedNumericInput ? 0 : 0.5;
|
|
94
|
+
var bottomRight = topRight;
|
|
95
|
+
var bottomLeft = topLeft;
|
|
96
|
+
return theme.spacing(topLeft, topRight, bottomRight, bottomLeft);
|
|
86
97
|
}
|
|
87
98
|
}
|
|
88
99
|
},
|
|
@@ -119,6 +130,41 @@ var useStyles = exports.useStyles = (0, _styles.makeStyles)(function (theme) {
|
|
|
119
130
|
},
|
|
120
131
|
inputMultiline: {
|
|
121
132
|
padding: theme.spacing(0.6, 0.6, 0.6, 0.85)
|
|
133
|
+
},
|
|
134
|
+
numericSpinnerContainer: {
|
|
135
|
+
display: "flex",
|
|
136
|
+
backgroundColor: theme.palette.grey.light,
|
|
137
|
+
flexDirection: "column",
|
|
138
|
+
borderTopLeftRadius: 0,
|
|
139
|
+
borderBottomLeftRadius: 0,
|
|
140
|
+
borderTopRightRadius: theme.shape.borderRadius,
|
|
141
|
+
borderBottomRightRadius: theme.shape.borderRadius,
|
|
142
|
+
border: "".concat(theme.spacing(0.1), " solid ").concat(theme.palette.grey.borders),
|
|
143
|
+
padding: 0,
|
|
144
|
+
margin: "0 0 0 -1px"
|
|
145
|
+
},
|
|
146
|
+
numericSpinnerUp: {
|
|
147
|
+
fontSize: "8px",
|
|
148
|
+
padding: "0 3px",
|
|
149
|
+
borderBottom: "1px solid #CCCCCC",
|
|
150
|
+
borderRadius: 0,
|
|
151
|
+
flex: 1,
|
|
152
|
+
margin: 0,
|
|
153
|
+
width: "20px",
|
|
154
|
+
"& + .MuiButton-root, & + .MuiIconButton-root, & + .MuiInputBase-root": {
|
|
155
|
+
marginLeft: 0
|
|
156
|
+
}
|
|
157
|
+
},
|
|
158
|
+
numericSpinnerDown: {
|
|
159
|
+
fontSize: "8px",
|
|
160
|
+
padding: "0 3px",
|
|
161
|
+
borderRadius: 0,
|
|
162
|
+
flex: 1,
|
|
163
|
+
margin: 0,
|
|
164
|
+
marginLeft: 0,
|
|
165
|
+
"& + .MuiButton-root, & + .MuiIconButton-root, & + .MuiInputBase-root": {
|
|
166
|
+
marginLeft: 0
|
|
167
|
+
}
|
|
122
168
|
}
|
|
123
169
|
};
|
|
124
170
|
});
|
|
@@ -141,8 +187,27 @@ var AdvancedNumericInput = exports.AdvancedNumericInput = function AdvancedNumer
|
|
|
141
187
|
}
|
|
142
188
|
}));
|
|
143
189
|
};
|
|
190
|
+
var AdvancedIntegerInput = exports.AdvancedIntegerInput = function AdvancedIntegerInput(props) {
|
|
191
|
+
var integerButtons = props.integerButtons,
|
|
192
|
+
other = _objectWithoutProperties(props, _excluded2);
|
|
193
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
194
|
+
style: {
|
|
195
|
+
display: "flex"
|
|
196
|
+
},
|
|
197
|
+
className: "InputBase-input-wrapper"
|
|
198
|
+
}, /*#__PURE__*/_react.default.createElement(AdvancedNumericInput, other), integerButtons);
|
|
199
|
+
};
|
|
200
|
+
var getInputComponent = function getInputComponent(isAdvancedNumericInput, decimalScale) {
|
|
201
|
+
if (isAdvancedNumericInput) {
|
|
202
|
+
if (decimalScale === 0) {
|
|
203
|
+
return AdvancedIntegerInput;
|
|
204
|
+
}
|
|
205
|
+
return AdvancedNumericInput;
|
|
206
|
+
}
|
|
207
|
+
return undefined;
|
|
208
|
+
};
|
|
144
209
|
var InputBase = function InputBase(_ref) {
|
|
145
|
-
var _inputProps$get;
|
|
210
|
+
var _inputProps$get, _numericInputProps$de;
|
|
146
211
|
var inputProps = _ref.inputProps;
|
|
147
212
|
if ((0, _InputBaseProps.isInputProps)(inputProps) === false) {
|
|
148
213
|
throw new TypeError("inputProps property is not of type InputBaseProps");
|
|
@@ -166,8 +231,21 @@ var InputBase = function InputBase(_ref) {
|
|
|
166
231
|
var rowsProps = inputProps == null ? void 0 : inputProps.get(_InputBaseProps.default.propNames.rows);
|
|
167
232
|
var numericInputProps = (inputProps == null ? void 0 : inputProps.get(_InputBaseProps.default.propNames.numericInputProps)) || null;
|
|
168
233
|
var isAdvancedNumericInput = type.toLowerCase() === "advancednumericinput";
|
|
169
|
-
var
|
|
234
|
+
var decimalScale = (_numericInputProps$de = numericInputProps == null ? void 0 : numericInputProps.decimalScale) != null ? _numericInputProps$de : 0;
|
|
235
|
+
var inputComponent = getInputComponent(isAdvancedNumericInput, decimalScale);
|
|
170
236
|
var inputControlType = isAdvancedNumericInput ? "text" : type;
|
|
237
|
+
var _React$useState = _react.default.useState(null),
|
|
238
|
+
_React$useState2 = _slicedToArray(_React$useState, 2),
|
|
239
|
+
inputText = _React$useState2[0],
|
|
240
|
+
setInputText = _React$useState2[1];
|
|
241
|
+
var textToDisplay = inputText != null ? inputText : value;
|
|
242
|
+
var classes = useStyles({
|
|
243
|
+
label: label,
|
|
244
|
+
errorPosition: errorPosition,
|
|
245
|
+
isAdvancedNumericInput: isAdvancedNumericInput
|
|
246
|
+
});
|
|
247
|
+
var onKeyDown = null;
|
|
248
|
+
var onWheel = null;
|
|
171
249
|
if (isAdvancedNumericInput && numericInputProps) {
|
|
172
250
|
Object.keys(numericInputProps).forEach(function (key) {
|
|
173
251
|
if (key !== "blurFormattingSkipFixedDecimalScale") {
|
|
@@ -176,20 +254,118 @@ var InputBase = function InputBase(_ref) {
|
|
|
176
254
|
});
|
|
177
255
|
}
|
|
178
256
|
if (isAdvancedNumericInput) {
|
|
179
|
-
var _numericInputProps$de;
|
|
180
257
|
if (inputAttributes.max === undefined) {
|
|
181
258
|
inputAttributes.max = 2147483647;
|
|
182
259
|
}
|
|
183
260
|
if (inputAttributes.min === undefined) {
|
|
184
261
|
inputAttributes.min = -2147483648;
|
|
185
262
|
}
|
|
186
|
-
var decimalScale = (_numericInputProps$de = numericInputProps == null ? void 0 : numericInputProps.decimalScale) != null ? _numericInputProps$de : 0;
|
|
187
263
|
var lengthForMin = Math.trunc(inputAttributes.min).toString().length;
|
|
188
264
|
var lengthForMax = Math.trunc(inputAttributes.max).toString().length;
|
|
189
265
|
inputAttributes.maxLength = Math.max(lengthForMin, lengthForMax) + (decimalScale > 0 ? decimalScale + 1 : 0);
|
|
190
266
|
inputAttributes.isAllowed = function (val) {
|
|
191
267
|
return val.value === "" || val.value === "-" || val.value !== null;
|
|
192
268
|
};
|
|
269
|
+
if (decimalScale === 0 && !disabled) {
|
|
270
|
+
var getInitialNumericValue = function getInitialNumericValue() {
|
|
271
|
+
if (0 >= inputAttributes.min && 0 <= inputAttributes.max) {
|
|
272
|
+
return 0;
|
|
273
|
+
}
|
|
274
|
+
if (Math.abs(inputAttributes.min) < Math.abs(inputAttributes.max)) {
|
|
275
|
+
return inputAttributes.min;
|
|
276
|
+
}
|
|
277
|
+
return inputAttributes.max;
|
|
278
|
+
};
|
|
279
|
+
var increaseNumericValue = function increaseNumericValue() {
|
|
280
|
+
if (textToDisplay) {
|
|
281
|
+
var currentValue = parseInt(textToDisplay, 10);
|
|
282
|
+
if (currentValue + 1 <= inputAttributes.max) {
|
|
283
|
+
setInputText((currentValue + 1).toString());
|
|
284
|
+
}
|
|
285
|
+
} else {
|
|
286
|
+
var _currentValue = getInitialNumericValue();
|
|
287
|
+
if (_currentValue === 0 && _currentValue + 1 <= inputAttributes.max) {
|
|
288
|
+
_currentValue++;
|
|
289
|
+
}
|
|
290
|
+
setInputText(_currentValue.toString());
|
|
291
|
+
}
|
|
292
|
+
};
|
|
293
|
+
var decreaseNumericValue = function decreaseNumericValue() {
|
|
294
|
+
if (textToDisplay) {
|
|
295
|
+
var currentValue = parseInt(textToDisplay, 10);
|
|
296
|
+
if (currentValue - 1 >= inputAttributes.min) {
|
|
297
|
+
setInputText((currentValue - 1).toString());
|
|
298
|
+
}
|
|
299
|
+
} else {
|
|
300
|
+
var _currentValue2 = getInitialNumericValue();
|
|
301
|
+
if (_currentValue2 === 0 && _currentValue2 - 1 >= inputAttributes.min) {
|
|
302
|
+
_currentValue2--;
|
|
303
|
+
}
|
|
304
|
+
setInputText(_currentValue2.toString());
|
|
305
|
+
}
|
|
306
|
+
};
|
|
307
|
+
var focusInput = function focusInput(target) {
|
|
308
|
+
target.closest(".InputBase-input-wrapper").getElementsByTagName("input")[0].focus();
|
|
309
|
+
};
|
|
310
|
+
inputAttributes.integerButtons = /*#__PURE__*/_react.default.createElement("div", {
|
|
311
|
+
className: classes.numericSpinnerContainer
|
|
312
|
+
}, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
|
|
313
|
+
className: classes.numericSpinnerUp,
|
|
314
|
+
tabIndex: "-1",
|
|
315
|
+
"data-qa": "increase",
|
|
316
|
+
disabled: disabled,
|
|
317
|
+
onMouseDown: function onMouseDown(event) {
|
|
318
|
+
return event.preventDefault();
|
|
319
|
+
} // prevent the button from stealing focus
|
|
320
|
+
,
|
|
321
|
+
onClick: function onClick(event) {
|
|
322
|
+
event.preventDefault();
|
|
323
|
+
event.stopPropagation();
|
|
324
|
+
increaseNumericValue();
|
|
325
|
+
focusInput(event.target);
|
|
326
|
+
}
|
|
327
|
+
}, /*#__PURE__*/_react.default.createElement(_Icon.default, {
|
|
328
|
+
id: "chevron-up"
|
|
329
|
+
})), /*#__PURE__*/_react.default.createElement(_IconButton.default, {
|
|
330
|
+
className: classes.numericSpinnerDown,
|
|
331
|
+
tabIndex: "-1",
|
|
332
|
+
"data-qa": "decrease",
|
|
333
|
+
disabled: disabled,
|
|
334
|
+
onMouseDown: function onMouseDown(event) {
|
|
335
|
+
return event.preventDefault();
|
|
336
|
+
} // prevent the button from stealing focus
|
|
337
|
+
,
|
|
338
|
+
onClick: function onClick(event) {
|
|
339
|
+
event.preventDefault();
|
|
340
|
+
event.stopPropagation();
|
|
341
|
+
decreaseNumericValue();
|
|
342
|
+
focusInput(event.target);
|
|
343
|
+
}
|
|
344
|
+
}, /*#__PURE__*/_react.default.createElement(_Icon.default, {
|
|
345
|
+
id: "chevron-down"
|
|
346
|
+
})));
|
|
347
|
+
onKeyDown = function onKeyDown(event) {
|
|
348
|
+
if (event.key === "ArrowUp") {
|
|
349
|
+
event.preventDefault();
|
|
350
|
+
event.stopPropagation();
|
|
351
|
+
increaseNumericValue();
|
|
352
|
+
}
|
|
353
|
+
// Note Alex20260119: using an 'else if' caused issue with code coverage
|
|
354
|
+
if (event.key === "ArrowDown") {
|
|
355
|
+
event.preventDefault();
|
|
356
|
+
event.stopPropagation();
|
|
357
|
+
decreaseNumericValue();
|
|
358
|
+
}
|
|
359
|
+
};
|
|
360
|
+
onWheel = function onWheel(event) {
|
|
361
|
+
if (event.deltaY < 0) {
|
|
362
|
+
increaseNumericValue();
|
|
363
|
+
} else {
|
|
364
|
+
decreaseNumericValue();
|
|
365
|
+
}
|
|
366
|
+
focusInput(event.target);
|
|
367
|
+
};
|
|
368
|
+
}
|
|
193
369
|
}
|
|
194
370
|
var defaultRows = 4;
|
|
195
371
|
var rows = rowsProps;
|
|
@@ -200,10 +376,6 @@ var InputBase = function InputBase(_ref) {
|
|
|
200
376
|
// causing onBlur to never fire
|
|
201
377
|
item.target.focus();
|
|
202
378
|
};
|
|
203
|
-
var classes = useStyles({
|
|
204
|
-
label: label,
|
|
205
|
-
errorPosition: errorPosition
|
|
206
|
-
});
|
|
207
379
|
var onChangeHandler = function onChangeHandler(event) {
|
|
208
380
|
if (event.persist) {
|
|
209
381
|
event.persist();
|
|
@@ -245,11 +417,6 @@ var InputBase = function InputBase(_ref) {
|
|
|
245
417
|
};
|
|
246
418
|
var inputBaseInputStyle = inputProps == null ? void 0 : inputProps.getStyle(_InputBaseProps.default.ruleNames.input);
|
|
247
419
|
var errorTextStyle = inputProps == null ? void 0 : inputProps.getStyle(_InputBaseProps.default.ruleNames.errorText);
|
|
248
|
-
var _React$useState = _react.default.useState(null),
|
|
249
|
-
_React$useState2 = _slicedToArray(_React$useState, 2),
|
|
250
|
-
inputText = _React$useState2[0],
|
|
251
|
-
setInputText = _React$useState2[1];
|
|
252
|
-
var textToDisplay = inputText != null ? inputText : value;
|
|
253
420
|
_react.default.useEffect(function () {
|
|
254
421
|
if (inputText === null || window.bypassDebounce === true) {
|
|
255
422
|
return;
|
|
@@ -271,6 +438,19 @@ var InputBase = function InputBase(_ref) {
|
|
|
271
438
|
|
|
272
439
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
273
440
|
}, [inputText, metadata, timeoutDelay, update, value]);
|
|
441
|
+
if (onKeyDown) {
|
|
442
|
+
if (inputAttributes.onKeyDown) {
|
|
443
|
+
var originalKeyDown = inputAttributes.onKeyDown;
|
|
444
|
+
inputAttributes.onKeyDown = function (event) {
|
|
445
|
+
originalKeyDown(event);
|
|
446
|
+
if (!event.isDefaultPrevented()) {
|
|
447
|
+
onKeyDown(event);
|
|
448
|
+
}
|
|
449
|
+
};
|
|
450
|
+
} else {
|
|
451
|
+
inputAttributes.onKeyDown = onKeyDown;
|
|
452
|
+
}
|
|
453
|
+
}
|
|
274
454
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
275
455
|
className: classes.container
|
|
276
456
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -291,6 +471,7 @@ var InputBase = function InputBase(_ref) {
|
|
|
291
471
|
placeholder: placeholder,
|
|
292
472
|
value: textToDisplay,
|
|
293
473
|
fullWidth: true,
|
|
474
|
+
onWheel: onWheel,
|
|
294
475
|
onChange: function onChange(event) {
|
|
295
476
|
return onChangeHandler(event);
|
|
296
477
|
},
|
|
@@ -308,10 +489,10 @@ var InputBase = function InputBase(_ref) {
|
|
|
308
489
|
className: (0, _classnames.default)(classes.errorText, errorTextStyle)
|
|
309
490
|
}, error));
|
|
310
491
|
};
|
|
311
|
-
__signature__(InputBase, "
|
|
492
|
+
__signature__(InputBase, "useState{[inputText, setInputText](null)}\nuseStyles{classes}\nuseRef{timerId}\nuseEffect{}\nuseEffect{}", function () {
|
|
312
493
|
return [useStyles];
|
|
313
494
|
});
|
|
314
|
-
__signature__(InputBase, "
|
|
495
|
+
__signature__(InputBase, "useState{[inputText, setInputText](null)}\nuseStyles{classes}\nuseRef{timerId}\nuseEffect{}\nuseEffect{}", function () {
|
|
315
496
|
return [useStyles];
|
|
316
497
|
});
|
|
317
498
|
var compareInputBase = function compareInputBase(prev, next) {
|
|
@@ -328,6 +509,8 @@ var _default3 = exports.default = _default2;
|
|
|
328
509
|
}
|
|
329
510
|
reactHotLoader.register(useStyles, "useStyles", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
330
511
|
reactHotLoader.register(AdvancedNumericInput, "AdvancedNumericInput", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
512
|
+
reactHotLoader.register(AdvancedIntegerInput, "AdvancedIntegerInput", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
513
|
+
reactHotLoader.register(getInputComponent, "getInputComponent", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
331
514
|
reactHotLoader.register(InputBase, "InputBase", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
332
515
|
reactHotLoader.register(compareInputBase, "compareInputBase", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
333
516
|
reactHotLoader.register(_default, "default", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
@@ -345,6 +528,8 @@ var _default3 = exports.default = _default2;
|
|
|
345
528
|
}
|
|
346
529
|
reactHotLoader.register(useStyles, "useStyles", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
347
530
|
reactHotLoader.register(AdvancedNumericInput, "AdvancedNumericInput", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
531
|
+
reactHotLoader.register(AdvancedIntegerInput, "AdvancedIntegerInput", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
532
|
+
reactHotLoader.register(getInputComponent, "getInputComponent", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
348
533
|
reactHotLoader.register(InputBase, "InputBase", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
349
534
|
reactHotLoader.register(compareInputBase, "compareInputBase", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
|
350
535
|
reactHotLoader.register(_default2, "default", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/InputBase.js");
|
package/package.json
CHANGED
|
@@ -165,7 +165,7 @@ const StepperModal = ({
|
|
|
165
165
|
<FormattedMessage {...sharedMessages.cancel} />
|
|
166
166
|
</Button>
|
|
167
167
|
|
|
168
|
-
{currentStep < steps.length - 1 &&
|
|
168
|
+
{(currentStep < steps.length - 1 || steps[currentStep]?.isIntermediate) &&
|
|
169
169
|
(steps[currentStep]?.actions?.length > 0 ? (
|
|
170
170
|
steps[currentStep].actions.map(action => (
|
|
171
171
|
<Button
|
|
@@ -191,7 +191,7 @@ const StepperModal = ({
|
|
|
191
191
|
</Button>
|
|
192
192
|
))}
|
|
193
193
|
|
|
194
|
-
{currentStep === steps.length - 1 && (
|
|
194
|
+
{currentStep === steps.length - 1 && !steps[currentStep]?.isIntermediate && (
|
|
195
195
|
<Button
|
|
196
196
|
variant="contained"
|
|
197
197
|
color="primary"
|
|
@@ -335,6 +335,80 @@ describe("StepperModal", () => {
|
|
|
335
335
|
expect(okCallback, "was called");
|
|
336
336
|
});
|
|
337
337
|
|
|
338
|
+
it("Renders StepperModal correctly without confirm button for an intermediate step", () => {
|
|
339
|
+
const open = true;
|
|
340
|
+
const title = "title";
|
|
341
|
+
const backdropClickCallback = jest.fn();
|
|
342
|
+
const okCallback = jest.fn();
|
|
343
|
+
const cancelCallback = jest.fn();
|
|
344
|
+
const modalProps = new ModalProps();
|
|
345
|
+
const actions = [
|
|
346
|
+
{
|
|
347
|
+
value: "first value",
|
|
348
|
+
label: "first action",
|
|
349
|
+
Handler: () => {},
|
|
350
|
+
},
|
|
351
|
+
{
|
|
352
|
+
value: "second value",
|
|
353
|
+
label: "second action",
|
|
354
|
+
Handler: () => {},
|
|
355
|
+
},
|
|
356
|
+
];
|
|
357
|
+
const steps = [{ title: "step1", content: <div>content</div>, actions, isIntermediate: true }];
|
|
358
|
+
|
|
359
|
+
const titleComponent = (
|
|
360
|
+
<div>
|
|
361
|
+
<div>{title}</div>
|
|
362
|
+
<div>step1</div>
|
|
363
|
+
</div>
|
|
364
|
+
);
|
|
365
|
+
const messageComponent = <div>{steps[0].content}</div>;
|
|
366
|
+
|
|
367
|
+
modalProps.set(ModalProps.propNames.title, titleComponent);
|
|
368
|
+
modalProps.set(ModalProps.propNames.open, open);
|
|
369
|
+
modalProps.set(ModalProps.propNames.backdropClickCallback, backdropClickCallback);
|
|
370
|
+
modalProps.set(ModalProps.propNames.type, "wide");
|
|
371
|
+
|
|
372
|
+
const actionPanel = (
|
|
373
|
+
<div>
|
|
374
|
+
<div></div>
|
|
375
|
+
<div>
|
|
376
|
+
<Button variant="outlined" disabled={false} onClick={() => cancelCallback()}>
|
|
377
|
+
{sharedMessages.cancel.defaultMessage}
|
|
378
|
+
</Button>
|
|
379
|
+
<Button variant="contained" color="primary" disabled={false} onClick={() => {}} disableElevation>
|
|
380
|
+
first action
|
|
381
|
+
</Button>
|
|
382
|
+
<Button variant="contained" color="primary" disabled={false} onClick={() => {}} disableElevation>
|
|
383
|
+
second action
|
|
384
|
+
</Button>
|
|
385
|
+
</div>
|
|
386
|
+
</div>
|
|
387
|
+
);
|
|
388
|
+
|
|
389
|
+
modalProps.set(ModalProps.propNames.actionPanel, actionPanel);
|
|
390
|
+
|
|
391
|
+
const component = (
|
|
392
|
+
<IntlProvider locale="en-US" messages={messages}>
|
|
393
|
+
<StepperModal
|
|
394
|
+
steps={steps}
|
|
395
|
+
title={title}
|
|
396
|
+
open={open}
|
|
397
|
+
confirmCallback={okCallback}
|
|
398
|
+
closeCallback={cancelCallback}
|
|
399
|
+
/>
|
|
400
|
+
</IntlProvider>
|
|
401
|
+
);
|
|
402
|
+
|
|
403
|
+
const expected = (
|
|
404
|
+
<IntlProvider locale="en-US" messages={messages}>
|
|
405
|
+
<Modal message={messageComponent} modalProps={modalProps} />
|
|
406
|
+
</IntlProvider>
|
|
407
|
+
);
|
|
408
|
+
|
|
409
|
+
expect(component, "when mounted", "to satisfy", expected);
|
|
410
|
+
});
|
|
411
|
+
|
|
338
412
|
it("Render closed modal", () => {
|
|
339
413
|
const open = false;
|
|
340
414
|
|