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

Jump to bottom

MNT Use React Testing Library #240

Merged
merged 1 commit into from
May 1, 2023
Merged

MNT Use React Testing Library #240

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 27 additions & 8 deletions client/src/components/TagField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ class TagField extends Component {
if (!input) {
return Promise.resolve([]);
}

return this.fetchOptions(input);
}

Expand Down Expand Up @@ -152,20 +151,32 @@ class TagField extends Component {
}

render() {
const { lazyLoad, options, creatable, multi, disabled, labelKey, valueKey, ...passThroughAttributes } =
this.props;
const {
lazyLoad,
options,
creatable,
multi,
disabled,
labelKey,
valueKey,
SelectComponent,
AsyncCreatableSelectComponent,
AsyncSelectComponent,
CreatableSelectComponent,
...passThroughAttributes
} = this.props;

const optionAttributes = lazyLoad
? { loadOptions: this.getOptions }
: { options };

let SelectComponent = Select;
let DynamicSelect = SelectComponent;
if (lazyLoad && creatable) {
SelectComponent = AsyncCreatableSelect;
DynamicSelect = AsyncCreatableSelectComponent;
} else if (lazyLoad) {
SelectComponent = AsyncSelect;
DynamicSelect = AsyncSelectComponent;
} else if (creatable) {
SelectComponent = CreatableSelect;
DynamicSelect = CreatableSelectComponent;
}

// Update the value to passthrough with the kept state provided this component is not
Expand All @@ -190,7 +201,7 @@ class TagField extends Component {

return (
<EmotionCssCacheProvider>
<SelectComponent
<DynamicSelect
{...passThroughAttributes}
isMulti={multi}
isDisabled={disabled}
Expand Down Expand Up @@ -222,6 +233,10 @@ TagField.propTypes = {
value: PropTypes.any,
onChange: PropTypes.func,
onBlur: PropTypes.func,
SelectComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
AsyncCreatableSelectComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
AsyncSelectComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
CreatableSelectComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
};

TagField.defaultProps = {
Expand All @@ -231,6 +246,10 @@ TagField.defaultProps = {
lazyLoad: false,
creatable: false,
multi: false,
SelectComponent: Select,
GuySartorelli marked this conversation as resolved.
Show resolved Hide resolved
AsyncCreatableSelectComponent: AsyncCreatableSelect,
AsyncSelectComponent: AsyncSelect,
CreatableSelectComponent: CreatableSelect,
};

export { TagField as Component };
Expand Down
Loading