mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-16 12:50:38 +00:00
Fix disabled button with AccountSelect
This commit is contained in:
@@ -76,6 +76,7 @@ export default function AccountsSelectList({
|
||||
popoverProps={{ minimal: true }}
|
||||
filterable={true}
|
||||
onItemSelect={onAccountSelect}
|
||||
disabled={disabled}
|
||||
>
|
||||
<Button
|
||||
disabled={disabled}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import React, { useCallback } from 'react';
|
||||
import {
|
||||
ListSelect,
|
||||
} from 'components';
|
||||
import { ListSelect } from 'components';
|
||||
|
||||
export default function AccountsTypesSelect({
|
||||
accountsTypes,
|
||||
selectedTypeId,
|
||||
defaultSelectText = 'Select account type',
|
||||
onTypeSelected,
|
||||
disabled = false,
|
||||
...restProps
|
||||
}) {
|
||||
// Filters accounts types items.
|
||||
@@ -28,7 +27,8 @@ export default function AccountsTypesSelect({
|
||||
};
|
||||
|
||||
const items = accountsTypes.map((type) => ({
|
||||
id: type.id, label: type.label,
|
||||
id: type.id,
|
||||
label: type.label,
|
||||
}));
|
||||
|
||||
return (
|
||||
@@ -40,7 +40,8 @@ export default function AccountsTypesSelect({
|
||||
defaultText={defaultSelectText}
|
||||
onItemSelect={handleItemSelected}
|
||||
itemPredicate={filterAccountTypeItems}
|
||||
disabled={disabled}
|
||||
{...restProps}
|
||||
/>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ export default function ListSelect({
|
||||
|
||||
initialSelectedItem,
|
||||
onItemSelect,
|
||||
|
||||
disabled = false,
|
||||
...selectProps
|
||||
}) {
|
||||
const selectedItemObj = useMemo(
|
||||
@@ -24,7 +24,10 @@ export default function ListSelect({
|
||||
);
|
||||
|
||||
const selectedInitialItem = useMemo(
|
||||
() => selectProps.items.find((i) => i[selectedItemProp] === initialSelectedItem),
|
||||
() =>
|
||||
selectProps.items.find(
|
||||
(i) => i[selectedItemProp] === initialSelectedItem,
|
||||
),
|
||||
[initialSelectedItem],
|
||||
);
|
||||
|
||||
@@ -65,10 +68,12 @@ export default function ListSelect({
|
||||
onItemSelect={handleItemSelect}
|
||||
{...selectProps}
|
||||
noResults={noResults}
|
||||
disabled={disabled}
|
||||
>
|
||||
<Button
|
||||
text={currentItem ? currentItem[labelProp] : defaultText}
|
||||
loading={isLoading}
|
||||
disabled={disabled}
|
||||
{...buttonProps}
|
||||
/>
|
||||
</Select>
|
||||
|
||||
Reference in New Issue
Block a user