From a89625515eb283c7448787993cbe8c05117d330b Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Tue, 14 Jan 2025 15:14:34 +0300 Subject: [PATCH] Fixed #7085 - ProgressSpinner Token Names Invalid --- .../style/ProgressSpinnerStyle.js | 10 ++++---- .../src/presets/aura/progressspinner/index.js | 16 ++++++------- .../src/presets/lara/progressspinner/index.js | 16 ++++++------- .../presets/material/progressspinner/index.js | 16 ++++++------- .../src/presets/nora/progressspinner/index.js | 16 ++++++------- .../themes/types/progressspinner/index.d.ts | 24 +++++++++---------- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/packages/primevue/src/progressspinner/style/ProgressSpinnerStyle.js b/packages/primevue/src/progressspinner/style/ProgressSpinnerStyle.js index 9e26450c8..d1ee160ed 100644 --- a/packages/primevue/src/progressspinner/style/ProgressSpinnerStyle.js +++ b/packages/primevue/src/progressspinner/style/ProgressSpinnerStyle.js @@ -31,7 +31,7 @@ const theme = ({ dt }) => ` .p-progressspinner-circle { stroke-dasharray: 89, 200; stroke-dashoffset: 0; - stroke: ${dt('progressspinner.color.1')}; + stroke: ${dt('progressspinner.colorOne')}; animation: p-progressspinner-dash 1.5s ease-in-out infinite, p-progressspinner-color 6s ease-in-out infinite; stroke-linecap: round; } @@ -58,17 +58,17 @@ const theme = ({ dt }) => ` @keyframes p-progressspinner-color { 100%, 0% { - stroke: ${dt('progressspinner.color.1')}; + stroke: ${dt('progressspinner.colorOne')}; } 40% { - stroke: ${dt('progressspinner.color.2')}; + stroke: ${dt('progressspinner.colorTwo')}; } 66% { - stroke: ${dt('progressspinner.color.3')}; + stroke: ${dt('progressspinner.colorThree')}; } 80%, 90% { - stroke: ${dt('progressspinner.color.4')}; + stroke: ${dt('progressspinner.colorFour')}; } } `; diff --git a/packages/themes/src/presets/aura/progressspinner/index.js b/packages/themes/src/presets/aura/progressspinner/index.js index 30c1c4175..a136d7253 100644 --- a/packages/themes/src/presets/aura/progressspinner/index.js +++ b/packages/themes/src/presets/aura/progressspinner/index.js @@ -2,18 +2,18 @@ export default { colorScheme: { light: { root: { - 'color.1': '{red.500}', - 'color.2': '{blue.500}', - 'color.3': '{green.500}', - 'color.4': '{yellow.500}' + 'colorOne': '{red.500}', + 'colorTwo': '{blue.500}', + 'colorThree': '{green.500}', + 'colorFour': '{yellow.500}' } }, dark: { root: { - 'color.1': '{red.400}', - 'color.2': '{blue.400}', - 'color.3': '{green.400}', - 'color.4': '{yellow.400}' + 'colorOne': '{red.400}', + 'colorTwo': '{blue.400}', + 'colorThree': '{green.400}', + 'colorFour': '{yellow.400}' } } } diff --git a/packages/themes/src/presets/lara/progressspinner/index.js b/packages/themes/src/presets/lara/progressspinner/index.js index 4620074b4..219c48bd4 100644 --- a/packages/themes/src/presets/lara/progressspinner/index.js +++ b/packages/themes/src/presets/lara/progressspinner/index.js @@ -2,18 +2,18 @@ export default { colorScheme: { light: { root: { - 'color.1': '{pink.500}', - 'color.2': '{sky.500}', - 'color.3': '{emerald.500}', - 'color.4': '{amber.500}' + colorOne: '{pink.500}', + colorTwo: '{sky.500}', + colorThree: '{emerald.500}', + colorFour: '{amber.500}' } }, dark: { root: { - 'color.1': '{pink.400}', - 'color.2': '{sky.400}', - 'color.3': '{emerald.400}', - 'color.4': '{amber.400}' + colorOne: '{pink.400}', + colorTwo: '{sky.400}', + colorThree: '{emerald.400}', + colorFour: '{amber.400}' } } } diff --git a/packages/themes/src/presets/material/progressspinner/index.js b/packages/themes/src/presets/material/progressspinner/index.js index 30c1c4175..4bdc9eb51 100644 --- a/packages/themes/src/presets/material/progressspinner/index.js +++ b/packages/themes/src/presets/material/progressspinner/index.js @@ -2,18 +2,18 @@ export default { colorScheme: { light: { root: { - 'color.1': '{red.500}', - 'color.2': '{blue.500}', - 'color.3': '{green.500}', - 'color.4': '{yellow.500}' + colorOne: '{red.500}', + colorTwo: '{blue.500}', + colorThree: '{green.500}', + colorFour: '{yellow.500}' } }, dark: { root: { - 'color.1': '{red.400}', - 'color.2': '{blue.400}', - 'color.3': '{green.400}', - 'color.4': '{yellow.400}' + colorOne: '{red.400}', + colorTwo: '{blue.400}', + colorThree: '{green.400}', + colorFour: '{yellow.400}' } } } diff --git a/packages/themes/src/presets/nora/progressspinner/index.js b/packages/themes/src/presets/nora/progressspinner/index.js index 30c1c4175..4bdc9eb51 100644 --- a/packages/themes/src/presets/nora/progressspinner/index.js +++ b/packages/themes/src/presets/nora/progressspinner/index.js @@ -2,18 +2,18 @@ export default { colorScheme: { light: { root: { - 'color.1': '{red.500}', - 'color.2': '{blue.500}', - 'color.3': '{green.500}', - 'color.4': '{yellow.500}' + colorOne: '{red.500}', + colorTwo: '{blue.500}', + colorThree: '{green.500}', + colorFour: '{yellow.500}' } }, dark: { root: { - 'color.1': '{red.400}', - 'color.2': '{blue.400}', - 'color.3': '{green.400}', - 'color.4': '{yellow.400}' + colorOne: '{red.400}', + colorTwo: '{blue.400}', + colorThree: '{green.400}', + colorFour: '{yellow.400}' } } } diff --git a/packages/themes/types/progressspinner/index.d.ts b/packages/themes/types/progressspinner/index.d.ts index 02185e3da..556c1a1d7 100644 --- a/packages/themes/types/progressspinner/index.d.ts +++ b/packages/themes/types/progressspinner/index.d.ts @@ -16,28 +16,28 @@ export interface ProgressSpinnerDesignTokens extends ColorSchemeDesignToken