Skip to content

Commit eda4470

Browse files
committed
fix: eui-combo-box
1 parent aecc0c8 commit eda4470

File tree

4 files changed

+4
-33
lines changed

4 files changed

+4
-33
lines changed

packages/core/src/components/eui-combo-box.gts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { isArray } from '@ember/array';
44
import { action } from '@ember/object';
55
import { inject as service } from '@ember/service';
66
import { isEqual } from '@ember/utils';
7+
import 'ember-basic-dropdown/styles';
78

89
import optional from 'ember-composable-helpers/helpers/optional';
910
import pipe from 'ember-composable-helpers/helpers/pipe';

packages/core/src/components/eui-combo-box/options.gts

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import { isArray as isEmberArray } from '@ember/array';
21
import didInsert from '@ember/render-modifiers/modifiers/did-insert';
32
import willDestroy from '@ember/render-modifiers/modifiers/will-destroy';
43
import { inject as service } from '@ember/service';
54
import { htmlSafe } from '@ember/template';
6-
import { isEqual } from '@ember/utils';
75
import { EnsureSafeComponentHelper } from '@embroider/util';
86

97
//@ts-expect-error
@@ -21,27 +19,7 @@ import EuiLoadingSpinner from '../eui-loading-spinner.gts';
2119
import EuiText from '../eui-text.gts';
2220

2321
import type EuiConfigService from '../../services/eui-config';
24-
25-
26-
//This was extracted from ember-power-select v7.2.0, becuase it was removed in v8.0.0... or renamed to ember-power-select-
27-
function emberPowerSelectIsSelected([option, selected]: [any, any[]]/* , hash*/): boolean {
28-
if (selected === undefined || selected === null) {
29-
return false;
30-
}
31-
32-
if (isEmberArray(selected)) {
33-
for (let i = 0; i < selected.length; i++) {
34-
if (isEqual(selected[i], option)) {
35-
return true;
36-
}
37-
}
38-
39-
return false;
40-
} else {
41-
return isEqual(option, selected);
42-
}
43-
}
44-
22+
import emberPowerSelectIsEqual from 'ember-power-select/helpers/ember-power-select-is-equal';
4523

4624
export default class EuiComboBoxOptionsComponent extends EmberPowerSelectOptions {
4725
@service declare euiConfig: EuiConfigService;
@@ -143,10 +121,7 @@ export default class EuiComboBoxOptionsComponent extends EmberPowerSelectOptions
143121
(eq opt @select.highlighted)
144122
' euiFilterSelectItem-isFocused'
145123
}}"
146-
aria-selected="{{emberPowerSelectIsSelected
147-
opt
148-
@select.selected
149-
}}"
124+
aria-selected="{{emberPowerSelectIsEqual opt @select.selected}}"
150125
aria-disabled={{if opt.disabled "true"}}
151126
aria-current="{{eq opt @select.highlighted}}"
152127
data-option-index="{{index}}"

packages/core/src/components/eui-combo-box/trigger.gts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ export default class EuiComboBoxTriggerComponent extends EmberPowerSelectMultipl
9999
{{this.maybePlaceholder}}
100100
</p>
101101
{{/if}}
102-
103102
{{#let
104103
(component
105104
EuiComboBoxTriggerInput
@@ -127,7 +126,7 @@ export default class EuiComboBoxTriggerComponent extends EmberPowerSelectMultipl
127126
(EnsureSafeComponentHelper @placeholderComponent)
128127
select=@select
129128
placeholder=@placeholder
130-
isMutlipleWithSearch=true
129+
isMultipleWithSearch=true
131130
inputComponent=InputComponent
132131
displayPlaceholder=(and
133132
(not @select.searchText) (not @select.selected)

packages/core/src/components/eui-combo-box/trigger/input.gts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { on } from '@ember/modifier';
22
import { action } from '@ember/object';
3-
import didInsert from '@ember/render-modifiers/modifiers/did-insert';
43
import { scheduleOnce } from '@ember/runloop';
54
import { htmlSafe } from '@ember/template';
65
import { isBlank } from '@ember/utils';
@@ -103,16 +102,13 @@ export default class EuiComboBoxTriggerInputComponent extends EmberPowerSelectPo
103102
id="ember-power-select-trigger-multiple-input-{{@select.uniqueId}}"
104103
value={{@select.searchText}}
105104
aria-controls={{@listboxId}}
106-
style={{this.triggerMultipleInputStyle}}
107105
disabled={{@select.disabled}}
108106
tabindex={{@tabindex}}
109107
form="power-select-fake-form"
110108
{{on "focus" @onFocus}}
111109
{{on "blur" @onBlur}}
112110
{{on "input" this.handleInput}}
113111
{{on "keydown" this.handleKeydown}}
114-
{{!@glint-expect-error}}
115-
{{didInsert this.storeInputStyles}}
116112
/>
117113
</div>
118114
</template>

0 commit comments

Comments
 (0)