Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Search string in catalogs in char prefs #2758

Merged
merged 1 commit into from
Apr 7, 2024
Merged

[MIRROR] Search string in catalogs in char prefs #2758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 49 additions & 29 deletions tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ import { filterMap, sortBy } from 'common/collections';
import { classes } from 'common/react';
import { useState } from 'react';

import { filter } from '../../../common/collections';
import { flow } from '../../../common/fp';
import { createSearch } from '../../../common/string';
import { sendAct, useBackend } from '../../backend';
import {
Autofocus,
Box,
Button,
Dropdown, // NOVA EDIT ADDITION
Flex,
Input,
LabeledList,
Popper,
Stack,
Expand Down Expand Up @@ -115,6 +119,7 @@ const ChoicedSelection = (props: {
const { act } = useBackend<PreferencesMenuData>();

const { catalog, supplementalFeature, supplementalValue } = props;
const [getSearchText, searchTextSet] = useState('');

if (!catalog.icons) {
return <Box color="red">Provided catalog had no icons!</Box>;
Expand Down Expand Up @@ -170,39 +175,49 @@ const ChoicedSelection = (props: {

<Stack.Item overflowX="hidden" overflowY="scroll">
<Autofocus>
<Input
placeholder="Search..."
style={{
margin: '0px 5px',
width: '95%',
}}
onInput={(_, value) => searchTextSet(value)}
/>
<Flex wrap>
{Object.entries(catalog.icons).map(([name, image], index) => {
return (
<Flex.Item
key={index}
basis={`${CLOTHING_SELECTION_CELL_SIZE}px`}
style={{
padding: '5px',
}}
>
<Button
onClick={() => {
props.onSelect(name);
}}
selected={name === props.selected}
tooltip={name}
tooltipPosition="right"
{searchInCatalog(getSearchText, catalog.icons).map(
([name, image], index) => {
return (
<Flex.Item
key={index}
basis={`${CLOTHING_SELECTION_CELL_SIZE}px`}
style={{
height: `${CLOTHING_SELECTION_CELL_SIZE}px`,
width: `${CLOTHING_SELECTION_CELL_SIZE}px`,
padding: '5px',
}}
>
<Box
className={classes([
'preferences32x32',
image,
'centered-image',
])}
/>
</Button>
</Flex.Item>
);
})}
<Button
onClick={() => {
props.onSelect(name);
}}
selected={name === props.selected}
tooltip={name}
tooltipPosition="right"
style={{
height: `${CLOTHING_SELECTION_CELL_SIZE}px`,
width: `${CLOTHING_SELECTION_CELL_SIZE}px`,
}}
>
<Box
className={classes([
'preferences32x32',
image,
'centered-image',
])}
/>
</Button>
</Flex.Item>
);
},
)}
</Flex>
</Autofocus>
</Stack.Item>
Expand All @@ -211,6 +226,11 @@ const ChoicedSelection = (props: {
);
};

const searchInCatalog = (searchText = '', catalog: Record<string, string>) => {
const maybeSearch = createSearch(searchText, ([name, _icon]) => name);
return flow([searchText && filter(maybeSearch)])(Object.entries(catalog));
};

const GenderButton = (props: {
handleSetGender: (gender: Gender) => void;
gender: Gender;
Expand Down
Loading