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

feat(react): refactor filterable multi select to function #10198

Merged
merged 21 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b0e0a3c
chore: check in progress
abbeyhrt Nov 18, 2021
505d85b
feat(react): refactor FilterableMultiSelect
abbeyhrt Nov 30, 2021
9389ff1
fix(react): reset Filterable field on multiselct
abbeyhrt Nov 30, 2021
efe4e8f
fix(styles): remove unnecessary styles
abbeyhrt Nov 30, 2021
9360c13
Merge branch 'main' into feat/filterable-multi-select
abbeyhrt Nov 30, 2021
8803a8e
fix(react): update snapshot
abbeyhrt Dec 1, 2021
d4477c0
Merge branch 'feat/filterable-multi-select' of github.com:abbeyhrt/my…
abbeyhrt Dec 1, 2021
1192581
Merge branch 'main' into feat/filterable-multi-select
abbeyhrt Dec 1, 2021
4185965
Merge branch 'main' into feat/filterable-multi-select
abbeyhrt Dec 2, 2021
d889a67
Merge branch 'main' into feat/filterable-multi-select
abbeyhrt Dec 3, 2021
cbe473f
chore(react): update to follow code style guidelines
abbeyhrt Dec 3, 2021
b677ceb
Update packages/react/src/components/MultiSelect/next/FilterableMulti…
abbeyhrt Dec 3, 2021
ef8f824
Merge branch 'main' into feat/filterable-multi-select
abbeyhrt Dec 6, 2021
de9e788
Update packages/react/src/components/MultiSelect/next/FilterableMulti…
abbeyhrt Dec 6, 2021
acad918
Update packages/react/src/components/MultiSelect/next/__tests__/Filte…
abbeyhrt Dec 6, 2021
b6265cc
fix(react): clear input and reset focus through user action
abbeyhrt Dec 7, 2021
3bbdf7d
Merge branch 'main' into feat/filterable-multi-select
abbeyhrt Dec 7, 2021
e589eee
Merge branch 'feat/filterable-multi-select' of github.com:abbeyhrt/my…
abbeyhrt Dec 7, 2021
24b9e31
chore(react): format file
abbeyhrt Dec 7, 2021
726e9d6
Merge branch 'main' into feat/filterable-multi-select
abbeyhrt Dec 7, 2021
aaf6ffc
Merge branch 'main' into feat/filterable-multi-select
kodiakhq[bot] Dec 7, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -3108,7 +3108,6 @@ Map {
"selectionFeedback": "top-after-reopen",
"sortItems": [Function],
},
"displayName": "MultiSelect.Filterable",
"propTypes": Object {
"ariaLabel": Object {
"type": "string",
Expand Down Expand Up @@ -4074,7 +4073,6 @@ Map {
"selectionFeedback": "top-after-reopen",
"sortItems": [Function],
},
"displayName": "MultiSelect.Filterable",
"propTypes": Object {
"ariaLabel": Object {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default from '../MultiSelect/FilterableMultiSelect';
export { FilterableMultiSelect } from '../MultiSelect';
13 changes: 10 additions & 3 deletions packages/react/src/components/MultiSelect/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import * as FeatureFlags from '@carbon/feature-flags';
import { deprecateFieldOnObject } from '../../internal/deprecateFieldOnObject';

import MultiSelect from './MultiSelect';
import FilterableMultiSelect from './FilterableMultiSelect';
import { default as FilterableMultiSelectClassic } from './FilterableMultiSelect';
import { default as FilterableMultiSelectNext } from './next/FilterableMultiSelect';

FilterableMultiSelectNext.displayName = 'MultiSelect.Filterable';
MultiSelect.Filterable = FilterableMultiSelectClassic;

FilterableMultiSelect.displayName = 'MultiSelect.Filterable';
MultiSelect.Filterable = FilterableMultiSelect;
export const FilterableMultiSelect = FeatureFlags.enabled('enable-v11-release')
? FilterableMultiSelectNext
: FilterableMultiSelectClassic;

if (__DEV__) {
deprecateFieldOnObject(MultiSelect, 'Filterable', FilterableMultiSelect);
Expand Down
Loading