fix: Conflict between picklist used inputicon-style and table loading…

… mask Fixes #17263
primefaces · Feb 6, 2025 · cab3c60 · cab3c60
1 parent 280a9a7
commit cab3c60
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/packages/primeng/src/base/style/basestyle.ts b/packages/primeng/src/base/style/basestyle.ts
@@ -195,9 +195,9 @@ export class BaseStyle {
 
     useStyle: UseStyle = inject(UseStyle);
 
-    theme = theme;
+    theme = undefined;
 
-    css = css;
+    css = undefined;
 
     classes = {};
 
@@ -216,6 +216,14 @@ export class BaseStyle {
         return this.load(this.theme, options, (computedStyle = '') => Theme.transformCSS(options.name || this.name, `${computedStyle}${style}`));
     };
 
+    loadGlobalCSS = (options = {}) => {
+        return this.load(css, options);
+    };
+
+    loadGlobalTheme = (options: any = {}, style: string = '') => {
+        return this.load(theme, options, (computedStyle = '') => Theme.transformCSS(options.name || this.name, `${computedStyle}${style}`));
+    };
+
     getCommonTheme = (params?) => {
         return Theme.getCommon(this.name, params);
     };

diff --git a/packages/primeng/src/basecomponent/basecomponent.ts b/packages/primeng/src/basecomponent/basecomponent.ts
@@ -1,8 +1,7 @@
 import { DOCUMENT, isPlatformServer } from '@angular/common';
-import { ChangeDetectorRef, ContentChildren, Directive, ElementRef, inject, Injector, Input, PLATFORM_ID, QueryList, Renderer2, SimpleChanges } from '@angular/core';
+import { ChangeDetectorRef, Directive, ElementRef, inject, Injector, Input, PLATFORM_ID, Renderer2, SimpleChanges } from '@angular/core';
 import { Theme, ThemeService } from '@primeuix/styled';
 import { getKeyValue, uuid } from '@primeuix/utils';
-import { PrimeTemplate } from 'primeng/api';
 import { Base, BaseStyle } from 'primeng/base';
 import { PrimeNG } from 'primeng/config';
 import { BaseComponentStyle } from './style/basecomponentstyle';
@@ -87,7 +86,7 @@ export class BaseComponent {
     _loadStyles() {
         const _load = () => {
             if (!Base.isStyleNameLoaded('base')) {
-                this.baseStyle.loadCSS(this.styleOptions);
+                this.baseStyle.loadGlobalCSS(this.styleOptions);
                 Base.setLoadedStyleName('base');
             }
 
@@ -115,7 +114,7 @@ export class BaseComponent {
             this.baseStyle.load(primitive?.css, { name: 'primitive-variables', ...this.styleOptions });
             this.baseStyle.load(semantic?.css, { name: 'semantic-variables', ...this.styleOptions });
             this.baseStyle.load(global?.css, { name: 'global-variables', ...this.styleOptions });
-            this.baseStyle.loadTheme({ name: 'global-style', ...this.styleOptions }, style);
+            this.baseStyle.loadGlobalTheme({ name: 'global-style', ...this.styleOptions }, style);
 
             Theme.setLoadedStyleName('common');
         }

diff --git a/packages/primeng/src/config/themeprovider.ts b/packages/primeng/src/config/themeprovider.ts
@@ -69,7 +69,7 @@ export class ThemeProvider {
             this.baseStyle.load(primitive?.css, { name: 'primitive-variables', ...styleOptions });
             this.baseStyle.load(semantic?.css, { name: 'semantic-variables', ...styleOptions });
             this.baseStyle.load(global?.css, { name: 'global-variables', ...styleOptions });
-            this.baseStyle.loadTheme({ name: 'global-style', ...styleOptions }, style);
+            this.baseStyle.loadGlobalTheme({ name: 'global-style', ...styleOptions }, style);
 
             Theme.setLoadedStyleName('common');
         }