Rooba
/
stash
mirror of https://github.com/stashapp/stash.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix performer scrape select, and studio/gallery select glitching (#1080)

This commit is contained in:
InfiniteTF 2021-01-28 21:00:58 +01:00 committed by GitHub
parent d1274d559d
commit 0d7663c13d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/v2.5/src/components/Shared/Select.tsx
View File

@ -110,7 +110,10 @@ const SelectComponent = <T extends boolean>({
noOptionsMessage = type !== "tags" ? "None" : null, noOptionsMessage = type !== "tags" ? "None" : null,
}: ISelectProps<T> & ITypeProps) => { }: ISelectProps<T> & ITypeProps) => {
const values = items.filter((item) => initialIds?.indexOf(item.value) !== -1); const values = items.filter((item) => initialIds?.indexOf(item.value) !== -1);
const defaultValue = (isMulti ? values : values[0]) as ValueType<Option, T>; const defaultValue = (isMulti ? values : values[0] ?? null) as ValueType<
Option,
T
>;
const options = groupHeader const options = groupHeader
? [ ? [
@ -186,10 +189,9 @@ const FilterSelectComponent = <T extends boolean>(
const selected = options.filter((option) => const selected = options.filter((option) =>
selectedIds.includes(option.value) selectedIds.includes(option.value)
); );
const selectedOptions = (isMulti ? selected : selected[0]) as ValueType< const selectedOptions = (isMulti
Option, ? selected
T : selected[0] ?? null) as ValueType<Option, T>;
>;
const onChange = (selectedItems: ValueType<Option, boolean>) => { const onChange = (selectedItems: ValueType<Option, boolean>) => {
const selectedValues = getSelectedValues(selectedItems); const selectedValues = getSelectedValues(selectedItems);
@ -301,8 +303,8 @@ export const ScrapePerformerSuggest: React.FC<IScrapePerformerSuggestProps> = (
setQuery(input); setQuery(input);
}, 500); }, 500);
const onChange = (name: ValueType<Option, false>) => { const onChange = (option: ValueType<Option, false>) => {
const performer = performers.find((p) => p.name === name); const performer = performers.find((p) => p.name === option?.value);
if (performer) props.onSelectPerformer(performer); if (performer) props.onSelectPerformer(performer);
}; };
@ -461,11 +463,11 @@ export const TagSelect: React.FC<IFilterProps> = (props) => {
export const FilterSelect: React.FC<IFilterProps & ITypeProps> = (props) => export const FilterSelect: React.FC<IFilterProps & ITypeProps> = (props) =>
props.type === "performers" ? ( props.type === "performers" ? (
<PerformerSelect {...(props as IFilterProps)} /> <PerformerSelect {...props} />
) : props.type === "studios" || props.type === "parent_studios" ? ( ) : props.type === "studios" || props.type === "parent_studios" ? (
<StudioSelect {...(props as IFilterProps)} /> <StudioSelect {...props} />
) : props.type === "movies" ? ( ) : props.type === "movies" ? (
<MovieSelect {...(props as IFilterProps)} /> <MovieSelect {...props} />
) : ( ) : (
<TagSelect {...(props as IFilterProps)} /> <TagSelect {...props} />
); );