From 7c299f55f91e460a54d1b0a542bc1acc02449f47 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Mon, 1 Apr 2024 14:08:53 +0100
Subject: [PATCH] Theming API: Add `dt` props to all component

---
 components/lib/base/style/BaseStyle.js        |  3 ++
 .../lib/basecomponent/BaseComponent.vue       | 28 +++++++++++++-
 components/lib/themes/config/index.js         |  5 +++
 components/lib/themes/utils/themeUtils.js     | 37 +++++++++----------
 components/lib/utils/DomHandler.js            |  2 +-
 components/lib/utils/UniqueComponentId.js     | 10 +++--
 6 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/components/lib/base/style/BaseStyle.js b/components/lib/base/style/BaseStyle.js
index c62de86c7..1ac7d44f4 100644
--- a/components/lib/base/style/BaseStyle.js
+++ b/components/lib/base/style/BaseStyle.js
@@ -49,6 +49,9 @@ export default {
     getDirectiveThemeCSS(params) {
         return Theme.getDirectiveCSS(this.name, params);
     },
+    getPresetThemeCSS(preset, selector, params) {
+        return Theme.getPresetCSS(this.name, preset, selector, params);
+    },
     getLayerOrderThemeCSS() {
         return Theme.getLayerOrderCSS(this.name);
     },
diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
index 366346eb8..12699061c 100644
--- a/components/lib/basecomponent/BaseComponent.vue
+++ b/components/lib/basecomponent/BaseComponent.vue
@@ -1,7 +1,7 @@
 <script>
 import BaseStyle from 'primevue/base/style';
 import Theme, { ThemeService } from 'primevue/themes';
-import { ObjectUtils } from 'primevue/utils';
+import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 import { mergeProps } from 'vue';
 import BaseComponentStyle from './style/BaseComponentStyle';
 
@@ -19,6 +19,10 @@ export default {
         unstyled: {
             type: Boolean,
             default: undefined
+        },
+        dt: {
+            type: Object,
+            default: undefined
         }
     },
     inject: {
@@ -38,8 +42,17 @@ export default {
                     this._loadThemeStyles();
                 }
             }
+        },
+        dt: {
+            immediate: true,
+            handler(newValue) {
+                if (newValue) {
+                    this._loadScopedThemeStyles(newValue);
+                }
+            }
         }
     },
+    scopedStyleEl: undefined,
     beforeCreate() {
         const _usept = this.pt?.['_usept'];
         const originalValue = _usept ? this.pt?.originalValue?.[this.$.type.name] : undefined;
@@ -61,6 +74,9 @@ export default {
         this._hook('onBeforeMount');
     },
     mounted() {
+        const rootElement = DomHandler.findSingle(this.$el, `[data-pc-name="${ObjectUtils.toFlatCase(this.$.type.name)}"]`);
+
+        rootElement?.setAttribute(this.$attrSelector, '');
         this._hook('onMounted');
     },
     beforeUpdate() {
@@ -73,6 +89,7 @@ export default {
         this._hook('onBeforeUnmount');
     },
     unmounted() {
+        this.scopedStyleEl?.value?.remove();
         this._hook('onUnmounted');
     },
     methods: {
@@ -143,6 +160,12 @@ export default {
                 Theme.setLoadedStyleName('layer-order');
             }
         },
+        _loadScopedThemeStyles(preset) {
+            const variables = this.$style?.getPresetThemeCSS?.(preset, `[${this.$attrSelector}]`) || {};
+            const scopedStyle = this.$style?.loadTheme(variables, { name: `${this.$attrSelector}-${this.$style.name}`, ...this.$styleOptions });
+
+            this.scopedStyleEl = scopedStyle.el;
+        },
         _getHostInstance(instance) {
             return instance ? (this.$options.hostName ? (instance.$.type.name === this.$options.hostName ? instance : this._getHostInstance(instance.$parentInstance)) : instance.$parentInstance) : undefined;
         },
@@ -322,6 +345,9 @@ export default {
 
                     return acc;
                 }, {});
+        },
+        $attrSelector() {
+            return UniqueComponentId('pc');
         }
     }
 };
diff --git a/components/lib/themes/config/index.js b/components/lib/themes/config/index.js
index a31ccb64a..cdc57919f 100644
--- a/components/lib/themes/config/index.js
+++ b/components/lib/themes/config/index.js
@@ -108,6 +108,11 @@ export default {
             variables: ThemeUtils.getPresetD(options)
         };
     },
+    getPresetCSS(name = '', preset, selector, params) {
+        const options = { name, preset, options: this.options, selector, params, defaults: this.defaults, set: { layerNames: this.setLayerNames.bind(this) } };
+
+        return ThemeUtils.getPreset(options);
+    },
     getLayerOrderCSS(name = '') {
         return ThemeUtils.getLayerOrder(name, this.options, { names: this.getLayerNames() }, this.defaults);
     },
diff --git a/components/lib/themes/utils/themeUtils.js b/components/lib/themes/utils/themeUtils.js
index dc5f98b7a..a380437ab 100644
--- a/components/lib/themes/utils/themeUtils.js
+++ b/components/lib/themes/utils/themeUtils.js
@@ -71,19 +71,24 @@ export default {
             global: global_css
         };
     },
-    getPresetC({ name = '', theme = {}, params, set, defaults }) {
-        const { preset, options } = theme;
-        const { colorScheme, ...vRest } = preset?.components?.[name] || {};
+    getPreset({ name = '', preset = {}, options, params, set, defaults, selector }) {
+        const { colorScheme, ...vRest } = preset;
         const { dark, ...csRest } = colorScheme || {};
         const vRest_css = SharedUtils.object.isNotEmpty(vRest) ? this._toVariables({ [name]: vRest }, options).declarations : '';
         const csRest_css = SharedUtils.object.isNotEmpty(csRest) ? this._toVariables({ [name]: csRest }, options).declarations : '';
         const dark_css = SharedUtils.object.isNotEmpty(dark) ? this._toVariables({ [name]: dark }, options).declarations : '';
 
-        const light_variable_css = this._transformCSS(name, `${vRest_css}${csRest_css}`, 'light', 'variable', options, set, defaults);
-        const dark_variable_css = this._transformCSS(name, dark_css, 'dark', 'variable', options, set, defaults);
+        const light_variable_css = this._transformCSS(name, `${vRest_css}${csRest_css}`, 'light', 'variable', options, set, defaults, selector);
+        const dark_variable_css = this._transformCSS(name, dark_css, 'dark', 'variable', options, set, defaults, selector);
 
         return `${light_variable_css}${dark_variable_css}`;
     },
+    getPresetC({ name = '', theme = {}, params, set, defaults }) {
+        const { preset, options } = theme;
+        const cPreset = preset?.components?.[name];
+
+        return this.getPreset({ name, preset: cPreset, options, params, set, defaults });
+    },
     getBaseC({ name = '', theme = {}, params, set, defaults }) {
         const { base, options } = theme;
         const { css } = base?.components?.[name] || {};
@@ -94,16 +99,9 @@ export default {
     getPresetD({ name = '', theme = {}, params, set, defaults }) {
         const dName = name.replace('-directive', '');
         const { preset, options } = theme;
-        const { colorScheme, ...vRest } = preset?.directives?.[dName] || {};
-        const { dark, ...csRest } = colorScheme || {};
-        const vRest_css = SharedUtils.object.isNotEmpty(vRest) ? this._toVariables({ [dName]: vRest }, options).declarations : '';
-        const csRest_css = SharedUtils.object.isNotEmpty(csRest) ? this._toVariables({ [dName]: csRest }, options).declarations : '';
-        const dark_css = SharedUtils.object.isNotEmpty(dark) ? this._toVariables({ [dName]: dark }, options).declarations : '';
+        const dPreset = preset?.directives?.[dName];
 
-        const light_variable_css = this._transformCSS(dName, `${vRest_css}${csRest_css}`, 'light', 'variable', options, set, defaults);
-        const dark_variable_css = this._transformCSS(dName, dark_css, 'dark', 'variable', options, set, defaults);
-
-        return `${light_variable_css}${dark_variable_css}`;
+        return this.getPreset({ name: dName, preset: dPreset, options, params, set, defaults });
     },
     getBaseD({ name = '', theme = {}, params, set, defaults }) {
         const dName = name.replace('-directive', '');
@@ -235,23 +233,24 @@ export default {
     _toVariables(theme, options) {
         return toVariables(theme, { prefix: options?.prefix });
     },
-    _transformCSS(name, css, mode, type, options = {}, set, defaults) {
+    _transformCSS(name, css, mode, type, options = {}, set, defaults, selector) {
         if (SharedUtils.object.isNotEmpty(css)) {
             const { cssLayer } = options;
 
             if (type !== 'style') {
                 const colorSchemeOption = this.getColorSchemeOption(options, defaults);
+                const _css = selector ? SharedUtils.object.getRule(selector, css) : css;
 
                 css =
                     mode === 'dark'
-                        ? colorSchemeOption.reduce((acc, { selector }) => {
-                              if (SharedUtils.object.isNotEmpty(selector)) {
-                                  acc += selector.includes('[CSS]') ? selector.replace('[CSS]', css) : SharedUtils.object.getRule(selector, css);
+                        ? colorSchemeOption.reduce((acc, { selector: _selector }) => {
+                              if (SharedUtils.object.isNotEmpty(_selector)) {
+                                  acc += _selector.includes('[CSS]') ? _selector.replace('[CSS]', _css) : SharedUtils.object.getRule(_selector, _css);
                               }
 
                               return acc;
                           }, '')
-                        : SharedUtils.object.getRule(':root', css);
+                        : SharedUtils.object.getRule(selector ?? ':root', css);
             }
 
             if (cssLayer) {
diff --git a/components/lib/utils/DomHandler.js b/components/lib/utils/DomHandler.js
index deba01f78..7875f9ce2 100755
--- a/components/lib/utils/DomHandler.js
+++ b/components/lib/utils/DomHandler.js
@@ -180,7 +180,7 @@ export default {
     },
 
     findSingle(element, selector) {
-        return this.isElement(element) ? element.querySelector(selector) : null;
+        return this.isElement(element) ? (element.matches(selector) ? element : element.querySelector(selector)) : null;
     },
 
     createElement(type, attributes = {}, ...children) {
diff --git a/components/lib/utils/UniqueComponentId.js b/components/lib/utils/UniqueComponentId.js
index ccb65ff83..87b831b57 100755
--- a/components/lib/utils/UniqueComponentId.js
+++ b/components/lib/utils/UniqueComponentId.js
@@ -1,7 +1,11 @@
-var lastId = 0;
+const lastIds = {};
 
 export default function (prefix = 'pv_id_') {
-    lastId++;
+    if (!lastIds.hasOwnProperty(prefix)) {
+        lastIds[prefix] = 0;
+    }
 
-    return `${prefix}${lastId}`;
+    lastIds[prefix]++;
+
+    return `${prefix}${lastIds[prefix]}`;
 }