shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to EnhancedSelectInput

Browse Source 
(cherry picked from commit 4c622fd41289cd293a68a6a9f6b8da2a086edecb)
This commit is contained in:
Mark McDowall
2024-06-19 15:50:36 -07:00
committed by Bogdan
parent 2d6c818aec
commit bdae60bac9
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/src/Components/Form/EnhancedSelectInput.js
View File

@@ -271,26 +271,29 @@ class EnhancedSelectInput extends Component {
this.setState({ isOpen: !this.state.isOpen }); this.setState({ isOpen: !this.state.isOpen });
}; };
onSelect = (value) => { onSelect = (newValue) => {
if (Array.isArray(this.props.value)) { const { name, value, values, onChange } = this.props;
let newValue = null;
const index = this.props.value.indexOf(value); if (Array.isArray(value)) {
let arrayValue = null;
const index = value.indexOf(newValue);
if (index === -1) { if (index === -1) {
newValue = this.props.values.map((v) => v.key).filter((v) => (v === value) || this.props.value.includes(v)); arrayValue = values.map((v) => v.key).filter((v) => (v === newValue) || value.includes(v));
} else { } else {
newValue = [...this.props.value]; arrayValue = [...value];
newValue.splice(index, 1); arrayValue.splice(index, 1);
} }
this.props.onChange({ onChange({
name: this.props.name, name,
value: newValue value: arrayValue
}); });
} else { } else {
this.setState({ isOpen: false }); this.setState({ isOpen: false });
this.props.onChange({ onChange({
name: this.props.name, name,
value value: newValue
}); });
} }
}; };
@@ -485,7 +488,7 @@ class EnhancedSelectInput extends Component {
values.map((v, index) => { values.map((v, index) => {
const hasParent = v.parentKey !== undefined; const hasParent = v.parentKey !== undefined;
const depth = hasParent ? 1 : 0; const depth = hasParent ? 1 : 0;
const parentSelected = hasParent && value.includes(v.parentKey); const parentSelected = hasParent && Array.isArray(value) && value.includes(v.parentKey);
return ( return (
<OptionComponent <OptionComponent
key={v.key} key={v.key}

3
frontend/src/Components/Form/EnhancedSelectInputConnector.js
View File

@@ -34,7 +34,8 @@ function getSelectOptions(items) {
key: option.value, key: option.value,
value: option.name, value: option.name,
hint: option.hint, hint: option.hint,
parentKey: option.parentValue parentKey: option.parentValue,
isDisabled: option.isDisabled
}; };
}); });
} }