Skip to content

Commit d40a1b4

Browse files
authored
Merge pull request #2765 from Akshat55/accordion-fix
fix: accordion item flickering
2 parents a731b3f + 1535956 commit d40a1b4

File tree

3 files changed

+93
-65
lines changed

3 files changed

+93
-65
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@angular/common": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
6464
"@angular/core": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
6565
"@angular/forms": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
66-
"@carbon/styles": "^1.5.0",
66+
"@carbon/styles": "^1.44.0",
6767
"rxjs": "^6.0.0 || ^7.0.0",
6868
"zone.js": "^0.11.0"
6969
},
@@ -81,7 +81,7 @@
8181
"@angular/platform-browser-dynamic": "14.3.0",
8282
"@angular/router": "14.3.0",
8383
"@babel/core": "7.9.6",
84-
"@carbon/styles": "1.36.0",
84+
"@carbon/styles": "1.48.1",
8585
"@carbon/themes": "11.24.0",
8686
"@commitlint/cli": "17.0.3",
8787
"@commitlint/config-conventional": "17.0.3",

src/accordion/accordion-item.component.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@ import {
3131
[ngTemplateOutletContext]="context">
3232
</ng-template>
3333
</button>
34-
<div [id]="id" class="cds--accordion__content">
35-
<ng-content *ngIf="!skeleton; else skeletonTemplate"></ng-content>
36-
<ng-template #skeletonTemplate>
37-
<p class="cds--skeleton__text" style="width: 90%"></p>
38-
<p class="cds--skeleton__text" style="width: 80%"></p>
39-
<p class="cds--skeleton__text" style="width: 95%"></p>
40-
</ng-template>
34+
<div class="cds--accordion__wrapper">
35+
<div [id]="id" class="cds--accordion__content">
36+
<ng-content *ngIf="!skeleton; else skeletonTemplate"></ng-content>
37+
<ng-template #skeletonTemplate>
38+
<p class="cds--skeleton__text" style="width: 90%"></p>
39+
<p class="cds--skeleton__text" style="width: 80%"></p>
40+
<p class="cds--skeleton__text" style="width: 95%"></p>
41+
</ng-template>
42+
</div>
4143
</div>
4244
`,
4345
styles: [`

0 commit comments

Comments
 (0)