From ced67bded19a36aa30adc1c8b090cad1ecaa26da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 7 Jun 2022 00:12:59 +0300
Subject: [PATCH] Fixed Left menu livewire event fire issue..

---
 app/Http/Livewire/Menu/Neww.php               |  2 ++
 app/Http/Livewire/Menu/Settings.php           |  2 ++
 resources/views/livewire/menu/neww.blade.php  | 32 ++++++++++++-------
 .../livewire/menu/notifications.blade.php     | 14 ++++----
 .../views/livewire/menu/settings.blade.php    | 32 ++++++++++++-------
 5 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/app/Http/Livewire/Menu/Neww.php b/app/Http/Livewire/Menu/Neww.php
index f8948835d..2a573e403 100644
--- a/app/Http/Livewire/Menu/Neww.php
+++ b/app/Http/Livewire/Menu/Neww.php
@@ -28,6 +28,8 @@ class Neww extends Component
 
             foreach($menu->getItems() as $item) {
                 if ($this->availableInSearch($item)) {
+                    $this->neww[] = $item;
+
                     continue;
                 }
 
diff --git a/app/Http/Livewire/Menu/Settings.php b/app/Http/Livewire/Menu/Settings.php
index cdf3ed678..a293591d2 100644
--- a/app/Http/Livewire/Menu/Settings.php
+++ b/app/Http/Livewire/Menu/Settings.php
@@ -37,6 +37,8 @@ class Settings extends Component
                 }
 
                 if ($this->availableInSearch($item)) {
+                    $this->settings[] = $item;
+
                     continue;
                 }
 
diff --git a/resources/views/livewire/menu/neww.blade.php b/resources/views/livewire/menu/neww.blade.php
index 0f853c165..352a4bb39 100644
--- a/resources/views/livewire/menu/neww.blade.php
+++ b/resources/views/livewire/menu/neww.blade.php
@@ -1,15 +1,23 @@
-<div wire:click.stop id="menu-neww">
+<div wire:click.stop id="menu-neww" class="relative">
     <input type="text" name="neww_keyword" wire:model.debounce.500ms="keyword" placeholder="{{ trans('general.search_placeholder') }}" class="border-t-0 border-l-0 border-r-0 border-b border-gray-300 bg-transparent text-gray-500 text-sm mb-3 focus:outline-none focus:ring-transparent focus:border-purple placeholder-light-gray js-search-action">
 
-    {!! menu('neww') !!}
-</div>
+    @if ($keyword)
+        <button type="button" class="absolute ltr:right-2 rtl:left-2 top-2 clear" wire:click="resetKeyword">
+            <span class="material-icons text-sm">close</span>
+        </button>
+    @endif
 
-@push('scripts_end')
-<script type="text/javascript">
-    window.addEventListener('click', function() {
-        if (Livewire.components.getComponentsByName('menu.neww')[0].data.neww.length > 0) {
-            Livewire.emit('resetKeyword');
-        }
-    });
-</script>
-@endpush
+    @if ($neww)
+        {!! menu('neww') !!}
+    @else
+        <ul class="flex flex-col justify-center">
+            <li class="text-sm mb-5">
+                <div class="flex items-start">
+                    <p class="text-black">
+                        {{ trans('notifications.empty') }}
+                    </p>
+                </div>
+            </li>
+        </ul>
+    @endif
+</div>
diff --git a/resources/views/livewire/menu/notifications.blade.php b/resources/views/livewire/menu/notifications.blade.php
index 2726e2a56..6f6e9c4e5 100644
--- a/resources/views/livewire/menu/notifications.blade.php
+++ b/resources/views/livewire/menu/notifications.blade.php
@@ -1,6 +1,12 @@
-<div wire:click.stop id="menu-notifications">
+<div wire:click.stop id="menu-notifications" class="relative">
     <input type="text" name="notification_keyword" wire:model.debounce.500ms="keyword" placeholder="{{ trans('general.search_placeholder') }}" class="border-t-0 border-l-0 border-r-0 border-b border-gray-300 bg-transparent text-gray-500 text-sm mb-3 focus:outline-none focus:ring-transparent focus:border-purple placeholder-light-gray js-search-action">
 
+    @if ($keyword)
+        <button type="button" class="absolute ltr:right-2 rtl:left-2 top-2 clear" wire:click="resetKeyword">
+            <span class="material-icons text-sm">close</span>
+        </button>
+    @endif
+
     @if ($notifications)
         <div class="flex justify-end mt-1">
             <x-tooltip id="notification-all" placement="right" message="Mark as All Read">
@@ -53,12 +59,6 @@
 
 @push('scripts_end')
     <script type="text/javascript">
-        window.addEventListener('click', function() {
-            if (Livewire.components.getComponentsByName('menu.notifications')[0].data.notifications.length > 0) {
-                Livewire.emit('resetKeyword');
-            }
-        });
-
         window.addEventListener('mark-read', event => {
             if (event.detail.type == 'notifications') {
                 $.notify(event.detail.message, {
diff --git a/resources/views/livewire/menu/settings.blade.php b/resources/views/livewire/menu/settings.blade.php
index 14c9d365f..ee5ec1f08 100644
--- a/resources/views/livewire/menu/settings.blade.php
+++ b/resources/views/livewire/menu/settings.blade.php
@@ -1,7 +1,25 @@
-<div wire:click.stop id="menu-settings">
+<div wire:click.stop id="menu-settings" class="relative">
     <input type="text" name="settings_keyword" wire:model.debounce.500ms="keyword" placeholder="{{ trans('general.search_placeholder') }}" class="border-t-0 border-l-0 border-r-0 border-b border-gray-300 bg-transparent text-gray-500 text-sm mb-3 focus:outline-none focus:ring-transparent focus:border-purple placeholder-light-gray js-search-action">
 
-    {!! menu('settings') !!}
+    @if ($keyword)
+        <button type="button" class="absolute ltr:right-2 rtl:left-2 top-2 clear" wire:click="resetKeyword">
+            <span class="material-icons text-sm">close</span>
+        </button>
+    @endif
+
+    @if ($settings)
+        {!! menu('settings') !!}
+    @else
+        <ul class="flex flex-col justify-center">
+            <li class="text-sm mb-5">
+                <div class="flex items-start">
+                    <p class="text-black">
+                        {{ trans('notifications.empty') }}
+                    </p>
+                </div>
+            </li>
+        </ul>
+    @endif
 </div>
 
 @push('scripts_start')
@@ -9,13 +27,3 @@
     var is_settings_menu = {{ $active_menu }};
 </script>
 @endpush
-
-@push('scripts_end')
-<script type="text/javascript">
-    window.addEventListener('click', function() {
-        if (Livewire.components.getComponentsByName('menu.settings')[0].data.settings.length > 0) {
-            Livewire.emit('resetKeyword');
-        }
-    });
-</script>
-@endpush