wip

Author: joetannenbaum

packages/react/tests/use-echo.test.ts

@@ -1041,10 +1041,11 @@ describe("useEchoNotification hook", async () => {
             echoModule.useEchoNotification(channelName, mockCallback),
         );
 
-        expect(echoInstance.private).toHaveBeenCalledWith(channelName);
+        const channel = echoInstance.private(channelName);
 
         expect(() => unmount()).not.toThrow();
 
+        expect(channel.stopListeningForNotification).toHaveBeenCalled();
         expect(echoInstance.leaveChannel).toHaveBeenCalledWith(
             `private-${channelName}`,
         );
@@ -1113,8 +1114,11 @@ describe("useEchoNotification hook", async () => {
         expect(channel.notification).toHaveBeenCalledTimes(1);
 
         result.current.stopListening();
+        expect(channel.stopListeningForNotification).toHaveBeenCalled();
+
         result.current.listen();
 
+        // notification should still only be called once due to initialized check
         expect(channel.notification).toHaveBeenCalledTimes(1);
     });
 

packages/vue/src/composables/useEcho.ts

@@ -245,6 +245,10 @@ export const useEchoNotification = <
         listen();
     });
 
+    onUnmounted(() => {
+        stopListening();
+    });
+
     return {
         ...result,
         /**

packages/vue/tests/useEcho.test.ts

@@ -924,10 +924,11 @@ describe("useEchoNotification hook", async () => {
             undefined,
         );
 
-        expect(echoInstance.private).toHaveBeenCalledWith(channelName);
+        const channel = echoInstance.private(channelName);
 
         wrapper.unmount();
 
+        expect(channel.stopListeningForNotification).toHaveBeenCalled();
         expect(echoInstance.leaveChannel).toHaveBeenCalledWith(
             `private-${channelName}`,
         );