From a21c83e92712e4094a739e6b958c845498fab555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tu=C4=9F=C3=A7e=20K=C3=BC=C3=A7=C3=BCko=C4=9Flu?=
 <tugcekucukoglu.860@gmail.com>
Date: Fri, 19 May 2023 15:19:16 +0300
Subject: [PATCH] Refactor #3965 - For Toolbar

---
 components/lib/toolbar/BaseToolbar.vue | 57 ++++++++++++++++++++++++++
 components/lib/toolbar/Toolbar.d.ts    |  5 +++
 components/lib/toolbar/Toolbar.vue     | 41 ++++--------------
 3 files changed, 69 insertions(+), 34 deletions(-)
 create mode 100644 components/lib/toolbar/BaseToolbar.vue

diff --git a/components/lib/toolbar/BaseToolbar.vue b/components/lib/toolbar/BaseToolbar.vue
new file mode 100644
index 000000000..ccee98a41
--- /dev/null
+++ b/components/lib/toolbar/BaseToolbar.vue
@@ -0,0 +1,57 @@
+<script>
+import BaseComponent from 'primevue/basecomponent';
+import { useStyle } from 'primevue/usestyle';
+
+const styles = `
+.p-toolbar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.p-toolbar-group-start,
+.p-toolbar-group-center,
+.p-toolbar-group-end {
+    display: flex;
+    align-items: center;
+}
+
+.p-toolbar-group-left,
+.p-toolbar-group-right {
+    display: flex;
+    align-items: center;
+}
+`;
+
+const classes = {
+    root: 'p-toolbar p-component',
+    start: 'p-toolbar-group-start p-toolbar-group-left',
+    center: 'p-toolbar-group-center',
+    end: 'p-toolbar-group-end p-toolbar-group-right'
+};
+
+const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_toolbar_style', manual: true });
+
+export default {
+    name: 'BaseToolbar',
+    extends: BaseComponent,
+    props: {
+        'aria-labelledby': {
+            type: String,
+            default: null
+        }
+    },
+    css: {
+        classes
+    },
+    watch: {
+        isUnstyled: {
+            immediate: true,
+            handler(newValue) {
+                !newValue && loadStyle();
+            }
+        }
+    }
+};
+</script>
diff --git a/components/lib/toolbar/Toolbar.d.ts b/components/lib/toolbar/Toolbar.d.ts
index 668180840..8f50f5064 100755
--- a/components/lib/toolbar/Toolbar.d.ts
+++ b/components/lib/toolbar/Toolbar.d.ts
@@ -62,6 +62,11 @@ export interface ToolbarProps {
      * @type {ToolbarPassThroughOptions}
      */
     pt?: ToolbarPassThroughOptions;
+    /**
+     * When enabled, it removes component related styles in the core.
+     * @defaultValue false
+     */
+    unstyled?: boolean;
 }
 
 /**
diff --git a/components/lib/toolbar/Toolbar.vue b/components/lib/toolbar/Toolbar.vue
index 47a014c3d..1e92a9c3b 100755
--- a/components/lib/toolbar/Toolbar.vue
+++ b/components/lib/toolbar/Toolbar.vue
@@ -1,49 +1,22 @@
 <template>
-    <div class="p-toolbar p-component" role="toolbar" :aria-labelledby="ariaLabelledby" v-bind="ptm('root')">
-        <div class="p-toolbar-group-start p-toolbar-group-left" v-bind="ptm('start')">
+    <div :class="cx('root')" role="toolbar" :aria-labelledby="ariaLabelledby" data-pc-name="toolbar" data-pc-section="root" v-bind="ptm('root')">
+        <div :class="cx('start')" data-pc-section="start" v-bind="ptm('start')">
             <slot name="start"></slot>
         </div>
-        <div class="p-toolbar-group-center" v-bind="ptm('center')">
+        <div :class="cx('center')" data-pc-section="center" v-bind="ptm('center')">
             <slot name="center"></slot>
         </div>
-        <div class="p-toolbar-group-end p-toolbar-group-right" v-bind="ptm('end')">
+        <div :class="cx('end')" data-pc-section="end" v-bind="ptm('end')">
             <slot name="end"></slot>
         </div>
     </div>
 </template>
 
 <script>
-import BaseComponent from 'primevue/basecomponent';
+import BaseToolbar from './BaseToolbar.vue';
+
 export default {
     name: 'Toolbar',
-    extends: BaseComponent,
-    props: {
-        'aria-labelledby': {
-            type: String,
-            default: null
-        }
-    }
+    extends: BaseToolbar
 };
 </script>
-
-<style>
-.p-toolbar {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    flex-wrap: wrap;
-}
-
-.p-toolbar-group-start,
-.p-toolbar-group-center,
-.p-toolbar-group-end {
-    display: flex;
-    align-items: center;
-}
-
-.p-toolbar-group-left,
-.p-toolbar-group-right {
-    display: flex;
-    align-items: center;
-}
-</style>