Skip to content

Commit 89ad8eb

Browse files
authored
Merge branch 'carbon-design-system:master' into master
2 parents 8e49338 + a213947 commit 89ad8eb

File tree

10 files changed

+56
-43
lines changed

10 files changed

+56
-43
lines changed

integration/ng14/package-lock.json

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/ng15/package-lock.json

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/ng16/package-lock.json

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 29 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
},
141141
"dependencies": {
142142
"@carbon/icon-helpers": "10.37.0",
143-
"@carbon/icons": "11.14.0",
143+
"@carbon/icons": "11.58.0",
144144
"@carbon/utils-position": "1.1.4",
145145
"@floating-ui/dom": "1.6.13",
146146
"@ibm/telemetry-js": "^1.5.0",

src/dropdown/list/dropdown-list.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ export class DropdownList implements AbstractDropdownView, AfterViewInit, OnDest
508508
const selected = this.getSelected();
509509
if (selected.length) {
510510
this.index = this.displayItems.indexOf(selected[0]);
511-
} else if (this.hasNextElement()) {
511+
} else if (this.index < 0 && this.hasNextElement()) {
512512
this.getNextElement();
513513
}
514514
}

src/i18n/en.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default {
4545
"TITLE": "Loading"
4646
},
4747
"MODAL": {
48-
"CLOSE": "Close modal"
48+
"CLOSE": "Close"
4949
},
5050
"NOTIFICATION": {
5151
"CLOSE_BUTTON": "Close alert notification"

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"dependencies": {
1919
"@carbon/icon-helpers": "10.37.0",
20-
"@carbon/icons": "11.14.0",
20+
"@carbon/icons": "11.58.0",
2121
"@carbon/utils-position": "1.1.4",
2222
"@floating-ui/dom": "1.6.13",
2323
"@ibm/telemetry-js": "^1.5.0",

src/search/search.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ export class Search implements ControlValueAccessor {
212212
*/
213213
clearSearch(): void {
214214
this.value = "";
215+
this.doValueChange();
215216
this.clear.emit();
216-
this.propagateChange(this.value);
217217
}
218218

219219
doValueChange() {
220-
this.valueChange.emit(this.value);
221220
this.propagateChange(this.value);
221+
this.valueChange.emit(this.value);
222222
}
223223

224224
openSearch() {

src/tabs/tab.component.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import {
6060
role="tabpanel"
6161
*ngIf="shouldRender()"
6262
class="cds--tab-content"
63+
[id]="id"
6364
[ngStyle]="{'display': active ? null : 'none'}"
6465
[attr.aria-labelledby]="id + '-header'"
6566
aria-live="polite">
@@ -128,10 +129,6 @@ export class Tab implements OnInit {
128129
* Value 'selected' to be emitted after a new `Tab` is selected.
129130
*/
130131
@Output() selected: EventEmitter<void> = new EventEmitter<void>();
131-
/**
132-
* Used to set the id property on the element.
133-
*/
134-
@HostBinding("attr.id") attrClass = this.id;
135132

136133
get cacheActive() {
137134
return this._cacheActive;

0 commit comments

Comments
 (0)