Skip to content

Commit 2290af7

Browse files
committed
Merge branch 'v8-master'
2 parents 3392efa + 28da63b commit 2290af7

File tree

11 files changed

+58
-9
lines changed

11 files changed

+58
-9
lines changed

packages/changeset-form/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@
109109

110110
- Updated dependencies [157b860]
111111
- @ember-eui/core@8.1.0
112+
## 8.0.37
113+
114+
### Patch Changes
115+
116+
- add eui-i18n token for eui-combo-box loadingMessage
117+
- Updated dependencies
118+
- @ember-eui/core@8.0.37
112119

113120
## 8.0.36
114121

packages/core/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
### Minor Changes
7676

7777
- 157b860: Fixes issues
78+
## 8.0.37
79+
80+
### Patch Changes
81+
82+
- add eui-i18n token for eui-combo-box loadingMessage
7883

7984
## 8.0.36
8085

packages/core/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,5 @@
552552
},
553553
"volta": {
554554
"extends": "../../package.json"
555-
},
556-
"gitHead": "2e4aaf4cf519520be36d696cb88394e166476045"
555+
}
557556
}

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
22
import { cached, tracked } from '@glimmer/tracking';
33
import { isArray } from '@ember/array';
44
import { action } from '@ember/object';
5+
import { inject as service } from '@ember/service';
56
import { isEqual } from '@ember/utils';
67

78
import optional from 'ember-composable-helpers/helpers/optional';
@@ -20,6 +21,8 @@ import EuiComboBoxOptions from './eui-combo-box/options.gts';
2021
import EuiComboBoxSearchMessage from './eui-combo-box/search-message.gts';
2122
import EuiComboBoxTrigger from './eui-combo-box/trigger.gts';
2223

24+
import type EuiI18n from '../services/eui-i18n';
25+
2326
interface PromiseProxy<T> extends Promise<T> {
2427
content: any;
2528
}
@@ -105,16 +108,28 @@ export const toPlainArray = <T,>(collection: T[] | Sliceable<T>): T[] => {
105108
};
106109

107110
export default class EuiComboBoxComponent extends Component<EuiComboBoxSignature> {
111+
@service declare euiI18n: EuiI18n;
112+
108113
@tracked select: any = null;
109114
@tracked private _resolvedOptions?: any[];
110115
@tracked searchText = '';
111116
@tracked private _searchResult?: any[];
117+
112118
private _filterResultsCache: {
113119
results: any[];
114120
options: any[];
115121
searchText: string;
116122
} = { results: [], options: [], searchText: this.searchText };
117123

124+
get loadingMessage() {
125+
return;
126+
this.args.loadingMessage ||
127+
this.euiI18n.lookupToken(
128+
'euiComboBox.loadingMessage',
129+
'Loading options...'
130+
);
131+
}
132+
118133
<template>
119134
{{! @glint-nocheck: not typesafe yet }}
120135
<PowerSelectMultiple
@@ -177,7 +192,7 @@ export default class EuiComboBoxComponent extends Component<EuiComboBoxSignature
177192
@title={{@title}}
178193
@triggerId={{@triggerId}}
179194
@allowClear={{and (argOrDefault @isClearable true) (not @isDisabled)}}
180-
@loadingMessage={{@loadingMessage}}
195+
@loadingMessage={{this.loadingMessage}}
181196
@selectedItemComponent={{@selectedItemComponent}}
182197
@beforeOptionsComponent={{@beforeOptionsComponent}}
183198
@afterOptionsComponent={{@afterOptionsComponent}}

packages/flatpickr/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@
109109

110110
- Updated dependencies [157b860]
111111
- @ember-eui/core@8.1.0
112+
## 8.0.37
113+
114+
### Patch Changes
115+
116+
- add eui-i18n token for eui-combo-box loadingMessage
117+
- Updated dependencies
118+
- @ember-eui/core@8.0.37
112119

113120
## 8.0.36
114121

packages/flatpickr/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,5 @@
143143
},
144144
"volta": {
145145
"extends": "../../package.json"
146-
},
147-
"gitHead": "2e4aaf4cf519520be36d696cb88394e166476045"
146+
}
148147
}

packages/pikaday/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@
109109

110110
- Updated dependencies [157b860]
111111
- @ember-eui/core@8.1.0
112+
## 8.0.37
113+
114+
### Patch Changes
115+
116+
- add eui-i18n token for eui-combo-box loadingMessage
117+
- Updated dependencies
118+
- @ember-eui/core@8.0.37
112119

113120
## 8.0.36
114121

packages/pikaday/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,5 @@
141141
},
142142
"volta": {
143143
"extends": "../../package.json"
144-
},
145-
"gitHead": "2e4aaf4cf519520be36d696cb88394e166476045"
144+
}
146145
}

packages/validated-form/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@
109109

110110
- Updated dependencies [157b860]
111111
- @ember-eui/core@8.1.0
112+
## 8.0.37
113+
114+
### Patch Changes
115+
116+
- add eui-i18n token for eui-combo-box loadingMessage
117+
- Updated dependencies
118+
- @ember-eui/core@8.0.37
112119

113120
## 8.0.36
114121

packages/validated-form/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,5 @@
155155
},
156156
"volta": {
157157
"extends": "../../package.json"
158-
},
159-
"gitHead": "2e4aaf4cf519520be36d696cb88394e166476045"
158+
}
160159
}

0 commit comments

Comments
 (0)