From ee81d3b10ca64d235fa17118abb1e9460e57caa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bahad=C4=B1r=20Sofuo=C4=9Flu?= <bahadirsofuoglu@gmail.com>
Date: Wed, 24 May 2023 14:44:15 +0300
Subject: [PATCH] Refactor #3965 - For ProgressSpinner

---
 .../progressspinner/BaseProgressSpinner.vue   | 70 +++++++++++++++++++
 .../lib/progressspinner/ProgressSpinner.d.ts  |  5 ++
 .../lib/progressspinner/ProgressSpinner.vue   | 48 +------------
 3 files changed, 78 insertions(+), 45 deletions(-)
 create mode 100644 components/lib/progressspinner/BaseProgressSpinner.vue

diff --git a/components/lib/progressspinner/BaseProgressSpinner.vue b/components/lib/progressspinner/BaseProgressSpinner.vue
new file mode 100644
index 000000000..def707578
--- /dev/null
+++ b/components/lib/progressspinner/BaseProgressSpinner.vue
@@ -0,0 +1,70 @@
+<script>
+import BaseComponent from 'primevue/basecomponent';
+import { useStyle } from 'primevue/usestyle';
+
+const styles = `
+.p-progress-spinner {
+    position: relative;
+    margin: 0 auto;
+    width: 100px;
+    height: 100px;
+    display: inline-block;
+}
+
+.p-progress-spinner::before {
+    content: '';
+    display: block;
+    padding-top: 100%;
+}
+
+.p-progress-spinner-svg {
+    height: 100%;
+    transform-origin: center center;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+}
+`;
+
+const classes = {
+    root: 'p-progress-spinner',
+    spinner: 'p-progress-spinner-svg',
+    circle: 'p-progress-spinner-circle'
+};
+
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_progressspinner_style', manual: true });
+
+export default {
+    name: 'BaseProgressSpinner',
+    extends: BaseComponent,
+    props: {
+        strokeWidth: {
+            type: String,
+            default: '2'
+        },
+        fill: {
+            type: String,
+            default: 'none'
+        },
+        animationDuration: {
+            type: String,
+            default: '2s'
+        }
+    },
+    css: {
+        classes
+    },
+    watch: {
+        isUnstyled: {
+            immediate: true,
+            handler(newValue) {
+                !newValue && loadStyle();
+            }
+        }
+    }
+};
+</script>
diff --git a/components/lib/progressspinner/ProgressSpinner.d.ts b/components/lib/progressspinner/ProgressSpinner.d.ts
index 23fb36c1d..2deea45cb 100755
--- a/components/lib/progressspinner/ProgressSpinner.d.ts
+++ b/components/lib/progressspinner/ProgressSpinner.d.ts
@@ -67,6 +67,11 @@ export interface ProgressSpinnerProps {
      * @type {ProgressSpinnerPassThroughOptions}
      */
     pt?: ProgressSpinnerPassThroughOptions;
+    /**
+     * When enabled, it removes component related styles in the core.
+     * @defaultValue false
+     */
+    unstyled?: boolean;
 }
 
 /**
diff --git a/components/lib/progressspinner/ProgressSpinner.vue b/components/lib/progressspinner/ProgressSpinner.vue
index c10da4e18..29c654914 100755
--- a/components/lib/progressspinner/ProgressSpinner.vue
+++ b/components/lib/progressspinner/ProgressSpinner.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="p-progress-spinner" role="progressbar" v-bind="ptm('root')">
-        <svg class="p-progress-spinner-svg" viewBox="25 25 50 50" :style="svgStyle" v-bind="ptm('spinner')">
-            <circle class="p-progress-spinner-circle" cx="50" cy="50" r="20" :fill="fill" :stroke-width="strokeWidth" strokeMiterlimit="10" v-bind="ptm('circle')" />
+    <div :class="cx('root')" role="progressbar" v-bind="ptm('root')">
+        <svg :class="cx('spinner')" viewBox="25 25 50 50" :style="svgStyle" v-bind="ptm('spinner')">
+            <circle :class="cx('circle')" cx="50" cy="50" r="20" :fill="fill" :stroke-width="strokeWidth" strokeMiterlimit="10" v-bind="ptm('circle')" />
         </svg>
     </div>
 </template>
@@ -12,20 +12,6 @@ import BaseComponent from 'primevue/basecomponent';
 export default {
     name: 'ProgressSpinner',
     extends: BaseComponent,
-    props: {
-        strokeWidth: {
-            type: String,
-            default: '2'
-        },
-        fill: {
-            type: String,
-            default: 'none'
-        },
-        animationDuration: {
-            type: String,
-            default: '2s'
-        }
-    },
     computed: {
         svgStyle() {
             return {
@@ -35,31 +21,3 @@ export default {
     }
 };
 </script>
-
-<style>
-.p-progress-spinner {
-    position: relative;
-    margin: 0 auto;
-    width: 100px;
-    height: 100px;
-    display: inline-block;
-}
-
-.p-progress-spinner::before {
-    content: '';
-    display: block;
-    padding-top: 100%;
-}
-
-.p-progress-spinner-svg {
-    height: 100%;
-    transform-origin: center center;
-    width: 100%;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-}
-</style>