ish-ui 1.0.37 → 1.0.39

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.
@@ -98,12 +98,12 @@ const EditInPlaceFieldBase = ({ value, invalid, className, inline, label, fieldC
98
98
  } }, (InputProps === null || InputProps === void 0 ? void 0 : InputProps.inputProps) || {}), classes: {
99
99
  root: clsx(fieldClasses.text, inline && classes.inlineInput),
100
100
  underline: fieldClasses.underline
101
- }, disabled: disabled, endAdornment: !disabled &&
101
+ }, disabled: disabled, endAdornment: InputProps.endAdornment || (!disabled &&
102
102
  React.createElement(InputAdornment, { position: "end", onClick: onAdornmentClick, className: clsx(endAdornmentClass, {
103
103
  ['fsInherit']: inline,
104
104
  ['d-none']: (rightAligned || inline),
105
105
  ['invisible']: variant !== 'outlined' && !(rightAligned || inline)
106
- }) }, editIcon), id: `input-${name}`, name: name })),
106
+ }) }, editIcon)), id: `input-${name}`, name: name })),
107
107
  React.createElement(FormHelperText, { classes: {
108
108
  root: clsx(rightAligned && 'text-end'),
109
109
  error: 'shakingError'
@@ -298,7 +298,7 @@ function EditInPlaceSearchSelect({ label, disabled, className, labelAdornment, i
298
298
  groupUl: 'm-0'
299
299
  }, groupBy: categoryKey && (option => option[categoryKey]), renderOption: renderOption, getOptionLabel: getOptionLabel, filterOptions: filterItems, ListboxComponent: inline || categoryKey ? null : ListBoxAdapter, PopperComponent: categoryKey ? null : PopperAdapter, renderInput: (_a) => {
300
300
  var { InputLabelProps, InputProps, inputProps } = _a, params = __rest(_a, ["InputLabelProps", "InputProps", "inputProps"]);
301
- return (React.createElement(EditInPlaceFieldBase, Object.assign({}, params, { variant: variant, name: input.name, value: displayedValue, error: error, invalid: hasError || invalid, inline: inline, label: label, warning: warning, fieldClasses: fieldClasses, rightAligned: rightAligned, shrink: Boolean(label || input.value), labelAdornment: labelAdornment, placeholder: renderedPlaceholder, editIcon: !hideEditIcon && renderIcons, InputProps: Object.assign(Object.assign({}, InputProps), { onChange: handleInputChange, onFocus: edit, onClick: onEditButtonFocus, onBlur,
301
+ return (React.createElement(EditInPlaceFieldBase, Object.assign({}, params, { variant: variant, name: input.name, value: displayedValue, error: error, invalid: hasError || invalid, inline: inline, label: label, warning: warning, fieldClasses: fieldClasses, rightAligned: rightAligned, shrink: Boolean(label || input.value), labelAdornment: labelAdornment, placeholder: renderedPlaceholder, editIcon: !hideEditIcon && renderIcons, InputProps: Object.assign(Object.assign({}, InputProps), { endAdornment: null, onChange: handleInputChange, onFocus: edit, onClick: onEditButtonFocus, onBlur,
302
302
  disableUnderline, classes: {
303
303
  underline: fieldClasses.underline,
304
304
  input: clsx(disabled && classes.readonly, fieldClasses.text),
@@ -16,7 +16,7 @@ const useStyles = makeAppStyles(theme => ({
16
16
  }));
17
17
  function FormRadioButtons({ items, disabled, input: { value, onChange, name }, meta: { invalid, error }, labelPath = 'label', valuePath = 'value', color = 'primary', row, label, labelClass, labelAdornment, radioProps, radioGroupProps }) {
18
18
  const classes = useStyles();
19
- return (React.createElement(FormControl, { component: "fieldset", error: invalid },
19
+ return (React.createElement(FormControl, { fullWidth: true, component: "fieldset", error: invalid },
20
20
  label && (React.createElement(InputLabel, { shrink: true, htmlFor: `input-${name}`, className: labelClass },
21
21
  label,
22
22
  labelAdornment)),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ish-ui",
3
- "version": "1.0.37",
3
+ "version": "1.0.39",
4
4
  "description": "UI elements for onCourse and other ish apps",
5
5
  "main": "main.ts",
6
6
  "devDependencies": {