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.

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

Add async searchable multiSelect and searchable multiSelect types #1228

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions src/Select/AsyncSelect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import { defaultStyles, defaultTheme, SELECT_SIZES } from './styles';
const AsyncSelect = ({
'aria-label': ariaLabel,
'aria-labelledby': ariaLabelledBy,
cacheOptions,
className,
closeMenuOnSelect,
components,
defaultOptions,
defaultValue,
Expand All @@ -26,7 +28,6 @@ const AsyncSelect = ({
modal,
name,
noOptionsMessage,
placeholder,
size,
value,

Expand All @@ -37,8 +38,10 @@ const AsyncSelect = ({
{...props}
aria-label={ariaLabel}
aria-labelledby={ariaLabelledBy}
cacheOptions={cacheOptions}
className={`${className || ''} AsyncSelect`}
classNamePrefix="Select"
closeMenuOnSelect={closeMenuOnSelect}
components={components}
defaultOptions={defaultOptions}
defaultValue={defaultValue}
Expand All @@ -54,7 +57,7 @@ const AsyncSelect = ({
menuPortalTarget={modal ? document.body : undefined}
name={name}
noOptionsMessage={noOptionsMessage}
placeholder={placeholder}
placeholder="Search"
shouldShowValue
styles={{
...defaultStyles({ menuWidth, size }),
Expand All @@ -75,7 +78,9 @@ const AsyncSelect = ({
AsyncSelect.propTypes = {
'aria-label': propTypes.string,
'aria-labelledby': propTypes.string,
cacheOptions: propTypes.bool,
className: propTypes.string,
closeMenuOnSelect: propTypes.bool,
components: propTypes.any,
defaultOptions: propTypes.oneOfType([propTypes.bool, propTypes.array]),
defaultValue: propTypes.object,
Expand Down Expand Up @@ -106,7 +111,9 @@ AsyncSelect.propTypes = {
AsyncSelect.defaultProps = {
'aria-label': undefined,
'aria-labelledby': undefined,
cacheOptions: undefined,
className: undefined,
closeMenuOnSelect: undefined,
components: undefined,
defaultOptions: false,
defaultValue: undefined,
Expand All @@ -124,7 +131,6 @@ AsyncSelect.defaultProps = {
placeholder: undefined,
size: SELECT_SIZES.SMALL,
value: undefined,

onChange: undefined,
};

Expand Down
22 changes: 22 additions & 0 deletions src/Select/AsyncSelect.stories.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
Modal, ModalHeader, ModalBody, ModalFooter,
} from 'src/Modal';

import Option from './Option';

export default {
title: 'Components/Selects/Async',
component: AsyncSelect,
Expand Down Expand Up @@ -90,3 +92,23 @@ export const InModal = () => {
</>
);
};

export const MultiSelect = () => (
<FormGroup
label="Async MultiSelect"
labelHtmlFor="async-multiselect"
>
<AsyncSelect
cacheOptions
closeMenuOnSelect={false}
components={{ Option }}
getOptionLabel={({ label }) => label}
getOptionValue={({ value }) => value}
inputId="async-multiselect"
isClearable
isMulti
loadOptions={loadOptions}
noOptionsMessage={({ inputValue }) => inputValue.length ? 'No results!' : 'Type to search...'}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think noOptionsMessage might be controlling a separate menu which makes it seem like closeMenuOnSelect={false} is not working on this one and works on SingleSelect. I know there is menuIsOpen prop to close any menu, but we might wanna double check on this behavior and see if that's an okay expectation.

/>
</FormGroup>
);
3 changes: 2 additions & 1 deletion src/Select/Option.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ import './Option.scss';
const Option = forwardRef(({ indeterminate, ...props }, ref) => (
<components.Option {...props}>
<div className="Option">
<label>{props.label}</label>
<CheckboxButton
checked={props.isSelected}
className="Checkbox"
id={props.label}
indeterminate={indeterminate}
ref={ref}
onChange={() => null}
/>
<label>{props.label}</label>
</div>
</components.Option>
));
Expand Down
7 changes: 5 additions & 2 deletions src/Select/Option.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.Option {
display: flex;
justify-content: space-between;
display: flex;
align-items: center;

.Checkbox {
margin-right: var(--synth-spacing-3);
}
}
4 changes: 4 additions & 0 deletions src/Select/SingleSelect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const SingleSelect = ({
'aria-labelledby': ariaLabelledBy,
borderedMultiValue,
className,
closeMenuOnScroll,
closeMenuOnSelect,
components,
defaultValue,
Expand Down Expand Up @@ -42,6 +43,7 @@ const SingleSelect = ({
aria-labelledby={ariaLabelledBy}
className={classNames('SingleSelect', className)}
classNamePrefix="Select"
closeMenuOnScroll={closeMenuOnScroll}
closeMenuOnSelect={closeMenuOnSelect}
components={components}
defaultValue={defaultValue}
Expand Down Expand Up @@ -77,6 +79,7 @@ SingleSelect.propTypes = {
'aria-labelledby': propTypes.string,
borderedMultiValue: propTypes.bool,
className: propTypes.string,
closeMenuOnScroll: propTypes.bool,
closeMenuOnSelect: propTypes.bool,
components: propTypes.any,
defaultValue: propTypes.object,
Expand Down Expand Up @@ -109,6 +112,7 @@ SingleSelect.defaultProps = {
'aria-labelledby': undefined,
borderedMultiValue: undefined,
className: undefined,
closeMenuOnScroll: true,
closeMenuOnSelect: true,
components: undefined,
defaultValue: undefined,
Expand Down
27 changes: 26 additions & 1 deletion src/Select/SingleSelect.stories.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,14 @@ export const Searchable = () => (
label="Searchable select"
labelHtmlFor="searchable-select"
>
<SingleSelect inputId="searchable-select" isSearchable options={options} onChange={onChange} />
<SingleSelect
closeMenuOnScroll={false}
inputId="searchable-select"
isSearchable
options={options}
placeholder="Search or select..."
onChange={onChange}
/>
</FormGroup>
);

Expand Down Expand Up @@ -215,6 +222,24 @@ export const CustomOptionWithCheckbox = () => (
</FormGroup>
);

export const SearchableCustomOptionWithCheckbox = () => (
<FormGroup
label="Searchable Custom Option with Checkbox"
labelHtmlFor="searchable-custom-option-with-checkbox-select"
>
<SingleSelect
closeMenuOnSelect={false}
components={{ Option }}
hideSelectedOptions={false}
inputId="searchable-custom-option-with-checkbox-select"
isMulti
isSearchable
options={options}
onChange={onChange}
/>
</FormGroup>
);

export const CustomOptionWithIndeterminateCheckbox = () => {
const optionsArr = [
{ label: 'Riley Researcher', value: 1 },
Expand Down
Loading