From ea311d2ee44508434d2320df38629a2cd230fcdb Mon Sep 17 00:00:00 2001
From: Willem Poortman <wpoortman@users.noreply.github.com>
Date: Sun, 12 Feb 2023 10:41:31 +0100
Subject: [PATCH] Bugfix/loader missing effects (#75)

* Bugfix on missing message effects property on failure hook

---------

Co-authored-by: Willem <git@wpoortman.nl>
---
 src/view/frontend/templates/html/loader.phtml         |  2 +-
 .../templates/page/js/magewire/plugin/loader.phtml    | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/view/frontend/templates/html/loader.phtml b/src/view/frontend/templates/html/loader.phtml
index 01aa657..49af5ba 100644
--- a/src/view/frontend/templates/html/loader.phtml
+++ b/src/view/frontend/templates/html/loader.phtml
@@ -63,11 +63,11 @@ $magewireScripts = $block->getViewModel();
      x-cloak
      role="status"
      aria-live="polite"
+     x-bind:class="{'z-50 relative': active}"
 >
      <div class="fixed
                  top-0 left-0 right-0 bottom-0
                  w-full h-screen
-                 z-40
                  overflow-hidden
                  bg-white bg-opacity-90"
           x-show="active"
diff --git a/src/view/frontend/templates/page/js/magewire/plugin/loader.phtml b/src/view/frontend/templates/page/js/magewire/plugin/loader.phtml
index dac7500..b5e9b0b 100644
--- a/src/view/frontend/templates/page/js/magewire/plugin/loader.phtml
+++ b/src/view/frontend/templates/page/js/magewire/plugin/loader.phtml
@@ -75,15 +75,10 @@ use Magewirephp\Magewire\Model\Action\FireEvent;
             start = null,
 
             tryToStop = function(message, component, failed = false) {
-                queue = queue.filter(item => component.id !== item.component.id)
-                let emits = null
+                queue = queue.filter(item => component.id !== item.component.id);
 
-                if (message.response.effects.emits) {
-                    emits = message.response.effects.emits || null
-                }
-
-                if (emits) {
-                    emits.forEach((emit) => {
+                if (message.response && message.response.effects) {
+                    (message.response.effects.emits || []).forEach((emit) => {
                         Magewire.components.componentsListeningForEvent(emit.event).forEach((component) => {
                             queue.push({ component: component, emit: true })
                         })