Skip to content

Commit 5f859e5

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/prismjs-1.30.0
2 parents 60105c3 + 3040367 commit 5f859e5

File tree

6 files changed

+31
-21
lines changed

6 files changed

+31
-21
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.

package-lock.json

Lines changed: 15 additions & 7 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/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/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)