Skip to content

Commit 32229f0

Browse files
abbeyhrttay1orjonesjoshblackkodiakhq[bot]
authored
feat(react): refactor filterable multi select to function (#10198)
* chore: check in progress * feat(react): refactor FilterableMultiSelect * fix(react): reset Filterable field on multiselct * fix(styles): remove unnecessary styles * fix(react): update snapshot * chore(react): update to follow code style guidelines * Update packages/react/src/components/MultiSelect/next/FilterableMultiSelect.js Co-authored-by: Taylor Jones <tay1orjones@users.noreply.github.com> * Update packages/react/src/components/MultiSelect/next/FilterableMultiSelect.js Co-authored-by: Josh Black <josh@josh.black> * Update packages/react/src/components/MultiSelect/next/__tests__/FilterableMultiSelect-test.js Co-authored-by: Josh Black <josh@josh.black> * fix(react): clear input and reset focus through user action * chore(react): format file Co-authored-by: Taylor Jones <tay1orjones@users.noreply.github.com> Co-authored-by: Josh Black <josh@josh.black> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent 1d3e95f commit 32229f0

File tree

10 files changed

+1095
-13
lines changed

10 files changed

+1095
-13
lines changed

packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3108,7 +3108,6 @@ Map {
31083108
"selectionFeedback": "top-after-reopen",
31093109
"sortItems": [Function],
31103110
},
3111-
"displayName": "MultiSelect.Filterable",
31123111
"propTypes": Object {
31133112
"ariaLabel": Object {
31143113
"type": "string",
@@ -4074,7 +4073,6 @@ Map {
40744073
"selectionFeedback": "top-after-reopen",
40754074
"sortItems": [Function],
40764075
},
4077-
"displayName": "MultiSelect.Filterable",
40784076
"propTypes": Object {
40794077
"ariaLabel": Object {
40804078
"type": "string",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export default from '../MultiSelect/FilterableMultiSelect';
1+
export { FilterableMultiSelect } from '../MultiSelect';

packages/react/src/components/MultiSelect/index.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
* This source code is licensed under the Apache-2.0 license found in the
55
* LICENSE file in the root directory of this source tree.
66
*/
7+
8+
import * as FeatureFlags from '@carbon/feature-flags';
79
import { deprecateFieldOnObject } from '../../internal/deprecateFieldOnObject';
810

911
import MultiSelect from './MultiSelect';
10-
import FilterableMultiSelect from './FilterableMultiSelect';
12+
import { default as FilterableMultiSelectClassic } from './FilterableMultiSelect';
13+
import { default as FilterableMultiSelectNext } from './next/FilterableMultiSelect';
14+
15+
FilterableMultiSelectNext.displayName = 'MultiSelect.Filterable';
16+
MultiSelect.Filterable = FilterableMultiSelectClassic;
1117

12-
FilterableMultiSelect.displayName = 'MultiSelect.Filterable';
13-
MultiSelect.Filterable = FilterableMultiSelect;
18+
export const FilterableMultiSelect = FeatureFlags.enabled('enable-v11-release')
19+
? FilterableMultiSelectNext
20+
: FilterableMultiSelectClassic;
1421

1522
if (__DEV__) {
1623
deprecateFieldOnObject(MultiSelect, 'Filterable', FilterableMultiSelect);

0 commit comments

Comments
 (0)