From 303959438ac36df9e32112b59659fc9868833b48 Mon Sep 17 00:00:00 2001
From: Mert Sincan <sincan.mert@gmail.com>
Date: Tue, 28 Jan 2025 19:56:48 +0000
Subject: [PATCH] fix: Base Presets: CSS var --p-scrollbar-width is not
 defined. Fixes #6094

---
 apps/showcase/nuxt.config.js                |  2 +-
 packages/primevue/src/blockui/BlockUI.vue   |  3 ++-
 packages/primevue/src/dialog/Dialog.vue     |  3 ++-
 packages/primevue/src/drawer/Drawer.vue     |  3 ++-
 packages/primevue/src/galleria/Galleria.vue |  3 ++-
 packages/primevue/src/image/Image.vue       |  3 ++-
 packages/primevue/src/utils/Utils.d.ts      |  2 ++
 packages/primevue/src/utils/Utils.js        | 10 ++++++++++
 packages/primevue/src/utils/package.json    |  5 +++++
 9 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 packages/primevue/src/utils/Utils.d.ts
 create mode 100644 packages/primevue/src/utils/Utils.js
 create mode 100644 packages/primevue/src/utils/package.json

diff --git a/apps/showcase/nuxt.config.js b/apps/showcase/nuxt.config.js
index 2b8dcee76..7804dbea2 100644
--- a/apps/showcase/nuxt.config.js
+++ b/apps/showcase/nuxt.config.js
@@ -26,7 +26,7 @@ export default defineNuxtConfig({
     },
     vite: {
         resolve: {
-            dedupe: ['vue', '@primeuix/themes'],
+            dedupe: ['vue', '@primeuix/themes', '@primeuix/utils'],
             optimizeDeps: {
                 disabled: true
             },
diff --git a/packages/primevue/src/blockui/BlockUI.vue b/packages/primevue/src/blockui/BlockUI.vue
index 4c18ed745..bb326fac3 100755
--- a/packages/primevue/src/blockui/BlockUI.vue
+++ b/packages/primevue/src/blockui/BlockUI.vue
@@ -5,8 +5,9 @@
 </template>
 
 <script>
-import { addClass, blockBodyScroll, createElement, hasCSSAnimation, unblockBodyScroll } from '@primeuix/utils/dom';
+import { addClass, createElement, hasCSSAnimation } from '@primeuix/utils/dom';
 import { ZIndex } from '@primeuix/utils/zindex';
+import { blockBodyScroll, unblockBodyScroll } from 'primevue/utils';
 import BaseBlockUI from './BaseBlockUI.vue';
 
 export default {
diff --git a/packages/primevue/src/dialog/Dialog.vue b/packages/primevue/src/dialog/Dialog.vue
index 3ab31e992..7541b5a37 100755
--- a/packages/primevue/src/dialog/Dialog.vue
+++ b/packages/primevue/src/dialog/Dialog.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { addClass, addStyle, blockBodyScroll, focus, getOuterHeight, getOuterWidth, getViewport, setAttribute, unblockBodyScroll } from '@primeuix/utils/dom';
+import { addClass, addStyle, focus, getOuterHeight, getOuterWidth, getViewport, setAttribute } from '@primeuix/utils/dom';
 import { ZIndex } from '@primeuix/utils/zindex';
 import TimesIcon from '@primevue/icons/times';
 import WindowMaximizeIcon from '@primevue/icons/windowmaximize';
@@ -71,6 +71,7 @@ import Button from 'primevue/button';
 import FocusTrap from 'primevue/focustrap';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
+import { blockBodyScroll, unblockBodyScroll } from 'primevue/utils';
 import { computed } from 'vue';
 import BaseDialog from './BaseDialog.vue';
 
diff --git a/packages/primevue/src/drawer/Drawer.vue b/packages/primevue/src/drawer/Drawer.vue
index e2d6f1626..8619d17e7 100755
--- a/packages/primevue/src/drawer/Drawer.vue
+++ b/packages/primevue/src/drawer/Drawer.vue
@@ -42,12 +42,13 @@
 </template>
 
 <script>
-import { addClass, blockBodyScroll, focus, unblockBodyScroll } from '@primeuix/utils/dom';
+import { addClass, focus } from '@primeuix/utils/dom';
 import { ZIndex } from '@primeuix/utils/zindex';
 import TimesIcon from '@primevue/icons/times';
 import Button from 'primevue/button';
 import FocusTrap from 'primevue/focustrap';
 import Portal from 'primevue/portal';
+import { blockBodyScroll, unblockBodyScroll } from 'primevue/utils';
 import BaseDrawer from './BaseDrawer.vue';
 
 export default {
diff --git a/packages/primevue/src/galleria/Galleria.vue b/packages/primevue/src/galleria/Galleria.vue
index 84a517a0b..c3d9f3232 100755
--- a/packages/primevue/src/galleria/Galleria.vue
+++ b/packages/primevue/src/galleria/Galleria.vue
@@ -10,10 +10,11 @@
 </template>
 
 <script>
-import { unblockBodyScroll, blockBodyScroll, addClass } from '@primeuix/utils/dom';
+import { addClass } from '@primeuix/utils/dom';
 import { ZIndex } from '@primeuix/utils/zindex';
 import FocusTrap from 'primevue/focustrap';
 import Portal from 'primevue/portal';
+import { blockBodyScroll, unblockBodyScroll } from 'primevue/utils';
 import BaseGalleria from './BaseGalleria.vue';
 import GalleriaContent from './GalleriaContent.vue';
 
diff --git a/packages/primevue/src/image/Image.vue b/packages/primevue/src/image/Image.vue
index a5f6f7390..bb14d2fdb 100644
--- a/packages/primevue/src/image/Image.vue
+++ b/packages/primevue/src/image/Image.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import { blockBodyScroll, isAttributeEquals, focus, addClass, unblockBodyScroll } from '@primeuix/utils/dom';
+import { addClass, focus, isAttributeEquals } from '@primeuix/utils/dom';
 import { ZIndex } from '@primeuix/utils/zindex';
 import EyeIcon from '@primevue/icons/eye';
 import RefreshIcon from '@primevue/icons/refresh';
@@ -66,6 +66,7 @@ import TimesIcon from '@primevue/icons/times';
 import UndoIcon from '@primevue/icons/undo';
 import FocusTrap from 'primevue/focustrap';
 import Portal from 'primevue/portal';
+import { blockBodyScroll, unblockBodyScroll } from 'primevue/utils';
 import BaseImage from './BaseImage.vue';
 
 export default {
diff --git a/packages/primevue/src/utils/Utils.d.ts b/packages/primevue/src/utils/Utils.d.ts
new file mode 100644
index 000000000..6f4f50e6a
--- /dev/null
+++ b/packages/primevue/src/utils/Utils.d.ts
@@ -0,0 +1,2 @@
+export declare function blockBodyScroll() : void;
+export declare function unblockBodyScroll() : void;
diff --git a/packages/primevue/src/utils/Utils.js b/packages/primevue/src/utils/Utils.js
new file mode 100644
index 000000000..17745ad6f
--- /dev/null
+++ b/packages/primevue/src/utils/Utils.js
@@ -0,0 +1,10 @@
+import { $dt } from "@primeuix/styled";
+import * as utils from "@primeuix/utils";
+
+export function blockBodyScroll() {
+    utils.blockBodyScroll({ variableName: $dt('scrollbar.width').name });
+}
+
+export function unblockBodyScroll() {
+    utils.unblockBodyScroll({ variableName: $dt('scrollbar.width').name });
+}
diff --git a/packages/primevue/src/utils/package.json b/packages/primevue/src/utils/package.json
new file mode 100644
index 000000000..d0f409d0e
--- /dev/null
+++ b/packages/primevue/src/utils/package.json
@@ -0,0 +1,5 @@
+{
+    "main": "./Utils.js",
+    "module": "./Utils.js",
+    "types": "./Utils.d.ts"
+}