From 015b7eee5c701ebf86ec84a20685a7287d83fe49 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Wed, 25 Oct 2023 12:50:23 +0100
Subject: [PATCH 1/4] Refactor on nuxt module doc

---
 doc/nuxt/SetupDoc.vue                 | 10 ++++++----
 doc/nuxt/configuration/OptionsDoc.vue |  7 ++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/doc/nuxt/SetupDoc.vue b/doc/nuxt/SetupDoc.vue
index 22d198e36..1970aba69 100644
--- a/doc/nuxt/SetupDoc.vue
+++ b/doc/nuxt/SetupDoc.vue
@@ -17,8 +17,8 @@ export default defineNuxtConfig({
     modules: [
         'nuxt-primevue'
     ],
-    primevue: { 
-        /* Options */ 
+    primevue: {
+        /* Options */
     }
 })
 `
@@ -29,9 +29,11 @@ export default defineNuxtConfig({
     modules: [
         'nuxt-primevue'
     ],
-    primevue: { 
+    primevue: {
         usePrimeVue: true,
         options: {},
+        importPT: undefined,
+        cssLayerOrder: 'tailwind-base, primevue, tailwind-utilities',
         components: {
             prefix: '',
             name: undefined,
@@ -51,7 +53,7 @@ export default defineNuxtConfig({
             exclude: undefined
         }
     }
-}) 
+})
 `
             }
         };
diff --git a/doc/nuxt/configuration/OptionsDoc.vue b/doc/nuxt/configuration/OptionsDoc.vue
index abe48da55..9fdefd82e 100644
--- a/doc/nuxt/configuration/OptionsDoc.vue
+++ b/doc/nuxt/configuration/OptionsDoc.vue
@@ -11,14 +11,11 @@ export default {
         return {
             code: {
                 basic: `
-primevue: { 
+primevue: {
     options: {
         unstyled: true,
         ripple: true,
-        inputStyle: 'filled',
-        pt: {
-
-        }
+        inputStyle: 'filled'
     }
 }
 `

From b6c96e83a03ba80dd58f7a4af4df28b7bfb38878 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: Wed, 25 Oct 2023 15:20:58 +0300
Subject: [PATCH 2/4] Fixed #4690 - MegaMenu: separate label and submenuLabel
 pt options

---
 components/lib/megamenu/MegaMenu.d.ts          | 4 ++++
 components/lib/megamenu/MegaMenuSub.vue        | 2 +-
 components/lib/megamenu/style/MegaMenuStyle.js | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/lib/megamenu/MegaMenu.d.ts b/components/lib/megamenu/MegaMenu.d.ts
index c86a2605f..0d863065a 100755
--- a/components/lib/megamenu/MegaMenu.d.ts
+++ b/components/lib/megamenu/MegaMenu.d.ts
@@ -98,6 +98,10 @@ export interface MegaMenuPassThroughOptions {
      * Used to pass attributes to the submenu's DOM element.
      */
     submenu?: MegaMenuPassThroughOptionType;
+    /**
+     * Used to pass attributes to the submenu label's DOM element.
+     */
+    submenuLabel?: MegaMenuPassThroughOptionType;
     /**
      * Used to pass attributes to the separator's DOM element.
      */
diff --git a/components/lib/megamenu/MegaMenuSub.vue b/components/lib/megamenu/MegaMenuSub.vue
index b9c203ed9..240c3b272 100644
--- a/components/lib/megamenu/MegaMenuSub.vue
+++ b/components/lib/megamenu/MegaMenuSub.vue
@@ -32,7 +32,7 @@
                         <a v-else v-ripple :href="getItemProp(processedItem, 'url')" :class="cx('action')" :target="getItemProp(processedItem, 'target')" tabindex="-1" aria-hidden="true" v-bind="getPTOptions(processedItem, index, 'action')">
                             <component v-if="templates.itemicon" :is="templates.itemicon" :item="processedItem.item" :class="[cx('icon'), getItemProp(processedItem, 'icon')]" />
                             <span v-else-if="getItemProp(processedItem, 'icon')" :class="[cx('icon'), getItemProp(processedItem, 'icon')]" v-bind="getPTOptions(processedItem, index, 'icon')" />
-                            <span :class="cx('label')" v-bind="getPTOptions(processedItem, index, 'label')">{{ getItemLabel(processedItem) }}</span>
+                            <span :class="level === 0 ? cx('label') : cx('submenuLabel')" v-bind="level === 0 ? getPTOptions(processedItem, index, 'label') : getPTOptions(processedItem, index, 'submenuLabel')">{{ getItemLabel(processedItem) }}</span>
                             <template v-if="isItemGroup(processedItem)">
                                 <component v-if="templates.submenuicon" :is="templates.submenuicon" :active="isItemActive(processedItem)" :class="cx('submenuIcon')" v-bind="getPTOptions(processedItem, index, 'submenuIcon')" />
                                 <component v-else :is="horizontal ? 'AngleDownIcon' : 'AngleRightIcon'" :class="cx('submenuIcon')" v-bind="getPTOptions(processedItem, index, 'submenuIcon')" />
diff --git a/components/lib/megamenu/style/MegaMenuStyle.js b/components/lib/megamenu/style/MegaMenuStyle.js
index 6d1a6eb07..0309512df 100644
--- a/components/lib/megamenu/style/MegaMenuStyle.js
+++ b/components/lib/megamenu/style/MegaMenuStyle.js
@@ -185,6 +185,7 @@ const classes = {
         return columnClass;
     },
     submenu: 'p-submenu-list p-megamenu-submenu',
+    submenuLabel: 'p-menuitem-text',
     separator: 'p-menuitem-separator',
     end: 'p-megamenu-end'
 };

From 90ecc89386ee72087fd342fa731a59b8f655323c Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <>
Date: Wed, 25 Oct 2023 12:22:20 +0000
Subject: [PATCH 3/4] Update API doc

---
 doc/common/apidoc/index.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/common/apidoc/index.json b/doc/common/apidoc/index.json
index 8eb936870..1a42d8502 100644
--- a/doc/common/apidoc/index.json
+++ b/doc/common/apidoc/index.json
@@ -31503,6 +31503,14 @@
                             "default": "",
                             "description": "Used to pass attributes to the submenu's DOM element."
                         },
+                        {
+                            "name": "submenuLabel",
+                            "optional": true,
+                            "readonly": false,
+                            "type": "MegaMenuPassThroughOptionType",
+                            "default": "",
+                            "description": "Used to pass attributes to the submenu label's DOM element."
+                        },
                         {
                             "name": "separator",
                             "optional": true,

From 2e3d6c88cba5417ae226daf296be5bedf7703126 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: Wed, 25 Oct 2023 15:29:22 +0300
Subject: [PATCH 4/4] TreeTable demo height updates

---
 doc/treetable/scroll/FrozenColumnsDoc.vue    | 8 ++++----
 doc/treetable/scroll/HorizontalScrollDoc.vue | 8 ++++----
 doc/treetable/scroll/VerticalScrollDoc.vue   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/treetable/scroll/FrozenColumnsDoc.vue b/doc/treetable/scroll/FrozenColumnsDoc.vue
index 6a3d90e72..c66c24ddc 100644
--- a/doc/treetable/scroll/FrozenColumnsDoc.vue
+++ b/doc/treetable/scroll/FrozenColumnsDoc.vue
@@ -3,7 +3,7 @@
         <p>A column can be fixed during horizontal scrolling by enabling the <i>frozen</i> property on a Column. The location is defined with the <i>alignFrozen</i> that can be <i>left</i> or <i>right</i>.</p>
     </DocSectionText>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px" scrollDirection="both">
+        <TreeTable :value="nodes" scrollable scrollHeight="300px" scrollDirection="both">
             <Column field="name" header="Name" expander frozen style="width: 250px; height: 57px"></Column>
             <Column field="size" header="Size" style="width: 250px; height: 57px"></Column>
             <Column field="type" header="Type 2" style="width: 250px; height: 57px"></Column>
@@ -24,7 +24,7 @@ export default {
             nodes: null,
             code: {
                 basic: `
-<TreeTable :value="nodes" scrollable scrollHeight="200px" scrollDirection="both">
+<TreeTable :value="nodes" scrollable scrollHeight="300px" scrollDirection="both">
     <Column field="name" header="Name" expander frozen style="width: 250px; height: 57px"></Column>
     <Column field="size" header="Size" style="width: 250px; height: 57px"></Column>
     <Column field="type" header="Type 2" style="width: 250px; height: 57px"></Column>
@@ -36,7 +36,7 @@ export default {
                 options: `
 <template>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px" scrollDirection="both">
+        <TreeTable :value="nodes" scrollable scrollHeight="300px" scrollDirection="both">
             <Column field="name" header="Name" expander frozen style="width: 250px; height: 57px"></Column>
             <Column field="size" header="Size" style="width: 250px; height: 57px"></Column>
             <Column field="type" header="Type 2" style="width: 250px; height: 57px"></Column>
@@ -65,7 +65,7 @@ export default {
                 composition: `
 <template>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px" scrollDirection="both">
+        <TreeTable :value="nodes" scrollable scrollHeight="300px" scrollDirection="both">
             <Column field="name" header="Name" expander frozen style="width: 250px; height: 57px"></Column>
             <Column field="size" header="Size" style="width: 250px; height: 57px"></Column>
             <Column field="type" header="Type 2" style="width: 250px; height: 57px"></Column>
diff --git a/doc/treetable/scroll/HorizontalScrollDoc.vue b/doc/treetable/scroll/HorizontalScrollDoc.vue
index ff4ef5bdf..5c6cd2e07 100644
--- a/doc/treetable/scroll/HorizontalScrollDoc.vue
+++ b/doc/treetable/scroll/HorizontalScrollDoc.vue
@@ -3,7 +3,7 @@
         <p>Horizontal scrolling is enabled when the total width of columns exceeds table width.</p>
     </DocSectionText>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px" scrollDirection="both">
+        <TreeTable :value="nodes" scrollable scrollHeight="300px" scrollDirection="both">
             <Column field="name" header="Name" expander style="width: 250px"></Column>
             <Column field="size" header="Size" style="width: 250px"></Column>
             <Column field="type" header="Type 2" style="width: 250px"></Column>
@@ -24,7 +24,7 @@ export default {
             nodes: null,
             code: {
                 basic: `
-<TreeTable :value="nodes" scrollable scrollHeight="200px" scrollDirection="both">
+<TreeTable :value="nodes" scrollable scrollHeight="300px" scrollDirection="both">
     <Column field="name" header="Name" expander style="width: 250px"></Column>
     <Column field="size" header="Size" style="width: 250px"></Column>
     <Column field="type" header="Type 2" style="width: 250px"></Column>
@@ -36,7 +36,7 @@ export default {
                 options: `
 <template>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px" scrollDirection="both">
+        <TreeTable :value="nodes" scrollable scrollHeight="300px" scrollDirection="both">
             <Column field="name" header="Name" expander style="width: 250px"></Column>
             <Column field="size" header="Size" style="width: 250px"></Column>
             <Column field="type" header="Type 2" style="width: 250px"></Column>
@@ -65,7 +65,7 @@ export default {
                 composition: `
 <template>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px" scrollDirection="both">
+        <TreeTable :value="nodes" scrollable scrollHeight="300px" scrollDirection="both">
             <Column field="name" header="Name" expander style="width: 250px"></Column>
             <Column field="size" header="Size" style="width: 250px"></Column>
             <Column field="type" header="Type 2" style="width: 250px"></Column>
diff --git a/doc/treetable/scroll/VerticalScrollDoc.vue b/doc/treetable/scroll/VerticalScrollDoc.vue
index 4f13a44cf..6e496ac22 100644
--- a/doc/treetable/scroll/VerticalScrollDoc.vue
+++ b/doc/treetable/scroll/VerticalScrollDoc.vue
@@ -3,7 +3,7 @@
         <p>Adding <i>scrollable</i> property along with a <i>scrollHeight</i> for the data viewport enables vertical scrolling with fixed headers.</p>
     </DocSectionText>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px">
+        <TreeTable :value="nodes" scrollable scrollHeight="270px">
             <Column field="name" header="Name" expander></Column>
             <Column field="size" header="Size"></Column>
             <Column field="type" header="Type"></Column>
@@ -21,7 +21,7 @@ export default {
             nodes: null,
             code: {
                 basic: `
-<TreeTable :value="nodes" scrollable scrollHeight="200px">
+<TreeTable :value="nodes" scrollable scrollHeight="270px">
     <Column field="name" header="Name" expander></Column>
     <Column field="size" header="Size"></Column>
     <Column field="type" header="Type"></Column>
@@ -30,7 +30,7 @@ export default {
                 options: `
 <template>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px">
+        <TreeTable :value="nodes" scrollable scrollHeight="270px">
             <Column field="name" header="Name" expander></Column>
             <Column field="size" header="Size"></Column>
             <Column field="type" header="Type"></Column>
@@ -56,7 +56,7 @@ export default {
                 composition: `
 <template>
     <div class="card">
-        <TreeTable :value="nodes" scrollable scrollHeight="200px">
+        <TreeTable :value="nodes" scrollable scrollHeight="270px">
             <Column field="name" header="Name" expander></Column>
             <Column field="size" header="Size"></Column>
             <Column field="type" header="Type"></Column>