From 1b83d9319bed7b9462745c5514c048ab3bf18320 Mon Sep 17 00:00:00 2001
From: Cagatay Civici <cagatay.civici@gmail.com>
Date: Wed, 3 Mar 2021 13:30:19 +0300
Subject: [PATCH] Refactor OverlayEventBus location

---
 rollup.config.js                                  | 2 ++
 src/components/autocomplete/AutoComplete.vue      | 3 ++-
 src/components/calendar/Calendar.vue              | 3 ++-
 src/components/cascadeselect/CascadeSelect.vue    | 3 ++-
 src/components/colorpicker/ColorPicker.vue        | 3 ++-
 src/components/confirmpopup/ConfirmPopup.vue      | 3 ++-
 src/components/datatable/BodyCell.vue             | 3 ++-
 src/components/dropdown/Dropdown.vue              | 3 ++-
 src/components/menu/Menu.vue                      | 3 ++-
 src/components/multiselect/MultiSelect.vue        | 3 ++-
 src/components/overlayeventbus/OverlayEventBus.js | 3 +++
 src/components/overlayeventbus/package.json       | 5 +++++
 src/components/overlaypanel/OverlayPanel.vue      | 3 ++-
 src/components/password/Password.vue              | 3 ++-
 src/components/tieredmenu/TieredMenu.vue          | 3 ++-
 src/components/utils/OverlayEventBus.js           | 3 ---
 src/components/utils/Utils.js                     | 3 +--
 vue.config.js                                     | 1 +
 18 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 src/components/overlayeventbus/OverlayEventBus.js
 create mode 100644 src/components/overlayeventbus/package.json
 delete mode 100644 src/components/utils/OverlayEventBus.js

diff --git a/rollup.config.js b/rollup.config.js
index 26e707beb..a3cad0557 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -18,6 +18,7 @@ let globalDependencies = {
     'primevue/paginator': 'primevue.paginator',
     'primevue/confirmationeventbus': 'primevue.confirmationeventbus',
     'primevue/toasteventbus': 'primevue.toasteventbus',
+    'primevue/overlayeventbus': 'primevue.overlayeventbus',
     'primevue/useconfirm': 'primevue.useconfirm',
     'primevue/usetoast': 'primevue.usetoast',
     'primevue/progressbar': 'primevue.progressbar',
@@ -113,6 +114,7 @@ function addServices() {
     addEntry('useconfirm', 'UseConfirm.js', 'useconfirm');
     addEntry('toastservice', 'ToastService.js', 'toastservice');
     addEntry('toasteventbus', 'ToastEventBus.js', 'toasteventbus');
+    addEntry('overlayeventbus', 'OverlayEventBus.js', 'overlayeventbus');
     addEntry('usetoast', 'UseToast.js', 'usetoast');
     addEntry('terminalservice', 'TerminalService.js', 'terminalservice');
 }
diff --git a/src/components/autocomplete/AutoComplete.vue b/src/components/autocomplete/AutoComplete.vue
index cba9e1e8a..a4d1b7d0d 100755
--- a/src/components/autocomplete/AutoComplete.vue
+++ b/src/components/autocomplete/AutoComplete.vue
@@ -43,7 +43,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,UniqueComponentId,ObjectUtils,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,UniqueComponentId,ObjectUtils,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import Button from 'primevue/button';
 import Ripple from 'primevue/ripple';
 
diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index a0786e156..f120265b8 100755
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -133,7 +133,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import InputText from 'primevue/inputtext';
 import Button from 'primevue/button';
 import Ripple from 'primevue/ripple';
diff --git a/src/components/cascadeselect/CascadeSelect.vue b/src/components/cascadeselect/CascadeSelect.vue
index be93bb49a..af63f0826 100644
--- a/src/components/cascadeselect/CascadeSelect.vue
+++ b/src/components/cascadeselect/CascadeSelect.vue
@@ -28,7 +28,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import CascadeSelectSub from './CascadeSelectSub.vue';
 
 export default {
diff --git a/src/components/colorpicker/ColorPicker.vue b/src/components/colorpicker/ColorPicker.vue
index 527a9235d..54aeb6ee0 100755
--- a/src/components/colorpicker/ColorPicker.vue
+++ b/src/components/colorpicker/ColorPicker.vue
@@ -24,7 +24,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 
 export default {
     emits: ['update:modelValue'],
diff --git a/src/components/confirmpopup/ConfirmPopup.vue b/src/components/confirmpopup/ConfirmPopup.vue
index a97d49f0b..853080125 100644
--- a/src/components/confirmpopup/ConfirmPopup.vue
+++ b/src/components/confirmpopup/ConfirmPopup.vue
@@ -17,7 +17,8 @@
 
 <script>
 import ConfirmationEventBus from 'primevue/confirmationeventbus';
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import Button from 'primevue/button';
 
 export default {
diff --git a/src/components/datatable/BodyCell.vue b/src/components/datatable/BodyCell.vue
index baf5ee675..22da35e3e 100755
--- a/src/components/datatable/BodyCell.vue
+++ b/src/components/datatable/BodyCell.vue
@@ -31,7 +31,8 @@
 </template>
 
 <script>
-import {DomHandler,ObjectUtils,OverlayEventBus} from 'primevue/utils';
+import {DomHandler,ObjectUtils} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import RowRadioButton from './RowRadioButton.vue';
 import RowCheckbox from './RowCheckbox.vue';
 import Ripple from 'primevue/ripple';
diff --git a/src/components/dropdown/Dropdown.vue b/src/components/dropdown/Dropdown.vue
index ec206e3c9..0b434fe40 100755
--- a/src/components/dropdown/Dropdown.vue
+++ b/src/components/dropdown/Dropdown.vue
@@ -58,7 +58,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import {FilterService} from 'primevue/api';
 import Ripple from 'primevue/ripple';
 
diff --git a/src/components/menu/Menu.vue b/src/components/menu/Menu.vue
index 686cb47dc..3bb0f5f02 100755
--- a/src/components/menu/Menu.vue
+++ b/src/components/menu/Menu.vue
@@ -21,7 +21,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import Menuitem from './Menuitem.vue';
 
 export default {
diff --git a/src/components/multiselect/MultiSelect.vue b/src/components/multiselect/MultiSelect.vue
index d7d876efe..1a0d71d03 100755
--- a/src/components/multiselect/MultiSelect.vue
+++ b/src/components/multiselect/MultiSelect.vue
@@ -93,7 +93,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import {FilterService} from 'primevue/api';
 import Ripple from 'primevue/ripple';
 
diff --git a/src/components/overlayeventbus/OverlayEventBus.js b/src/components/overlayeventbus/OverlayEventBus.js
new file mode 100644
index 000000000..844a1b111
--- /dev/null
+++ b/src/components/overlayeventbus/OverlayEventBus.js
@@ -0,0 +1,3 @@
+import {EventBus} from 'primevue/utils';
+
+export default EventBus();
\ No newline at end of file
diff --git a/src/components/overlayeventbus/package.json b/src/components/overlayeventbus/package.json
new file mode 100644
index 000000000..03bc81a3d
--- /dev/null
+++ b/src/components/overlayeventbus/package.json
@@ -0,0 +1,5 @@
+{
+    "main": "./overlayeventbus.cjs.js",
+    "module": "./overlayeventbus.esm.js",
+    "unpkg": "./overlayeventbus.min.js"
+  }
\ No newline at end of file
diff --git a/src/components/overlaypanel/OverlayPanel.vue b/src/components/overlaypanel/OverlayPanel.vue
index 4f21e5e43..31dd36734 100755
--- a/src/components/overlaypanel/OverlayPanel.vue
+++ b/src/components/overlaypanel/OverlayPanel.vue
@@ -14,7 +14,8 @@
 </template>
 
 <script>
-import {UniqueComponentId,DomHandler,ConnectedOverlayScrollHandler,OverlayEventBus} from 'primevue/utils';
+import {UniqueComponentId,DomHandler,ConnectedOverlayScrollHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/src/components/password/Password.vue b/src/components/password/Password.vue
index 9c62a63bf..10fd64a75 100755
--- a/src/components/password/Password.vue
+++ b/src/components/password/Password.vue
@@ -20,7 +20,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import InputText from 'primevue/inputtext';
 
 export default {
diff --git a/src/components/tieredmenu/TieredMenu.vue b/src/components/tieredmenu/TieredMenu.vue
index 14f228dc3..0b2e78d55 100755
--- a/src/components/tieredmenu/TieredMenu.vue
+++ b/src/components/tieredmenu/TieredMenu.vue
@@ -9,7 +9,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import TieredMenuSub from './TieredMenuSub.vue';
 
 export default {
diff --git a/src/components/utils/OverlayEventBus.js b/src/components/utils/OverlayEventBus.js
deleted file mode 100644
index 5b55760f8..000000000
--- a/src/components/utils/OverlayEventBus.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import EventBus from './EventBus.js';
-
-export default EventBus();
\ No newline at end of file
diff --git a/src/components/utils/Utils.js b/src/components/utils/Utils.js
index 02358c65b..87eb125bd 100644
--- a/src/components/utils/Utils.js
+++ b/src/components/utils/Utils.js
@@ -3,6 +3,5 @@ import DomHandler from './DomHandler';
 import ObjectUtils from './ObjectUtils';
 import UniqueComponentId from './UniqueComponentId';
 import EventBus from './EventBus';
-import OverlayEventBus from './OverlayEventBus';
 
-export {ConnectedOverlayScrollHandler,DomHandler,ObjectUtils,UniqueComponentId,EventBus,OverlayEventBus};
\ No newline at end of file
+export {ConnectedOverlayScrollHandler,DomHandler,ObjectUtils,UniqueComponentId,EventBus};
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index aca0203ac..9a30e29c4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,6 +21,7 @@ module.exports = {
                 'primevue/message': path.resolve(__dirname, 'src/components/message/Message.vue'),
                 'primevue/confirmationeventbus': path.resolve(__dirname, 'src/components/confirmationeventbus/ConfirmationEventBus.js'),
                 'primevue/toasteventbus': path.resolve(__dirname, 'src/components/toasteventbus/ToastEventBus.js'),
+                'primevue/overlayeventbus': path.resolve(__dirname, 'src/components/overlayeventbus/OverlayEventBus.js'),
                 'primevue/terminalservice': path.resolve(__dirname, 'src/components/terminalservice/TerminalService.js')
             },
         },