feat(core-blocks): CB-1656 naming

This commit is contained in:
Naumov Alexey
2022-03-28 19:41:25 +02:00
parent 2a89a5f0f4
commit 33b4660cd3
2 changed files with 6 additions and 6 deletions
@@ -133,7 +133,7 @@ type BaseProps<TKey, TValue> = Omit<React.InputHTMLAttributes<HTMLInputElement>,
valueSelector: (item: TValue) => string;
titleSelector?: (item: TValue) => string | undefined;
iconSelector?: (item: TValue) => string | React.ReactElement | undefined;
stateSelector?: (item: TValue) => boolean;
isDisabled?: (item: TValue) => boolean;
onSwitch?: (state: boolean) => void;
};
@@ -175,7 +175,7 @@ export const Combobox: ComboboxType = observer(function Combobox({
valueSelector = v => v,
iconSelector,
titleSelector,
stateSelector,
isDisabled,
onChange = () => { },
onSelect,
onSwitch,
@@ -203,8 +203,8 @@ export const Combobox: ComboboxType = observer(function Combobox({
item => !searchValue || valueSelector(item).toUpperCase().includes(searchValue.toUpperCase())
);
if (stateSelector) {
return result.sort((a, b) => Number(stateSelector(a)) - Number(stateSelector(b)));
if (isDisabled) {
return result.sort((a, b) => Number(isDisabled(a)) - Number(isDisabled(b)));
}
return result;
@@ -374,7 +374,7 @@ export const Combobox: ComboboxType = observer(function Combobox({
: (filteredItems.map((item, index) => {
const icon = iconSelector?.(item);
const title = titleSelector?.(item);
const selected = stateSelector?.(item);
const selected = isDisabled?.(item);
return (
<MenuItem
@@ -70,7 +70,7 @@ export const ServerConfigurationDriversForm = observer<Props>(function ServerCon
keySelector={item => item.id}
valueSelector={value => value.name || value.id}
iconSelector={value => value.icon}
stateSelector={item => serverConfig.disabledDrivers?.includes(item.id) ?? false}
isDisabled={item => serverConfig.disabledDrivers?.includes(item.id) ?? false}
items={drivers}
placeholder={translate('administration_disabled_drivers_search_placeholder')}
searchable