Theming API: Update themes folder structure and all exports

components/lib/themes/actions/index.js

@@ -0,0 +1,5 @@
+export { default as extendPreset } from './extendPreset';
+export { default as updatePreset } from './updatePreset';
+export { default as updatePrimary } from './updatePrimary';
+export { default as updateSurface } from './updateSurface';
+export { default as updateTheme } from './updateTheme';

components/lib/themes/actions/package.json

@@ -0,0 +1,6 @@
+{
+    "main": "./index.cjs.js",
+    "module": "./index.esm.js",
+    "unpkg": "./index.min.js",
+    "types": "./index.d.ts"
+}

components/lib/themes/actions/updatePreset.js

@@ -1,8 +1,7 @@
 import Theme, { SharedUtils } from 'primevue/themes';
 
-const VARIABLE = Theme.defaults.variable;
-
 export default (preset) => {
+    const VARIABLE = Theme.defaults.variable;
     const newPreset = SharedUtils.object.mergeKeysByRegex(Theme.getPreset(), preset, VARIABLE.excludedKeyRegex);
 
     Theme.setPreset(newPreset);

components/lib/themes/actions/updatePrimary.js

@@ -0,0 +1,15 @@
+import Theme from 'primevue/themes';
+
+export default (primary) => {
+    const { primitive, semantic, components, directives } = Theme.getPreset();
+    const newPreset = {
+        primitive,
+        semantic: { ...semantic, primary },
+        components,
+        directives
+    };
+
+    Theme.setPreset(newPreset);
+
+    return newPreset;
+};

components/lib/themes/actions/updateSurface.js

@@ -0,0 +1,22 @@
+import Theme from 'primevue/themes';
+
+export default (surface) => {
+    const { primitive, semantic, components, directives } = Theme.getPreset();
+    const hasLightDark = surface?.hasOwnProperty('light') || surface?.hasOwnProperty('dark');
+    const newColorScheme = {
+        colorScheme: {
+            light: { ...semantic?.colorScheme?.light, ...{ surface: hasLightDark ? surface?.light : surface } },
+            dark: { ...semantic?.colorScheme?.dark, ...{ surface: hasLightDark ? surface?.dark : surface } }
+        }
+    };
+    const newPreset = {
+        primitive,
+        semantic: { ...semantic, ...newColorScheme },
+        components,
+        directives
+    };
+
+    Theme.setPreset(newPreset);
+
+    return newPreset;
+};

components/lib/themes/helpers/dt.js

@@ -1,7 +1,5 @@
 import Theme, { SharedUtils } from 'primevue/themes';
 
-const VARIABLE = Theme.defaults.variable;
-
 export const $dt = (tokenPath, type) => {
     const config = Theme.getPConfig();
 
@@ -10,6 +8,7 @@ export const $dt = (tokenPath, type) => {
 
 export const dt = (theme = {}, tokenPath, type) => {
     if (tokenPath) {
+        const VARIABLE = Theme.defaults.variable;
         const { prefix, transform } = theme?.options || {};
         const regex = /{([^}]*)}/g;
         const token = SharedUtils.object.test(regex, tokenPath) ? tokenPath : `{${tokenPath}}`;

components/lib/themes/helpers/index.js

@@ -0,0 +1,3 @@
+export * from './color/index.js';
+export * from './dt';
+export { default as toVariables } from './toVariables';

components/lib/themes/helpers/package.json

@@ -0,0 +1,6 @@
+{
+    "main": "./index.cjs.js",
+    "module": "./index.esm.js",
+    "unpkg": "./index.min.js",
+    "types": "./index.d.ts"
+}

components/lib/themes/helpers/toVariables.js

@@ -1,8 +1,7 @@
 import Theme, { SharedUtils } from 'primevue/themes';
 
-const VARIABLE = Theme.defaults.variable;
-
 export default function (theme, options = {}) {
+    const VARIABLE = Theme.defaults.variable;
     const { prefix = VARIABLE.prefix, selector = VARIABLE.selector, excludedKeyRegex = VARIABLE.excludedKeyRegex } = options;
 
     const _toVariables = (_theme, _prefix = '') => {

components/lib/themes/index.js

@@ -1,2 +1,5 @@
+export * from 'primevue/themes/actions';
 export { default } from 'primevue/themes/config';
-export * from './utils';
+export * from 'primevue/themes/helpers';
+export { default as ThemeService } from 'primevue/themes/service';
+export * from 'primevue/themes/utils';

components/lib/themes/primeone/base/calendar/package.json

@@ -0,0 +1,6 @@
+{
+    "main": "./index.cjs.js",
+    "module": "./index.esm.js",
+    "unpkg": "./index.min.js",
+    "types": "./index.d.ts"
+}

components/lib/themes/primeone/base/global/package.json

@@ -0,0 +1,6 @@
+{
+    "main": "./index.cjs.js",
+    "module": "./index.esm.js",
+    "unpkg": "./index.min.js",
+    "types": "./index.d.ts"
+}

components/lib/themes/primeone/base/index.js

@@ -84,8 +84,8 @@ import treeselect from 'primevue/themes/primeone/base/treeselect';
 import treetable from 'primevue/themes/primeone/base/treetable';
 
 export default {
+    global,
     components: {
-        global,
         accordion,
         autocomplete,
         avatar,

components/lib/themes/primeone/presets/aura/avatar/index.js

@@ -2,7 +2,7 @@ export default {
     colorScheme: {
         light: {
             root: {
-                background: '{surface.200}',
+                background: '{surface.200}'
             },
             grouped: {
                 borderColor: '{surface.0}'
@@ -10,7 +10,7 @@ export default {
         },
         dark: {
             root: {
-                background: '{surface.700}',
+                background: '{surface.700}'
             },
             grouped: {
                 borderColor: '{surface.900}'

components/lib/themes/primeone/presets/aura/floatlabel/index.js

@@ -2,6 +2,6 @@ export default {
     root: {
         color: '{form.field.float.label.color}',
         focusColor: '{form.field.float.label.focus.color}',
-        invalidColor: '{form.field.float.label.invalid.color}',
+        invalidColor: '{form.field.float.label.invalid.color}'
     }
 };

components/lib/themes/service/package.json

@@ -0,0 +1,6 @@
+{
+    "main": "./index.cjs.js",
+    "module": "./index.esm.js",
+    "unpkg": "./index.min.js",
+    "types": "./index.d.ts"
+}

components/lib/themes/utils/index.js

@@ -1,9 +1,2 @@
-export * from './color';
-export * from './dt';
-export { default as extendPreset } from './extendPreset';
-export { default as ThemeService } from './service';
 export { default as SharedUtils } from './sharedUtils';
 export { default as ThemeUtils } from './themeUtils';
-export { default as toVariables } from './toVariables';
-export { default as updatePreset } from './updatePreset';
-export { default as updateTheme } from './updateTheme';

components/lib/themes/utils/package.json

@@ -0,0 +1,6 @@
+{
+    "main": "./index.cjs.js",
+    "module": "./index.esm.js",
+    "unpkg": "./index.min.js",
+    "types": "./index.d.ts"
+}