Skip to content

Commit 73ddbd7

Browse files
Merge branch 'master' into fix-accessibility-violation-button
2 parents 42ed562 + ee4fdb0 commit 73ddbd7

File tree

8 files changed

+53
-37
lines changed

8 files changed

+53
-37
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",

0 commit comments

Comments
 (0)