Fix up failing unit tests

- Added more tests around different payload types as well

Author: mofojed

packages/golden-layout/src/utils/EventUtils.test.ts

@@ -45,7 +45,7 @@ describe('EventUtils', () => {
 
   it('makeEmitFunction', () => {
     const event = 'test';
-    const emit = makeEmitFunction(event);
+    const emit = makeEmitFunction<unknown>(event);
     const payload = { test: 'test' };
     emit(eventEmitter, payload);
     expect(eventEmitter.emit).toHaveBeenCalledWith(event, payload);
@@ -109,30 +109,93 @@ describe('EventUtils', () => {
   });
 
   describe('makeEventFunctions', () => {
-    const event = 'test';
-    const { listen, emit, useListener } = makeEventFunctions(event);
-    const handler = jest.fn();
+    describe('makeEventFunctions without payload', () => {
+      const event = 'test';
+      const { listen, emit, useListener } = makeEventFunctions(event);
+      const handler = jest.fn();
 
-    it('listen', () => {
-      listen(eventEmitter, handler);
-      expect(eventEmitter.on).toHaveBeenCalledWith(event, handler);
-      expect(eventEmitter.off).not.toHaveBeenCalled();
+      it('listen', () => {
+        listen(eventEmitter, handler);
+        expect(eventEmitter.on).toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).not.toHaveBeenCalled();
+      });
+
+      it('emit', () => {
+        emit(eventEmitter);
+        expect(eventEmitter.emit).toHaveBeenCalledWith(event);
+      });
+
+      it('useListener', () => {
+        const { unmount } = renderHook(() =>
+          useListener(eventEmitter, handler)
+        );
+        expect(eventEmitter.on).toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).not.toHaveBeenCalled();
+        jest.clearAllMocks();
+        unmount();
+        expect(eventEmitter.on).not.toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).toHaveBeenCalledWith(event, handler);
+      });
     });
+    describe('makeEventFunctions with payload', () => {
+      type Payload = { test: string };
+      const event = 'test';
+      const { listen, emit, useListener } = makeEventFunctions<Payload>(event);
+      const handler = jest.fn();
+
+      it('listen', () => {
+        listen(eventEmitter, handler);
+        expect(eventEmitter.on).toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).not.toHaveBeenCalled();
+      });
+
+      it('emit', () => {
+        const payload: Payload = { test: 'test' };
+        emit(eventEmitter, payload);
+        expect(eventEmitter.emit).toHaveBeenCalledWith(event, payload);
+      });
 
-    it('emit', () => {
-      const payload = { test: 'test' };
-      emit(eventEmitter, payload);
-      expect(eventEmitter.emit).toHaveBeenCalledWith(event, payload);
+      it('useListener', () => {
+        const { unmount } = renderHook(() =>
+          useListener(eventEmitter, handler)
+        );
+        expect(eventEmitter.on).toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).not.toHaveBeenCalled();
+        jest.clearAllMocks();
+        unmount();
+        expect(eventEmitter.on).not.toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).toHaveBeenCalledWith(event, handler);
+      });
     });
+    describe('makeEventFunctions with multiple parameters', () => {
+      type Payload = [number, string];
+      const event = 'test';
+      const { listen, emit, useListener } = makeEventFunctions<Payload>(event);
+      const handler = jest.fn();
 
-    it('useListener', () => {
-      const { unmount } = renderHook(() => useListener(eventEmitter, handler));
-      expect(eventEmitter.on).toHaveBeenCalledWith(event, handler);
-      expect(eventEmitter.off).not.toHaveBeenCalled();
-      jest.clearAllMocks();
-      unmount();
-      expect(eventEmitter.on).not.toHaveBeenCalledWith(event, handler);
-      expect(eventEmitter.off).toHaveBeenCalledWith(event, handler);
+      it('listen', () => {
+        listen(eventEmitter, handler);
+        expect(eventEmitter.on).toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).not.toHaveBeenCalled();
+      });
+
+      it('emit', () => {
+        const payload: Payload = [1, 'test'];
+        emit(eventEmitter, ...payload);
+        expect(eventEmitter.emit).toHaveBeenCalledWith(event, ...payload);
+      });
+
+      it('useListener', () => {
+        const { unmount } = renderHook(() =>
+          useListener(eventEmitter, handler)
+        );
+        expect(eventEmitter.on).toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).not.toHaveBeenCalled();
+        jest.clearAllMocks();
+        unmount();
+        expect(eventEmitter.on).not.toHaveBeenCalledWith(event, handler);
+        expect(eventEmitter.off).toHaveBeenCalledWith(event, handler);
+      });
     });
   });
 });

packages/golden-layout/src/utils/EventUtils.ts

@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 import EventEmitter from './EventEmitter';
 
-export type EventHandlerFunction<P = []> = (
-  ...parameters: P extends unknown[] ? P : [P]
-) => void;
+type AsArray<P> = P extends unknown[] ? P : [P];
+
+export type EventHandlerFunction<P = []> = (...parameters: AsArray<P>) => void;
 export type EventListenerRemover = () => void;
 export type EventListenFunction<TParameters = []> = (
   eventEmitter: EventEmitter,
@@ -12,7 +12,7 @@ export type EventListenFunction<TParameters = []> = (
 
 export type EventEmitFunction<TParameters = []> = (
   eventEmitter: EventEmitter,
-  ...parameters: TParameters extends unknown[] ? TParameters : [TParameters]
+  ...parameters: AsArray<TParameters>
 ) => void;
 
 export type EventListenerHook<TParameters = []> = (