diff --git a/src/app/components/base/style/basestyle.ts b/src/app/components/base/style/basestyle.ts index 9fae9ea247b..a5c11bac4a2 100644 --- a/src/app/components/base/style/basestyle.ts +++ b/src/app/components/base/style/basestyle.ts @@ -105,8 +105,8 @@ const theme = ({ dt }) => ` .p-overlay-mask-leave { animation: p-overlay-mask-leave-animation ${dt('mask.transition.duration')} forwards; } - -@keyframes p-overlay-mask-enter-animation { +/* Temporarily disabled, distrupts PrimeNG overlay animations */ +/* @keyframes p-overlay-mask-enter-animation { from { background: transparent; } @@ -121,7 +121,7 @@ const theme = ({ dt }) => ` to { background: transparent; } -} +}*/ `; const css = ({ dt }) => ` diff --git a/src/app/components/baseicon/baseicon.ts b/src/app/components/baseicon/baseicon.ts index 97d43814586..d3689aa9357 100644 --- a/src/app/components/baseicon/baseicon.ts +++ b/src/app/components/baseicon/baseicon.ts @@ -1,5 +1,6 @@ -import { Component, Input, ChangeDetectionStrategy, ViewEncapsulation, ElementRef, HostBinding, booleanAttribute } from '@angular/core'; +import { Component, Input, ChangeDetectionStrategy, ViewEncapsulation, ElementRef, HostBinding, booleanAttribute, inject } from '@angular/core'; import { ObjectUtils } from 'primeng/utils'; +import { BaseComponent } from 'primeng/basecomponent'; @Component({ template: ` `, @@ -7,10 +8,10 @@ import { ObjectUtils } from 'primeng/utils'; changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, host: { - class: 'p-element p-icon-wrapper' + class: 'p-component p-icon-wrapper' } }) -export class BaseIcon { +export class BaseIcon extends BaseComponent { @Input() label: string; @Input({ transform: booleanAttribute }) spin: boolean = false; @@ -24,6 +25,7 @@ export class BaseIcon { ariaHidden: boolean; ngOnInit() { + super.ngOnInit(); this.getAttributes(); }