Refactor #4530

components/lib/base/style/BaseStyle.js

@@ -33,16 +33,20 @@ export default {
     classes,
     inlineStyles,
     loadStyle(options = {}) {
-        return useStyle(this.css, { name: this.name, ...options });
+        return this.css ? useStyle(this.css, { name: this.name, ...options }) : {};
     },
     getStyleSheet(extendedCSS = '', props = {}) {
-        const _props = Object.entries(props)
+        if (this.css) {
-            .reduce((acc, [k, v]) => acc.push(`${k}="${v}"`) && acc, [])
+            const _props = Object.entries(props)
-            .join(' ');
+                .reduce((acc, [k, v]) => acc.push(`${k}="${v}"`) && acc, [])
+                .join(' ');
 
-        return `<style type="text/css" data-primevue-style-id="${this.name}" ${_props}>${this.css}${extendedCSS}</style>`;
+            return `<style type="text/css" data-primevue-style-id="${this.name}" ${_props}>${this.css}${extendedCSS}</style>`;
+        }
+
+        return '';
     },
     extend(style) {
-        return { ...this, ...style };
+        return { ...this, css: undefined, ...style };
     }
 };

components/lib/button/style/ButtonStyle.js

@@ -35,6 +35,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'button',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/card/style/CardStyle.js

@@ -12,6 +12,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'card',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/checkbox/style/CheckboxStyle.js

@@ -22,6 +22,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'checkbox',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/confirmdialog/style/ConfirmDialogStyle.js

@@ -10,6 +10,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'confirmdialog',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/dataview/style/DataViewStyle.js

@@ -19,6 +19,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'dataview',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/dataviewlayoutoptions/style/DataViewLayoutOptionsStyle.js

@@ -18,6 +18,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'dataviewlayoutoptions',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/inputmask/style/InputMaskStyle.js

@@ -11,6 +11,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'inputmask',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/inputtext/style/InputTextStyle.js

@@ -13,6 +13,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'inputtext',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/radiobutton/style/RadioButtonStyle.js

@@ -22,6 +22,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'radiobutton',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/selectbutton/style/SelectButtonStyle.js

@@ -14,6 +14,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'selectbutton',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/togglebutton/style/ToggleButtonStyle.js

@@ -22,6 +22,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'accordion',
-    classes,
+    classes
-    loadStyle: () => {}
 });

components/lib/tristatecheckbox/style/TriStateCheckboxStyle.js

@@ -24,6 +24,5 @@ const classes = {
 
 export default BaseStyle.extend({
     name: 'tristatecheckbox',
-    classes,
+    classes
-    loadStyle: () => {}
 });