Skip to content

Commit

Permalink
Merge pull request #6114 from melloware/PR6113
Browse files Browse the repository at this point in the history
Fix #6113: MultiSelect loading and loadingIcon types
  • Loading branch information
nitrogenous authored Mar 14, 2024
2 parents 5a882d4 + e97105d commit cd52101
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions components/lib/multiselect/MultiSelectBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ export const MultiSelectBase = ComponentBase.extend({
itemClassName: null,
itemTemplate: null,
loading: false,
loadingIcon: null,
maxSelectedLabels: null,
name: null,
onBlur: null,
Expand Down
11 changes: 10 additions & 1 deletion components/lib/multiselect/multiselect.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ export interface MultiSelectProps extends Omit<React.DetailedHTMLProps<React.Inp
/**
* Icon class of the dropdown icon.
*/
dropdownIcon?: IconType<MultiSelectProps>;
dropdownIcon?: IconType<MultiSelectProps> | undefined;
/**
* Template to display when filtering does not return any results.
* @defaultValue No records found
Expand Down Expand Up @@ -550,6 +550,15 @@ export interface MultiSelectProps extends Omit<React.DetailedHTMLProps<React.Inp
* Function that gets the option and returns the content for it.
*/
itemTemplate?: React.ReactNode | ((option: any) => React.ReactNode);
/**
* Displays a loader to indicate data load is in progress.
* @defaultValue false
*/
loading?: boolean | undefined;
/**
* The icon to show while indicating data load is in progress.
*/
loadingIcon?: IconType<MultiSelectProps> | undefined;
/**
* Decides how many selected item labels to show at most.
*/
Expand Down

0 comments on commit cd52101

Please sign in to comment.